Api.h		Api.h
	skipping to change at line 99		skipping to change at line 99
	struct G__Preprocessfilekey *preprocessfilekey;		struct G__Preprocessfilekey *preprocessfilekey;
	/* input file */		/* input file */
	int nfile;		int nfile;
	/* macro table */		/* macro table */
	struct G__Deffuncmacro *deffuncmacro;		struct G__Deffuncmacro *deffuncmacro;
	/* template class */		/* template class */
	struct G__Definedtemplateclass *definedtemplateclass;		struct G__Definedtemplateclass *definedtemplateclass;
	/* function template */		/* function template */
	struct G__Definetemplatefunc *definedtemplatefunc;		struct G__Definetemplatefunc *definedtemplatefunc;
	char* ptype; /* struct,union,enum,class */		int nactives; /* number of 'active' classes */
	};		};
	namespace Cint {		namespace Cint {
	/*********************************************************************		/*********************************************************************
	* $xxx object resolution function, pointer to a class object		* $xxx object resolution function, pointer to a class object
	*		*
	* Usage:		* Usage:
	*		*
	* void YourGetObject(char *name,G__ClassInfo *type) {		* void YourGetObject(char *name,G__ClassInfo *type) {
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	BinData.h		BinData.h
	// @(#)root/mathcore:$Id: BinData.h 25876 2008-10-18 09:35:00Z moneta $		// @(#)root/mathcore:$Id: BinData.h 27169 2009-01-16 09:46:05Z moneta $
	// Author: L. Moneta Wed Aug 30 11:15:23 2006		// Author: L. Moneta Wed Aug 30 11:15:23 2006
	/**********************************************************************		/**********************************************************************
	* *		* *
	* Copyright (c) 2006 LCG ROOT Math Team, CERN/PH-SFT *		* Copyright (c) 2006 LCG ROOT Math Team, CERN/PH-SFT *
	* *		* *
	* *		* *
	**********************************************************************/		**********************************************************************/
	// Header file for class BinData		// Header file for class BinData
	skipping to change at line 62		skipping to change at line 62
	@ingroup FitData		@ingroup FitData
	*/		*/
	class BinData : public FitData {		class BinData : public FitData {
	public :		public :
	enum ErrorType { kNoError, kValueError, kCoordError, kAsymError };		enum ErrorType { kNoError, kValueError, kCoordError, kAsymError };
	static unsigned int GetPointSize(ErrorType err, unsigned int dim) {		static unsigned int GetPointSize(ErrorType err, unsigned int dim) {
			if (dim == 0 || dim > MaxSize() ) return 0;
	if (err == kNoError) return dim + 1; // no errors		if (err == kNoError) return dim + 1; // no errors
	if (err == kValueError) return dim + 2; // error only on the value		if (err == kValueError) return dim + 2; // error only on the value
	if (err == kCoordError) return 2 * dim + 2 ; // error on value and c oordinate		if (err == kCoordError) return 2 * dim + 2 ; // error on value and c oordinate
	return 2 * dim + 3; // error on value (low and high) and error on coordinate		return 2 * dim + 3; // error on value (low and high) and error on coordinate
	}		}
	ErrorType GetErrorType() const {		ErrorType GetErrorType() const {
	if (fPointSize == fDim + 1) return kNoError;		if (fPointSize == fDim + 1) return kNoError;
	if (fPointSize == fDim + 2) return kValueError;		if (fPointSize == fDim + 2) return kValueError;
	if (fPointSize == 2 * fDim + 2) return kCoordError;		if (fPointSize == 2 * fDim + 2) return kCoordError;
	skipping to change at line 127		skipping to change at line 128
	assignment operator		assignment operator
	*/		*/
	BinData & operator= (const BinData &);		BinData & operator= (const BinData &);
	/**		/**
	destructor		destructor
	*/		*/
	virtual ~BinData();		virtual ~BinData();
	/**		/**
	preallocate a data set given size and dimension		preallocate a data set with given size , dimension and error type (t
	need to be initialized with the with the right dimension before		o get the full point size)
			If the data set already exists and it is having the compatible point
			size space for the new points
			is created in the data sets, while if not compatible the old data are
			erased and new space of
			new size is allocated.
			(i.e if exists initialize is equivalent to a resize( NPoints() + maxp
			oints)
	*/		*/
	void Initialize(unsigned int maxpoints, unsigned int dim = 1, ErrorType err = kValueError );		void Initialize(unsigned int maxpoints, unsigned int dim = 1, ErrorType err = kValueError );
	/**		/**
	return the size of a fit point (is the coordinate dimension + 1 for t he value and eventually		return the size of a fit point (is the coordinate dimension + 1 for t he value and eventually
	the number of all errors		the number of all errors
	*/		*/
	unsigned int PointSize() const {		unsigned int PointSize() const {
	return fPointSize;		return fPointSize;
	}		}
	skipping to change at line 410		skipping to change at line 414
	double value = fDataWrapper->Value(ipoint);		double value = fDataWrapper->Value(ipoint);
	double e = fDataWrapper->Error(ipoint);		double e = fDataWrapper->Error(ipoint);
	double invError = ( e != 0 ) ? 1.0/e : 0;		double invError = ( e != 0 ) ? 1.0/e : 0;
	fPoint.Set(fDataWrapper->Coords(ipoint), value, invError);		fPoint.Set(fDataWrapper->Coords(ipoint), value, invError);
	}		}
	return fPoint;		return fPoint;
	}		}
	#endif		#endif
	/**		/**
	resize the vector to the given npoints		resize the vector to the new given npoints
			if vector does not exists is created using existing point size
	*/		*/
	void Resize (unsigned int npoints) {		void Resize (unsigned int npoints);
	fNPoints = npoints;
	(fDataVector->Data()).resize(PointSize() *npoints);
	}
	/**		/**
	return number of fit points		return number of fit points
	*/		*/
	unsigned int NPoints() const { return fNPoints; }		unsigned int NPoints() const { return fNPoints; }
	/**		/**
	return number of fit points		return number of fit points
	In case of integral option size is npoints -1		In case of integral option size is npoints -1
	*/		*/
End of changes. 5 change blocks.
	8 lines changed or deleted		14 lines changed or added

	CollectionProxy.h		CollectionProxy.h
	// @(#)root/reflex:$Id: CollectionProxy.h 23409 2008-04-23 07:41:37Z axel $		// @(#)root/reflex:$Id: CollectionProxy.h 27278 2009-01-28 14:02:41Z axel $
	// Author: Markus Frank 2004		// Author: Markus Frank 2004
	// Copyright CERN, CH-1211 Geneva 23, 2004-2006, All rights reserved.		// Copyright CERN, CH-1211 Geneva 23, 2004-2006, All rights reserved.
	//		//
	// Permission to use, copy, modify, and distribute this software for any		// Permission to use, copy, modify, and distribute this software for any
	// purpose is hereby granted without fee, provided that this copyright and		// purpose is hereby granted without fee, provided that this copyright and
	// permissions notice appear in all copies and derivatives.		// permissions notice appear in all copies and derivatives.
	//		//
	// This software is provided "as is" without express or implied warranty.		// This software is provided "as is" without express or implied warranty.
	skipping to change at line 48		skipping to change at line 48
	#elif defined(_WIN32)		#elif defined(_WIN32)
	namespace stdext { // Visual C++		namespace stdext { // Visual C++
	template <class K, class T, class A> class hash_set;		template <class K, class T, class A> class hash_set;
	template <class K, class T, class A> class hash_multiset;		template <class K, class T, class A> class hash_multiset;
	template <class K, class T, class R, class A> class hash_map;		template <class K, class T, class R, class A> class hash_map;
	template <class K, class T, class R, class A> class hash_multimap;		template <class K, class T, class R, class A> class hash_multimap;
	}		}
	#endif		#endif
	namespace Reflex {		namespace Reflex {
	#ifndef __CINT__		#ifndef __CINT__
	template <typename T> struct Environ {		struct EnvironBase {
			EnvironBase() : fIdx(0), fSize(0), fObject(0), fStart(0), fTemp(0), f
			DeleteTemp(false), fRefSize(1), fSpace(0)
			{
			// fprintf("Running default constructor on %p\n",this);
			}
			virtual ~EnvironBase() {}
			size_t fIdx;
			size_t fSize;
			void* fObject;
			void* fStart;
			void* fTemp;
			bool fDeleteTemp;
			int fRefSize;
			size_t fSpace;
			};
			template <typename T> struct Environ : public EnvironBase {
	typedef T Iter_t;		typedef T Iter_t;
	char buff[64];		Iter_t fIterator;
	size_t idx;		T& iter() { return fIterator; }
	size_t size;		static void *Create() {
	void* object;		return new Environ();
	void* start;		}
	void* temp;
	bool delete_temp;
	int refSize;
	size_t space;
	T& iter() { return *(T*)buff; }
	};		};
	#else		#else
			struct EnvironBase;
	template <typename T> struct Environ;		template <typename T> struct Environ;
	#endif		#endif
	template <typename T> struct Address {		template <typename T> struct Address {
	static void* address(T ref) {		static void* address(T ref) {
	return (void*)&ref;		return (void*)&ref;
	}		}
	};		};
	template <class T> struct CollType		template <class T> struct CollType
	#ifdef _KCC // KAI compiler		#ifdef _KCC // KAI compiler
	: public Address<typename T::value_type&>		: public Address<typename T::value_type&>
	#else		#else
	: public Address<typename T::const_reference>		: public Address<typename T::const_reference>
	#endif		#endif
	{		{
	typedef T Cont_t;		typedef T Cont_t;
	typedef typename T::iterator Iter_t;		typedef typename T::iterator Iter_t;
	typedef typename T::value_type Value_t;		typedef typename T::value_type Value_t;
	typedef Reflex::Environ<Iter_t> Env_t;		typedef Reflex::Environ<Iter_t> Env_t;
	typedef Env_t *PEnv_t;		typedef Env_t *PEnv_t;
	typedef Cont_t *PCont_t;		typedef Cont_t *PCont_t;
	typedef Value_t *PValue_t;		typedef Value_t *PValue_t;
	static inline PCont_t object(void* ptr) {		static inline PCont_t object(void* ptr) {
	return PCont_t(PEnv_t(ptr)->object);		return PCont_t(PEnv_t(ptr)->fObject);
	}		}
	static void* size(void* env) {		static void* size(void* env) {
	PEnv_t e = PEnv_t(env);		PEnv_t e = PEnv_t(env);
	e->size = PCont_t(e->object)->size();		e->fSize = PCont_t(e->fObject)->size();
	return &e->size;		return &e->fSize;
	}		}
	static void* clear(void* env) {		static void* clear(void* env) {
	object(env)->clear();		object(env)->clear();
	return 0;		return 0;
	}		}
	static void* first(void* env) {		static void* first(void* env) {
	PEnv_t e = PEnv_t(env);		PEnv_t e = PEnv_t(env);
	PCont_t c = PCont_t(e->object);		PCont_t c = PCont_t(e->fObject);
	// Assume iterators do not need destruction		// Assume iterators do not need destruction
	::new(e->buff) Iter_t(c->begin());		e->fIterator = c->begin();
	e->size = c->size();		e->fSize = c->size();
	if ( 0 == e->size ) return e->start = 0;		if ( 0 == e->fSize ) return e->fStart = 0;
	#ifdef _KCC // KAI compiler		#ifdef _KCC // KAI compiler
	typename T::value_type& ref = *(e->iter());		typename T::value_type& ref = *(e->iter());
	#else		#else
	typename T::const_reference ref = *(e->iter());		typename T::const_reference ref = *(e->iter());
	#endif		#endif
	return e->start = address(ref);		return e->fStart = address(ref);
	}		}
	static void* next(void* env) {		static void* next(void* env) {
	PEnv_t e = PEnv_t(env);		PEnv_t e = PEnv_t(env);
	PCont_t c = PCont_t(e->object);		PCont_t c = PCont_t(e->fObject);
	for ( ; e->idx > 0 && e->iter() != c->end(); ++(e->iter()), --e->i		for ( ; e->fIdx > 0 && e->iter() != c->end(); ++(e->iter()), --e->
	dx ) {}		fIdx ) {}
	// TODO: Need to find something for going backwards....		// TODO: Need to find something for going backwards....
	if ( e->iter() == c->end() ) return 0;		if ( e->iter() == c->end() ) return 0;
	#ifdef _KCC // KAI compiler		#ifdef _KCC // KAI compiler
	typename T::value_type& ref = *(e->iter());		typename T::value_type& ref = *(e->iter());
	#else		#else
	typename T::const_reference ref = *(e->iter());		typename T::const_reference ref = *(e->iter());
	#endif		#endif
	return address(ref);		return address(ref);
	}		}
	static void* construct(void* env) {		static void* construct(void* env) {
	PEnv_t e = PEnv_t(env);		PEnv_t e = PEnv_t(env);
	PValue_t m = PValue_t(e->start);		PValue_t m = PValue_t(e->fStart);
	for (size_t i=0; i<e->size; ++i, ++m)		for (size_t i=0; i<e->fSize; ++i, ++m)
	::new(m) Value_t();		::new(m) Value_t();
	return 0;		return 0;
	}		}
	static void* collect(void* env) {		static void* collect(void* env) {
	PEnv_t e = PEnv_t(env);		PEnv_t e = PEnv_t(env);
	PCont_t c = PCont_t(e->object);		PCont_t c = PCont_t(e->fObject);
	PValue_t m = PValue_t(e->start);		PValue_t m = PValue_t(e->fStart);
	for (Iter_t i=c->begin(); i != c->end(); ++i, ++m )		for (Iter_t i=c->begin(); i != c->end(); ++i, ++m )
	::new(m) Value_t(*i);		::new(m) Value_t(*i);
	return 0;		return 0;
	}		}
	static void* destruct(void* env) {		static void* destruct(void* env) {
	PEnv_t e = PEnv_t(env);		PEnv_t e = PEnv_t(env);
	PValue_t m = PValue_t(e->start);		PValue_t m = PValue_t(e->fStart);
	for (size_t i=0; i < e->size; ++i, ++m )		for (size_t i=0; i < e->fSize; ++i, ++m )
	m->~Value_t();		m->~Value_t();
	return 0;		return 0;
	}		}
	};		};
	/** @class TCollectionProxy::Map TCollectionProxy.h TCollectionProxy.h		/** @class TCollectionProxy::Map TCollectionProxy.h TCollectionProxy.h
	*		*
	* Small helper to encapsulate all necessary data accesses for		* Small helper to encapsulate all necessary data accesses for
	* containers like vector, list, deque		* containers like vector, list, deque
	*		*
	skipping to change at line 170		skipping to change at line 180
	template <class T> struct Pushback : public CollType<T> {		template <class T> struct Pushback : public CollType<T> {
	typedef T Cont_t;		typedef T Cont_t;
	typedef typename T::iterator Iter_t;		typedef typename T::iterator Iter_t;
	typedef typename T::value_type Value_t;		typedef typename T::value_type Value_t;
	typedef Environ<Iter_t> Env_t;		typedef Environ<Iter_t> Env_t;
	typedef Env_t *PEnv_t;		typedef Env_t *PEnv_t;
	typedef Cont_t *PCont_t;		typedef Cont_t *PCont_t;
	typedef Value_t *PValue_t;		typedef Value_t *PValue_t;
	static void* resize(void* env) {		static void* resize(void* env) {
	PEnv_t e = PEnv_t(env);		PEnv_t e = PEnv_t(env);
	PCont_t c = PCont_t(e->object);		PCont_t c = PCont_t(e->fObject);
	c->resize(e->size);		c->resize(e->fSize);
	e->idx = 0;		e->fIdx = 0;
	return e->start = address(*c->begin());		return e->fStart = address(*c->begin());
	}		}
	static void* feed(void* env) {		static void* feed(void* env) {
	PEnv_t e = PEnv_t(env);		PEnv_t e = PEnv_t(env);
	PCont_t c = PCont_t(e->object);		PCont_t c = PCont_t(e->fObject);
	PValue_t m = PValue_t(e->start);		PValue_t m = PValue_t(e->fStart);
	for (size_t i=0; i<e->size; ++i, ++m)		for (size_t i=0; i<e->fSize; ++i, ++m)
	c->push_back(*m);		c->push_back(*m);
	return 0;		return 0;
	}		}
	static int value_offset() {		static int value_offset() {
	return 0;		return 0;
	}		}
	};		};
	/** @class TCollectionProxy::Map TCollectionProxy.h TCollectionProxy.h		/** @class TCollectionProxy::Map TCollectionProxy.h TCollectionProxy.h
	*		*
	skipping to change at line 207		skipping to change at line 217
	template <class T> struct Insert : public CollType<T> {		template <class T> struct Insert : public CollType<T> {
	typedef T Cont_t;		typedef T Cont_t;
	typedef typename T::iterator Iter_t;		typedef typename T::iterator Iter_t;
	typedef typename T::value_type Value_t;		typedef typename T::value_type Value_t;
	typedef Environ<Iter_t> Env_t;		typedef Environ<Iter_t> Env_t;
	typedef Env_t *PEnv_t;		typedef Env_t *PEnv_t;
	typedef Cont_t *PCont_t;		typedef Cont_t *PCont_t;
	typedef Value_t *PValue_t;		typedef Value_t *PValue_t;
	static void* feed(void* env) {		static void* feed(void* env) {
	PEnv_t e = PEnv_t(env);		PEnv_t e = PEnv_t(env);
	PCont_t c = PCont_t(e->object);		PCont_t c = PCont_t(e->fObject);
	PValue_t m = PValue_t(e->start);		PValue_t m = PValue_t(e->fStart);
	for (size_t i=0; i<e->size; ++i, ++m)		for (size_t i=0; i<e->fSize; ++i, ++m)
	c->insert(*m);		c->insert(*m);
	return 0;		return 0;
	}		}
	static void* resize(void* /* env */ ) {		static void* resize(void* /* env */ ) {
	return 0;		return 0;
	}		}
	static int value_offset() {		static int value_offset() {
	return 0;		return 0;
	}		}
	};		};
	skipping to change at line 240		skipping to change at line 250
	template <class T> struct MapInsert : public CollType<T> {		template <class T> struct MapInsert : public CollType<T> {
	typedef T Cont_t;		typedef T Cont_t;
	typedef typename T::iterator Iter_t;		typedef typename T::iterator Iter_t;
	typedef typename T::value_type Value_t;		typedef typename T::value_type Value_t;
	typedef Environ<Iter_t> Env_t;		typedef Environ<Iter_t> Env_t;
	typedef Env_t *PEnv_t;		typedef Env_t *PEnv_t;
	typedef Cont_t *PCont_t;		typedef Cont_t *PCont_t;
	typedef Value_t *PValue_t;		typedef Value_t *PValue_t;
	static void* feed(void* env) {		static void* feed(void* env) {
	PEnv_t e = PEnv_t(env);		PEnv_t e = PEnv_t(env);
	PCont_t c = PCont_t(e->object);		PCont_t c = PCont_t(e->fObject);
	PValue_t m = PValue_t(e->start);		PValue_t m = PValue_t(e->fStart);
	for (size_t i=0; i<e->size; ++i, ++m)		for (size_t i=0; i<e->fSize; ++i, ++m)
	c->insert(*m);		c->insert(*m);
	return 0;		return 0;
	}		}
	static void* resize(void* /* env */ ) {		static void* resize(void* /* env */ ) {
	return 0;		return 0;
	}		}
	static int value_offset() {		static int value_offset() {
	return ((char*)&((PValue_t(0x1000))->second)) - ((char*)PValue_t(0 x1000));		return ((char*)&((PValue_t(0x1000))->second)) - ((char*)PValue_t(0 x1000));
	}		}
	};		};
	skipping to change at line 285		skipping to change at line 295
	int value_offset;		int value_offset;
	void* (*size_func)(void*);		void* (*size_func)(void*);
	void* (*resize_func)(void*);		void* (*resize_func)(void*);
	void* (*clear_func)(void*);		void* (*clear_func)(void*);
	void* (*first_func)(void*);		void* (*first_func)(void*);
	void* (*next_func)(void*);		void* (*next_func)(void*);
	void* (*construct_func)(void*);		void* (*construct_func)(void*);
	void* (*destruct_func)(void*);		void* (*destruct_func)(void*);
	void* (*feed_func)(void*);		void* (*feed_func)(void*);
	void* (*collect_func)(void*);		void* (*collect_func)(void*);
			void* (*create_env)();
	};		};
	template <typename T> struct CFTGenerator {		template <typename T> struct CFTGenerator {
	static CollFuncTable* Generate() {		static CollFuncTable* Generate() {
	typedef typename T::Value_t Value_t;		typedef typename T::Value_t Value_t;
	typedef std::pair<Value_t,Value_t> Pair_t;		typedef std::pair<Value_t,Value_t> Pair_t;
	Pair_t* ptr = (Pair_t*)0x1000;		Pair_t* ptr = (Pair_t*)0x1000;
	CollFuncTable* p = new CollFuncTable();		CollFuncTable* p = new CollFuncTable();
	p->iter_size = sizeof(typename T::Iter_t);		p->iter_size = sizeof(typename T::Iter_t);
	p->value_diff = ((char*)&ptr->second) - ((char*)&ptr->first);		p->value_diff = ((char*)&ptr->second) - ((char*)&ptr->first);
	p->value_offset = T::value_offset();		p->value_offset = T::value_offset();
	p->size_func = T::size;		p->size_func = T::size;
	p->first_func = T::first;		p->first_func = T::first;
	p->next_func = T::next;		p->next_func = T::next;
	p->clear_func = T::clear;		p->clear_func = T::clear;
	p->resize_func = T::resize;		p->resize_func = T::resize;
	p->collect_func = T::collect;		p->collect_func = T::collect;
	p->construct_func = T::construct;		p->construct_func = T::construct;
	p->destruct_func = T::destruct;		p->destruct_func = T::destruct;
	p->feed_func = T::feed;		p->feed_func = T::feed;
			p->create_env = T::Env_t::Create;
	return p;		return p;
	}		}
	};		};
	struct CFTNullGenerator {		struct CFTNullGenerator {
	static void* Void_func(void*) {		static void* Void_func(void*) {
	return 0;		return 0;
	}		}
			static void* Void_func0() { return 0; }
	static CollFuncTable* Generate() {		static CollFuncTable* Generate() {
	CollFuncTable* p = new CollFuncTable();		CollFuncTable* p = new CollFuncTable();
	p->iter_size = 4;		p->iter_size = 4;
	p->value_diff = 0;		p->value_diff = 0;
	p->value_offset = 0;		p->value_offset = 0;
	p->size_func = Void_func;		p->size_func = Void_func;
	p->first_func = Void_func;		p->first_func = Void_func;
	p->next_func = Void_func;		p->next_func = Void_func;
	p->clear_func = Void_func;		p->clear_func = Void_func;
	p->resize_func = Void_func;		p->resize_func = Void_func;
	p->collect_func = Void_func;		p->collect_func = Void_func;
	p->construct_func = Void_func;		p->construct_func = Void_func;
	p->destruct_func = Void_func;		p->destruct_func = Void_func;
	p->feed_func = Void_func;		p->feed_func = Void_func;
			p->create_env = Void_func0;
	return p;		return p;
	}		}
	};		};
	// General proxy (dummy)		// General proxy (dummy)
	template <typename A> struct Proxy {};		template <typename A> struct Proxy {};
	// Specialization for std::vector		// Specialization for std::vector
	template <class T, class A> struct Proxy< std::vector<T,A> > {		template <class T, class A> struct Proxy< std::vector<T,A> > {
	static CollFuncTable* Generate() {		static CollFuncTable* Generate() {
	return CFTGenerator<Pushback<std::vector<T,A> > >::Generate();		return CFTGenerator<Pushback<std::vector<T,A> > >::Generate();
End of changes. 23 change blocks.
	44 lines changed or deleted		59 lines changed or added

	DataVector.h		DataVector.h
	// @(#)root/mathcore:$Id: DataVector.h 25876 2008-10-18 09:35:00Z moneta $		// @(#)root/mathcore:$Id: DataVector.h 27169 2009-01-16 09:46:05Z moneta $
	// Author: L. Moneta Wed Aug 30 11:15:23 2006		// Author: L. Moneta Wed Aug 30 11:15:23 2006
	/**********************************************************************		/**********************************************************************
	* *		* *
	* Copyright (c) 2006 LCG ROOT Math Team, CERN/PH-SFT *		* Copyright (c) 2006 LCG ROOT Math Team, CERN/PH-SFT *
	* *		* *
	* *		* *
	**********************************************************************/		**********************************************************************/
	// Header file for class DataVector		// Header file for class DataVector
	skipping to change at line 82		skipping to change at line 82
	access to options		access to options
	*/		*/
	const DataOptions & Opt() const { return fOptions; }		const DataOptions & Opt() const { return fOptions; }
	DataOptions & Opt() { return fOptions; }		DataOptions & Opt() { return fOptions; }
	/**		/**
	access to range		access to range
	*/		*/
	const DataRange & Range() const { return fRange; }		const DataRange & Range() const { return fRange; }
			/**
			define a max size to avoid allocating too large arrays
			*/
			static unsigned int MaxSize() {
			return (unsigned int) (-1) / sizeof (double);
			}
	private:		private:
	DataOptions fOptions;		DataOptions fOptions;
	DataRange fRange;		DataRange fRange;
	};		};
	/**		/**
	class holding the fit data points. It is template on the type of point,		class holding the fit data points. It is template on the type of point,
	which can be for example a binned or unbinned point.		which can be for example a binned or unbinned point.
	skipping to change at line 107		skipping to change at line 114
	class DataVector {		class DataVector {
	public:		public:
	typedef std::vector<double> FData;		typedef std::vector<double> FData;
	/**		/**
	default constructor for a vector of N -data		default constructor for a vector of N -data
	*/		*/
	explicit DataVector (unsigned int n ) :		explicit DataVector (size_t n ) :
	fData(std::vector<double>(n))		fData(std::vector<double>(n))
	{		{
	//if (n!=0) fData.reserve(n);		//if (n!=0) fData.reserve(n);
	}		}
	/**		/**
	Destructor (no operations)		Destructor (no operations)
	*/		*/
	~DataVector () {}		~DataVector () {}
	// use default copy constructor and assignment operator		// use default copy constructor and assignment operator
	skipping to change at line 156		skipping to change at line 164
	#endif		#endif
	/**		/**
	access to the point		access to the point
	*/		*/
	const double & operator[] (unsigned int i) const { return fData[i]; }		const double & operator[] (unsigned int i) const { return fData[i]; }
	double & operator[] (unsigned int i) { return fData[i]; }		double & operator[] (unsigned int i) { return fData[i]; }
	/**		/**
	full size of data vector (npoints * point size)		full size of data vector (npoints * point size)
	*/		*/
	unsigned int Size() const { return fData.size(); }		size_t Size() const { return fData.size(); }
	private:		private:
	FData fData;		FData fData;
	};		};
	// // usefule typedef's of DataVector		// // usefule typedef's of DataVector
	// class BinPoint;		// class BinPoint;
	// // declaration for various type of data vectors		// // declaration for various type of data vectors
	skipping to change at line 264		skipping to change at line 272
	fValues(0),		fValues(0),
	fErrors(0),		fErrors(0),
	fCoords(std::vector<const double * >(coordItr, coordItr+dim) ),		fCoords(std::vector<const double * >(coordItr, coordItr+dim) ),
	fX(std::vector<double>(dim) )		fX(std::vector<double>(dim) )
	{ }		{ }
	/**		/**
	constructor for multi-dim data with errors and values (if errors are not present a null pointer should be passed)		constructor for multi-dim data with errors and values (if errors are not present a null pointer should be passed)
	*/		*/
	template<class Iterator>		template<class Iterator>
	DataWrapper(unsigned int dim, Iterator coordItr, const double * val, con		DataWrapper(size_t dim, Iterator coordItr, const double * val, const dou
	st double * eval, Iterator errItr ) :		ble * eval, Iterator errItr ) :
			// use size_t for dim to avoid allocating huge vector on 64 bits when
			dim=-1
	fDim(dim),		fDim(dim),
	fValues(val),		fValues(val),
	fErrors(eval),		fErrors(eval),
	fCoords(std::vector<const double * >(coordItr, coordItr+dim) ),		fCoords(std::vector<const double * >(coordItr, coordItr+dim) ),
	fErrCoords(std::vector<const double * >(errItr, errItr+dim) ),		fErrCoords(std::vector<const double * >(errItr, errItr+dim) ),
	fX(std::vector<double>(dim) ),		fX(std::vector<double>(dim) ),
	fErr(std::vector<double>(dim) )		fErr(std::vector<double>(dim) )
	{ }		{ }
	// use default copy constructor and assignment operator		// use default copy constructor and assignment operator
End of changes. 6 change blocks.
	5 lines changed or deleted		15 lines changed or added

	G__ci.h		G__ci.h
	skipping to change at line 23		skipping to change at line 23
	*		*
	************************************************************************/		************************************************************************/
	#ifndef G__CI_H		#ifndef G__CI_H
	#define G__CI_H		#define G__CI_H
	#ifndef G__CINT_VER6		#ifndef G__CINT_VER6
	#define G__CINT_VER6 1		#define G__CINT_VER6 1
	#endif		#endif
	#define G__CINTVERSION_V6 60010029		#define G__CINTVERSION_V6 60020000
	#define G__CINTVERSIONSTR_V6 "6.1.29, Jan 08, 2008"		#define G__CINTVERSIONSTR_V6 "6.2.00, Dec 21, 2008"
	#define G__CINTVERSION_V5 50160029		#define G__CINTVERSION_V5 50170000
	#define G__CINTVERSIONSTR_V5 "5.16.29, Jan 08, 2008"		#define G__CINTVERSIONSTR_V5 "5.17.00, Dec 21, 2008"
	#define G__ALWAYS		#define G__ALWAYS
	/* #define G__NEVER */		/* #define G__NEVER */
	/**********************************************************************		/**********************************************************************
	* SPECIAL CHANGES and CINT CORE COMPILATION SWITCH		* SPECIAL CHANGES and CINT CORE COMPILATION SWITCH
	**********************************************************************/		**********************************************************************/
	#define G__NATIVELONGLONG 1		#define G__NATIVELONGLONG 1
	#ifndef G__CINT_VER6		#ifndef G__CINT_VER6
	skipping to change at line 896		skipping to change at line 896
	};		};
	/**************************************************************************		/**************************************************************************
	* struct of internal data		* struct of internal data
	*		*
	**************************************************************************/		**************************************************************************/
	struct G__DUMMY_FOR_CINT7 {		struct G__DUMMY_FOR_CINT7 {
	void* fTypeName;		void* fTypeName;
	unsigned int fModifiers;		unsigned int fModifiers;
	};		};
	#ifdef __cplusplus		#ifdef __cplusplus
	struct G__value {		struct G__value {
	#else		#else
	typedef struct {		typedef struct {
	#endif		#endif
	union {		union {
	double d;		double d;
	long i; /* used to be int */		long i; /* used to be int */
	#if defined(G__PRIVATE_GVALUE) && !defined(_WINDOWS)		#if defined(G__PRIVATE_GVALUE) && !defined(_WIN32)
	#if defined(private) && defined(ROOT_RVersion)		#if defined(private) && defined(ROOT_RVersion)
	#define G__alt_private private		#define G__alt_private private
	#undef private		#undef private
	#endif		#endif
	private:		private:
	#endif		#endif
	struct G__p2p reftype;		struct G__p2p reftype;
	#if defined(G__PRIVATE_GVALUE) && !defined(_WINDOWS)		#if defined(G__PRIVATE_GVALUE) && !defined(_WIN32)
	public:		public:
	#endif		#endif
	char ch;		char ch;
	short sh;		short sh;
	int in;		int in;
	float fl;		float fl;
	unsigned char uch;		unsigned char uch;
	unsigned short ush;		unsigned short ush;
	unsigned int uin;		unsigned int uin;
	unsigned long ulo;		unsigned long ulo;
	G__int64 ll;		G__int64 ll;
	G__uint64 ull;		G__uint64 ull;
	long double ld;		long double ld;
	} obj;		} obj;
	#ifdef G__REFERENCETYPE2		#ifdef G__REFERENCETYPE2
	long ref;		long ref;
	#endif		#endif
	#if defined(G__PRIVATE_GVALUE) && !defined(_WINDOWS)		#if defined(G__PRIVATE_GVALUE) && !defined(_WIN32)
	private:		private:
	#if defined(G__alt_private) && defined(ROOT_RVersion)		#if defined(G__alt_private) && defined(ROOT_RVersion)
	#define private public		#define private public
	#endif		#endif
	#endif		#endif
	int type;		int type;
	int tagnum;		int tagnum;
	int typenum;		int typenum;
	#ifndef G__OLDIMPLEMENTATION1259		#ifndef G__OLDIMPLEMENTATION1259
	G__SIGNEDCHAR_T isconst;		G__SIGNEDCHAR_T isconst;
End of changes. 5 change blocks.
	7 lines changed or deleted		8 lines changed or added

	IParamFunction.h		IParamFunction.h
	// @(#)root/mathcore:$Id: IParamFunction.h 24482 2008-06-23 15:33:08Z monet a $		// @(#)root/mathcore:$Id: IParamFunction.h 27272 2009-01-28 09:03:03Z monet a $
	// Author: L. Moneta Tue Nov 14 14:20:07 2006		// Author: L. Moneta Tue Nov 14 14:20:07 2006
	/**********************************************************************		/**********************************************************************
	* *		* *
	* Copyright (c) 2006 LCG ROOT Math Team, CERN/PH-SFT *		* Copyright (c) 2006 LCG ROOT Math Team, CERN/PH-SFT *
	* *		* *
	* *		* *
	**********************************************************************/		**********************************************************************/
	// Header file for class IParamFunction		// Header file for class IParamFunction
	skipping to change at line 196		skipping to change at line 196
	*/		*/
	virtual double DoEval(double x) const {		virtual double DoEval(double x) const {
	return DoEvalPar( x, Parameters() );		return DoEvalPar( x, Parameters() );
	}		}
	};		};
	//_________________________________________________________________________ ______		//_________________________________________________________________________ ______
	/**		/**
	Interface (abstract class) for parametric gradient multi-dimensional fun ctions providing		Interface (abstract class) for parametric gradient multi-dimensional fun ctions providing
	in addition to function evaluation and gradient with respect the coordin ates		in addition to function evaluation with respect to the coordinates
	also the gradient with respect to the parameters, via the method Paramet erGradient.		also the gradient with respect to the parameters, via the method Paramet erGradient.
	It is a derived class from ROOT::Math::IParametricFunctionMultiDim and		It is a derived class from ROOT::Math::IParametricFunctionMultiDim.
	ROOT::Math::IGradientFunctionMultiDim.
	Virtual inheritance is used since IBaseFunctionMultiDim is the common ba
	se of both
	ROOT::Math::IParametricFunctionMultiDim and ROOT::Math::IGradientFunctio
	nMultiDim.
	The pure private virtual method DoParameterGradient must be implemented by the derived classes		The pure private virtual method DoParameterGradient must be implemented by the derived classes
	in addition to those inherited by the base abstract classes.		in addition to those inherited by the base abstract classes.
	@ingroup ParamFunc		@ingroup ParamFunc
	*/		*/
	class IParametricGradFunctionMultiDim :		class IParametricGradFunctionMultiDim :
	public IParametricFunctionMultiDim		public IParametricFunctionMultiDim
	// ,public IGradientFunctionMultiDim		// ,public IGradientFunctionMultiDim
	{		{
	skipping to change at line 269		skipping to change at line 267
	/**		/**
	Evaluate the partial derivative w.r.t a parameter ipar , to be implem ented by the derived classes		Evaluate the partial derivative w.r.t a parameter ipar , to be implem ented by the derived classes
	*/		*/
	virtual double DoParameterDerivative(const double * x, const double * p, unsigned int ipar) const = 0;		virtual double DoParameterDerivative(const double * x, const double * p, unsigned int ipar) const = 0;
	};		};
	//_________________________________________________________________________ ______		//_________________________________________________________________________ ______
	/**		/**
	Interface (abstract class) for parametric one-dimensional gradient funct ions providing		Interface (abstract class) for parametric one-dimensional gradient funct ions providing
	in addition to function evaluation and derivative with respect the coord inates		in addition to function evaluation with respect the coordinates
	also the gradient with respect to the parameters, via the method Paramet erGradient.		also the gradient with respect to the parameters, via the method Paramet erGradient.
	It is a derived class from ROOT::Math::IParametricFunctionOneDim and		It is a derived class from ROOT::Math::IParametricFunctionOneDim.
	ROOT::Math::IGradientFunctionOneDim.
	Virtual inheritance is used since IBaseFunctionOneDim is the common base
	of both
	ROOT::Math::IParametricFunctionOneDim and ROOT::Math::IGradientFunctionO
	neDim.
	The pure private virtual method DoParameterGradient must be implemented by the derived classes		The pure private virtual method DoParameterGradient must be implemented by the derived classes
	in addition to those inherited by the base abstract classes.		in addition to those inherited by the base abstract classes.
	@ingroup ParamFunc		@ingroup ParamFunc
	*/		*/
	class IParametricGradFunctionOneDim :		class IParametricGradFunctionOneDim :
	public IParametricFunctionOneDim		public IParametricFunctionOneDim
	// ,public IGradientFunctionOneDim		// ,public IGradientFunctionOneDim
	{		{
End of changes. 5 change blocks.
	15 lines changed or deleted		7 lines changed or added

	Kernel.h		Kernel.h
	// @(#)root/reflex:$Id: Kernel.h 26193 2008-11-14 14:12:27Z axel $		// @(#)root/reflex:$Id: Kernel.h 27579 2009-02-23 15:15:06Z pcanal $
	// Author: Stefan Roiser 2004		// Author: Stefan Roiser 2004
	// Copyright CERN, CH-1211 Geneva 23, 2004-2006, All rights reserved.		// Copyright CERN, CH-1211 Geneva 23, 2004-2006, All rights reserved.
	//		//
	// Permission to use, copy, modify, and distribute this software for any		// Permission to use, copy, modify, and distribute this software for any
	// purpose is hereby granted without fee, provided that this copyright and		// purpose is hereby granted without fee, provided that this copyright and
	// permissions notice appear in all copies and derivatives.		// permissions notice appear in all copies and derivatives.
	//		//
	// This software is provided "as is" without express or implied warranty.		// This software is provided "as is" without express or implied warranty.
	skipping to change at line 117		skipping to change at line 117
	#endif		#endif
	#ifndef ULONGLONG_MAX		#ifndef ULONGLONG_MAX
	#define ULONGLONG_MAX 0xFFFFFFFFFFFFFFFFLL		#define ULONGLONG_MAX 0xFFFFFFFFFFFFFFFFLL
	#endif		#endif
	#ifndef ULONGLONG_MIN		#ifndef ULONGLONG_MIN
	#define ULONGLONG_MIN 0x0000000000000000LL		#define ULONGLONG_MIN 0x0000000000000000LL
	#endif		#endif
	// Include files		// Include files
	#include <string>		#include <string>
			#include <cstring>
	#include <vector>		#include <vector>
	#include <utility>		#include <utility>
	#include <exception>		#include <exception>
	namespace Reflex {		namespace Reflex {
	#if 0		#if 0
	// The definition of Reflex::longlong is now removed.		// The definition of Reflex::longlong is now removed.
	// It is not needed by the Reflex API, and it interfers		// It is not needed by the Reflex API, and it interfers
	// with user code defining its own longlong, because		// with user code defining its own longlong, because
	skipping to change at line 305		skipping to change at line 306
	TYPEDEF,		TYPEDEF,
	UNION,		UNION,
	TYPETEMPLATEINSTANCE,		TYPETEMPLATEINSTANCE,
	MEMBERTEMPLATEINSTANCE,		MEMBERTEMPLATEINSTANCE,
	NAMESPACE,		NAMESPACE,
	DATAMEMBER,		DATAMEMBER,
	FUNCTIONMEMBER,		FUNCTIONMEMBER,
	UNRESOLVED		UNRESOLVED
	};		};
			/** enum containing all possible 'representation' types */
			enum REPRESTYPE {
			REPRES_POINTER = 'a' - 'A', // To be added to the other
			value to refer to a pointer to
			REPRES_CHAR = 'c',
			REPRES_SIGNED_CHAR = 'c',
			REPRES_SHORT_INT = 's',
			REPRES_INT = 'i',
			REPRES_LONG_INT = 'l',
			REPRES_UNSIGNED_CHAR = 'b',
			REPRES_UNSIGNED_SHORT_INT = 'r',
			REPRES_UNSIGNED_INT = 'h',
			REPRES_UNSIGNED_LONG_INT = 'k',
			REPRES_BOOL = 'g',
			REPRES_FLOAT = 'f',
			REPRES_DOUBLE = 'd',
			REPRES_LONG_DOUBLE = 'q',
			REPRES_VOID = 'y',
			REPRES_LONGLONG = 'n',
			REPRES_ULONGLONG = 'm',
			REPRES_STRUCT = 'u',
			REPRES_CLASS = 'u',
			REPRES_ENUM = 'i', // Intentionally equal to REPRES_IN
			T
			REPRES_NOTYPE = '\0'
			// '1' is also a value used (for legacy implementation of function po
			inter)
			// 'E' is also a value used (for legacy implementation of FILE*)
			// 'a', 'j', 'T', 'o', 'O', 'p', 'P', 'z', 'Z', '\011', '\001', 'w' a
			re also a value used (for support of various interpreter types)
			};
			// Note TYPE and REPRESTYPE are 'small' enums and could be stored as 'ch
			ar' to save space
	/** the max unsigned int */		/** the max unsigned int */
	size_t NPos();		size_t NPos();
	/**		/**
	* typedef for function member type (necessary for return value of		* typedef for function member type (necessary for return value of
	* getter function)		* getter function)
	*/		*/
	typedef void (* StubFunction) ( void*, void *, const std::vector < void * > &, void *);		typedef void (* StubFunction) ( void*, void *, const std::vector < void * > &, void *);
	/** typedef for function for Offset calculation */		/** typedef for function for Offset calculation */
End of changes. 3 change blocks.
	1 lines changed or deleted		37 lines changed or added

	Member.h		Member.h
	// @(#)root/reflex:$Id: Member.h 26631 2008-12-03 15:50:16Z axel $		// @(#)root/reflex:$Id: Member.h 27509 2009-02-19 03:32:22Z pcanal $
	// Author: Stefan Roiser 2004		// Author: Stefan Roiser 2004
	// Copyright CERN, CH-1211 Geneva 23, 2004-2006, All rights reserved.		// Copyright CERN, CH-1211 Geneva 23, 2004-2006, All rights reserved.
	//		//
	// Permission to use, copy, modify, and distribute this software for any		// Permission to use, copy, modify, and distribute this software for any
	// purpose is hereby granted without fee, provided that this copyright and		// purpose is hereby granted without fee, provided that this copyright and
	// permissions notice appear in all copies and derivatives.		// permissions notice appear in all copies and derivatives.
	//		//
	// This software is provided "as is" without express or implied warranty.		// This software is provided "as is" without express or implied warranty.
	skipping to change at line 343		skipping to change at line 343
	* Name returns the Name of the member		* Name returns the Name of the member
	* @param mod modifiers can be or'ed as argument		* @param mod modifiers can be or'ed as argument
	* SCOPED - fully scoped name		* SCOPED - fully scoped name
	* FINAL - resolve all typedefs		* FINAL - resolve all typedefs
	* QUALIFIED - cv and reference qualification		* QUALIFIED - cv and reference qualification
	* @return name of the member		* @return name of the member
	*/		*/
	std::string Name( unsigned int mod = 0 ) const;		std::string Name( unsigned int mod = 0 ) const;
	/**		/**
			* Name_c_str returns a char* pointer to the unqualified member name
			* @return c string to unqualified member name
			*/
			const char * Name_c_str() const;
			/**
	* Offset returns the offset of the data member relative to the start of the scope		* Offset returns the offset of the data member relative to the start of the scope
	* @return offset of member as int		* @return offset of member as int
	*/		*/
	size_t Offset() const;		size_t Offset() const;
			void InterpreterOffset(char*);
			char*& InterpreterOffset() const;
	/**		/**
	* FunctionParameterSize returns the number of parameters		* FunctionParameterSize returns the number of parameters
	* @param required if true only returns the number of required paramet ers		* @param required if true only returns the number of required paramet ers
	* @return number of parameters		* @return number of parameters
	*/		*/
	size_t FunctionParameterSize( bool required = false ) const;		size_t FunctionParameterSize( bool required = false ) const;
	/** FunctionParameterAt nth default value if declared*/		/** FunctionParameterAt nth default value if declared*/
	std::string FunctionParameterDefaultAt( size_t nth ) const;		std::string FunctionParameterDefaultAt( size_t nth ) const;
	skipping to change at line 486		skipping to change at line 494
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
	if ( (*this) && rh )		if ( (*this) && rh )
	return ( TypeOf() < rh.TypeOf() && Name() < rh.Name());		return ( TypeOf() < rh.TypeOf() && Name() < rh.Name());
	return false;		return false;
	}		}
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
	inline bool Reflex::Member::operator == ( const Member & rh ) const {		inline bool Reflex::Member::operator == ( const Member & rh ) const {
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
	if ( (*this) && rh )		if ( (*this) && rh )
	return ( TypeOf() == rh.TypeOf() && Name() == rh.Name() );		return ( TypeOf() == rh.TypeOf() && 0==strcmp(Name_c_str(),rh.Name_c_ str()) );
	// both invalid is equal, too		// both invalid is equal, too
	return (!(*this)) && (!rh);		return (!(*this)) && (!rh);
	}		}
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
	inline bool Reflex::Member::operator != ( const Member & rh ) const {		inline bool Reflex::Member::operator != ( const Member & rh ) const {
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
	return ! ( *this == rh );		return ! ( *this == rh );
	}		}
	skipping to change at line 745		skipping to change at line 753
	}		}
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
	inline std::string Reflex::Member::Name( unsigned int mod ) const {		inline std::string Reflex::Member::Name( unsigned int mod ) const {
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
	if ( *this ) return fMemberBase->Name( mod );		if ( *this ) return fMemberBase->Name( mod );
	return "";		return "";
	}		}
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
			inline const char * Reflex::Member::Name_c_str ( ) const {
			//----------------------------------------------------------------------
			---------
			if ( *this ) return fMemberBase->Name_c_str( );
			return "";
			}
			//-------------------------------------------------------------------------
			------
	inline size_t Reflex::Member::Offset() const {		inline size_t Reflex::Member::Offset() const {
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
	if ( *this ) return fMemberBase->Offset();		if ( *this ) return fMemberBase->Offset();
	return 0;		return 0;
	}		}
			inline void Reflex::Member::InterpreterOffset(char* offset)
			{
			if (*this) {
			fMemberBase->InterpreterOffset(offset);
			}
			}
			inline char*& Reflex::Member::InterpreterOffset() const
			{
			return fMemberBase->InterpreterOffset();
			}
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
	inline size_t Reflex::Member::FunctionParameterSize( bool required ) const {		inline size_t Reflex::Member::FunctionParameterSize( bool required ) const {
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
	if ( *this ) return fMemberBase->FunctionParameterSize( required );		if ( *this ) return fMemberBase->FunctionParameterSize( required );
	return 0;		return 0;
	}		}
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
	inline std::string Reflex::Member::FunctionParameterDefaultAt( size_t nth ) const {		inline std::string Reflex::Member::FunctionParameterDefaultAt( size_t nth ) const {
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
	skipping to change at line 930		skipping to change at line 957
	if (*this) return fMemberBase->UpdateFunctionParameterNames(parameters);		if (*this) return fMemberBase->UpdateFunctionParameterNames(parameters);
	}		}
	#ifdef REFLEX_CINT_MERGE		#ifdef REFLEX_CINT_MERGE
	inline bool operator&&(bool b, const Reflex::Member & rh) {		inline bool operator&&(bool b, const Reflex::Member & rh) {
	return b && rh.operator bool();		return b && rh.operator bool();
	}		}
	inline bool operator&&(int i, const Reflex::Member & rh) {		inline bool operator&&(int i, const Reflex::Member & rh) {
	return i && rh.operator bool();		return i && rh.operator bool();
	}		}
			inline bool operator&&(short s, const Reflex::Member & rh) {
			return s && rh.operator bool();
			}
			inline bool operator||(short s, const Reflex::Member & rh) {
			return s || rh.operator bool();
			}
	inline bool operator||(bool b, const Reflex::Member & rh) {		inline bool operator||(bool b, const Reflex::Member & rh) {
	return b || rh.operator bool();		return b || rh.operator bool();
	}		}
	inline bool operator||(int i, const Reflex::Member & rh) {		inline bool operator||(int i, const Reflex::Member & rh) {
	return i || rh.operator bool();		return i || rh.operator bool();
	}		}
	#endif		#endif
	#endif // Reflex_Member		#endif // Reflex_Member
End of changes. 7 change blocks.
	2 lines changed or deleted		37 lines changed or added

	MemberBase.h		MemberBase.h
	// @(#)root/reflex:$Id: MemberBase.h 26631 2008-12-03 15:50:16Z axel $		// @(#)root/reflex:$Id: MemberBase.h 27509 2009-02-19 03:32:22Z pcanal $
	// Author: Stefan Roiser 2004		// Author: Stefan Roiser 2004
	// Copyright CERN, CH-1211 Geneva 23, 2004-2006, All rights reserved.		// Copyright CERN, CH-1211 Geneva 23, 2004-2006, All rights reserved.
	//		//
	// Permission to use, copy, modify, and distribute this software for any		// Permission to use, copy, modify, and distribute this software for any
	// purpose is hereby granted without fee, provided that this copyright and		// purpose is hereby granted without fee, provided that this copyright and
	// permissions notice appear in all copies and derivatives.		// permissions notice appear in all copies and derivatives.
	//		//
	// This software is provided "as is" without express or implied warranty.		// This software is provided "as is" without express or implied warranty.
	skipping to change at line 169		skipping to change at line 169
	/** return the type of the member (function or data member) */		/** return the type of the member (function or data member) */
	TYPE MemberType() const;		TYPE MemberType() const;
	/** returns the string representation of the member species */		/** returns the string representation of the member species */
	std::string MemberTypeAsString() const;		std::string MemberTypeAsString() const;
	/** return the name of the member */		/** return the name of the member */
	virtual std::string Name( unsigned int mod = 0 ) const;		virtual std::string Name( unsigned int mod = 0 ) const;
			/**
			* Name_c_str returns a char* pointer to the unqualified Name
			* @ return c string to unqualified Name
			*/
			const char * Name_c_str() const;
	/** return the offset of the member */		/** return the offset of the member */
	virtual size_t Offset() const;		virtual size_t Offset() const;
			virtual void InterpreterOffset(char*);
			virtual char*& InterpreterOffset() const;
	/** number of parameters */		/** number of parameters */
	virtual size_t FunctionParameterSize( bool required = false ) const;		virtual size_t FunctionParameterSize( bool required = false ) const;
	/** FunctionParameterDefaultAt returns the nth default value if decla red*/		/** FunctionParameterDefaultAt returns the nth default value if decla red*/
	virtual std::string FunctionParameterDefaultAt( size_t nth ) const;		virtual std::string FunctionParameterDefaultAt( size_t nth ) const;
	virtual StdString_Iterator FunctionParameterDefault_Begin() const;		virtual StdString_Iterator FunctionParameterDefault_Begin() const;
	virtual StdString_Iterator FunctionParameterDefault_End() const;		virtual StdString_Iterator FunctionParameterDefault_End() const;
	virtual Reverse_StdString_Iterator FunctionParameterDefault_RBegin() const;		virtual Reverse_StdString_Iterator FunctionParameterDefault_RBegin() const;
	skipping to change at line 516		skipping to change at line 524
	if ( 0 != ( mod & ( SCOPED | S ))) {		if ( 0 != ( mod & ( SCOPED | S ))) {
	std::string s(DeclaringScope().Name( mod ));		std::string s(DeclaringScope().Name( mod ));
	if ( ! DeclaringScope().IsTopScope()) s += "::";		if ( ! DeclaringScope().IsTopScope()) s += "::";
	s += fName;		s += fName;
	return s;		return s;
	}		}
	return fName;		return fName;
	}		}
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
			inline const char * Reflex::MemberBase::Name_c_str() const {
			//-------------------------------------------------------------------------
			------
			return fName.c_str();
			}
			//-------------------------------------------------------------------------
			------
	inline size_t Reflex::MemberBase::Offset() const {		inline size_t Reflex::MemberBase::Offset() const {
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
	return 0;		return 0;
	}		}
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
			inline void Reflex::MemberBase::InterpreterOffset(char*) {
			//-------------------------------------------------------------------------
			------
			}
			//-------------------------------------------------------------------------
			------
			inline char*& Reflex::MemberBase::InterpreterOffset() const {
			//-------------------------------------------------------------------------
			------
			static char* p = 0;
			return p;
			}
			//-------------------------------------------------------------------------
			------
	inline size_t Reflex::MemberBase::FunctionParameterSize( bool /* required * / ) const {		inline size_t Reflex::MemberBase::FunctionParameterSize( bool /* required * / ) const {
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
	return 0;		return 0;
	}		}
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
	inline std::string Reflex::MemberBase::FunctionParameterDefaultAt( size_t / * nth */ ) const {		inline std::string Reflex::MemberBase::FunctionParameterDefaultAt( size_t / * nth */ ) const {
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
	return "";		return "";
	}		}
End of changes. 5 change blocks.
	1 lines changed or deleted		33 lines changed or added

	MethodBDT.h		MethodBDT.h
	// @(#)root/tmva $Id: MethodBDT.h 26050 2008-11-01 09:18:41Z brun $		// @(#)root/tmva $Id: MethodBDT.h 27320 2009-02-02 06:40:36Z brun $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss		// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss
	/************************************************************************** ********		/************************************************************************** ********
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *		* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *		* Package: TMVA *
	* Class : MethodBDT (Boosted Decision Trees) *		* Class : MethodBDT (Boosted Decision Trees) *
	* Web : http://tmva.sourceforge.net *		* Web : http://tmva.sourceforge.net *
	* *		* *
	* Description: *		* Description: *
	* Analysis of Boosted Decision Trees *		* Analysis of Boosted Decision Trees *
	skipping to change at line 205		skipping to change at line 205
	Int_t fITree; // ntuple var: ith tree		Int_t fITree; // ntuple var: ith tree
	Double_t fBoostWeight; // ntuple var: boo st weight		Double_t fBoostWeight; // ntuple var: boo st weight
	Double_t fErrorFraction; // ntuple var: mis classification error fraction		Double_t fErrorFraction; // ntuple var: mis classification error fraction
	Double_t fPruneStrength; // a parameter to set the "amount" of pruning..needs to be adjusted		Double_t fPruneStrength; // a parameter to set the "amount" of pruning..needs to be adjusted
	DecisionTree::EPruneMethod fPruneMethod; // method used for prunig		DecisionTree::EPruneMethod fPruneMethod; // method used for prunig
	TString fPruneMethodS; // prune method op tion String		TString fPruneMethodS; // prune method op tion String
	Bool_t fPruneBeforeBoost;// flag to prune b efore boosting		Bool_t fPruneBeforeBoost;// flag to prune b efore boosting
	Bool_t fAutomatic; // use user given prune strength or automatically determined one using a validation sample		Bool_t fAutomatic; // use user given prune strength or automatically determined one using a validation sample
	Bool_t fNoNegWeightsInTraining; // ignore n egative event weights in the training		Bool_t fNoNegWeightsInTraining; // ignore n egative event weights in the training
	Bool_t fRandomisedTrees; // choose a random subset of possible cut variables at each node during training		Bool_t fRandomisedTrees; // choose a random subset of possible cut variables at each node during training
			Double_t fSampleSizeFraction; // relative siz e of bagged event sample to original sample size
	Int_t fUseNvars; // the number of v ariables used in the randomised tree splitting		Int_t fUseNvars; // the number of v ariables used in the randomised tree splitting
	std::vector<Double_t> fVariableImportance; // the relative importance of the different variables		std::vector<Double_t> fVariableImportance; // the relative importance of the different variables
	Double_t fDeltaPruneStrength; // step size in pruning, is adjusted according to experience of previous trees		Double_t fDeltaPruneStrength; // step size in pruning, is adjusted according to experience of previous trees
	// debugging flags		// debugging flags
	static const Int_t fgDebugLevel = 0; // debug level determining some printout/control plots etc.		static const Int_t fgDebugLevel = 0; // debug level determining some printout/control plots etc.
	ClassDef(MethodBDT,0) // Analysis of Boosted Decision Trees		ClassDef(MethodBDT,0) // Analysis of Boosted Decision Trees
	};		};
End of changes. 2 change blocks.
	1 lines changed or deleted		2 lines changed or added

	MethodCuts.h		MethodCuts.h
	// @(#)root/tmva $Id: MethodCuts.h 23645 2008-05-03 15:33:17Z brun $		// @(#)root/tmva $Id: MethodCuts.h 27320 2009-02-02 06:40:36Z brun $
	// Author: Andreas Hoecker, Matt Jachowski, Peter Speckmayer, Helge Voss, K ai Voss		// Author: Andreas Hoecker, Matt Jachowski, Peter Speckmayer, Helge Voss, K ai Voss
	/************************************************************************** ********		/************************************************************************** ********
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *		* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *		* Package: TMVA *
	* Class : MethodCuts *		* Class : MethodCuts *
	* Web : http://tmva.sourceforge.net *		* Web : http://tmva.sourceforge.net *
	* *		* *
	* Description: *		* Description: *
	* Multivariate optimisation of signal efficiency for given background *		* Multivariate optimisation of signal efficiency for given background *
	skipping to change at line 129		skipping to change at line 129
	// accessors for Minuit		// accessors for Minuit
	Double_t ComputeEstimator( std::vector<Double_t> & );		Double_t ComputeEstimator( std::vector<Double_t> & );
	Double_t EstimatorFunction( std::vector<Double_t> & );		Double_t EstimatorFunction( std::vector<Double_t> & );
	Double_t EstimatorFunction( Int_t ievt1, Int_t ievt2 );		Double_t EstimatorFunction( Int_t ievt1, Int_t ievt2 );
	void SetTestSignalEfficiency( Double_t effS ) { fTestSignalEff = effS ; }		void SetTestSignalEfficiency( Double_t effS ) { fTestSignalEff = effS ; }
	// retrieve cut values for given signal efficiency		// retrieve cut values for given signal efficiency
	void PrintCuts( Double_t effS ) const;		void PrintCuts( Double_t effS ) const;
	void GetCuts ( Double_t effS, std::vector<Double_t>& cutMin, std::ve		Double_t GetCuts( Double_t effS, std::vector<Double_t>& cutMin, std::
	ctor<Double_t>& cutMax ) const;		vector<Double_t>& cutMax ) const;
	void GetCuts ( Double_t effS, Double_t* cutMin, Double_t* cutMax ) c		Double_t GetCuts( Double_t effS, Double_t* cutMin, Double_t* cutMax )
	onst;		const;
	// ranking of input variables		// ranking of input variables
	const Ranking* CreateRanking() { return 0; }		const Ranking* CreateRanking() { return 0; }
	void DeclareOptions();		void DeclareOptions();
	void ProcessOptions();		void ProcessOptions();
	// maximum |cut| value		// maximum |cut| value
	static const Double_t fgMaxAbsCutVal;		static const Double_t fgMaxAbsCutVal;
End of changes. 2 change blocks.
	5 lines changed or deleted		5 lines changed or added

	ModulekNN.h		ModulekNN.h
	// @(#)root/tmva $Id: ModulekNN.h 27001 2008-12-18 08:38:09Z brun $		// @(#)root/tmva $Id: ModulekNN.h 27320 2009-02-02 06:40:36Z brun $
	// Author: Rustem Ospanov		// Author: Rustem Ospanov
	/************************************************************************** ********		/************************************************************************** ********
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *		* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *		* Package: TMVA *
	* Class : ModulekNN *		* Class : ModulekNN *
	* Web : http://tmva.sourceforge.net *		* Web : http://tmva.sourceforge.net *
	* *		* *
	* Description: *		* Description: *
	* Module for k-nearest neighbor algorithm *		* Module for k-nearest neighbor algorithm *
	skipping to change at line 112		skipping to change at line 112
	public:		public:
	ModulekNN();		ModulekNN();
	~ModulekNN();		~ModulekNN();
	void Clear();		void Clear();
	void Add(const Event &event);		void Add(const Event &event);
	Bool_t Fill(UShort_t odepth, UInt_t ifrac, const std::string &opti on = "");		Bool_t Fill(const UShort_t odepth, UInt_t ifrac, const std::string &option = "");
	Bool_t Find(Event event, UInt_t nfind = 100) const;		Bool_t Find(Event event, UInt_t nfind = 100) const;
	Bool_t Find(UInt_t nfind, const std::string &option) const;		Bool_t Find(UInt_t nfind, const std::string &option) const;
	const EventVec& GetEventVec() const;		const EventVec& GetEventVec() const;
	const List& GetkNNList() const;		const List& GetkNNList() const;
	const Event& GetkNNEvent() const;		const Event& GetkNNEvent() const;
	const VarMap& GetVarMap() const;		const VarMap& GetVarMap() const;
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	RConfigOptions.h		RConfigOptions.h
	#ifndef ROOT_RConfigOptions		#ifndef ROOT_RConfigOptions
	#define ROOT_RConfigOptions		#define ROOT_RConfigOptions
	#define R__CONFIGUREOPTIONS "QTDIR=/afs/cern.ch/sw/lcg/external/qt/4.4.2/ i686-slc5-gcc43-opt PYTHONDIR=/afs/cern.ch/sw/lcg/external/Python/2.5/i686- slc5-gcc43-opt --fail-on-missing --enable-cintex --enable-explicitlink --en able-gdml --enable-genvector --enable-mathmore --enable-minuit2 --enable-my sql --enable-oracle --enable-python --enable-qt --enable-qtgsi --enable-ref lex --enable-roofit --enable-table --enable-unuran --with-castor-incdir=/af s/cern.ch/sw/lcg/external/castor/2.1.6-12/i686-slc5-gcc43-opt/usr/include/s hift --with-castor-libdir=/afs/cern.ch/sw/lcg/external/castor/2.1.6-12/i686 -slc5-gcc43-opt/usr/lib --with-cern-libdir=/afs/cern.ch/sw/lcg/external/cer nlib/2005/i686-slc5-gcc43-opt/lib --with-dcap-libdir=/afs/cern.ch/sw/lcg/ex ternal/dcap/1.2.35/i686-slc5-gcc43-opt/lib --with-dcap-incdir=/afs/cern.ch/ sw/lcg/external/dcap/1.2.35/i686-slc5-gcc43-opt/include --with-fftw3-incdir =/afs/cern.ch/sw/lcg/external/fftw3/3.1.2/i686-slc5-gcc43-opt/include --wit h-fftw3-libdir=/afs/cern.ch/sw/lcg/external/fftw3/3.1.2/i686-slc5-gcc43-opt /lib --with-gccxml=/afs/cern.ch/sw/lcg/external/gccxml/0.9.0_20081130/i686- slc5-gcc43-opt/bin --with-gfal-libdir=/afs/cern.ch/sw/lcg/external/Grid/gfa l/1.10.17/i686-slc5-gcc43-opt/lib --with-gfal-incdir=/afs/cern.ch/sw/lcg/ex ternal/Grid/gfal/1.10.17/i686-slc5-gcc43-opt/include --with-globus-incdir=/ afs/cern.ch/sw/lcg/external/Grid/globus/4.0.3-VDT-1.6.0/i686-slc5-gcc43-opt /globus/include --with-globus-libdir=/afs/cern.ch/sw/lcg/external/Grid/glob us/4.0.3-VDT-1.6.0/i686-slc5-gcc43-opt/globus/lib --with-gsl-incdir=/afs/ce rn.ch/sw/lcg/external/GSL/1.10/i686-slc5-gcc43-opt/include --with-gsl-libdi r=/afs/cern.ch/sw/lcg/external/GSL/1.10/i686-slc5-gcc43-opt/lib --with-mysq l-incdir=/afs/cern.ch/sw/lcg/external/mysql/5.0.18/i686-slc5-gcc43-opt/incl ude --with-mysql-libdir=/afs/cern.ch/sw/lcg/external/mysql/5.0.18/i686-slc5 -gcc43-opt/lib --with-oracle-incdir=/afs/cern.ch/sw/lcg/external/oracle/10. 2.0.3-full/i686-slc5-gcc43-opt/include --with-oracle-libdir=/afs/cern.ch/sw /lcg/external/oracle/10.2.0.3-full/i686-slc5-gcc43-opt/lib --with-shift-inc dir=/afs/cern.ch/sw/lcg/external/castor/2.1.6-12/i686-slc5-gcc43-opt/usr/in clude/shift --with-shift-libdir=/afs/cern.ch/sw/lcg/external/castor/2.1.6-1 2/i686-slc5-gcc43-opt/usr/lib"		#define R__CONFIGUREOPTIONS "QTDIR=/afs/cern.ch/sw/lcg/external/qt/4.4.2/ i686-slc5-gcc43-opt PYTHONDIR=/afs/cern.ch/sw/lcg/external/Python/2.5.4/i68 6-slc5-gcc43-opt --fail-on-missing --enable-cintex --enable-explicitlink -- enable-gdml --enable-genvector --enable-mathmore --enable-minuit2 --enable- mysql --enable-oracle --enable-python --enable-qt --enable-qtgsi --enable-r eflex --enable-roofit --enable-table --enable-unuran --with-castor-incdir=/ afs/cern.ch/sw/lcg/external/castor/2.1.7-24/i686-slc5-gcc43-opt/usr/include /shift --with-castor-libdir=/afs/cern.ch/sw/lcg/external/castor/2.1.7-24/i6 86-slc5-gcc43-opt/usr/lib --with-cern-libdir=/afs/cern.ch/sw/lcg/external/c ernlib/2005/i686-slc5-gcc43-opt/lib --with-dcap-libdir=/afs/cern.ch/sw/lcg/ external/dcache_client/1.8.0p1/i686-slc5-gcc43-opt/dcap/lib --with-dcap-inc dir=/afs/cern.ch/sw/lcg/external/dcache_client/1.8.0p1/i686-slc5-gcc43-opt/ dcap/include --with-fftw3-incdir=/afs/cern.ch/sw/lcg/external/fftw3/3.1.2/i 686-slc5-gcc43-opt/include --with-fftw3-libdir=/afs/cern.ch/sw/lcg/external /fftw3/3.1.2/i686-slc5-gcc43-opt/lib --with-gccxml=/afs/cern.ch/sw/lcg/exte rnal/gccxml/0.9.0_20081130/i686-slc5-gcc43-opt/bin --with-gfal-libdir=/afs/ cern.ch/sw/lcg/external/Grid/gfal/1.11.2-1/i686-slc5-gcc43-opt/lib --with-g fal-incdir=/afs/cern.ch/sw/lcg/external/Grid/gfal/1.11.2-1/i686-slc5-gcc43- opt/include --with-globus-incdir=/afs/cern.ch/sw/lcg/external/Grid/globus/4 .0.3-VDT-1.6.0/i686-slc5-gcc43-opt/globus/include --with-globus-libdir=/afs /cern.ch/sw/lcg/external/Grid/globus/4.0.3-VDT-1.6.0/i686-slc5-gcc43-opt/gl obus/lib --with-gsl-incdir=/afs/cern.ch/sw/lcg/external/GSL/1.10/i686-slc5- gcc43-opt/include --with-gsl-libdir=/afs/cern.ch/sw/lcg/external/GSL/1.10/i 686-slc5-gcc43-opt/lib --with-mysql-incdir=/afs/cern.ch/sw/lcg/external/mys ql/5.0.18/i686-slc5-gcc43-opt/include --with-mysql-libdir=/afs/cern.ch/sw/l cg/external/mysql/5.0.18/i686-slc5-gcc43-opt/lib --with-oracle-incdir=/afs/ cern.ch/sw/lcg/external/oracle/10.2.0.4-full/i686-slc5-gcc43-opt/include -- with-oracle-libdir=/afs/cern.ch/sw/lcg/external/oracle/10.2.0.4-full/i686-s lc5-gcc43-opt/lib --with-shift-incdir=/afs/cern.ch/sw/lcg/external/castor/2 .1.7-24/i686-slc5-gcc43-opt/usr/include/shift --with-shift-libdir=/afs/cern .ch/sw/lcg/external/castor/2.1.7-24/i686-slc5-gcc43-opt/usr/lib"
	#endif		#endif
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	RConversionRuleParser.h		RConversionRuleParser.h
	// @(#)root/core:$Id: RConversionRuleParser.h 25458 2008-09-19 06:10:23Z pc anal $		// @(#)root/core:$Id: RConversionRuleParser.h 27282 2009-01-28 22:36:42Z rd m $
	// author: Lukasz Janyst <ljanyst@cern.ch>		// author: Lukasz Janyst <ljanyst@cern.ch>
	#ifndef R__R_CONVERSION_RULE_PARSER_H		#ifndef R__R_CONVERSION_RULE_PARSER_H
	#define R__R_CONVERSION_RULE_PARSER_H		#define R__R_CONVERSION_RULE_PARSER_H
	#include <list>		#include <list>
	#include <map>		#include <map>
	#include <string>		#include <string>
	#include <ostream>		#include <ostream>
	#include <utility>		#include <utility>
	#ifndef __MAKECINT__		#ifndef __MAKECINT__
	#ifndef R__BUILDING_CINT7		#ifndef R__BUILDING_CINT7
	#include "cint/Api.h"		#include "Api.h"
	#include "cint/Shadow.h"		#include "Shadow.h"
	#else		#else
	#include "cint7/Api.h"		#include "cint7/Api.h"
	#include "cint7/Shadow.h"		#include "cint7/Shadow.h"
	#endif		#endif
	#else		#else
	class G__ClassInfo;		class G__ClassInfo;
	#endif		#endif
	#if !defined(__CINT__)		#if !defined(__CINT__)
	// Avoid clutering the dictionary (in particular with the STL declaration)		// Avoid clutering the dictionary (in particular with the STL declaration)
End of changes. 2 change blocks.
	3 lines changed or deleted		3 lines changed or added

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

	Reader.h		Reader.h
	// @(#)root/tmva $Id: Reader.h 23334 2008-04-19 18:38:57Z brun $		// @(#)root/tmva $Id: Reader.h 27320 2009-02-02 06:40:36Z brun $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss		// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss
	/************************************************************************** ********		/************************************************************************** ********
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *		* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *		* Package: TMVA *
	* Class : Reader *		* Class : Reader *
	* Web : http://tmva.sourceforge.net *		* Web : http://tmva.sourceforge.net *
	* *		* *
	* Description: *		* Description: *
	* Reader class to be used in the user application to interpret the tr ained *		* Reader class to be used in the user application to interpret the tr ained *
	skipping to change at line 126		skipping to change at line 126
	// Decode Constructor string (or TString) and fill variable name std: :vector		// Decode Constructor string (or TString) and fill variable name std: :vector
	void DecodeVarNames( const std::string varNames );		void DecodeVarNames( const std::string varNames );
	void DecodeVarNames( const TString varNames );		void DecodeVarNames( const TString varNames );
	// Reads method name and title from the weightfile		// Reads method name and title from the weightfile
	void GetMethodNameTitle(const TString& weightfile, TString& methodNam e, TString& methodTitle);		void GetMethodNameTitle(const TString& weightfile, TString& methodNam e, TString& methodTitle);
	void DeclareOptions();		void DeclareOptions();
	Bool_t fVerbose; // verbosity		Bool_t fVerbose; // verbosity
			Bool_t fSilent; // overall silent flag
			Bool_t fColor; // color output
	std::map<TString, IMethod*> fMethodMap; // map of methods		std::map<TString, IMethod*> fMethodMap; // map of methods
	mutable MsgLogger fLogger; // message logger		mutable MsgLogger fLogger; // message logger
	ClassDef(Reader,0) // Interpret the trained MVAs in an analysis conte xt		ClassDef(Reader,0) // Interpret the trained MVAs in an analysis conte xt
	};		};
	}		}
End of changes. 2 change blocks.
	1 lines changed or deleted		3 lines changed or added

	RooAbsArg.h		RooAbsArg.h
	skipping to change at line 205		skipping to change at line 205
	virtual void printTitle(ostream& os) const ;		virtual void printTitle(ostream& os) const ;
	virtual void printClassName(ostream& os) const ;		virtual void printClassName(ostream& os) const ;
	virtual void printAddress(ostream& os) const ;		virtual void printAddress(ostream& os) const ;
	virtual void printArgs(ostream& os) const ;		virtual void printArgs(ostream& os) const ;
	virtual void printMultiline(ostream& os, Int_t contents, Bool_t verbose=k FALSE, TString indent="") const;		virtual void printMultiline(ostream& os, Int_t contents, Bool_t verbose=k FALSE, TString indent="") const;
	virtual void printTree(ostream& os, TString indent="") const ;		virtual void printTree(ostream& os, TString indent="") const ;
	virtual Int_t defaultPrintContents(Option_t* opt) const ;		virtual Int_t defaultPrintContents(Option_t* opt) const ;
	// Accessors to attributes		// Accessors to attributes
	void setAttribute(const Text_t* name, Bool_t value=kTRUE) ;		void setAttribute(const char* name, Bool_t value=kTRUE) ;
	Bool_t getAttribute(const Text_t* name) const ;		Bool_t getAttribute(const char* name) const ;
	inline const std::set<std::string>& attributes() const {		inline const std::set<std::string>& attributes() const {
	// Returns set of names of boolean attributes defined		// Returns set of names of boolean attributes defined
	return _boolAttrib ;		return _boolAttrib ;
	}		}
	void setStringAttribute(const Text_t* key, const Text_t* value) ;		void setStringAttribute(const char* key, const char* value) ;
	const Text_t* getStringAttribute(const Text_t* key) const ;		const char* getStringAttribute(const char* key) const ;
	inline const std::map<std::string,std::string>& stringAttributes() const {		inline const std::map<std::string,std::string>& stringAttributes() const {
	// Returns map<string,string> with all string attributes defined		// Returns map<string,string> with all string attributes defined
	return _stringAttrib ;		return _stringAttrib ;
	}		}
	// Accessors to transient attributes		// Accessors to transient attributes
	void setTransientAttribute(const Text_t* name, Bool_t value=kTRUE) ;		void setTransientAttribute(const char* name, Bool_t value=kTRUE) ;
	Bool_t getTransientAttribute(const Text_t* name) const ;		Bool_t getTransientAttribute(const char* name) const ;
	inline const std::set<std::string>& transientAttributes() const {		inline const std::set<std::string>& transientAttributes() const {
	// Return set of transient boolean attributes		// Return set of transient boolean attributes
	return _boolAttribTransient ;		return _boolAttribTransient ;
	}		}
	inline Bool_t isConstant() const {		inline Bool_t isConstant() const {
	// Returns true if 'Constant' attribute is set		// Returns true if 'Constant' attribute is set
	return getAttribute("Constant") ;		return getAttribute("Constant") ;
	}		}
	RooLinkedList getCloningAncestors() const ;		RooLinkedList getCloningAncestors() const ;
End of changes. 3 change blocks.
	6 lines changed or deleted		6 lines changed or added

	RooAbsCollection.h		RooAbsCollection.h
	skipping to change at line 74		skipping to change at line 74
	virtual Bool_t remove(const RooAbsArg& var, Bool_t silent=kFALSE, Bool_t matchByNameOnly=kFALSE) ;		virtual Bool_t remove(const RooAbsArg& var, Bool_t silent=kFALSE, Bool_t matchByNameOnly=kFALSE) ;
	virtual void removeAll() ;		virtual void removeAll() ;
	virtual Bool_t add(const RooAbsCollection& list, Bool_t silent=kFALSE) ;		virtual Bool_t add(const RooAbsCollection& list, Bool_t silent=kFALSE) ;
	virtual Bool_t addOwned(const RooAbsCollection& list, Bool_t silent=kFALS E);		virtual Bool_t addOwned(const RooAbsCollection& list, Bool_t silent=kFALS E);
	virtual void addClone(const RooAbsCollection& list, Bool_t silent=kFALS E);		virtual void addClone(const RooAbsCollection& list, Bool_t silent=kFALS E);
	Bool_t replace(const RooAbsCollection &other);		Bool_t replace(const RooAbsCollection &other);
	Bool_t remove(const RooAbsCollection& list, Bool_t silent=kFALSE, Bool_t matchByNameOnly=kFALSE) ;		Bool_t remove(const RooAbsCollection& list, Bool_t silent=kFALSE, Bool_t matchByNameOnly=kFALSE) ;
	// Group operations on AbsArgs		// Group operations on AbsArgs
	void setAttribAll(const Text_t* name, Bool_t value=kTRUE) ;		void setAttribAll(const char* name, Bool_t value=kTRUE) ;
	// List search methods		// List search methods
	RooAbsArg *find(const char *name) const ;		RooAbsArg *find(const char *name) const ;
	Bool_t contains(const RooAbsArg& var) const {		Bool_t contains(const RooAbsArg& var) const {
	// Returns true if var is contained in this collection		// Returns true if var is contained in this collection
	return (0 == find(var.GetName())) ? kFALSE:kTRUE;		return (0 == find(var.GetName())) ? kFALSE:kTRUE;
	}		}
	RooAbsCollection* selectByAttrib(const char* name, Bool_t value) const ;		RooAbsCollection* selectByAttrib(const char* name, Bool_t value) const ;
	RooAbsCollection* selectCommon(const RooAbsCollection& refColl) const ;		RooAbsCollection* selectCommon(const RooAbsCollection& refColl) const ;
	RooAbsCollection* selectByName(const char* nameList, Bool_t verbose=kFALS E) const ;		RooAbsCollection* selectByName(const char* nameList, Bool_t verbose=kFALS E) const ;
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	RooAbsReal.h		RooAbsReal.h
	skipping to change at line 62		skipping to change at line 62
	virtual ~RooAbsReal();		virtual ~RooAbsReal();
	// Return value and unit accessors		// Return value and unit accessors
	virtual Double_t getVal(const RooArgSet* set=0) const ;		virtual Double_t getVal(const RooArgSet* set=0) const ;
	inline Double_t getVal(const RooArgSet& set) const {		inline Double_t getVal(const RooArgSet& set) const {
	// Return value with given choice of observables		// Return value with given choice of observables
	return getVal(&set) ;		return getVal(&set) ;
	}		}
	Bool_t operator==(Double_t value) const ;		Bool_t operator==(Double_t value) const ;
	virtual Bool_t operator==(const RooAbsArg& other) ;		virtual Bool_t operator==(const RooAbsArg& other) ;
	inline const Text_t *getUnit() const {		inline const char *getUnit() const {
	// Return string with unit description		// Return string with unit description
	return _unit.Data();		return _unit.Data();
	}		}
	inline void setUnit(const char *unit) {		inline void setUnit(const char *unit) {
	// Set unit description to given string		// Set unit description to given string
	_unit= unit;		_unit= unit;
	}		}
	TString getTitle(Bool_t appendUnit= kFALSE) const;		TString getTitle(Bool_t appendUnit= kFALSE) const;
	// Lightweight interface adaptors (caller takes ownership)		// Lightweight interface adaptors (caller takes ownership)
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

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

	RtypesImp.h		RtypesImp.h
	// @(#)root/base:$Id: RtypesImp.h 25378 2008-09-09 19:28:04Z pcanal $		// @(#)root/base:$Id: RtypesImp.h 27287 2009-01-29 04:52:36Z pcanal $
	// Author: Philippe Canal 23/2/02		// Author: Philippe Canal 23/2/02
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2002, Rene Brun, Fons Rademakers and al. *		* Copyright (C) 1995-2002, Rene Brun, Fons Rademakers and al. *
	* 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 45		skipping to change at line 45
	if (!TClassEdit::IsSTLCont(topClassName)) {		if (!TClassEdit::IsSTLCont(topClassName)) {
	ClassInfo_t *b = gInterpreter->ClassInfo_Factory(topClassName);		ClassInfo_t *b = gInterpreter->ClassInfo_Factory(topClassName);
	Bool_t isloaded = gInterpreter->ClassInfo_IsLoaded(b);		Bool_t isloaded = gInterpreter->ClassInfo_IsLoaded(b);
	gInterpreter->ClassInfo_Delete(b);		gInterpreter->ClassInfo_Delete(b);
	if (!isloaded) return;		if (!isloaded) return;
	}		}
	}		}
	TClass *top = TClass::GetClass(topClassName);		TClass *top = TClass::GetClass(topClassName);
	if (top) {		if (top) {
	ShowMembersFunc_t show = top->GetShowMembersWrapper();		top->CallShowMembers(obj, R__insp, R__parent);
	if (show) show(obj, R__insp, R__parent);		} else {
			// This might be worth an error message
	}		}
	}		}
	class TOperatorNewHelper { };		class TOperatorNewHelper { };
	}		}
	// This is to provide a placement operator new on all platforms		// This is to provide a placement operator new on all platforms
	inline void *operator new(size_t /*size*/, ROOT::TOperatorNewHelper *p)		inline void *operator new(size_t /*size*/, ROOT::TOperatorNewHelper *p)
	{		{
	return((void*)p);		return((void*)p);
End of changes. 2 change blocks.
	3 lines changed or deleted		4 lines changed or added

	Scope.h		Scope.h
	// @(#)root/reflex:$Id: Scope.h 23635 2008-05-01 21:39:49Z russo $		// @(#)root/reflex:$Id: Scope.h 27509 2009-02-19 03:32:22Z pcanal $
	// Author: Stefan Roiser 2004		// Author: Stefan Roiser 2004
	// Copyright CERN, CH-1211 Geneva 23, 2004-2006, All rights reserved.		// Copyright CERN, CH-1211 Geneva 23, 2004-2006, All rights reserved.
	//		//
	// Permission to use, copy, modify, and distribute this software for any		// Permission to use, copy, modify, and distribute this software for any
	// purpose is hereby granted without fee, provided that this copyright and		// purpose is hereby granted without fee, provided that this copyright and
	// permissions notice appear in all copies and derivatives.		// permissions notice appear in all copies and derivatives.
	//		//
	// This software is provided "as is" without express or implied warranty.		// This software is provided "as is" without express or implied warranty.
	skipping to change at line 66		skipping to change at line 66
	* inequal operator		* inequal operator
	*/		*/
	bool operator != ( const Scope & rh ) const;		bool operator != ( const Scope & rh ) const;
	/**		/**
	* the bool operator will return true if the Scope is resolved (implem ented)		* the bool operator will return true if the Scope is resolved (implem ented)
	* @return true if Scope is implemented		* @return true if Scope is implemented
	*/		*/
	operator bool () const;		operator bool () const;
	#ifdef REFLEX_CINT_MERGE		#if defined(REFLEX_CINT_MERGE)
	// To prevent any un-authorized use as the old type		// To prevent any un-authorized use as the old type
	bool operator!() const { return !operator bool(); }		bool operator!() const { return !operator bool(); }
	bool operator&&(bool right) const { return operator bool() && right; }		bool operator&&(bool right) const { return operator bool() && right; }
	bool operator&&(int right) const { return operator bool() && right; }		bool operator&&(int right) const { return operator bool() && right; }
	bool operator&&(long right) const { return operator bool() && right; }		bool operator&&(long right) const { return operator bool() && right; }
	bool operator&&(const Scope &right) const;		bool operator&&(const Scope &right) const;
	bool operator&&(const Type &right) const;		bool operator&&(const Type &right) const;
	bool operator&&(const Member &right) const;		bool operator&&(const Member &right) const;
	bool operator||(bool right) const { return operator bool() || right; }		bool operator||(bool right) const { return operator bool() || right; }
	bool operator||(int right) const { return operator bool() || right; }		bool operator||(int right) const { return operator bool() || right; }
	skipping to change at line 461		skipping to change at line 461
	* Name returns the name of the type		* Name returns the name of the type
	* @param mod qualifiers can be or'ed		* @param mod qualifiers can be or'ed
	* FINAL - resolve typedefs		* FINAL - resolve typedefs
	* SCOPED - fully scoped name		* SCOPED - fully scoped name
	* QUALIFIED - cv, reference qualification		* QUALIFIED - cv, reference qualification
	* @return name of the type		* @return name of the type
	*/		*/
	std::string Name( unsigned int mod = 0 ) const;		std::string Name( unsigned int mod = 0 ) const;
	/**		/**
	* Name_c_str returns a char* pointer to the unqualified type name		* Name_c_str returns a char* pointer to the qualified type name
	* @return c string to unqualified type name		* @return c string to unqualified type name
	*/		*/
	const char * Name_c_str() const;		const char * Name_c_str() const;
	/**		/**
	* Properties will return a PropertyList attached to this item		* Properties will return a PropertyList attached to this item
	* @return PropertyList of this type		* @return PropertyList of this type
	*/		*/
	PropertyList Properties() const;		PropertyList Properties() const;
	skipping to change at line 750		skipping to change at line 750
	* @param typ the type of the data member		* @param typ the type of the data member
	* @param offs the offset of the data member relative to the beginning of the scope		* @param offs the offset of the data member relative to the beginning of the scope
	* @param modifiers of the data member		* @param modifiers of the data member
	*/		*/
	void AddDataMember( const char * name,		void AddDataMember( const char * name,
	const Type & type,		const Type & type,
	size_t offset,		size_t offset,
	unsigned int modifiers = 0 ) const;		unsigned int modifiers = 0 ) const;
	/**		/**
			* AddDataMember will add the information about a data member
			* @param output a placeholder for 'Member' pointing to the data memb
			er
			* @param nam the name of the data member
			* @param typ the type of the data member
			* @param offs the offset of the data member relative to the beginnin
			g of the scope
			* @param modifiers of the data member
			*/
			void AddDataMember(Member& output, const char* name, const Type& type
			, size_t offset, unsigned int modifiers = 0, char* interpreterOffset = 0) c
			onst;
			/**
	* AddFunctionMember will add the information about a function member		* AddFunctionMember will add the information about a function member
	* @param fm function member to add		* @param fm function member to add
	*/		*/
	void AddFunctionMember( const Member & fm ) const;		void AddFunctionMember( const Member & fm ) const;
	/**		/**
	* AddFunctionMember will add the information about a function member		* AddFunctionMember will add the information about a function member
	* @param nam the name of the function member		* @param nam the name of the function member
	* @param typ the type of the function member		* @param typ the type of the function member
	* @param stubFP a pointer to the stub function		* @param stubFP a pointer to the stub function
	skipping to change at line 1437		skipping to change at line 1447
	}		}
	inline bool operator&&(int i, const Reflex::Scope & rh) {		inline bool operator&&(int i, const Reflex::Scope & rh) {
	return i && rh.operator bool();		return i && rh.operator bool();
	}		}
	inline bool operator||(bool b, const Reflex::Scope & rh) {		inline bool operator||(bool b, const Reflex::Scope & rh) {
	return b || rh.operator bool();		return b || rh.operator bool();
	}		}
	inline bool operator||(int i, const Reflex::Scope & rh) {		inline bool operator||(int i, const Reflex::Scope & rh) {
	return i || rh.operator bool();		return i || rh.operator bool();
	}		}
			inline bool operator&&(char *c, const Reflex::Scope & rh) {
			return c && rh.operator bool();
			}
			inline bool operator||(char *c, const Reflex::Scope & rh) {
			return c ||rh.operator bool();
			}
	#endif		#endif
	#endif // Reflex_Scope		#endif // Reflex_Scope
End of changes. 5 change blocks.
	3 lines changed or deleted		23 lines changed or added

	ScopeBase.h		ScopeBase.h
	// @(#)root/reflex:$Id: ScopeBase.h 25669 2008-10-02 21:37:03Z pcanal $		// @(#)root/reflex:$Id: ScopeBase.h 27509 2009-02-19 03:32:22Z pcanal $
	// Author: Stefan Roiser 2004		// Author: Stefan Roiser 2004
	// Copyright CERN, CH-1211 Geneva 23, 2004-2006, All rights reserved.		// Copyright CERN, CH-1211 Geneva 23, 2004-2006, All rights reserved.
	//		//
	// Permission to use, copy, modify, and distribute this software for any		// Permission to use, copy, modify, and distribute this software for any
	// purpose is hereby granted without fee, provided that this copyright and		// purpose is hereby granted without fee, provided that this copyright and
	// permissions notice appear in all copies and derivatives.		// permissions notice appear in all copies and derivatives.
	//		//
	// This software is provided "as is" without express or implied warranty.		// This software is provided "as is" without express or implied warranty.
	skipping to change at line 491		skipping to change at line 491
	/** protected constructor for initialisation of the global namespace */		/** protected constructor for initialisation of the global namespace */
	ScopeBase();		ScopeBase();
	public:		public:
	/**		/**
	* AddDataMember will add the information about a data MemberAt		* AddDataMember will add the information about a data MemberAt
	* @param dm pointer to data MemberAt		* @param dm pointer to data MemberAt
	*/		*/
	virtual void AddDataMember( const Member & dm ) const;		virtual void AddDataMember(const Member& dm) const;
	virtual void AddDataMember( const char * name,		virtual void AddDataMember(const char* name, const Type& type, size_t
	const Type & type,		offset, unsigned int modifiers = 0) const;
	size_t offset,		virtual void AddDataMember(Member& output, const char* name, const Ty
	unsigned int modifiers = 0 ) const;		pe& type, size_t offset, unsigned int modifiers = 0, char* interpreterOffse
			t = 0) const;
	/**		/**
	* AddFunctionMember will add the information about a function MemberA t		* AddFunctionMember will add the information about a function MemberA t
	* @param fm pointer to function MemberAt		* @param fm pointer to function MemberAt
	*/		*/
	virtual void AddFunctionMember( const Member & fm ) const;		virtual void AddFunctionMember( const Member & fm ) const;
	virtual void AddFunctionMember( const char * name,		virtual void AddFunctionMember( const char * name,
	const Type & type,		const Type & type,
	StubFunction stubFP,		StubFunction stubFP,
	void * stubCtx = 0,		void * stubCtx = 0,
End of changes. 2 change blocks.
	6 lines changed or deleted		7 lines changed or added

	ScopeName.h		ScopeName.h
	// @(#)root/reflex:$Id: ScopeName.h 25669 2008-10-02 21:37:03Z pcanal $		// @(#)root/reflex:$Id: ScopeName.h 27197 2009-01-21 07:45:07Z pcanal $
	// Author: Stefan Roiser 2004		// Author: Stefan Roiser 2004
	// Copyright CERN, CH-1211 Geneva 23, 2004-2006, All rights reserved.		// Copyright CERN, CH-1211 Geneva 23, 2004-2006, All rights reserved.
	//		//
	// Permission to use, copy, modify, and distribute this software for any		// Permission to use, copy, modify, and distribute this software for any
	// purpose is hereby granted without fee, provided that this copyright and		// purpose is hereby granted without fee, provided that this copyright and
	// permissions notice appear in all copies and derivatives.		// permissions notice appear in all copies and derivatives.
	//		//
	// This software is provided "as is" without express or implied warranty.		// This software is provided "as is" without express or implied warranty.
	skipping to change at line 76		skipping to change at line 76
	*/		*/
	void UnhideName();		void UnhideName();
	/**		/**
	* Name will return a string representation of Name of the Scope		* Name will return a string representation of Name of the Scope
	* @return string representation of the Scope		* @return string representation of the Scope
	*/		*/
	const std::string & Name() const;		const std::string & Name() const;
	/**		/**
	* Name_c_str returns a char* pointer to the unqualified Scope Name		* Name_c_str returns a char* pointer to the qualified Scope Name
	* @return c string to unqualified Scope Name		* @return c string to unqualified Scope Name
	*/		*/
	const char * Name_c_str() const;		const char * Name_c_str() const;
	/**		/**
	* ThisScope will return the unqualified Scope object of this ScopeNam e		* ThisScope will return the unqualified Scope object of this ScopeNam e
	* @return corresponding Scope		* @return corresponding Scope
	*/		*/
	Scope ThisScope() const;		Scope ThisScope() const;
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	TApplication.h		TApplication.h
	// @(#)root/base:$Id: TApplication.h 26263 2008-11-18 12:00:21Z rdm $		// @(#)root/base:$Id: TApplication.h 27160 2009-01-15 16:24:27Z pcanal $
	// Author: Fons Rademakers 22/12/95		// Author: Fons Rademakers 22/12/95
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 108		skipping to change at line 108
	void InitializeGraphics();		void InitializeGraphics();
	virtual void GetOptions(Int_t *argc, char **argv);		virtual void GetOptions(Int_t *argc, char **argv);
	TSignalHandler *GetSignalHandler() const { return fSigHandler; }		TSignalHandler *GetSignalHandler() const { return fSigHandler; }
	virtual void SetEchoMode(Bool_t mode);		virtual void SetEchoMode(Bool_t mode);
	virtual void HandleException(Int_t sig);		virtual void HandleException(Int_t sig);
	virtual void HandleIdleTimer(); //*SIGNAL*		virtual void HandleIdleTimer(); //*SIGNAL*
	virtual Bool_t HandleTermInput() { return kFALSE; }		virtual Bool_t HandleTermInput() { return kFALSE; }
	virtual void Init() { fAppImp->Init(); }		virtual void Init() { fAppImp->Init(); }
	virtual Long_t ProcessLine(const char *line, Bool_t sync = kFALSE, Int_ t *error = 0);		virtual Long_t ProcessLine(const char *line, Bool_t sync = kFALSE, Int_ t *error = 0);
	virtual Long_t ProcessFile(const char *file, Int_t *error = 0);		virtual Long_t ProcessFile(const char *file, Int_t *error = 0, Bool_t k eep = kFALSE);
	virtual void Run(Bool_t retrn = kFALSE);		virtual void Run(Bool_t retrn = kFALSE);
	virtual void SetIdleTimer(UInt_t idleTimeInSec, const char *command);		virtual void SetIdleTimer(UInt_t idleTimeInSec, const char *command);
	virtual void RemoveIdleTimer();		virtual void RemoveIdleTimer();
	const char *GetIdleCommand() const { return fIdleCommand; }		const char *GetIdleCommand() const { return fIdleCommand; }
	virtual void StartIdleing();		virtual void StartIdleing();
	virtual void StopIdleing();		virtual void StopIdleing();
	virtual const char *ApplicationName() const { return fAppImp->Applicatio nName(); }		virtual const char *ApplicationName() const { return fAppImp->Applicatio nName(); }
	virtual void Show() { fAppImp->Show(); }		virtual void Show() { fAppImp->Show(); }
	virtual void Hide() { fAppImp->Hide(); }		virtual void Hide() { fAppImp->Hide(); }
	skipping to change at line 149		skipping to change at line 149
	Bool_t IsRunning() const { return fIsRunning; }		Bool_t IsRunning() const { return fIsRunning; }
	Bool_t ReturnFromRun() const { return fReturnFromRun; }		Bool_t ReturnFromRun() const { return fReturnFromRun; }
	void SetReturnFromRun(Bool_t ret) { fReturnFromRun = ret; }		void SetReturnFromRun(Bool_t ret) { fReturnFromRun = ret; }
	virtual void LineProcessed(const char *line); //*SIGNAL*		virtual void LineProcessed(const char *line); //*SIGNAL*
	virtual void Terminate(Int_t status = 0); //*SIGNAL*		virtual void Terminate(Int_t status = 0); //*SIGNAL*
	virtual void KeyPressed(Int_t key); //*SIGNAL*		virtual void KeyPressed(Int_t key); //*SIGNAL*
	virtual void ReturnPressed(char *text ); //*SIGNAL*		virtual void ReturnPressed(char *text ); //*SIGNAL*
	static Long_t ExecuteFile(const char *file, Int_t *error = 0);		static Long_t ExecuteFile(const char *file, Int_t *error = 0, Bool_t k eep = kFALSE);
	static TList *GetApplications();		static TList *GetApplications();
	static void CreateApplication();		static void CreateApplication();
	static void NeedGraphicsLibs();		static void NeedGraphicsLibs();
	ClassDef(TApplication,0) //GUI application singleton		ClassDef(TApplication,0) //GUI application singleton
	};		};
	R__EXTERN TApplication *gApplication;		R__EXTERN TApplication *gApplication;
	#endif		#endif
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	TBranchProxy.h		TBranchProxy.h
	// @(#)root/treeplayer:$Id: TBranchProxy.h 21709 2008-01-15 08:07:55Z pcana l $		// @(#)root/treeplayer:$Id: TBranchProxy.h 27129 2009-01-13 08:22:29Z pcana l $
	// Author: Philippe Canal 01/06/2004		// Author: Philippe Canal 01/06/2004
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers and al. *		* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers and al. *
	* 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 124		skipping to change at line 124
	TBranchProxy(TBranchProxyDirector* boss, TBranchProxy *parent, const char* membername, const char* top = 0, const char* name = 0);		TBranchProxy(TBranchProxyDirector* boss, TBranchProxy *parent, const char* membername, const char* top = 0, const char* name = 0);
	virtual ~TBranchProxy();		virtual ~TBranchProxy();
	TBranchProxy* GetProxy() { return this; }		TBranchProxy* GetProxy() { return this; }
	void Reset();		void Reset();
	Bool_t Setup();		Bool_t Setup();
	Bool_t IsInitialized() {		Bool_t IsInitialized() {
	return (fLastTree == fDirector->GetTree()) && (fLastTree);		return fLastTree && (fLastTree == fDirector->GetTree());
	}		}
	Bool_t IsaPointer() const {		Bool_t IsaPointer() const {
	return fIsaPointer;		return fIsaPointer;
	}		}
	Bool_t Read() {		Bool_t Read() {
	if (fDirector==0) return false;		if (fDirector==0) return false;
	if (fDirector->GetReadEntry()!=fRead) {		if (fDirector->GetReadEntry()!=fRead) {
	skipping to change at line 149		skipping to change at line 149
	}		}
	}		}
	if (fParent) fParent->Read();		if (fParent) fParent->Read();
	else {		else {
	if (fBranchCount) {		if (fBranchCount) {
	fBranchCount->GetEntry(fDirector->GetReadEntry());		fBranchCount->GetEntry(fDirector->GetReadEntry());
	}		}
	fBranch->GetEntry(fDirector->GetReadEntry());		fBranch->GetEntry(fDirector->GetReadEntry());
	}		}
	fRead = fDirector->GetReadEntry();		fRead = fDirector->GetReadEntry();
			return kTRUE;
			} else {
			return IsInitialized();
	}		}
	return IsInitialized();
	}		}
	Bool_t ReadEntries() {		Bool_t ReadEntries() {
	if (fDirector==0) return false;		if (fDirector==0) return false;
	if (fDirector->GetReadEntry()!=fRead) {		if (fDirector->GetReadEntry()!=fRead) {
	if (!IsInitialized()) {		if (!IsInitialized()) {
	if (!Setup()) {		if (!Setup()) {
	Error("Read",Form("Unable to initialize %s\n",fBranchName .Data()));		Error("Read",Form("Unable to initialize %s\n",fBranchName .Data()));
	return false;		return false;
End of changes. 4 change blocks.
	3 lines changed or deleted		5 lines changed or added

	TBranchProxyDirector.h		TBranchProxyDirector.h
	// @(#)root/base:$Id: TBranchProxyDirector.h 20882 2007-11-19 11:31:26Z rdm $		// @(#)root/base:$Id: TBranchProxyDirector.h 27129 2009-01-13 08:22:29Z pca nal $
	// Author: Philippe Canal 13/05/2003		// Author: Philippe Canal 13/05/2003
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2004, Rene Brun, Fons Rademakers and al. *		* Copyright (C) 1995-2004, Rene Brun, Fons Rademakers and al. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 32		skipping to change at line 32
	}		}
	#endif		#endif
	namespace ROOT {		namespace ROOT {
	class TBranchProxy;		class TBranchProxy;
	class TFriendProxy;		class TFriendProxy;
	class TBranchProxyDirector {		class TBranchProxyDirector {
	//This class could actually be the selector itself.		//This class could actually be the selector itself.
	TTree *fTree;		TTree *fTree; // TTree we are currently looking at.
	Long64_t fEntry;		Long64_t fEntry; // Entry currently being read.
	std::list<TBranchProxy*> fDirected;		std::list<TBranchProxy*> fDirected;
	std::list<TFriendProxy*> fFriends;		std::list<TFriendProxy*> fFriends;
	public:		public:
	TBranchProxyDirector(TTree* tree, Long64_t i);		TBranchProxyDirector(TTree* tree, Long64_t i);
	TBranchProxyDirector(TTree* tree, Int_t i); // cint has (had?) a problem casting int to long long		TBranchProxyDirector(TTree* tree, Int_t i); // cint has (had?) a problem casting int to long long
	TBranchProxyDirector(const TBranchProxyDirector &) {;}		TBranchProxyDirector(const TBranchProxyDirector &) {;}
	TBranchProxyDirector& operator=(const TBranchProxyDirector&) {return *this;}		TBranchProxyDirector& operator=(const TBranchProxyDirector&) {return *this;}
	void Attach(TBranchProxy* p);		void Attach(TBranchProxy* p);
	void Attach(TFriendProxy* f);		void Attach(TFriendProxy* f);
	Long64_t GetReadEntry() const;		Long64_t GetReadEntry() const { return fEntry; }
	TTree* GetTree() const;		TTree* GetTree() const { return fTree; };
	// void Print();		// void Print();
	void SetReadEntry(Long64_t entry);		void SetReadEntry(Long64_t entry);
	TTree* SetTree(TTree *newtree);		TTree* SetTree(TTree *newtree);
	};		};
	} /* namespace ROOT */		} /* namespace ROOT */
	#endif		#endif
End of changes. 3 change blocks.
	5 lines changed or deleted		5 lines changed or added

	TChair.h		TChair.h
	// @(#)root/table:$Id: TChair.h 20882 2007-11-19 11:31:26Z rdm $		// @(#)root/table:$Id: TChair.h 27157 2009-01-15 14:05:12Z brun $
	// Author: Valery Fine(fine@bnl.gov) 13/03/2000		// Author: Valery Fine(fine@bnl.gov) 13/03/2000
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 57		skipping to change at line 57
	virtual void AddAt(const void *c, Int_t i){GetThisTable()->Add At(c,i);}		virtual void AddAt(const void *c, Int_t i){GetThisTable()->Add At(c,i);}
	const void *At(Int_t i) const {return GetThisTable()->At(i);}		const void *At(Int_t i) const {return GetThisTable()->At(i);}
	virtual void Browse(TBrowser *b){GetThisTable()->Browse(b);}		virtual void Browse(TBrowser *b){GetThisTable()->Browse(b);}
	virtual void CopySet(TChair &chair){GetThisTable()->CopySet(*c hair.GetThisTable());}		virtual void CopySet(TChair &chair){GetThisTable()->CopySet(*c hair.GetThisTable());}
	Int_t CopyRows(const TChair *srcChair, Int_t srcRow=0, Int_t dstRow=0, Int_t nRows=0, Bool_t expand=kFALSE)		Int_t CopyRows(const TChair *srcChair, Int_t srcRow=0, Int_t dstRow=0, Int_t nRows=0, Bool_t expand=kFALSE)
	{return GetThisTable()->CopyRows(srcChair->GetThi sTable(),srcRow,dstRow,nRows,expand);}		{return GetThisTable()->CopyRows(srcChair->GetThi sTable(),srcRow,dstRow,nRows,expand);}
	virtual void Draw(Option_t *opt){GetThisTable()->Draw(opt);}		virtual void Draw(Option_t *opt){GetThisTable()->Draw(opt);}
	virtual TH1 *Draw(TCut varexp, TCut selection, Option_t *optio n="",		virtual TH1 *Draw(TCut varexp, TCut selection, Option_t *optio n="",
	Int_t nentries=1000000000, Int_t firstentry=0)		Int_t nentries=1000000000, Int_t firstentry=0)
	{return GetThisTable()->Draw(varexp,selection,opt ion,nentries,firstentry);}		{return GetThisTable()->Draw(varexp,selection,opt ion,nentries,firstentry);}
	virtual TH1 *Draw(const Text_t *varexp, const Text_t *selectio n, Option_t *option="",		virtual TH1 *Draw(const char *varexp, const char *selection, O ption_t *option="",
	Int_t nentries=1000000000, Int_t firstentry= 0) {		Int_t nentries=1000000000, Int_t firstentry= 0) {
	return GetThisTable()->Draw(varexp,selection,opt ion,nentries,firstentry);}		return GetThisTable()->Draw(varexp,selection,opt ion,nentries,firstentry);}
	virtual Char_t *GetArray() const {return (Char_t *)GetThisTabl e()->GetArray();}		virtual Char_t *GetArray() const {return (Char_t *)GetThisTabl e()->GetArray();}
	virtual TClass *GetRowClass() const {return GetThisTable()->GetRo wClass();}		virtual TClass *GetRowClass() const {return GetThisTable()->GetRo wClass();}
	virtual Long_t GetNRows() const {return GetThisTable()->GetNR ows();}		virtual Long_t GetNRows() const {return GetThisTable()->GetNR ows();}
	virtual Long_t GetRowSize() const {return GetThisTable()->GetRo wSize();}		virtual Long_t GetRowSize() const {return GetThisTable()->GetRo wSize();}
	virtual Long_t GetTableSize() const{return GetThisTable()->GetTa bleSize();}		virtual Long_t GetTableSize() const{return GetThisTable()->GetTa bleSize();}
	const TTable *Table() const {return fTable; }		const TTable *Table() const {return fTable; }
	virtual TTableDescriptor *GetRowDescriptors() const {return GetThi sTable()->GetRowDescriptors();}		virtual TTableDescriptor *GetRowDescriptors() const {return GetThi sTable()->GetRowDescriptors();}
	virtual const Char_t *GetType() const {return GetT hisTable()->GetType();}		virtual const Char_t *GetType() const {return GetT hisTable()->GetType();}
	virtual void Fit(const Text_t *formula ,const Text_t *varexp, const Text_t *selection="",Option_t *option="",Option_t *goption="",		virtual void Fit(const char *formula ,const char *varexp, cons t char *selection="",Option_t *option="",Option_t *goption="",
	Int_t nentries=1000000000, Int_t firstentry=0 ) {		Int_t nentries=1000000000, Int_t firstentry=0 ) {
	GetThisTable()->Fit(formula,varexp,selection,opt ion,goption,nentries,firstentry);}		GetThisTable()->Fit(formula,varexp,selection,opt ion,goption,nentries,firstentry);}
	virtual Long_t HasData() const { return GetThisTable()->HasData ();}		virtual Long_t HasData() const { return GetThisTable()->HasData ();}
	virtual Bool_t IsFolder() const { return GetThisTable()->IsFolde r();}		virtual Bool_t IsFolder() const { return GetThisTable()->IsFolde r();}
	virtual void ls(Option_t *option="") const {GetThisTable()->ls (option);}		virtual void ls(Option_t *option="") const {GetThisTable()->ls (option);}
	virtual void ls(Int_t deep) const {GetThisTable()->ls(deep);}		virtual void ls(Int_t deep) const {GetThisTable()->ls(deep);}
	Int_t NaN() {return GetThisTable()->NaN();}		Int_t NaN() {return GetThisTable()->NaN();}
	virtual Char_t *MakeExpression(const Char_t *expressions[],Int_t nExpressions)		virtual Char_t *MakeExpression(const Char_t *expressions[],Int_t nExpressions)
	{return GetThisTable()->MakeExpression(expressions ,nExpressions);}		{return GetThisTable()->MakeExpression(expressions ,nExpressions);}
	virtual Char_t *Print(Char_t *buf,Int_t n) const { return GetThis Table()->Print(buf, n);}		virtual Char_t *Print(Char_t *buf,Int_t n) const { return GetThis Table()->Print(buf, n);}
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	TCint.h		TCint.h
	// @(#)root/meta:$Id: TCint.h 26888 2008-12-12 21:43:12Z pcanal $		// @(#)root/meta:$Id: TCint.h 27282 2009-01-28 22:36:42Z rdm $
	// Author: Fons Rademakers 01/03/96		// Author: Fons Rademakers 01/03/96
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 35		skipping to change at line 35
	#ifndef ROOT_TInterpreter		#ifndef ROOT_TInterpreter
	#include "TInterpreter.h"		#include "TInterpreter.h"
	#endif		#endif
	#ifndef __CINT__		#ifndef __CINT__
	# ifdef R__BUILDING_CINT7		# ifdef R__BUILDING_CINT7
	# include "cint7/G__ci.h"		# include "cint7/G__ci.h"
	# include "cint7/Api.h"		# include "cint7/Api.h"
	# else		# else
	# include "cint/G__ci.h"		# include "G__ci.h"
	# include "cint/Api.h"		# include "Api.h"
	# endif		# endif
	#else		#else
	struct G__dictposition;		struct G__dictposition;
	#endif		#endif
	#ifndef WIN32		#ifndef WIN32
	# define TWin32SendClass char		# define TWin32SendClass char
	#endif		#endif
	namespace Cint {		namespace Cint {
End of changes. 2 change blocks.
	3 lines changed or deleted		3 lines changed or added

	TClass.h		TClass.h
	// @(#)root/meta:$Id: TClass.h 26606 2008-12-02 20:36:09Z pcanal $		// @(#)root/meta:$Id: TClass.h 27287 2009-01-29 04:52:36Z pcanal $
	// Author: Rene Brun 07/01/95		// Author: Rene Brun 07/01/95
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 91		skipping to change at line 91
	private:		private:
	mutable TObjArray *fStreamerInfo; //Array of TVirtualStreamerInfo		mutable TObjArray *fStreamerInfo; //Array of TVirtualStreamerInfo
	mutable std::map<std::string, TObjArray*> *fConversionStreamerInfo; //Ar ray of the streamer infos derived from another class.		mutable std::map<std::string, TObjArray*> *fConversionStreamerInfo; //Ar ray of the streamer infos derived from another class.
	TList *fRealData; //linked list for persistent member s including base classes		TList *fRealData; //linked list for persistent member s including base classes
	TList *fBase; //linked list for base classes		TList *fBase; //linked list for base classes
	TList *fData; //linked list for data members		TList *fData; //linked list for data members
	TList *fMethod; //linked list for methods		TList *fMethod; //linked list for methods
	TList *fAllPubData; //all public data members (includin g from base classes)		TList *fAllPubData; //all public data members (includin g from base classes)
	TList *fAllPubMethod; //all public methods (including fro m base classes)		TList *fAllPubMethod; //all public methods (including fro m base classes)
			mutable TList *fClassMenuList; //list of class menu items
	const char *fDeclFileName; //name of class declaration file		const char *fDeclFileName; //name of class declaration file
	const char *fImplFileName; //name of class implementation file		const char *fImplFileName; //name of class implementation file
	Short_t fDeclFileLine; //line of class declaration		Short_t fDeclFileLine; //line of class declaration
	Short_t fImplFileLine; //line of class implementation		Short_t fImplFileLine; //line of class implementation
	UInt_t fInstanceCount; //number of instances of this class		UInt_t fInstanceCount; //number of instances of this class
	UInt_t fOnHeap; //number of instances on heap		UInt_t fOnHeap; //number of instances on heap
	mutable UInt_t fCheckSum; //checksum of data members and base classes		mutable UInt_t fCheckSum; //checksum of data members and base classes
	TVirtualCollectionProxy *fCollectionProxy; //Collection interface		TVirtualCollectionProxy *fCollectionProxy; //Collection interface
	Version_t fClassVersion; //Class version Identifier		Version_t fClassVersion; //Class version Identifier
	ClassInfo_t *fClassInfo; //pointer to CINT class info class		ClassInfo_t *fClassInfo; //pointer to CINT class info class
	TString fContextMenuTitle;//context menu title		TString fContextMenuTitle;//context menu title
	TList *fClassMenuList; //list of class menu items
	const type_info *fTypeInfo; //pointer to the C++ type informati on.		const type_info *fTypeInfo; //pointer to the C++ type informati on.
	ShowMembersFunc_t fShowMembers; //pointer to the class's ShowMember s function		ShowMembersFunc_t fShowMembers; //pointer to the class's ShowMember s function
			mutable void *fInterShowMembers;//Interpreter call setup for ShowMe mbers
	TClassStreamer *fStreamer; //pointer to streamer function		TClassStreamer *fStreamer; //pointer to streamer function
	TString fSharedLibs; //shared libraries containing class code		TString fSharedLibs; //shared libraries containing class code
	TVirtualIsAProxy *fIsA; //!pointer to the class's IsA proxy .		TVirtualIsAProxy *fIsA; //!pointer to the class's IsA proxy .
	IsAGlobalFunc_t fGlobalIsA; //pointer to a global IsA function.		IsAGlobalFunc_t fGlobalIsA; //pointer to a global IsA function.
	mutable TMethodCall *fIsAMethod; //!saved info to call a IsA membe r function		mutable TMethodCall *fIsAMethod; //!saved info to call a IsA membe r function
	ROOT::NewFunc_t fNew; //pointer to a function newing one object.		ROOT::NewFunc_t fNew; //pointer to a function newing one object.
	ROOT::NewArrFunc_t fNewArray; //pointer to a function newing an a rray of objects.		ROOT::NewArrFunc_t fNewArray; //pointer to a function newing an a rray of objects.
	ROOT::DelFunc_t fDelete; //pointer to a function deleting on e object.		ROOT::DelFunc_t fDelete; //pointer to a function deleting on e object.
	skipping to change at line 207		skipping to change at line 209
	ShowMembersFunc_t showmember,		ShowMembersFunc_t showmember,
	const char *dfil, const char *ifil,		const char *dfil, const char *ifil,
	Int_t dl, Int_t il, Bool_t silent = kFALSE);		Int_t dl, Int_t il, Bool_t silent = kFALSE);
	virtual ~TClass();		virtual ~TClass();
	void AddInstance(Bool_t heap = kFALSE) { fInstanceCount++; if (heap) fOnHeap++; }		void AddInstance(Bool_t heap = kFALSE) { fInstanceCount++; if (heap) fOnHeap++; }
	void AddImplFile(const char *filename, int line);		void AddImplFile(const char *filename, int line);
	void AddRef(TClassRef *ref);		void AddRef(TClassRef *ref);
	void AdoptSchemaRules( ROOT::TSchemaRuleSet *rules );		void AdoptSchemaRules( ROOT::TSchemaRuleSet *rules );
	virtual void Browse(TBrowser *b);		virtual void Browse(TBrowser *b);
	void BuildRealData(void *pointer=0);		void BuildRealData(void *pointer=0, Bool_t isTransient = k FALSE);
	void BuildEmulatedRealData(const char *name, Long_t offset , TClass *cl);		void BuildEmulatedRealData(const char *name, Long_t offset , TClass *cl);
	void CalculateStreamerOffset();		void CalculateStreamerOffset() const;
			Bool_t CallShowMembers(void* obj, TMemberInspector &insp, ch
			ar *parent,
			Int_t isATObject = -1) const;
	Bool_t CanSplit() const;		Bool_t CanSplit() const;
	Bool_t CanIgnoreTObjectStreamer() { return TestBit(kIgnoreTO bjectStreamer);}		Bool_t CanIgnoreTObjectStreamer() { return TestBit(kIgnoreTO bjectStreamer);}
			TObject *Clone(const char *newname="") const;
	void CopyCollectionProxy(const TVirtualCollectionProxy&);		void CopyCollectionProxy(const TVirtualCollectionProxy&);
	void Draw(Option_t *option="");		void Draw(Option_t *option="");
	void Dump() const { TDictionary::Dump(); }		void Dump() const { TDictionary::Dump(); }
	void Dump(void *obj) const;		void Dump(void *obj) const;
	char *EscapeChars(const char *text) const;		char *EscapeChars(const char *text) const;
	TVirtualStreamerInfo *FindStreamerInfo(UInt_t checksum) const;		TVirtualStreamerInfo *FindStreamerInfo(UInt_t checksum) const;
	TVirtualStreamerInfo *GetConversionStreamerInfo( const char* onfile_ classname, Int_t version ) const;		TVirtualStreamerInfo *GetConversionStreamerInfo( const char* onfile_ classname, Int_t version ) const;
	TVirtualStreamerInfo *FindConversionStreamerInfo( const char* onfile _classname, UInt_t checksum ) const;		TVirtualStreamerInfo *FindConversionStreamerInfo( const char* onfile _classname, UInt_t checksum ) const;
	TVirtualStreamerInfo *GetConversionStreamerInfo( const TClass* onfil e_cl, Int_t version ) const;		TVirtualStreamerInfo *GetConversionStreamerInfo( const TClass* onfil e_cl, Int_t version ) const;
	TVirtualStreamerInfo *FindConversionStreamerInfo( const TClass* onfi le_cl, UInt_t checksum ) const;		TVirtualStreamerInfo *FindConversionStreamerInfo( const TClass* onfi le_cl, UInt_t checksum ) const;
	skipping to change at line 257		skipping to change at line 262
	Short_t GetImplFileLine() const { return fImplFileLine; }		Short_t GetImplFileLine() const { return fImplFileLine; }
	TClass *GetActualClass(const void *object) const;		TClass *GetActualClass(const void *object) const;
	TClass *GetBaseClass(const char *classname);		TClass *GetBaseClass(const char *classname);
	TClass *GetBaseClass(const TClass *base);		TClass *GetBaseClass(const TClass *base);
	Int_t GetBaseClassOffset(const TClass *base);		Int_t GetBaseClassOffset(const TClass *base);
	TClass *GetBaseDataMember(const char *datamember);		TClass *GetBaseDataMember(const char *datamember);
	ROOT::DirAutoAdd_t GetDirectoryAutoAdd() const;		ROOT::DirAutoAdd_t GetDirectoryAutoAdd() const;
	UInt_t GetInstanceCount() const { return fInstanceCount; }		UInt_t GetInstanceCount() const { return fInstanceCount; }
	UInt_t GetHeapInstanceCount() const { return fOnHeap; }		UInt_t GetHeapInstanceCount() const { return fOnHeap; }
	void GetMenuItems(TList *listitems);		void GetMenuItems(TList *listitems);
	TList *GetMenuList() const { return fClassMenuList; }		TList *GetMenuList() const;
	TMethod *GetMethod(const char *method, const char *params);		TMethod *GetMethod(const char *method, const char *params);
	TMethod *GetMethodWithPrototype(const char *method, const char *proto);		TMethod *GetMethodWithPrototype(const char *method, const char *proto);
	TMethod *GetMethodAny(const char *method);		TMethod *GetMethodAny(const char *method);
	TMethod *GetMethodAllAny(const char *method);		TMethod *GetMethodAllAny(const char *method);
	Int_t GetNdata();		Int_t GetNdata();
	ROOT::NewFunc_t GetNew() const;		ROOT::NewFunc_t GetNew() const;
	ROOT::NewArrFunc_t GetNewArray() const;		ROOT::NewArrFunc_t GetNewArray() const;
	Int_t GetNmethods();		Int_t GetNmethods();
	TRealData *GetRealData(const char *name) const;		TRealData *GetRealData(const char *name) const;
	TVirtualRefProxy *GetReferenceProxy() const { return fRefProxy; }		TVirtualRefProxy *GetReferenceProxy() const { return fRefProxy; }
End of changes. 8 change blocks.
	5 lines changed or deleted		11 lines changed or added

	TClassEdit.h		TClassEdit.h
	// @(#)root/base:$Id: TClassEdit.h 20882 2007-11-19 11:31:26Z rdm $		// @(#)root/base:$Id: TClassEdit.h 27409 2009-02-10 22:31:15Z pcanal $
	// Author: Victor Perev 10/04/2003		// Author: Victor Perev 10/04/2003
	// Philippe Canal 05/2004		// Philippe Canal 05/2004
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2003, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2003, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 41		skipping to change at line 41
	namespace TClassEdit {		namespace TClassEdit {
	enum EModType {		enum EModType {
	kDropTrailStar = 1<<0,		kDropTrailStar = 1<<0,
	kDropDefaultAlloc = 1<<1,		kDropDefaultAlloc = 1<<1,
	kDropAlloc = 1<<2,		kDropAlloc = 1<<2,
	kInnerClass = 1<<3,		kInnerClass = 1<<3,
	kInnedMostClass = 1<<4,		kInnedMostClass = 1<<4,
	kDropStlDefault = 1<<5, /* implies kDropDefaultAlloc */		kDropStlDefault = 1<<5, /* implies kDropDefaultAlloc */
	kDropComparator = 1<<6 /* if the class has a comparator, drops BOT		kDropComparator = 1<<6, /* if the class has a comparator, drops BOT
	H the comparator and the Allocator */		H the comparator and the Allocator */
			kDropAllDefault = 1<<7 /* Drop default template parameter even in
			non STL classes */
	};		};
	enum ESTLType {		enum ESTLType {
	kNotSTL = 0,		kNotSTL = 0,
	kVector = 1,		kVector = 1,
	kList = 2,		kList = 2,
	kDeque = 3,		kDeque = 3,
	kMap = 4,		kMap = 4,
	kMultiMap = 5,		kMultiMap = 5,
	kSet = 6,		kSet = 6,
End of changes. 2 change blocks.
	3 lines changed or deleted		5 lines changed or added

	TCollectionProxyInfo.h		TCollectionProxyInfo.h
	// @(#)root/cont:$Id: TCollectionProxyInfo.h 26123 2008-11-10 15:40:40Z pca nal $		// @(#)root/cont:$Id: TCollectionProxyInfo.h 27255 2009-01-27 10:59:53Z pca nal $
	// Author: Markus Frank 28/10/04. Philippe Canal 02/01/2007		// Author: Markus Frank 28/10/04. Philippe Canal 02/01/2007
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 57		skipping to change at line 57
	/** @class TCollectionProxyInfo::Environ TCollectionProxyInfo.h TCollecti onProxyInfo.h		/** @class TCollectionProxyInfo::Environ TCollectionProxyInfo.h TCollecti onProxyInfo.h
	*		*
	* Small helper to save proxy environment in the event of		* Small helper to save proxy environment in the event of
	* recursive calls.		* recursive calls.
	*		*
	* @author M.Frank		* @author M.Frank
	* @version 1.0		* @version 1.0
	* @date 10/10/2004		* @date 10/10/2004
	*/		*/
	#ifndef __CINT__		#ifndef __CINT__
	template <typename T> struct Environ {		struct EnvironBase {
			EnvironBase() : fIdx(0), fSize(0), fObject(0), fStart(0), fTemp(0), f
			UseTemp(kFALSE), fRefCount(1), fSpace(0)
			{
			// fprintf("Running default constructor on %p\n",this);
			}
			virtual ~EnvironBase() {}
			size_t fIdx;
			size_t fSize;
			void* fObject;
			void* fStart;
			void* fTemp;
			Bool_t fUseTemp;
			int fRefCount;
			size_t fSpace;
			};
			template <typename T> struct Environ : public EnvironBase {
	typedef T Iter_t;		typedef T Iter_t;
	char buff[64];		Iter_t fIterator;
	size_t idx;		T& iter() { return fIterator; }
	size_t size;		static void *Create() {
	void* object;		return new Environ();
	void* start;		}
	void* temp;
	Bool_t use_temp;
	int refCount;
	size_t space;
	T& iter() { return *(T*)buff; }
	};		};
	#else		#else
			struct EnvironBase;
	template <typename T> struct Environ;		template <typename T> struct Environ;
	#endif		#endif
	#if defined(R__VCXX6)		#if defined(R__VCXX6)
	template <class T> void Destruct(T* obj) { obj->~T(); }		template <class T> void Destruct(T* obj) { obj->~T(); }
	#endif		#endif
	template <class T, class Q> struct PairHolder {		template <class T, class Q> struct PairHolder {
	T first;		T first;
	Q second;		Q second;
	PairHolder() {}		PairHolder() {}
	skipping to change at line 117		skipping to change at line 128
	typedef typename T::iterator Iter_t;		typedef typename T::iterator Iter_t;
	typedef typename T::value_type Value_t;		typedef typename T::value_type Value_t;
	typedef Environ<Iter_t> Env_t;		typedef Environ<Iter_t> Env_t;
	typedef Env_t *PEnv_t;		typedef Env_t *PEnv_t;
	typedef Cont_t *PCont_t;		typedef Cont_t *PCont_t;
	typedef Value_t *PValue_t;		typedef Value_t *PValue_t;
	virtual ~Type() {}		virtual ~Type() {}
	static inline PCont_t object(void* ptr) {		static inline PCont_t object(void* ptr) {
	return PCont_t(PEnv_t(ptr)->object);		return PCont_t(PEnv_t(ptr)->fObject);
	}		}
	static void* size(void* env) {		static void* size(void* env) {
	PEnv_t e = PEnv_t(env);		PEnv_t e = PEnv_t(env);
	e->size = PCont_t(e->object)->size();		e->fSize = PCont_t(e->fObject)->size();
	return &e->size;		return &e->fSize;
	}		}
	static void* clear(void* env) {		static void* clear(void* env) {
	object(env)->clear();		object(env)->clear();
	return 0;		return 0;
	}		}
	static void* first(void* env) {		static void* first(void* env) {
	PEnv_t e = PEnv_t(env);		PEnv_t e = PEnv_t(env);
	PCont_t c = PCont_t(e->object);		PCont_t c = PCont_t(e->fObject);
			#if 0
	// Assume iterators do not need destruction		// Assume iterators do not need destruction
	::new(e->buff) Iter_t(c->begin());		::new(e->buff) Iter_t(c->begin());
	e->size = c->size();		#endif
	if ( 0 == e->size ) return e->start = 0;		e->fIterator = c->begin();
			e->fSize = c->size();
			if ( 0 == e->fSize ) return e->fStart = 0;
	TYPENAME T::const_reference ref = *(e->iter());		TYPENAME T::const_reference ref = *(e->iter());
	return e->start = address(ref);		return e->fStart = address(ref);
	}		}
	static void* next(void* env) {		static void* next(void* env) {
	PEnv_t e = PEnv_t(env);		PEnv_t e = PEnv_t(env);
	PCont_t c = PCont_t(e->object);		PCont_t c = PCont_t(e->fObject);
	for (; e->idx > 0 && e->iter() != c->end(); ++(e->iter()), --e->id		for (; e->fIdx > 0 && e->iter() != c->end(); ++(e->iter()), --e->f
	x){ }		Idx){ }
	// TODO: Need to find something for going backwards....		// TODO: Need to find something for going backwards....
	if ( e->iter() == c->end() ) return 0;		if ( e->iter() == c->end() ) return 0;
	TYPENAME T::const_reference ref = *(e->iter());		TYPENAME T::const_reference ref = *(e->iter());
	return address(ref);		return address(ref);
	}		}
	static void* construct(void* env) {		static void* construct(void* env) {
	PEnv_t e = PEnv_t(env);		PEnv_t e = PEnv_t(env);
	PValue_t m = PValue_t(e->start);		PValue_t m = PValue_t(e->fStart);
	for (size_t i=0; i<e->size; ++i, ++m)		for (size_t i=0; i<e->fSize; ++i, ++m)
	::new(m) Value_t();		::new(m) Value_t();
	return 0;		return 0;
	}		}
	static void* collect(void* env) {		static void* collect(void* env) {
	PEnv_t e = PEnv_t(env);		PEnv_t e = PEnv_t(env);
	PCont_t c = PCont_t(e->object);		PCont_t c = PCont_t(e->fObject);
	PValue_t m = PValue_t(e->start);		PValue_t m = PValue_t(e->fStart);
	for (Iter_t i=c->begin(); i != c->end(); ++i, ++m )		for (Iter_t i=c->begin(); i != c->end(); ++i, ++m )
	::new(m) Value_t(*i);		::new(m) Value_t(*i);
	return 0;		return 0;
	}		}
	static void* destruct(void* env) {		static void* destruct(void* env) {
	PEnv_t e = PEnv_t(env);		PEnv_t e = PEnv_t(env);
	PValue_t m = PValue_t(e->start);		PValue_t m = PValue_t(e->fStart);
	#if defined(R__VCXX6)		#if defined(R__VCXX6)
	PCont_t c = PCont_t(e->object);		PCont_t c = PCont_t(e->fObject);
	for (size_t i=0; i < e->size; ++i, ++m )		for (size_t i=0; i < e->fSize; ++i, ++m )
	ROOT::Destruct(m);		ROOT::Destruct(m);
	#else		#else
	for (size_t i=0; i < e->size; ++i, ++m )		for (size_t i=0; i < e->fSize; ++i, ++m )
	m->~Value_t();		m->~Value_t();
	#endif		#endif
	return 0;		return 0;
	}		}
	};		};
	/** @class TCollectionProxyInfo::Map TCollectionProxyInfo.h TCollectionP roxyInfo.h		/** @class TCollectionProxyInfo::Map TCollectionProxyInfo.h TCollectionP roxyInfo.h
	*		*
	* Small helper to encapsulate all necessary data accesses for		* Small helper to encapsulate all necessary data accesses for
	* containers like vector, list, deque		* containers like vector, list, deque
	skipping to change at line 196		skipping to change at line 210
	template <class T> struct Pushback : public Type<T> {		template <class T> struct Pushback : public Type<T> {
	typedef T Cont_t;		typedef T Cont_t;
	typedef typename T::iterator Iter_t;		typedef typename T::iterator Iter_t;
	typedef typename T::value_type Value_t;		typedef typename T::value_type Value_t;
	typedef Environ<Iter_t> Env_t;		typedef Environ<Iter_t> Env_t;
	typedef Env_t *PEnv_t;		typedef Env_t *PEnv_t;
	typedef Cont_t *PCont_t;		typedef Cont_t *PCont_t;
	typedef Value_t *PValue_t;		typedef Value_t *PValue_t;
	static void* resize(void* env) {		static void* resize(void* env) {
	PEnv_t e = PEnv_t(env);		PEnv_t e = PEnv_t(env);
	PCont_t c = PCont_t(e->object);		PCont_t c = PCont_t(e->fObject);
	c->resize(e->size);		c->resize(e->fSize);
	e->idx = 0;		e->fIdx = 0;
	return e->start = address(*c->begin());		return e->fStart = e->fSize ? address(*c->begin()) : 0;
	}		}
	static void* feed(void* env) {		static void* feed(void* env) {
	PEnv_t e = PEnv_t(env);		PEnv_t e = PEnv_t(env);
	PCont_t c = PCont_t(e->object);		PCont_t c = PCont_t(e->fObject);
	PValue_t m = PValue_t(e->start); // Here start is actually a 'buff		PValue_t m = PValue_t(e->fStart); // Here start is actually a 'buf
	er' outside the buffer.		fer' outside the buffer.
	for (size_t i=0; i<e->size; ++i, ++m)		for (size_t i=0; i<e->fSize; ++i, ++m)
	c->push_back(*m);		c->push_back(*m);
	return 0;		return 0;
	}		}
	static int value_offset() {		static int value_offset() {
	return 0;		return 0;
	}		}
	};		};
	/** @class TCollectionProxyInfo::Map TCollectionProxyInfo.h TCollectionP roxyInfo.h		/** @class TCollectionProxyInfo::Map TCollectionProxyInfo.h TCollectionP roxyInfo.h
	*		*
	skipping to change at line 233		skipping to change at line 247
	template <class T> struct Insert : public Type<T> {		template <class T> struct Insert : public Type<T> {
	typedef T Cont_t;		typedef T Cont_t;
	typedef typename T::iterator Iter_t;		typedef typename T::iterator Iter_t;
	typedef typename T::value_type Value_t;		typedef typename T::value_type Value_t;
	typedef Environ<Iter_t> Env_t;		typedef Environ<Iter_t> Env_t;
	typedef Env_t *PEnv_t;		typedef Env_t *PEnv_t;
	typedef Cont_t *PCont_t;		typedef Cont_t *PCont_t;
	typedef Value_t *PValue_t;		typedef Value_t *PValue_t;
	static void* feed(void* env) {		static void* feed(void* env) {
	PEnv_t e = PEnv_t(env);		PEnv_t e = PEnv_t(env);
	PCont_t c = PCont_t(e->object);		PCont_t c = PCont_t(e->fObject);
	PValue_t m = PValue_t(e->start);		PValue_t m = PValue_t(e->fStart);
	for (size_t i=0; i<e->size; ++i, ++m)		for (size_t i=0; i<e->fSize; ++i, ++m)
	c->insert(*m);		c->insert(*m);
	return 0;		return 0;
	}		}
	static void* resize(void* /* env */ ) {		static void* resize(void* /* env */ ) {
	return 0;		return 0;
	}		}
	static int value_offset() {		static int value_offset() {
	return 0;		return 0;
	}		}
	};		};
	skipping to change at line 266		skipping to change at line 280
	template <class T> struct MapInsert : public Type<T> {		template <class T> struct MapInsert : public Type<T> {
	typedef T Cont_t;		typedef T Cont_t;
	typedef typename T::iterator Iter_t;		typedef typename T::iterator Iter_t;
	typedef typename T::value_type Value_t;		typedef typename T::value_type Value_t;
	typedef Environ<Iter_t> Env_t;		typedef Environ<Iter_t> Env_t;
	typedef Env_t *PEnv_t;		typedef Env_t *PEnv_t;
	typedef Cont_t *PCont_t;		typedef Cont_t *PCont_t;
	typedef Value_t *PValue_t;		typedef Value_t *PValue_t;
	static void* feed(void* env) {		static void* feed(void* env) {
	PEnv_t e = PEnv_t(env);		PEnv_t e = PEnv_t(env);
	PCont_t c = PCont_t(e->object);		PCont_t c = PCont_t(e->fObject);
	PValue_t m = PValue_t(e->start);		PValue_t m = PValue_t(e->fStart);
	for (size_t i=0; i<e->size; ++i, ++m)		for (size_t i=0; i<e->fSize; ++i, ++m)
	c->insert(*m);		c->insert(*m);
	return 0;		return 0;
	}		}
	static void* resize(void* /* env */ ) {		static void* resize(void* /* env */ ) {
	return 0;		return 0;
	}		}
	static int value_offset() {		static int value_offset() {
	return ((char*)&((PValue_t(0x1000))->second)) - ((char*)PValue_t(0 x1000));		return ((char*)&((PValue_t(0x1000))->second)) - ((char*)PValue_t(0 x1000));
	}		}
	};		};
	skipping to change at line 296		skipping to change at line 310
	int fValueOffset;		int fValueOffset;
	void* (*fSizeFunc)(void*);		void* (*fSizeFunc)(void*);
	void* (*fResizeFunc)(void*);		void* (*fResizeFunc)(void*);
	void* (*fClearFunc)(void*);		void* (*fClearFunc)(void*);
	void* (*fFirstFunc)(void*);		void* (*fFirstFunc)(void*);
	void* (*fNextFunc)(void*);		void* (*fNextFunc)(void*);
	void* (*fConstructFunc)(void*);		void* (*fConstructFunc)(void*);
	void* (*fDestructFunc)(void*);		void* (*fDestructFunc)(void*);
	void* (*fFeedFunc)(void*);		void* (*fFeedFunc)(void*);
	void* (*fCollectFunc)(void*);		void* (*fCollectFunc)(void*);
			void* (*fCreateEnv)();
	public:		public:
	TCollectionProxyInfo(const type_info& info,		TCollectionProxyInfo(const type_info& info,
	size_t iter_size,		size_t iter_size,
	size_t value_diff,		size_t value_diff,
	int value_offset,		int value_offset,
	void* (*size_func)(void*),		void* (*size_func)(void*),
	void* (*resize_func)(void*),		void* (*resize_func)(void*),
	void* (*clear_func)(void*),		void* (*clear_func)(void*),
	void* (*first_func)(void*),		void* (*first_func)(void*),
	void* (*next_func)(void*),		void* (*next_func)(void*),
	void* (*construct_func)(void*),		void* (*construct_func)(void*),
	void* (*destruct_func)(void*),		void* (*destruct_func)(void*),
	void* (*feed_func)(void*),		void* (*feed_func)(void*),
	void* (*collect_func)(void*)		void* (*collect_func)(void*),
			void* (*create_env)()
	) :		) :
	fInfo(info), fIterSize(iter_size), fValueDiff(value_diff),		fInfo(info), fIterSize(iter_size), fValueDiff(value_diff),
	fValueOffset(value_offset),		fValueOffset(value_offset),
	fSizeFunc(size_func),fResizeFunc(resize_func),fClearFunc(clear_fun c),		fSizeFunc(size_func),fResizeFunc(resize_func),fClearFunc(clear_fun c),
	fFirstFunc(first_func),fNextFunc(next_func),fConstructFunc(constru ct_func),		fFirstFunc(first_func),fNextFunc(next_func),fConstructFunc(constru ct_func),
	fDestructFunc(destruct_func),fFeedFunc(feed_func),fCollectFunc(col		fDestructFunc(destruct_func),fFeedFunc(feed_func),fCollectFunc(col
	lect_func)		lect_func),
			fCreateEnv(create_env)
	{		{
	}		}
	/// Generate proxy from template		/// Generate proxy from template
	template <class T> static ROOT::TCollectionProxyInfo* Generate(const T&) {		template <class T> static ROOT::TCollectionProxyInfo* Generate(const T&) {
	// Generate a TCollectionProxyInfo given a TCollectionProxyInfo::T ype		// Generate a TCollectionProxyInfo given a TCollectionProxyInfo::T ype
	// template (used to described the behavior of the stl collection.		// template (used to described the behavior of the stl collection.
	// Typical use looks like:		// Typical use looks like:
	// ::ROOT::TCollectionProxyInfo::Generate(TCollectionProxyInf o::Pushback< vector<string> >()));		// ::ROOT::TCollectionProxyInfo::Generate(TCollectionProxyInf o::Pushback< vector<string> >()));
	skipping to change at line 341		skipping to change at line 358
	(((char*)&p->second)-((char* )&p->first)),		(((char*)&p->second)-((char* )&p->first)),
	T::value_offset(),		T::value_offset(),
	T::size,		T::size,
	T::resize,		T::resize,
	T::clear,		T::clear,
	T::first,		T::first,
	T::next,		T::next,
	T::construct,		T::construct,
	T::destruct,		T::destruct,
	T::feed,		T::feed,
	T::collect);		T::collect,
			T::Env_t::Create);
	}		}
	template <class T> static ROOT::TCollectionProxyInfo Get(const T&) {		template <class T> static ROOT::TCollectionProxyInfo Get(const T&) {
	// Generate a TCollectionProxyInfo given a TCollectionProxyInfo::T ype		// Generate a TCollectionProxyInfo given a TCollectionProxyInfo::T ype
	// template (used to described the behavior of the stl collection.		// template (used to described the behavior of the stl collection.
	// Typical use looks like:		// Typical use looks like:
	// ::ROOT::TCollectionProxyInfo::Get(TCollectionProxyInfo::Pu shback< vector<string> >()));		// ::ROOT::TCollectionProxyInfo::Get(TCollectionProxyInfo::Pu shback< vector<string> >()));
	PairHolder<TYPENAME T::Value_t, TYPENAME T::Value_t>* p =		PairHolder<TYPENAME T::Value_t, TYPENAME T::Value_t>* p =
	skipping to change at line 365		skipping to change at line 383
	(((char*)&p->second)-((char*)&p- >first)),		(((char*)&p->second)-((char*)&p- >first)),
	T::value_offset(),		T::value_offset(),
	T::size,		T::size,
	T::resize,		T::resize,
	T::clear,		T::clear,
	T::first,		T::first,
	T::next,		T::next,
	T::construct,		T::construct,
	T::destruct,		T::destruct,
	T::feed,		T::feed,
	T::collect);		T::collect,
			T::Env_t::Create);
	}		}
	};		};
	template <> struct TCollectionProxyInfo::Type<std::vector<bool> >		template <> struct TCollectionProxyInfo::Type<std::vector<bool> >
	: public Address<std::vector<bool>::const_reference>		: public Address<std::vector<bool>::const_reference>
	{		{
	typedef std::vector<bool> Cont_t;		typedef std::vector<bool> Cont_t;
	typedef std::vector<bool>::iterator Iter_t;		typedef std::vector<bool>::iterator Iter_t;
	typedef std::vector<bool>::value_type Value_t;		typedef std::vector<bool>::value_type Value_t;
	typedef Environ<Iter_t> Env_t;		typedef Environ<Iter_t> Env_t;
	typedef Env_t *PEnv_t;		typedef Env_t *PEnv_t;
	typedef Cont_t *PCont_t;		typedef Cont_t *PCont_t;
	typedef Value_t *PValue_t;		typedef Value_t *PValue_t;
	virtual ~Type() {}		virtual ~Type() {}
	static inline PCont_t object(void* ptr) {		static inline PCont_t object(void* ptr) {
	return PCont_t(PEnv_t(ptr)->object);		return PCont_t(PEnv_t(ptr)->fObject);
	}		}
	static void* size(void* env) {		static void* size(void* env) {
	PEnv_t e = PEnv_t(env);		PEnv_t e = PEnv_t(env);
	e->size = PCont_t(e->object)->size();		e->fSize = PCont_t(e->fObject)->size();
	return &e->size;		return &e->fSize;
	}		}
	static void* clear(void* env) {		static void* clear(void* env) {
	object(env)->clear();		object(env)->clear();
	return 0;		return 0;
	}		}
	static void* first(void* env) {		static void* first(void* env) {
	PEnv_t e = PEnv_t(env);		PEnv_t e = PEnv_t(env);
	PCont_t c = PCont_t(e->object);		PCont_t c = PCont_t(e->fObject);
			#if 0
	// Assume iterators do not need destruction		// Assume iterators do not need destruction
	::new(e->buff) Iter_t(c->begin());		::new(e->buff) Iter_t(c->begin());
	e->size = c->size();		#endif
			e->fIterator = c->begin();
			e->fSize = c->size();
	return 0;		return 0;
	}		}
	static void* next(void* env) {		static void* next(void* env) {
	PEnv_t e = PEnv_t(env);		PEnv_t e = PEnv_t(env);
	PCont_t c = PCont_t(e->object);		PCont_t c = PCont_t(e->fObject);
	for (; e->idx > 0 && e->iter() != c->end(); ++(e->iter()), --e->id		for (; e->fIdx > 0 && e->iter() != c->end(); ++(e->iter()), --e->f
	x){ }		Idx){ }
	// TODO: Need to find something for going backwards....		// TODO: Need to find something for going backwards....
	return 0;		return 0;
	}		}
	static void* construct(void*) {		static void* construct(void*) {
	// Nothing to construct.		// Nothing to construct.
	return 0;		return 0;
	}		}
	static void* collect(void* env) {		static void* collect(void* env) {
	PEnv_t e = PEnv_t(env);		PEnv_t e = PEnv_t(env);
	PCont_t c = PCont_t(e->object);		PCont_t c = PCont_t(e->fObject);
	PValue_t m = PValue_t(e->start); // 'start' is a buffer outside th		PValue_t m = PValue_t(e->fStart); // 'start' is a buffer outside t
	e container.		he container.
	for (Iter_t i=c->begin(); i != c->end(); ++i, ++m )		for (Iter_t i=c->begin(); i != c->end(); ++i, ++m )
	::new(m) Value_t(*i);		::new(m) Value_t(*i);
	return 0;		return 0;
	}		}
	static void* destruct(void*) {		static void* destruct(void*) {
	// Nothing to destruct.		// Nothing to destruct.
	return 0;		return 0;
	}		}
	};		};
	skipping to change at line 439		skipping to change at line 461
	typedef std::vector<bool> Cont_t;		typedef std::vector<bool> Cont_t;
	typedef Cont_t::iterator Iter_t;		typedef Cont_t::iterator Iter_t;
	typedef Cont_t::value_type Value_t;		typedef Cont_t::value_type Value_t;
	typedef Environ<Iter_t> Env_t;		typedef Environ<Iter_t> Env_t;
	typedef Env_t *PEnv_t;		typedef Env_t *PEnv_t;
	typedef Cont_t *PCont_t;		typedef Cont_t *PCont_t;
	typedef Value_t *PValue_t;		typedef Value_t *PValue_t;
	static void* resize(void* env) {		static void* resize(void* env) {
	PEnv_t e = PEnv_t(env);		PEnv_t e = PEnv_t(env);
	PCont_t c = PCont_t(e->object);		PCont_t c = PCont_t(e->fObject);
	c->resize(e->size);		c->resize(e->fSize);
	e->idx = 0;		e->fIdx = 0;
	return 0;		return 0;
	}		}
	static void* feed(void* env) {		static void* feed(void* env) {
	PEnv_t e = PEnv_t(env);		PEnv_t e = PEnv_t(env);
	PCont_t c = PCont_t(e->object);		PCont_t c = PCont_t(e->fObject);
	PValue_t m = PValue_t(e->start); // Here start is actually a 'buff		PValue_t m = PValue_t(e->fStart); // Here start is actually a 'buf
	er' outside the container.		fer' outside the container.
	for (size_t i=0; i<e->size; ++i, ++m)		for (size_t i=0; i<e->fSize; ++i, ++m)
	c->push_back(*m);		c->push_back(*m);
	return 0;		return 0;
	}		}
	static int value_offset() {		static int value_offset() {
	return 0;		return 0;
	}		}
	};		};
	#ifndef __CINT__		#ifndef __CINT__
	// Need specialization for boolean references due to stupid STL vector<b ool>		// Need specialization for boolean references due to stupid STL vector<b ool>
End of changes. 32 change blocks.
	67 lines changed or deleted		90 lines changed or added

	TDataSet.h		TDataSet.h
	// @(#)root/table:$Id: TDataSet.h 21565 2007-12-28 12:28:46Z brun $		// @(#)root/table:$Id: TDataSet.h 27157 2009-01-15 14:05:12Z brun $
	// Author: Valery Fine(fine@mail.cern.ch) 03/07/98		// Author: Valery Fine(fine@mail.cern.ch) 03/07/98
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 143		skipping to change at line 143
	void Mark(); // *MENU*		void Mark(); // *MENU*
	void UnMark(); // *MENU*		void UnMark(); // *MENU*
	void MarkAll(); // *MENU*		void MarkAll(); // *MENU*
	void UnMarkAll(); // *MENU*		void UnMarkAll(); // *MENU*
	void InvertAllMarks(); // *MENU*		void InvertAllMarks(); // *MENU*
	void Mark(UInt_t flag,EBitOpt reset=kSet);		void Mark(UInt_t flag,EBitOpt reset=kSet);
	virtual TDataSet *Next() const;		virtual TDataSet *Next() const;
	virtual TDataSet *Prev() const;		virtual TDataSet *Prev() const;
	virtual void Update(); // Update data set		virtual void Update(); // Update data set
	virtual void Update(TDataSet *set,UInt_t opt=0);// Update this d ataset with the new one		virtual void Update(TDataSet *set,UInt_t opt=0);// Update this d ataset with the new one
	virtual Int_t Write(const Text_t *name=0, Int_t option=0, Int_t b		virtual Int_t Write(const char *name=0, Int_t option=0, Int_t buf
	ufsize=0);		size=0);
	virtual Int_t Write(const Text_t *name=0, Int_t option=0, Int_t b		virtual Int_t Write(const char *name=0, Int_t option=0, Int_t buf
	ufsize=0) const;		size=0) const;
	ClassDef(TDataSet,1) // The base class to create the hierarchical data s tructures		ClassDef(TDataSet,1) // The base class to create the hierarchical data s tructures
	};		};
	inline void TDataSet::Add(TDataSet *dataset){ AddLast(dataset); }		inline void TDataSet::Add(TDataSet *dataset){ AddLast(dataset); }
	inline TDataSet *TDataSet::At(Int_t idx) const {return fList ? (TDataSet *)fList->At(idx) : 0; }		inline TDataSet *TDataSet::At(Int_t idx) const {return fList ? (TDataSet *)fList->At(idx) : 0; }
	inline Int_t TDataSet::GetListSize() const {return (fList) ? fList->G etSize():0;}		inline Int_t TDataSet::GetListSize() const {return (fList) ? fList->G etSize():0;}
	inline TDataSet *TDataSet::instance() { return new TDataSet();}		inline TDataSet *TDataSet::instance() { return new TDataSet();}
	inline Bool_t TDataSet::IsMarked() const { return TestBit(kMark); }		inline Bool_t TDataSet::IsMarked() const { return TestBit(kMark); }
	inline void TDataSet::Mark(UInt_t flag,EBitOpt reset){ SetBit(flag,r eset); }		inline void TDataSet::Mark(UInt_t flag,EBitOpt reset){ SetBit(flag,r eset); }
	inline void TDataSet::Mark() { Mark(kMark,kSet); }		inline void TDataSet::Mark() { Mark(kMark,kSet); }
End of changes. 2 change blocks.
	5 lines changed or deleted		5 lines changed or added

	TDictionary.h		TDictionary.h
	// @(#)root/meta:$Id: TDictionary.h 24423 2008-06-20 14:47:08Z rdm $		// @(#)root/meta:$Id: TDictionary.h 27287 2009-01-29 04:52:36Z pcanal $
	// Author: Fons Rademakers 20/06/96		// Author: Fons Rademakers 20/06/96
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 47		skipping to change at line 47
	// CINT C++ interpreter. //		// CINT C++ interpreter. //
	// //		// //
	// TMethodCall (method call environment) //		// TMethodCall (method call environment) //
	// //		// //
	//////////////////////////////////////////////////////////////////////////		//////////////////////////////////////////////////////////////////////////
	#ifndef ROOT_TNamed		#ifndef ROOT_TNamed
	#include "TNamed.h"		#include "TNamed.h"
	#endif		#endif
	#include "cint/Property.h"		#ifndef R__BUILDING_CINT7
			#include "Property.h"
			#else
			#include "cint7/Property.h"
			#endif
	typedef void CallFunc_t;		typedef void CallFunc_t;
	typedef void ClassInfo_t;		typedef void ClassInfo_t;
	typedef void BaseClassInfo_t;		typedef void BaseClassInfo_t;
	typedef void DataMemberInfo_t;		typedef void DataMemberInfo_t;
	typedef void MethodInfo_t;		typedef void MethodInfo_t;
	typedef void MethodArgInfo_t;		typedef void MethodArgInfo_t;
	typedef void MethodArgInfo_t;		typedef void MethodArgInfo_t;
	typedef void TypeInfo_t;		typedef void TypeInfo_t;
	typedef void TypedefInfo_t;		typedef void TypedefInfo_t;
	skipping to change at line 87		skipping to change at line 91
	kIsReference = G__BIT_ISREFERENCE,		kIsReference = G__BIT_ISREFERENCE,
	kIsConstant = G__BIT_ISCONSTANT,		kIsConstant = G__BIT_ISCONSTANT,
	kIsConstPointer = G__BIT_ISPCONSTANT,		kIsConstPointer = G__BIT_ISPCONSTANT,
	kIsMethConst = G__BIT_ISMETHCONSTANT		kIsMethConst = G__BIT_ISMETHCONSTANT
	};		};
	class TDictionary : public TNamed {		class TDictionary : public TNamed {
	public:		public:
	TDictionary() { }		TDictionary() { }
			TDictionary(const char* name): TNamed(name, "") { }
	virtual ~TDictionary() { }		virtual ~TDictionary() { }
	virtual Long_t Property() const = 0;		virtual Long_t Property() const = 0;
	// Type of STL container (returned by IsSTLContainer).		// Type of STL container (returned by IsSTLContainer).
	enum ESTLType {kNone=0, kVector=1, kList, kDeque, kMap, kMultimap, kSet, kMultiset};		enum ESTLType {kNone=0, kVector=1, kList, kDeque, kMap, kMultimap, kSet, kMultiset};
	ClassDef(TDictionary,0) //ABC defining interface to dictionary		ClassDef(TDictionary,0) //ABC defining interface to dictionary
	};		};
End of changes. 3 change blocks.
	2 lines changed or deleted		7 lines changed or added

	TDocOutput.h		TDocOutput.h
	// @(#)root/html:$Id: TDocOutput.h 26807 2008-12-10 17:47:42Z axel $		// @(#)root/html:$Id: TDocOutput.h 27562 2009-02-21 10:55:11Z axel $
	// Author: Axel Naumann 2007-01-09		// Author: Axel Naumann 2007-01-09
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 65		skipping to change at line 65
	void AddLink(TSubString& str, TString& link, const char* comme nt);		void AddLink(TSubString& str, TString& link, const char* comme nt);
	void ProcessDocInDir(std::ostream& out, const char* indir, con st char* outdir, const char* linkdir);		void ProcessDocInDir(std::ostream& out, const char* indir, con st char* outdir, const char* linkdir);
	Bool_t RunDot(const char* filename, std::ostream* outMap = 0, EG raphvizTool gvwhat = kDot);		Bool_t RunDot(const char* filename, std::ostream* outMap = 0, EG raphvizTool gvwhat = kDot);
	void WriteHtmlHeader(std::ostream& out, const char *titleNoSpe cial,		void WriteHtmlHeader(std::ostream& out, const char *titleNoSpe cial,
	const char* dir /*=""*/, TClass *cls /*=0 */,		const char* dir /*=""*/, TClass *cls /*=0 */,
	const char* header);		const char* header);
	void WriteHtmlFooter(std::ostream& out, const char *dir,		void WriteHtmlFooter(std::ostream& out, const char *dir,
	const char *lastUpdate, const char *autho r,		const char *lastUpdate, const char *autho r,
	const char *copyright, const char* footer );		const char *copyright, const char* footer );
	virtual void WriteSearch(std::ostream& out);		virtual void WriteSearch(std::ostream& out);
			void WriteLocation(std::ostream& out, TModuleDocInfo* module, const char* classname = 0);
	void WriteModuleLinks(std::ostream& out);		void WriteModuleLinks(std::ostream& out);
	void WriteModuleLinks(std::ostream& out, TModuleDocInfo* super );		void WriteModuleLinks(std::ostream& out, TModuleDocInfo* super );
	void WriteTopLinks(std::ostream& out, TModuleDocInfo* module, const char* classname = 0);		void WriteTopLinks(std::ostream& out, TModuleDocInfo* module, const char* classname = 0, Bool_t withLocation = kTRUE);
	public:		public:
	enum EFileType { kSource, kInclude, kTree, kDoc };		enum EFileType { kSource, kInclude, kTree, kDoc };
	TDocOutput(THtml& html);		TDocOutput(THtml& html);
	virtual ~TDocOutput();		virtual ~TDocOutput();
	virtual void AdjustSourcePath(TString& line, const char* relpath = ".. /");		virtual void AdjustSourcePath(TString& line, const char* relpath = ".. /");
	void Convert(std::istream& in, const char* infilename,		void Convert(std::istream& in, const char* infilename,
	const char* outfilename, const char *title,		const char* outfilename, const char *title,
	skipping to change at line 113		skipping to change at line 114
	virtual Bool_t ReferenceIsRelative(const char* reference) const;		virtual Bool_t ReferenceIsRelative(const char* reference) const;
	virtual const char* ReplaceSpecialChars(char c);		virtual const char* ReplaceSpecialChars(char c);
	void ReplaceSpecialChars(std::ostream &out, const char *string );		void ReplaceSpecialChars(std::ostream &out, const char *string );
	void ReplaceSpecialChars(TString& text);		void ReplaceSpecialChars(TString& text);
	void ReplaceSpecialChars(TString& text, Ssiz_t &pos);		void ReplaceSpecialChars(TString& text, Ssiz_t &pos);
	virtual void WriteHtmlHeader(std::ostream &out, const char *title, con st char* dir="", TClass *cls=0);		virtual void WriteHtmlHeader(std::ostream &out, const char *title, con st char* dir="", TClass *cls=0);
	virtual void WriteHtmlFooter(std::ostream &out, const char *dir="", co nst char *lastUpdate="",		virtual void WriteHtmlFooter(std::ostream &out, const char *dir="", co nst char *lastUpdate="",
	const char *author="", const char *copyri ght="");		const char *author="", const char *copyri ght="");
			void WriteLineNumbers(std::ostream& out, Long_t nLines, const TString& infileBase) const;
	ClassDef(TDocOutput, 0); // generates documentation web pages		ClassDef(TDocOutput, 0); // generates documentation web pages
	};		};
	#endif // ROOT_TDocOutput		#endif // ROOT_TDocOutput
End of changes. 4 change blocks.
	2 lines changed or deleted		4 lines changed or added

	TDocParser.h		TDocParser.h
	// @(#)root/html:$Id: TDocParser.h 26807 2008-12-10 17:47:42Z axel $		// @(#)root/html:$Id: TDocParser.h 27531 2009-02-19 16:51:35Z axel $
	// Author: Axel Naumann 2007-01-09		// Author: Axel Naumann 2007-01-09
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 108		skipping to change at line 108
	TString fLineComment; // current line with links and dire ctives for doc		TString fLineComment; // current line with links and dire ctives for doc
	TString fLineSource; // current line with links		TString fLineSource; // current line with links
	TString fComment; // current comment		TString fComment; // current comment
	TString fFirstClassDoc; // first class-doc found - per file, ta ken if fLastClassDoc is empty		TString fFirstClassDoc; // first class-doc found - per file, ta ken if fLastClassDoc is empty
	TString fLastClassDoc; // last class-doc found - becomes class doc at ClassImp or first method		TString fLastClassDoc; // last class-doc found - becomes class doc at ClassImp or first method
	TClass* fCurrentClass; // current class context of sources bei ng parsed		TClass* fCurrentClass; // current class context of sources bei ng parsed
	TClass* fRecentClass; // recently seen class context of sourc es being parsed, e.g. for Convert()		TClass* fRecentClass; // recently seen class context of sourc es being parsed, e.g. for Convert()
	TString fCurrentModule; // current module context of sources be ing parsed		TString fCurrentModule; // current module context of sources be ing parsed
	TString fCurrentMethodTag;// name_idx of the currently parsed met hod		TString fCurrentMethodTag;// name_idx of the currently parsed met hod
	Int_t fDirectiveCount; // index of directive for current metho d		Int_t fDirectiveCount; // index of directive for current metho d
			Long_t fLineNumber; // source line number
	TString fCurrentFile; // current source / header file name		TString fCurrentFile; // current source / header file name
	std::map<std::string /*name*/, Int_t > fMethodCounts; // current cla ss's method names		std::map<std::string /*name*/, Int_t > fMethodCounts; // current cla ss's method names
	EDocContext fDocContext; // current context of parsed sources fo r documenting		EDocContext fDocContext; // current context of parsed sources fo r documenting
	std::list<UInt_t> fParseContext; // current context of parsed sources		std::list<UInt_t> fParseContext; // current context of parsed sources
	Bool_t fCheckForMethod; // whether to check the current line fo r a method		Bool_t fCheckForMethod; // whether to check the current line fo r a method
	enum {		enum {
	kClassDoc_Uninitialized,		kClassDoc_Uninitialized,
	kClassDoc_LookingNothingFound,		kClassDoc_LookingNothingFound,
	kClassDoc_LookingHaveSomething,		kClassDoc_LookingHaveSomething,
	kClassDoc_Written,		kClassDoc_Written,
	kClassDoc_Ignore,		kClassDoc_Ignore,
	kClassDoc_NumStates		kClassDoc_NumStates
	} fClassDocState; // whether we found the class description		} fClassDocState; // whether we found the class description
	Bool_t fCommentAtBOL; // at the beginning of the current line , fParseContext contained kComment		Bool_t fCommentAtBOL; // at the beginning of the current line , fParseContext contained kComment
	TString fClassDescrTag; // tag for finding the class descriptio n		TString fClassDescrTag; // tag for finding the class descriptio n
	TString fSourceInfoTags[kNumSourceInfos]; // tags for source info elements (copyright, last changed, author)		TString fSourceInfoTags[kNumSourceInfos]; // tags for source info elements (copyright, last changed, author)
	TList fDirectiveHandlers;// handler for doc directives (TDocDir ective objects)		TList fDirectiveHandlers;// handler for doc directives (TDocDir ective objects)
			Bool_t fAllowDirectives; // whether directives are to be interp reted
	std::set<UInt_t> fExtraLinesWithAnchor; // lines that need an additional anchor		std::set<UInt_t> fExtraLinesWithAnchor; // lines that need an additional anchor
	TString fSourceInfo[kNumSourceInfos];// author, last changed, ...		TString fSourceInfo[kNumSourceInfos];// author, last changed, ...
	TList fMethods[3]; // methods as TMethodWrapper objects (b y access)		TList fMethods[3]; // methods as TMethodWrapper objects (b y access)
	TList fDataMembers[6]; // data members (by access, plus enums)		TList fDataMembers[6]; // data members (by access, plus enums)
	static std::set<std::string> fgKeywords; // C++ keywords		static std::set<std::string> fgKeywords; // C++ keywords
	void AddClassMethodsRecursively(TBaseClass* bc);		void AddClassMethodsRecursively(TBaseClass* bc);
	void AddClassDataMembersRecursively(TBaseClass* bc);		void AddClassDataMembersRecursively(TBaseClass* bc);
	EParseContext Context() const { return fParseContext.empty() ? kComment : (EParseContext)(fParseContext.back() & kParseContextMask); }		EParseContext Context() const { return fParseContext.empty() ? kComment : (EParseContext)(fParseContext.back() & kParseContextMask); }
	skipping to change at line 177		skipping to change at line 179
	void Convert(std::ostream& out, std::istream& in, const char* r elpath,		void Convert(std::ostream& out, std::istream& in, const char* r elpath,
	Bool_t isCode);		Bool_t isCode);
	void DecrementMethodCount(const char* name);		void DecrementMethodCount(const char* name);
	virtual void DecorateKeywords(std::ostream& out, const char* text);		virtual void DecorateKeywords(std::ostream& out, const char* text);
	virtual void DecorateKeywords(TString& text);		virtual void DecorateKeywords(TString& text);
	virtual void DeleteDirectiveOutput() const;		virtual void DeleteDirectiveOutput() const;
	const TList* GetMethods(EAccess access) const { return &fMethods[access ]; }		const TList* GetMethods(EAccess access) const { return &fMethods[access ]; }
	TClass* GetCurrentClass() const { return fCurrentClass; }		TClass* GetCurrentClass() const { return fCurrentClass; }
	void GetCurrentModule(TString& out_module) const;		void GetCurrentModule(TString& out_module) const;
	TDocOutput* GetDocOutput() const { return fDocOutput; }		TDocOutput* GetDocOutput() const { return fDocOutput; }
			Long_t GetLineNumber() const { return fLineNumber; }
	const TList* GetDataMembers(EAccess access) const { return &fDataMember s[access]; }		const TList* GetDataMembers(EAccess access) const { return &fDataMember s[access]; }
	const TList* GetEnums(EAccess access) const { return &fDataMembers[acce ss+3]; }		const TList* GetEnums(EAccess access) const { return &fDataMembers[acce ss+3]; }
	const char* GetSourceInfo(ESourceInfo type) const { return fSourceInfo [type]; }		const char* GetSourceInfo(ESourceInfo type) const { return fSourceInfo [type]; }
	void SetCurrentModule(const char* module) { fCurrentModule = mo dule; }		void SetCurrentModule(const char* module) { fCurrentModule = mo dule; }
	UInt_t InContext(Int_t context) const;		UInt_t InContext(Int_t context) const;
	static Bool_t IsName(UChar_t c);		static Bool_t IsName(UChar_t c);
	static Bool_t IsWord(UChar_t c);		static Bool_t IsWord(UChar_t c);
	virtual void Parse(std::ostream& out);		virtual void Parse(std::ostream& out);
End of changes. 4 change blocks.
	1 lines changed or deleted		4 lines changed or added

	TEveBoxSet.h		TEveBoxSet.h
	// @(#)root/eve:$Id: TEveBoxSet.h 25245 2008-08-25 21:44:09Z matevz $		// @(#)root/eve:$Id: TEveBoxSet.h 27157 2009-01-15 14:05:12Z brun $
	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007		// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 65		skipping to change at line 65
	Float_t fDefWidth; // Breadth assigned to first coordinate (A).		Float_t fDefWidth; // Breadth assigned to first coordinate (A).
	Float_t fDefHeight; // Breadth assigned to second coordinat e (B).		Float_t fDefHeight; // Breadth assigned to second coordinat e (B).
	Float_t fDefDepth; // Breadth assigned to third coordinate (C).		Float_t fDefDepth; // Breadth assigned to third coordinate (C).
	Bool_t fDrawConeCap;		Bool_t fDrawConeCap;
	static Int_t SizeofAtom(EBoxType_e bt);		static Int_t SizeofAtom(EBoxType_e bt);
	public:		public:
	TEveBoxSet(const Text_t* n="TEveBoxSet", const Text_t* t="");		TEveBoxSet(const char* n="TEveBoxSet", const char* t="");
	virtual ~TEveBoxSet() {}		virtual ~TEveBoxSet() {}
	void Reset(EBoxType_e boxType, Bool_t valIsCol, Int_t chunkSize);		void Reset(EBoxType_e boxType, Bool_t valIsCol, Int_t chunkSize);
	void Reset();		void Reset();
	void AddBox(const Float_t* verts);		void AddBox(const Float_t* verts);
	void AddBox(Float_t a, Float_t b, Float_t c, Float_t w, Float_t h, Float _t d);		void AddBox(Float_t a, Float_t b, Float_t c, Float_t w, Float_t h, Float _t d);
	void AddBox(Float_t a, Float_t b, Float_t c);		void AddBox(Float_t a, Float_t b, Float_t c);
	void AddCone(const TEveVector& pos, const TEveVector& dir, Float_t r);		void AddCone(const TEveVector& pos, const TEveVector& dir, Float_t r);
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	TEveCalo.h		TEveCalo.h
	// @(#)root/eve:$Id: TEveCalo.h 26772 2008-12-09 19:57:49Z matevz $		// @(#)root/eve:$Id: TEveCalo.h 27157 2009-01-15 14:05:12Z brun $
	// Author: Matevz Tadel 2007		// Author: Matevz Tadel 2007
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 70		skipping to change at line 70
	Bool_t fCellIdCacheOK; // Flag cell ids cache state		Bool_t fCellIdCacheOK; // Flag cell ids cache state
	void AssignCaloVizParameters(TEveCaloViz* cv);		void AssignCaloVizParameters(TEveCaloViz* cv);
	void SetupColorHeight(Float_t value, Int_t slice, Float_t& height) const ;		void SetupColorHeight(Float_t value, Int_t slice, Float_t& height) const ;
	virtual void BuildCellIdCache() = 0;		virtual void BuildCellIdCache() = 0;
	public:		public:
	TEveCaloViz(TEveCaloData* data=0, const Text_t* n="TEveCaloViz", const T ext_t* t="");		TEveCaloViz(TEveCaloData* data=0, const char* n="TEveCaloViz", const cha r* t="");
	virtual ~TEveCaloViz();		virtual ~TEveCaloViz();
	TEveCaloData* GetData() const { return fData; }		TEveCaloData* GetData() const { return fData; }
	virtual void SetData(TEveCaloData* d);		virtual void SetData(TEveCaloData* d);
	virtual void DataChanged();		virtual void DataChanged();
	virtual Float_t GetValToHeight() const;		virtual Float_t GetValToHeight() const;
	Float_t GetDataSliceThreshold(Int_t slice) const;		Float_t GetDataSliceThreshold(Int_t slice) const;
	skipping to change at line 160		skipping to change at line 160
	Bool_t fRnrEndCapFrame;		Bool_t fRnrEndCapFrame;
	Bool_t fRnrBarrelFrame;		Bool_t fRnrBarrelFrame;
	Color_t fFrameColor;		Color_t fFrameColor;
	UChar_t fFrameTransparency;		UChar_t fFrameTransparency;
	virtual void BuildCellIdCache();		virtual void BuildCellIdCache();
	public:		public:
	TEveCalo3D(TEveCaloData* d=0, const Text_t* n="TEveCalo3D", const Text_t * t="xx");		TEveCalo3D(TEveCaloData* d=0, const char* n="TEveCalo3D", const char* t= "xx");
	virtual ~TEveCalo3D() {}		virtual ~TEveCalo3D() {}
	virtual void ComputeBBox();		virtual void ComputeBBox();
	virtual Bool_t CanEditMainColor() const { return kTRUE; }		virtual Bool_t CanEditMainColor() const { return kTRUE; }
	virtual Bool_t CanEditMainTransparency() const { return kTRUE; }		virtual Bool_t CanEditMainTransparency() const { return kTRUE; }
	void SetRnrFrame(Bool_t e, Bool_t b) { fRnrEndCapFrame = e; fRnr BarrelFrame = b; }		void SetRnrFrame(Bool_t e, Bool_t b) { fRnrEndCapFrame = e; fRnr BarrelFrame = b; }
	void GetRnrFrame(Bool_t &e, Bool_t &b) const { e = fRnrEndCapFrame; b = fRnrBarrelFrame; }		void GetRnrFrame(Bool_t &e, Bool_t &b) const { e = fRnrEndCapFrame; b = fRnrBarrelFrame; }
	ClassDef(TEveCalo3D, 0); // Class for 3D visualization of calorimeter ev ent data.		ClassDef(TEveCalo3D, 0); // Class for 3D visualization of calorimeter ev ent data.
	skipping to change at line 193		skipping to change at line 193
	TEveProjection::EPType_e fOldProjectionType;		TEveProjection::EPType_e fOldProjectionType;
	protected:		protected:
	std::vector<TEveCaloData::vCellId_t*> fCellLists;		std::vector<TEveCaloData::vCellId_t*> fCellLists;
	std::vector<Int_t> fBinIds;		std::vector<Int_t> fBinIds;
	virtual void BuildCellIdCache();		virtual void BuildCellIdCache();
	public:		public:
	TEveCalo2D(const Text_t* n="TEveCalo2D", const Text_t* t="");		TEveCalo2D(const char* n="TEveCalo2D", const char* t="");
	virtual ~TEveCalo2D(){}		virtual ~TEveCalo2D(){}
	virtual void SetProjection(TEveProjectionManager* proj, TEveProjectable* model);		virtual void SetProjection(TEveProjectionManager* proj, TEveProjectable* model);
	virtual void UpdateProjection();		virtual void UpdateProjection();
	virtual void SetDepth(Float_t x){fDepth = x;}		virtual void SetDepth(Float_t x){fDepth = x;}
	virtual void ComputeBBox();		virtual void ComputeBBox();
	ClassDef(TEveCalo2D, 0); // Class for visualization of projected calorim eter event data.		ClassDef(TEveCalo2D, 0); // Class for visualization of projected calorim eter event data.
	};		};
	skipping to change at line 249		skipping to change at line 249
	EBoxMode_e fBoxMode; // additional scale info		EBoxMode_e fBoxMode; // additional scale info
	Bool_t fDrawHPlane;		Bool_t fDrawHPlane;
	Float_t fHPlaneVal;		Float_t fHPlaneVal;
	Int_t fTowerPicked;		Int_t fTowerPicked;
	virtual void BuildCellIdCache();		virtual void BuildCellIdCache();
	public:		public:
	TEveCaloLego(TEveCaloData* data=0, const Text_t* n="TEveCaloLego", const Text_t* t="");		TEveCaloLego(TEveCaloData* data=0, const char* n="TEveCaloLego", const c har* t="");
	virtual ~TEveCaloLego(){}		virtual ~TEveCaloLego(){}
	virtual void SetData(TEveCaloData* d);		virtual void SetData(TEveCaloData* d);
	Bool_t GetTopViewUseMaxColor() const { return fTopViewUseMaxColor; }		Bool_t GetTopViewUseMaxColor() const { return fTopViewUseMaxColor; }
	void SetTopViewUseMaxColor(Bool_t x) { fTopViewUseMaxColor = x; }		void SetTopViewUseMaxColor(Bool_t x) { fTopViewUseMaxColor = x; }
	Color_t GetTopViewTowerColor() const { return fTopViewTowerColor; }		Color_t GetTopViewTowerColor() const { return fTopViewTowerColor; }
	void SetTopViewTowerColor(Color_t x) { fTopViewTowerColor = x; }		void SetTopViewTowerColor(Color_t x) { fTopViewTowerColor = x; }
End of changes. 5 change blocks.
	5 lines changed or deleted		5 lines changed or added

	TEveCaloLegoGL.h		TEveCaloLegoGL.h
	// @(#)root/eve:$Id: TEveCaloLegoGL.h 26250 2008-11-17 20:56:44Z matevz $		// @(#)root/eve:$Id: TEveCaloLegoGL.h 27370 2009-02-06 18:58:23Z matevz $
	// Author: Matevz Tadel 2007		// Author: Alja Mrak-Tadel 2007
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	#ifndef ROOT_TEveCaloLegoGL		#ifndef ROOT_TEveCaloLegoGL
	#define ROOT_TEveCaloLegoGL		#define ROOT_TEveCaloLegoGL
	#include "TGLObject.h"		#include "TGLObject.h"
	#include "TEveCaloData.h"
	#include "TGLIncludes.h"		#include "TGLIncludes.h"
	#include "TGLAxisPainter.h"		#include "TGLAxisPainter.h"
			#include "TEveCaloData.h"
			#include "TEveVSDStructs.h"
			#include "TEveCalo.h"
	#include <map>		#include <map>
	class TEveCaloLego;		class TEveCaloLego;
	class TEveCaloLegoGL : public TGLObject		class TEveCaloLegoGL : public TGLObject
	{		{
	private:		private:
	TEveCaloLegoGL(const TEveCaloLegoGL&); // Not implemented		TEveCaloLegoGL(const TEveCaloLegoGL&); // Not implemented
	TEveCaloLegoGL& operator=(const TEveCaloLegoGL&); // Not implemented		TEveCaloLegoGL& operator=(const TEveCaloLegoGL&); // Not implemented
	mutable Float_t fDataMax; // cached		mutable Float_t fDataMax; // cached
	mutable TAxis* fEtaAxis;		// axis
	mutable TAxis* fPhiAxis;		mutable TAxis *fEtaAxis;
	mutable Int_t fBinStep;		mutable TAxis *fPhiAxis;
			mutable TAxis *fZAxis;
	mutable TGLAxisAttrib fXAxisAtt;
	mutable TGLAxisAttrib fYAxisAtt;		mutable TEveVector fXAxisTitlePos;
	mutable TGLAxisAttrib fZAxisAtt;		mutable TEveVector fYAxisTitlePos;
			mutable TEveVector fZAxisTitlePos;
			mutable TEveVector fBackPlaneXConst[2];
			mutable TEveVector fBackPlaneYConst[2];
			mutable TGLAxisPainter fAxisPainter;
			mutable Int_t fBinStep;
	mutable TGLAxisPainter fAxisPainter;
	protected:		protected:
	Int_t GetGridStep(TGLRnrCtx &rnrCtx) const;		Int_t GetGridStep(TGLRnrCtx &rnrCtx) const;
	void SetAxis(TAxis *orig, TAxis *curr) const;		void RebinAxis(TAxis *orig, TAxis *curr) const;
	Bool_t PhiShiftInterval(Float_t &min, Float_t &max) const;
	void DrawZScales3D(TGLRnrCtx &rnrCtx, Float_t x0, Float_t x1, Float_t		void SetAxis3DTitlePos(TGLRnrCtx &rnrCtx, Float_t x0, Float_t x1, Flo
	y0, Float_t y1) const;		at_t y0, Float_t y1) const;
	void DrawZAxis(TGLRnrCtx &rnrCtx, Float_t azX, Float_t azY) const;		void DrawAxis3D(TGLRnrCtx &rnrCtx) const;
			void DrawAxis2D(TGLRnrCtx &rnrCtx) const;
	void DrawXYScales(TGLRnrCtx &rnrCtx, Float_t x0, Float_t x1, Float_t
	y0, Float_t y1) const;
	void DrawHistBase(TGLRnrCtx &rnrCtx) const;		void DrawHistBase(TGLRnrCtx &rnrCtx) const;
	void DrawCells2D() const;		void DrawCells2D() const;
	void DrawCells3D(TGLRnrCtx & rnrCtx) const;		void DrawCells3D(TGLRnrCtx & rnrCtx) const;
	void MakeQuad(Float_t x, Float_t y, Float_t z,		void MakeQuad(Float_t x, Float_t y, Float_t z, Float_t xw, Float_t yw
	Float_t xw, Float_t yw, Float_t zh) const;		, Float_t zh) const;
	void MakeDisplayList() const;		void MakeDisplayList() const;
			void WrapTwoPi(Float_t &min, Float_t &max) const;
			TEveCaloLego *fM; // Model object.
	mutable Bool_t fDLCacheOK;		mutable Bool_t fDLCacheOK;
	typedef std::map<Int_t, UInt_t> SliceDLMap_t;		typedef std::map<Int_t, UInt_t> SliceDLMap_t;
	typedef std::map<Int_t, UInt_t>::iterator SliceDLMap_i;		typedef std::map<Int_t, UInt_t>::iterator SliceDLMap_i;
	mutable SliceDLMap_t fDLMap;		mutable SliceDLMap_t fDLMap;
	mutable TEveCaloData::RebinData_t fRebinData;		mutable TEveCaloData::RebinData_t fRebinData;
	mutable Bool_t fCells3D;		mutable Bool_t fCells3D;
	TEveCaloLego *fM; // Model object.
	public:		public:
	TEveCaloLegoGL();		TEveCaloLegoGL();
	virtual ~TEveCaloLegoGL();		virtual ~TEveCaloLegoGL();
	virtual Bool_t SetModel(TObject* obj, const Option_t* opt=0);		virtual Bool_t SetModel(TObject* obj, const Option_t* opt = 0);
	virtual void SetBBox();		virtual void SetBBox();
	virtual void DLCacheDrop();		virtual void DLCacheDrop();
	virtual void DLCachePurge();		virtual void DLCachePurge();
	virtual void DirectDraw(TGLRnrCtx & rnrCtx) const;		virtual void DirectDraw(TGLRnrCtx & rnrCtx) const;
	virtual Bool_t SupportsSecondarySelect() const { return kTRUE; }		virtual Bool_t SupportsSecondarySelect() const { return kTRUE; }
	virtual void ProcessSelection(TGLRnrCtx & rnrCtx, TGLSelectRecord & re c);		virtual void ProcessSelection(TGLRnrCtx & rnrCtx, TGLSelectRecord & re c);
	ClassDef(TEveCaloLegoGL, 0); // GL renderer class for TEveCaloLego.		ClassDef(TEveCaloLegoGL, 0); // GL renderer class for TEveCaloLego.
	};		};
			//_________________________________________________________________________
			_____
			inline void TEveCaloLegoGL::WrapTwoPi(Float_t &min, Float_t &max) const
			{
			// static const Float_t pi = TMath::Pi() + 1e-6;
			if (fM->GetPhiMax()>TMath::Pi() && max<=fM->GetPhiMin())
			{
			min += TMath::TwoPi();
			max += TMath::TwoPi();
			}
			else if (fM->GetPhiMin()<-TMath::Pi() && min>=fM->GetPhiMax())
			{
			min -= TMath::TwoPi();
			max -= TMath::TwoPi();
			}
			}
	#endif		#endif
End of changes. 13 change blocks.
	27 lines changed or deleted		49 lines changed or added

	TEveCompound.h		TEveCompound.h
	// @(#)root/eve:$Id: TEveCompound.h 24004 2008-05-24 20:08:56Z matevz $		// @(#)root/eve:$Id: TEveCompound.h 27157 2009-01-15 14:05:12Z brun $
	// Author: Matevz Tadel 2007		// Author: Matevz Tadel 2007
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 33		skipping to change at line 33
	public TEveProjectable		public TEveProjectable
	{		{
	private:		private:
	TEveCompound(const TEveCompound&); // Not implemented		TEveCompound(const TEveCompound&); // Not implemented
	TEveCompound& operator=(const TEveCompound&); // Not implemented		TEveCompound& operator=(const TEveCompound&); // Not implemented
	protected:		protected:
	Short_t fCompoundOpen; // If more than zero, tag new children as compou nd members.		Short_t fCompoundOpen; // If more than zero, tag new children as compou nd members.
	public:		public:
	TEveCompound(const Text_t* n="TEveCompound", const Text_t* t="",		TEveCompound(const char* n="TEveCompound", const char* t="",
	Bool_t doColor=kTRUE);		Bool_t doColor=kTRUE);
	virtual ~TEveCompound() {}		virtual ~TEveCompound() {}
	void OpenCompound() { ++fCompoundOpen; }		void OpenCompound() { ++fCompoundOpen; }
	void CloseCompound() { --fCompoundOpen; }		void CloseCompound() { --fCompoundOpen; }
	Bool_t IsCompoundOpen() const { return fCompoundOpen > 0; }		Bool_t IsCompoundOpen() const { return fCompoundOpen > 0; }
	virtual void SetMainColor(Color_t color);		virtual void SetMainColor(Color_t color);
	virtual void AddElement(TEveElement* el);		virtual void AddElement(TEveElement* el);
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	TEveDigitSet.h		TEveDigitSet.h
	// @(#)root/eve:$Id: TEveDigitSet.h 26034 2008-10-31 14:01:05Z matevz $		// @(#)root/eve:$Id: TEveDigitSet.h 27157 2009-01-15 14:05:12Z brun $
	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007		// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 74		skipping to change at line 74
	Bool_t fDisableLigting; // Disable lighting for rendering.		Bool_t fDisableLigting; // Disable lighting for rendering.
	Bool_t fHistoButtons; // Show histogram buttons in object editor.		Bool_t fHistoButtons; // Show histogram buttons in object editor.
	Bool_t fEmitSignals; // Emit signals on secondary-select.		Bool_t fEmitSignals; // Emit signals on secondary-select.
	Callback_foo fCallbackFoo; //! Additional function to call on se condary-select.		Callback_foo fCallbackFoo; //! Additional function to call on se condary-select.
	DigitBase_t* NewDigit();		DigitBase_t* NewDigit();
	void ReleaseIds();		void ReleaseIds();
	public:		public:
	TEveDigitSet(const Text_t* n="TEveDigitSet", const Text_t* t="");		TEveDigitSet(const char* n="TEveDigitSet", const char* t="");
	virtual ~TEveDigitSet();		virtual ~TEveDigitSet();
	virtual Bool_t CanEditMainColor() const { return kTRUE; }		virtual Bool_t CanEditMainColor() const { return kTRUE; }
	virtual void SetMainColor(Color_t color);		virtual void SetMainColor(Color_t color);
	virtual Bool_t CanEditMainTransparency() const { return kTRUE; }		virtual Bool_t CanEditMainTransparency() const { return kTRUE; }
	// Implemented in sub-classes:		// Implemented in sub-classes:
	// virtual void Reset(EQuadType_e quadType, Bool_t valIsCol, Int_t chunk Size);		// virtual void Reset(EQuadType_e quadType, Bool_t valIsCol, Int_t chunk Size);
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	TEveElement.h		TEveElement.h
	// @(#)root/eve:$Id: TEveElement.h 26717 2008-12-07 22:07:55Z matevz $		// @(#)root/eve:$Id: TEveElement.h 27577 2009-02-23 14:34:36Z matevz $
	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007		// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 114		skipping to change at line 114
	public:		public:
	TEveElement();		TEveElement();
	TEveElement(Color_t& main_color);		TEveElement(Color_t& main_color);
	TEveElement(const TEveElement& e);		TEveElement(const TEveElement& e);
	virtual ~TEveElement();		virtual ~TEveElement();
	virtual TEveElement* CloneElement() const { return new TEveElement(*this ); }		virtual TEveElement* CloneElement() const { return new TEveElement(*this ); }
	virtual TEveElement* CloneElementRecurse(Int_t level=0) const;		virtual TEveElement* CloneElementRecurse(Int_t level=0) const;
	virtual void CloneChildrenRecurse(TEveElement* dest, Int_t level =0) const;		virtual void CloneChildrenRecurse(TEveElement* dest, Int_t level =0) const;
	virtual const Text_t* GetElementName() const;		virtual const char* GetElementName() const;
	virtual const Text_t* GetElementTitle() const;		virtual const char* GetElementTitle() const;
	virtual void SetElementName (const Text_t* name);		virtual void SetElementName (const char* name);
	virtual void SetElementTitle(const Text_t* title);		virtual void SetElementTitle(const char* title);
	virtual void SetElementNameTitle(const Text_t* name, const Text_t* title		virtual void SetElementNameTitle(const char* name, const char* title);
	);
	virtual void NameTitleChanged();		virtual void NameTitleChanged();
	const TString& GetVizTag() const { return fVizTag; }		const TString& GetVizTag() const { return fVizTag; }
	void SetVizTag(const TString& tag) { fVizTag = tag; }		void SetVizTag(const TString& tag) { fVizTag = tag; }
	TEveElement* GetVizModel() const { return fVizModel; }		TEveElement* GetVizModel() const { return fVizModel; }
	void SetVizModel(TEveElement* model);		void SetVizModel(TEveElement* model);
	Bool_t FindVizModel();		Bool_t FindVizModel();
	Bool_t ApplyVizTag(const TString& tag, const TString& fallback_t ag="");		Bool_t ApplyVizTag(const TString& tag, const TString& fallback_t ag="");
	skipping to change at line 214		skipping to change at line 214
	virtual sLTI_i FindItem(TGListTree* ltree);		virtual sLTI_i FindItem(TGListTree* ltree);
	virtual sLTI_i FindItem(TGListTree* ltree,		virtual sLTI_i FindItem(TGListTree* ltree,
	TGListTreeItem* parent_lti);		TGListTreeItem* parent_lti);
	virtual TGListTreeItem* FindListTreeItem(TGListTree* ltree);		virtual TGListTreeItem* FindListTreeItem(TGListTree* ltree);
	virtual TGListTreeItem* FindListTreeItem(TGListTree* ltree,		virtual TGListTreeItem* FindListTreeItem(TGListTree* ltree,
	TGListTreeItem* parent_lti);		TGListTreeItem* parent_lti);
	virtual Int_t GetNItems() const { return fItems.size(); }		virtual Int_t GetNItems() const { return fItems.size(); }
	void SpawnEditor(); // *MENU*		void SpawnEditor(); // *MENU*
	virtual void ExportToCINT(Text_t* var_name); // *MENU*		virtual void ExportToCINT(char* var_name); // *MENU*
			void DumpSourceObject() const; // *MENU*
			void PrintSourceObject() const; // *MENU*
			void ExportSourceObjectToCINT(char* var_name) const; // *MENU*
	virtual Bool_t AcceptElement(TEveElement* el);		virtual Bool_t AcceptElement(TEveElement* el);
	virtual void AddElement(TEveElement* el);		virtual void AddElement(TEveElement* el);
	virtual void RemoveElement(TEveElement* el);		virtual void RemoveElement(TEveElement* el);
	virtual void RemoveElementLocal(TEveElement* el);		virtual void RemoveElementLocal(TEveElement* el);
	virtual void RemoveElements();		virtual void RemoveElements();
	virtual void RemoveElementsLocal();		virtual void RemoveElementsLocal();
	virtual void Destroy(); // *MENU*		virtual void Destroy(); // *MENU*
	skipping to change at line 378		skipping to change at line 382
	public:		public:
	TEveElementObjectPtr(TObject* obj, Bool_t own=kTRUE);		TEveElementObjectPtr(TObject* obj, Bool_t own=kTRUE);
	TEveElementObjectPtr(TObject* obj, Color_t& mainColor, Bool_t own=kTRUE) ;		TEveElementObjectPtr(TObject* obj, Color_t& mainColor, Bool_t own=kTRUE) ;
	TEveElementObjectPtr(const TEveElementObjectPtr& e);		TEveElementObjectPtr(const TEveElementObjectPtr& e);
	virtual ~TEveElementObjectPtr();		virtual ~TEveElementObjectPtr();
	virtual TEveElementObjectPtr* CloneElement() const { return new TEveElem entObjectPtr(*this); }		virtual TEveElementObjectPtr* CloneElement() const { return new TEveElem entObjectPtr(*this); }
	virtual TObject* GetObject(const TEveException& eh="TEveElementObjectPtr ::GetObject ") const;		virtual TObject* GetObject(const TEveException& eh="TEveElementObjectPtr ::GetObject ") const;
	virtual void ExportToCINT(Text_t* var_name);		virtual void ExportToCINT(char* var_name);
	Bool_t GetOwnObject() const { return fOwnObject; }		Bool_t GetOwnObject() const { return fOwnObject; }
	void SetOwnObject(Bool_t o) { fOwnObject = o; }		void SetOwnObject(Bool_t o) { fOwnObject = o; }
	ClassDef(TEveElementObjectPtr, 0); // TEveElement with external TObject as a holder of visualization data.		ClassDef(TEveElementObjectPtr, 0); // TEveElement with external TObject as a holder of visualization data.
	};		};
	/************************************************************************** ****/		/************************************************************************** ****/
	// TEveElementList		// TEveElementList
	/************************************************************************** ****/		/************************************************************************** ****/
	skipping to change at line 402		skipping to change at line 406
	{		{
	private:		private:
	TEveElementList& operator=(const TEveElementList&); // Not implemented		TEveElementList& operator=(const TEveElementList&); // Not implemented
	protected:		protected:
	Color_t fColor; // Color of the object.		Color_t fColor; // Color of the object.
	Bool_t fDoColor; // Should serve fColor as the main color of the object.		Bool_t fDoColor; // Should serve fColor as the main color of the object.
	TClass *fChildClass; // Class of acceptable children, others are reje cted.		TClass *fChildClass; // Class of acceptable children, others are reje cted.
	public:		public:
	TEveElementList(const Text_t* n="TEveElementList", const Text_t* t="",		TEveElementList(const char* n="TEveElementList", const char* t="",
	Bool_t doColor=kFALSE);		Bool_t doColor=kFALSE);
	TEveElementList(const TEveElementList& e);		TEveElementList(const TEveElementList& e);
	virtual ~TEveElementList() {}		virtual ~TEveElementList() {}
	virtual TEveElementList* CloneElement() const { return new TEveElementLi st(*this); }		virtual TEveElementList* CloneElement() const { return new TEveElementLi st(*this); }
	virtual const Text_t* GetElementName() const { return GetName(); }		virtual const char* GetElementName() const { return GetName(); }
	virtual const Text_t* GetElementTitle() const { return GetTitle(); }		virtual const char* GetElementTitle() const { return GetTitle(); }
	virtual void SetElementName (const Text_t* name)		virtual void SetElementName (const char* name)
	{ TNamed::SetName(name); NameTitleChanged(); }		{ TNamed::SetName(name); NameTitleChanged(); }
	virtual void SetElementTitle(const Text_t* title)		virtual void SetElementTitle(const char* title)
	{ TNamed::SetTitle(title); NameTitleChanged(); }		{ TNamed::SetTitle(title); NameTitleChanged(); }
	virtual void SetElementNameTitle(const Text_t* name, const Text_t* title )		virtual void SetElementNameTitle(const char* name, const char* title)
	{ TNamed::SetNameTitle(name, title); NameTitleChanged(); }		{ TNamed::SetNameTitle(name, title); NameTitleChanged(); }
	virtual Bool_t CanEditMainColor() const { return fDoColor; }		virtual Bool_t CanEditMainColor() const { return fDoColor; }
	TClass* GetChildClass() const { return fChildClass; }		TClass* GetChildClass() const { return fChildClass; }
	void SetChildClass(TClass* c) { fChildClass = c; }		void SetChildClass(TClass* c) { fChildClass = c; }
	virtual Bool_t AcceptElement(TEveElement* el);		virtual Bool_t AcceptElement(TEveElement* el);
	ClassDef(TEveElementList, 0); // List of TEveElement objects with a poss ibility to limit the class of accepted elements.		ClassDef(TEveElementList, 0); // List of TEveElement objects with a poss ibility to limit the class of accepted elements.
End of changes. 9 change blocks.
	16 lines changed or deleted		19 lines changed or added

	TEveEventManager.h		TEveEventManager.h
	// @(#)root/eve:$Id: TEveEventManager.h 23321 2008-04-18 18:15:27Z matevz $		// @(#)root/eve:$Id: TEveEventManager.h 27157 2009-01-15 14:05:12Z brun $
	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007		// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 25		skipping to change at line 25
	#include "TEveElement.h"		#include "TEveElement.h"
	#include <vector>		#include <vector>
	class TEveEventManager : public TEveElementList		class TEveEventManager : public TEveElementList
	{		{
	protected:		protected:
	std::vector<TString> fNewEventCommands;		std::vector<TString> fNewEventCommands;
	public:		public:
	TEveEventManager(const Text_t* n="TEveEventManager", const Text_t* t="") ;		TEveEventManager(const char* n="TEveEventManager", const char* t="");
	virtual ~TEveEventManager() {}		virtual ~TEveEventManager() {}
	std::vector<TString>& GetNewEventCommands() { return fNewEventCommands; }		std::vector<TString>& GetNewEventCommands() { return fNewEventCommands; }
	virtual void Open() {}		virtual void Open() {}
	virtual void GotoEvent(Int_t /*event*/) {}		virtual void GotoEvent(Int_t /*event*/) {}
	virtual void NextEvent() {}		virtual void NextEvent() {}
	virtual void PrevEvent() {}		virtual void PrevEvent() {}
	virtual void Close() {}		virtual void Close() {}
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	TEveGValuators.h		TEveGValuators.h
	// @(#)root/eve:$Id: TEveGValuators.h 24173 2008-06-06 19:33:15Z matevz $		// @(#)root/eve:$Id: TEveGValuators.h 27157 2009-01-15 14:05:12Z brun $
	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007		// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 98		skipping to change at line 98
	void SetSliderNewLine(Bool_t nl) { fSliderNewLine = nl; }		void SetSliderNewLine(Bool_t nl) { fSliderNewLine = nl; }
	void GetLimits(Float_t& min, Float_t& max) const { min = fMin; max = fMa x; }		void GetLimits(Float_t& min, Float_t& max) const { min = fMin; max = fMa x; }
	Float_t GetLimitMin() const { return fMin; }		Float_t GetLimitMin() const { return fMin; }
	Float_t GetLimitMax() const { return fMax; }		Float_t GetLimitMax() const { return fMax; }
	void SetLimits(Int_t min, Int_t max);		void SetLimits(Int_t min, Int_t max);
	void SetLimits(Float_t min, Float_t max, Int_t npos,		void SetLimits(Float_t min, Float_t max, Int_t npos,
	TGNumberFormat::EStyle nef=TGNumberFormat::kNESRealTwo);		TGNumberFormat::EStyle nef=TGNumberFormat::kNESRealTwo);
	void SetToolTip(const Text_t* tip);		void SetToolTip(const char* tip);
	void SetEnabled(Bool_t state);		void SetEnabled(Bool_t state);
	ClassDef(TEveGValuator, 0); // Composite GUI element for single value se lection (supports label, number-entry and slider).		ClassDef(TEveGValuator, 0); // Composite GUI element for single value se lection (supports label, number-entry and slider).
	};		};
	/************************************************************************** ****/		/************************************************************************** ****/
	class TEveGDoubleValuator: public TEveGValuatorBase		class TEveGDoubleValuator: public TEveGValuatorBase
	{		{
	TEveGDoubleValuator(const TEveGDoubleValuator&); // Not imple mented		TEveGDoubleValuator(const TEveGDoubleValuator&); // Not imple mented
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	TEveGeoNode.h		TEveGeoNode.h
	// @(#)root/eve:$Id: TEveGeoNode.h 26034 2008-10-31 14:01:05Z matevz $		// @(#)root/eve:$Id: TEveGeoNode.h 27157 2009-01-15 14:05:12Z brun $
	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007		// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 44		skipping to change at line 44
	TEveGeoNode(const TEveGeoNode&); // Not implemented		TEveGeoNode(const TEveGeoNode&); // Not implemented
	TEveGeoNode& operator=(const TEveGeoNode&); // Not implemented		TEveGeoNode& operator=(const TEveGeoNode&); // Not implemented
	protected:		protected:
	TGeoNode *fNode;		TGeoNode *fNode;
	TEveGeoShapeExtract* DumpShapeTree(TEveGeoNode* geon, TEveGeoShapeExtrac t* parent = 0, Int_t level = 0);		TEveGeoShapeExtract* DumpShapeTree(TEveGeoNode* geon, TEveGeoShapeExtrac t* parent = 0, Int_t level = 0);
	public:		public:
	TEveGeoNode(TGeoNode* node);		TEveGeoNode(TGeoNode* node);
	virtual const Text_t* GetName() const;		virtual const char* GetName() const;
	virtual const Text_t* GetTitle() const;		virtual const char* GetTitle() const;
	virtual const Text_t* GetElementName() const;		virtual const char* GetElementName() const;
	virtual const Text_t* GetElementTitle() const;		virtual const char* GetElementTitle() const;
	TGeoNode* GetNode() const { return fNode; }		TGeoNode* GetNode() const { return fNode; }
	virtual void ExpandIntoListTree(TGListTree* ltree, TGListTreeItem* par ent);		virtual void ExpandIntoListTree(TGListTree* ltree, TGListTreeItem* par ent);
	virtual Bool_t CanEditElement() const { return kFALSE; }		virtual Bool_t CanEditElement() const { return kFALSE; }
	virtual void AddStamp(UChar_t bits);		virtual void AddStamp(UChar_t bits);
	virtual Bool_t CanEditMainColor() const;		virtual Bool_t CanEditMainColor() const;
	skipping to change at line 140		skipping to change at line 140
	Color_t fColor;		Color_t fColor;
	Int_t fNSegments;		Int_t fNSegments;
	TGeoShape* fShape;		TGeoShape* fShape;
	static TGeoManager* fgGeoMangeur;		static TGeoManager* fgGeoMangeur;
	static TEveGeoShape* SubImportShapeExtract(TEveGeoShapeExtract* gse, TEv eElement* parent);		static TEveGeoShape* SubImportShapeExtract(TEveGeoShapeExtract* gse, TEv eElement* parent);
	TEveGeoShapeExtract* DumpShapeTree(TEveGeoShape* geon, TEveGeoShapeExtra ct* parent = 0);		TEveGeoShapeExtract* DumpShapeTree(TEveGeoShape* geon, TEveGeoShapeExtra ct* parent = 0);
	public:		public:
	TEveGeoShape(const Text_t* name="TEveGeoShape", const Text_t* title=0);		TEveGeoShape(const char* name="TEveGeoShape", const char* title=0);
	virtual ~TEveGeoShape();		virtual ~TEveGeoShape();
	virtual Bool_t CanEditMainColor() const { return kTRUE; }		virtual Bool_t CanEditMainColor() const { return kTRUE; }
	virtual Bool_t CanEditMainTransparency() const { return kTRUE; }		virtual Bool_t CanEditMainTransparency() const { return kTRUE; }
	Color_t GetColor() const { return fColor; }		Color_t GetColor() const { return fColor; }
	Int_t GetNSegments() const { return fNSegments; }		Int_t GetNSegments() const { return fNSegments; }
	void SetNSegments(Int_t s) { fNSegments = s; }		void SetNSegments(Int_t s) { fNSegments = s; }
	TGeoShape* GetShape() { return fShape; }		TGeoShape* GetShape() { return fShape; }
	void SetShape(TGeoShape* s);		void SetShape(TGeoShape* s);
End of changes. 3 change blocks.
	6 lines changed or deleted		6 lines changed or added

	TEveGeoShapeExtract.h		TEveGeoShapeExtract.h
	// @(#)root/eve:$Id: TEveGeoShapeExtract.h 21198 2007-12-05 02:31:27Z matev z $		// @(#)root/eve:$Id: TEveGeoShapeExtract.h 27157 2009-01-15 14:05:12Z brun $
	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007		// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 34		skipping to change at line 34
	protected:		protected:
	Double_t fTrans[16]; // Transformation matrix, 4x4 column major.		Double_t fTrans[16]; // Transformation matrix, 4x4 column major.
	Float_t fRGBA[4]; // RGBA color.		Float_t fRGBA[4]; // RGBA color.
	Bool_t fRnrSelf; // Render this object.		Bool_t fRnrSelf; // Render this object.
	Bool_t fRnrElements; // Render children of this object.		Bool_t fRnrElements; // Render children of this object.
	TGeoShape* fShape; // Shape to be drawn for this object.		TGeoShape* fShape; // Shape to be drawn for this object.
	TList* fElements; // Children elements.		TList* fElements; // Children elements.
	public:		public:
	TEveGeoShapeExtract(const Text_t* n="TEveGeoShapeExtract", const Text_t* t=0);		TEveGeoShapeExtract(const char* n="TEveGeoShapeExtract", const char* t=0 );
	~TEveGeoShapeExtract();		~TEveGeoShapeExtract();
	Bool_t HasElements();		Bool_t HasElements();
	void AddElement(TEveGeoShapeExtract* gse);		void AddElement(TEveGeoShapeExtract* gse);
	void SetTrans(const Double_t arr[16]);		void SetTrans(const Double_t arr[16]);
	void SetRGBA (const Float_t arr[4]);		void SetRGBA (const Float_t arr[4]);
	void SetRnrSelf(Bool_t r) { fRnrSelf = r; }		void SetRnrSelf(Bool_t r) { fRnrSelf = r; }
	void SetRnrElements(Bool_t r) { fRnrElements = r; }		void SetRnrElements(Bool_t r) { fRnrElements = r; }
	void SetShape(TGeoShape* s) { fShape = s; }		void SetShape(TGeoShape* s) { fShape = s; }
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	TEveLine.h		TEveLine.h
	// @(#)root/eve:$Id: TEveLine.h 25422 2008-09-16 20:50:49Z matevz $		// @(#)root/eve:$Id: TEveLine.h 27157 2009-01-15 14:05:12Z brun $
	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007		// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 43		skipping to change at line 43
	protected:		protected:
	Bool_t fRnrLine;		Bool_t fRnrLine;
	Bool_t fRnrPoints;		Bool_t fRnrPoints;
	Bool_t fSmooth;		Bool_t fSmooth;
	static Bool_t fgDefaultSmooth;		static Bool_t fgDefaultSmooth;
	public:		public:
	TEveLine(Int_t n_points=0, ETreeVarType_e tv_type=kTVT_XYZ);		TEveLine(Int_t n_points=0, ETreeVarType_e tv_type=kTVT_XYZ);
	TEveLine(const Text_t* name, Int_t n_points=0, ETreeVarType_e tv_type=kT VT_XYZ);		TEveLine(const char* name, Int_t n_points=0, ETreeVarType_e tv_type=kTVT _XYZ);
	virtual ~TEveLine() {}		virtual ~TEveLine() {}
	virtual void SetLineColor(Color_t col) { SetMainColor(col); }		virtual void SetLineColor(Color_t col) { SetMainColor(col); }
	virtual void SetMarkerColor(Color_t col);		virtual void SetMarkerColor(Color_t col);
	Bool_t GetRnrLine() const { return fRnrLine; }		Bool_t GetRnrLine() const { return fRnrLine; }
	Bool_t GetRnrPoints() const { return fRnrPoints; }		Bool_t GetRnrPoints() const { return fRnrPoints; }
	Bool_t GetSmooth() const { return fSmooth; }		Bool_t GetSmooth() const { return fSmooth; }
	void SetRnrLine(Bool_t r);		void SetRnrLine(Bool_t r);
	void SetRnrPoints(Bool_t r);		void SetRnrPoints(Bool_t r);
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	TEveManager.h		TEveManager.h
	// @(#)root/eve:$Id: TEveManager.h 26717 2008-12-07 22:07:55Z matevz $		// @(#)root/eve:$Id: TEveManager.h 27157 2009-01-15 14:05:12Z brun $
	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007		// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 156		skipping to change at line 156
	TEveScene* GetGlobalScene() const { return fGlobalScene; }		TEveScene* GetGlobalScene() const { return fGlobalScene; }
	TEveScene* GetEventScene() const { return fEventScene; }		TEveScene* GetEventScene() const { return fEventScene; }
	TEveEventManager* GetCurrentEvent() const { return fCurrentEvent; }		TEveEventManager* GetCurrentEvent() const { return fCurrentEvent; }
	void SetCurrentEvent(TEveEventManager* mgr) { fCurrentEvent = mgr; }		void SetCurrentEvent(TEveEventManager* mgr) { fCurrentEvent = mgr; }
	TCanvas* AddCanvasTab(const char* name);		TCanvas* AddCanvasTab(const char* name);
	TGWindow* GetMainWindow() const;		TGWindow* GetMainWindow() const;
	TEveViewer* GetDefaultViewer() const;		TEveViewer* GetDefaultViewer() const;
	TGLViewer* GetDefaultGLViewer() const;		TGLViewer* GetDefaultGLViewer() const;
	TEveViewer* SpawnNewViewer(const Text_t* name, const Text_t* title="",		TEveViewer* SpawnNewViewer(const char* name, const char* title="", Bool
	Bool_t embed=kTRUE);		_t embed=kTRUE);
	TEveScene* SpawnNewScene(const Text_t* name, const Text_t* title="");		TEveScene* SpawnNewScene(const char* name, const char* title="");
	TFolder* GetMacroFolder() const { return fMacroFolder; }		TFolder* GetMacroFolder() const { return fMacroFolder; }
	TMacro* GetMacro(const Text_t* name) const;		TMacro* GetMacro(const char* name) const;
	void EditElement(TEveElement* element);		void EditElement(TEveElement* element);
	void DisableRedraw() { ++fRedrawDisabled; }		void DisableRedraw() { ++fRedrawDisabled; }
	void EnableRedraw() { --fRedrawDisabled; if (fRedrawDisabled <= 0) Redr aw3D(); }		void EnableRedraw() { --fRedrawDisabled; if (fRedrawDisabled <= 0) Redr aw3D(); }
	void Redraw3D(Bool_t resetCameras=kFALSE, Bool_t dropLogicals=kFALSE)		void Redraw3D(Bool_t resetCameras=kFALSE, Bool_t dropLogicals=kFALSE)
	{		{
	if (fRedrawDisabled <= 0 && !fTimerActive) RegisterRedraw3D();		if (fRedrawDisabled <= 0 && !fTimerActive) RegisterRedraw3D();
	if (resetCameras) fResetCameras = kTRUE;		if (resetCameras) fResetCameras = kTRUE;
End of changes. 3 change blocks.
	5 lines changed or deleted		5 lines changed or added

	TEveParamList.h		TEveParamList.h
	// @(#)root/eve:$Id: TEveParamList.h 22548 2008-03-09 11:54:01Z rdm $		// @(#)root/eve:$Id: TEveParamList.h 27157 2009-01-15 14:05:12Z brun $
	// Author: Dmytro Kovalskyi, 28.2.2008		// Author: Dmytro Kovalskyi, 28.2.2008
	/*************************************************************************		/*************************************************************************
	* 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 82		skipping to change at line 82
	TEveParamList(const TEveParamList&); // Not implemented		TEveParamList(const TEveParamList&); // Not implemented
	TEveParamList& operator=(const TEveParamList&); // Not implemented		TEveParamList& operator=(const TEveParamList&); // Not implemented
	protected:		protected:
	Color_t fColor;		Color_t fColor;
	FloatConfigVec_t fFloatParameters;		FloatConfigVec_t fFloatParameters;
	IntConfigVec_t fIntParameters;		IntConfigVec_t fIntParameters;
	BoolConfigVec_t fBoolParameters;		BoolConfigVec_t fBoolParameters;
	public:		public:
	TEveParamList(const Text_t* n="TEveParamList", const Text_t* t="", Bool_ t doColor=kFALSE);		TEveParamList(const char* n="TEveParamList", const char* t="", Bool_t do Color=kFALSE);
	virtual ~TEveParamList() {}		virtual ~TEveParamList() {}
	void AddParameter(const FloatConfig_t& parameter) { fFloatParameters.pus h_back(parameter); }		void AddParameter(const FloatConfig_t& parameter) { fFloatParameters.pus h_back(parameter); }
	void AddParameter(const IntConfig_t& parameter) { fIntParameters.push_ back(parameter); }		void AddParameter(const IntConfig_t& parameter) { fIntParameters.push_ back(parameter); }
	void AddParameter(const BoolConfig_t& parameter) { fBoolParameters.push _back(parameter); }		void AddParameter(const BoolConfig_t& parameter) { fBoolParameters.push _back(parameter); }
	const FloatConfigVec_t& GetFloatParameters() { return fFloatParameters; }		const FloatConfigVec_t& GetFloatParameters() { return fFloatParameters; }
	const IntConfigVec_t& GetIntParameters() { return fIntParameters; }		const IntConfigVec_t& GetIntParameters() { return fIntParameters; }
	const BoolConfigVec_t& GetBoolParameters() { return fBoolParameters; }		const BoolConfigVec_t& GetBoolParameters() { return fBoolParameters; }
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	TEvePointSet.h		TEvePointSet.h
	// @(#)root/eve:$Id: TEvePointSet.h 26662 2008-12-04 20:25:08Z matevz $		// @(#)root/eve:$Id: TEvePointSet.h 27556 2009-02-20 17:38:28Z matevz $
	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007		// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 52		skipping to change at line 52
	protected:		protected:
	TString fTitle; // Title/tooltip of the TEvePointSet.		TString fTitle; // Title/tooltip of the TEvePointSet.
	TArrayI *fIntIds; // Optional array of integer ideices.		TArrayI *fIntIds; // Optional array of integer ideices.
	Int_t fIntIdsPerPoint; // Number of integer indices assigned to each point.		Int_t fIntIdsPerPoint; // Number of integer indices assigned to each point.
	void AssertIntIdsSize();		void AssertIntIdsSize();
	public:		public:
	TEvePointSet(Int_t n_points=0, ETreeVarType_e tv_type=kTVT_XYZ);		TEvePointSet(Int_t n_points=0, ETreeVarType_e tv_type=kTVT_XYZ);
	TEvePointSet(const Text_t* name, Int_t n_points=0, ETreeVarType_e tv_typ e=kTVT_XYZ);		TEvePointSet(const char* name, Int_t n_points=0, ETreeVarType_e tv_type= kTVT_XYZ);
	TEvePointSet(const TEvePointSet& e);		TEvePointSet(const TEvePointSet& e);
	virtual ~TEvePointSet();		virtual ~TEvePointSet();
	virtual TEvePointSet* CloneElement() const { return new TEvePointSet(*th is); }		virtual TEvePointSet* CloneElement() const { return new TEvePointSet(*th is); }
			virtual void ClonePoints(const TEvePointSet& e);
	virtual void ComputeBBox();		virtual void ComputeBBox();
	void Reset(Int_t n_points=0, Int_t n_int_ids=0);		void Reset(Int_t n_points=0, Int_t n_int_ids=0);
	Int_t GrowFor(Int_t n_points);		Int_t GrowFor(Int_t n_points);
	virtual const Text_t* GetTitle() const { return fTitle; }		virtual const char* GetTitle() const { return fTitle; }
	virtual const Text_t* GetElementName() const { return TPointSet3D::Get		virtual const char* GetElementName() const { return TPointSet3D::GetNa
	Name(); }		me(); }
	virtual const Text_t* GetElementTitle() const { return fTitle; }		virtual const char* GetElementTitle() const { return fTitle; }
	virtual void SetElementName (const Text_t* n) { fName = n; NameTitleCh		virtual void SetElementName (const char* n) { fName = n; NameTitleChan
	anged(); }		ged(); }
	virtual void SetTitle(const Text_t* t) { fTitle = t; NameTitleCh		virtual void SetTitle(const char* t) { fTitle = t; NameTitleChan
	anged(); }		ged(); }
	virtual void SetElementTitle(const Text_t* t) { fTitle = t; NameTitleCh		virtual void SetElementTitle(const char* t) { fTitle = t; NameTitleChan
	anged(); }		ged(); }
	virtual void SetElementNameTitle(const Text_t* n, const Text_t* t)		virtual void SetElementNameTitle(const char* n, const char* t)
	{ fName = n; fTitle = t; NameTitleChanged(); }		{ fName = n; fTitle = t; NameTitleChanged(); }
	Int_t GetIntIdsPerPoint() const { return fIntIdsPerPoint; }		Int_t GetIntIdsPerPoint() const { return fIntIdsPerPoint; }
	Int_t* GetPointIntIds(Int_t p) const;		Int_t* GetPointIntIds(Int_t p) const;
	Int_t GetPointIntId(Int_t p, Int_t i) const;		Int_t GetPointIntId(Int_t p, Int_t i) const;
	void SetPointIntIds(Int_t* ids);		void SetPointIntIds(Int_t* ids);
	void SetPointIntIds(Int_t n, Int_t* ids);		void SetPointIntIds(Int_t n, Int_t* ids);
	virtual void SetMarkerColor(Color_t col) { SetMainColor(col); }		virtual void SetMarkerColor(Color_t col) { SetMainColor(col); }
	skipping to change at line 123		skipping to change at line 125
	TEvePointSet** fBins; // Pointers to subjugated TEveP ointSet's.		TEvePointSet** fBins; // Pointers to subjugated TEveP ointSet's.
	Int_t fDefPointSetCapacity; // Default capacity of subjugated T EvePointSet's.		Int_t fDefPointSetCapacity; // Default capacity of subjugated T EvePointSet's.
	Int_t fNBins; // Number of subjugated TEvePointSe t's.		Int_t fNBins; // Number of subjugated TEvePointSe t's.
	Int_t fLastBin; //! Index of the last filled TEvePoi ntSet.		Int_t fLastBin; //! Index of the last filled TEvePoi ntSet.
	Double_t fMin, fCurMin; // Overall and current minimum valu e of the separating quantity.		Double_t fMin, fCurMin; // Overall and current minimum valu e of the separating quantity.
	Double_t fMax, fCurMax; // Overall and current maximum valu e of the separating quantity.		Double_t fMax, fCurMax; // Overall and current maximum valu e of the separating quantity.
	Double_t fBinWidth; // Separating quantity bin-width.		Double_t fBinWidth; // Separating quantity bin-width.
	TString fQuantName; // Name of the separating quantity.		TString fQuantName; // Name of the separating quantity.
	public:		public:
	TEvePointSetArray(const Text_t* name="TEvePointSetArray", const Text_t* title="");		TEvePointSetArray(const char* name="TEvePointSetArray", const char* titl e="");
	virtual ~TEvePointSetArray();		virtual ~TEvePointSetArray();
	virtual void RemoveElementLocal(TEveElement* el);		virtual void RemoveElementLocal(TEveElement* el);
	virtual void RemoveElementsLocal();		virtual void RemoveElementsLocal();
	virtual void SetMarkerColor(Color_t tcolor=1);		virtual void SetMarkerColor(Color_t tcolor=1);
	virtual void SetMarkerStyle(Style_t mstyle=1);		virtual void SetMarkerStyle(Style_t mstyle=1);
	virtual void SetMarkerSize(Size_t msize=1);		virtual void SetMarkerSize(Size_t msize=1);
	virtual void TakeAction(TEvePointSelector*);		virtual void TakeAction(TEvePointSelector*);
	virtual Int_t Size(Bool_t under=kFALSE, Bool_t over=kFALSE) const;		virtual Int_t Size(Bool_t under=kFALSE, Bool_t over=kFALSE) const;
	void InitBins(const Text_t* quant_name, Int_t nbins, Double_t min, Dou ble_t max);		void InitBins(const char* quant_name, Int_t nbins, Double_t min, Doubl e_t max);
	Bool_t Fill(Double_t x, Double_t y, Double_t z, Double_t quant);		Bool_t Fill(Double_t x, Double_t y, Double_t z, Double_t quant);
	void SetPointId(TObject* id);		void SetPointId(TObject* id);
	void CloseBins();		void CloseBins();
	void SetOwnIds(Bool_t o);		void SetOwnIds(Bool_t o);
	Int_t GetDefPointSetCapacity() const { return fDefPointSetCapacity; }		Int_t GetDefPointSetCapacity() const { return fDefPointSetCapacity; }
	void SetDefPointSetCapacity(Int_t c) { fDefPointSetCapacity = c; }		void SetDefPointSetCapacity(Int_t c) { fDefPointSetCapacity = c; }
	Int_t GetNBins() const { return fNBins; }		Int_t GetNBins() const { return fNBins; }
End of changes. 6 change blocks.
	15 lines changed or deleted		17 lines changed or added

	TEvePolygonSetProjected.h		TEvePolygonSetProjected.h
	// @(#)root/eve:$Id: TEvePolygonSetProjected.h 26047 2008-10-31 19:14:29Z m atevz $		// @(#)root/eve:$Id: TEvePolygonSetProjected.h 27157 2009-01-15 14:05:12Z b run $
	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007		// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 88		skipping to change at line 88
	vpPolygon_t fPolsBP; // polygons build from TBuffer3D polygons		vpPolygon_t fPolsBP; // polygons build from TBuffer3D polygons
	Int_t fNPnts; // number of reduced and projected points		Int_t fNPnts; // number of reduced and projected points
	TEveVector* fPnts; // reduced and projected points		TEveVector* fPnts; // reduced and projected points
	Color_t fFillColor; // fill color of polygons		Color_t fFillColor; // fill color of polygons
	Color_t fLineColor; // outline color of polygons		Color_t fLineColor; // outline color of polygons
	Float_t fLineWidth; // outline width of polygons		Float_t fLineWidth; // outline width of polygons
	public:		public:
	TEvePolygonSetProjected(const Text_t* n="TEvePolygonSetProjected", const Text_t* t="");		TEvePolygonSetProjected(const char* n="TEvePolygonSetProjected", const c har* t="");
	virtual ~TEvePolygonSetProjected();		virtual ~TEvePolygonSetProjected();
	virtual void SetProjection(TEveProjectionManager* mng, TEveProjectabl e* model);		virtual void SetProjection(TEveProjectionManager* mng, TEveProjectabl e* model);
	virtual void SetDepth(Float_t d);		virtual void SetDepth(Float_t d);
	virtual void UpdateProjection();		virtual void UpdateProjection();
	void ProjectBuffer3D();		void ProjectBuffer3D();
	virtual void ComputeBBox();		virtual void ComputeBBox();
	virtual void Paint(Option_t* option = "");		virtual void Paint(Option_t* option = "");
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	TEveProjectionAxes.h		TEveProjectionAxes.h
	// @(#)root/eve:$Id: TEveProjectionAxes.h 25899 2008-10-20 20:13:38Z matevz $		// @(#)root/eve:$Id: TEveProjectionAxes.h 27341 2009-02-03 19:47:35Z matevz $
	// Author: Matevz Tadel 2007		// Author: Matevz Tadel 2007
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	#ifndef ROOT_TEveProjectionAxes		#ifndef ROOT_TEveProjectionAxes
	#define ROOT_TEveProjectionAxes		#define ROOT_TEveProjectionAxes
	#include "TNamed.h"		#include "TNamed.h"
	#include "TAtt3D.h"		#include "TAtt3D.h"
	#include "TAttBBox.h"		#include "TAttBBox.h"
			#include "TAttAxis.h"
	#include "TEveElement.h"		#include "TEveElement.h"
	#include "TGLAxisPainter.h"
	class TEveProjectionManager;		class TEveProjectionManager;
	class TEveProjectionAxes : public TEveElement,		class TEveProjectionAxes : public TEveElement,
	public TNamed,		public TNamed,
	public TAtt3D,		public TAtt3D,
	public TAttBBox,		public TAttBBox,
	public TGLAxisAttrib		public TAttAxis
	{		{
	friend class TEveProjectionAxesGL;		friend class TEveProjectionAxesGL;
	public:		public:
	enum ELabMode { kPosition, kValue };		enum ELabMode { kPosition, kValue };
	enum EAxesMode { kHorizontal, kVertical, kAll};		enum EAxesMode { kHorizontal, kVertical, kAll};
	private:		private:
	TEveProjectionAxes(const TEveProjectionAxes&); // Not impleme nted		TEveProjectionAxes(const TEveProjectionAxes&); // Not impleme nted
	TEveProjectionAxes& operator=(const TEveProjectionAxes&); // Not impleme nted		TEveProjectionAxes& operator=(const TEveProjectionAxes&); // Not impleme nted
	protected:		protected:
	TEveProjectionManager* fManager; // model object		TEveProjectionManager* fManager; // Model object.
	Color_t fColor;		Color_t fColor; // Main eve-element color.
	ELabMode fLabMode; // tick-mark positioning		ELabMode fLabMode; // Division of distorted space.
	EAxesMode fAxesMode;		EAxesMode fAxesMode; // Axis vertical/hotrizontal orientat
			ion.
	Bool_t fDrawCenter; // draw center of distortion		Bool_t fDrawCenter; // Draw center of distortion.
	Bool_t fDrawOrigin; // draw origin		Bool_t fDrawOrigin; // Draw origin.
	public:		public:
	TEveProjectionAxes(TEveProjectionManager* m);		TEveProjectionAxes(TEveProjectionManager* m);
	virtual ~TEveProjectionAxes();		virtual ~TEveProjectionAxes();
	TEveProjectionManager* GetManager(){ return fManager; }		TEveProjectionManager* GetManager(){
			return fManager;
	void SetLabMode(ELabMode x) { fLabMode = x; }		}
	ELabMode GetLabMode() const { return fLabMode; }
	void SetAxesMode(EAxesMode x) { fAxesMode = x; }		void SetLabMode(ELabMode x) { fLabMode = x; }
			ELabMode GetLabMode() const { return fLabMode;}
			void SetAxesMode(EAxesMode x) { fAxesMode = x; }
	EAxesMode GetAxesMode() const { return fAxesMode; }		EAxesMode GetAxesMode() const { return fAxesMode; }
	void SetDrawCenter(Bool_t x){ fDrawCenter = x; }		void SetDrawCenter(Bool_t x) { fDrawCenter = x; }
	Bool_t GetDrawCenter() const { return fDrawCenter; }		Bool_t GetDrawCenter() const { return fDrawCenter; }
	void SetDrawOrigin(Bool_t x){ fDrawOrigin = x; }		void SetDrawOrigin(Bool_t x) { fDrawOrigin = x; }
	Bool_t GetDrawOrigin() const { return fDrawOrigin; }		Bool_t GetDrawOrigin() const { return fDrawOrigin; }
	virtual Bool_t CanEditMainColor() const { return kTRUE; }
			virtual Bool_t CanEditMainColor() const { return kTRUE;}
	virtual void Paint(Option_t* option="");		virtual void Paint(Option_t* option="");
	virtual void ComputeBBox();		virtual void ComputeBBox();
			virtual const TGPicture* GetListTreeIcon(Bool_t open=kFALSE);
	virtual const TGPicture* GetListTreeIcon(Bool_t open=kFALSE);
	ClassDef(TEveProjectionAxes, 1); // Class to draw scales in non-linear p rojections.		ClassDef(TEveProjectionAxes, 1); // Class to draw scales in non-linear p rojections.
	};		};
	#endif		#endif
End of changes. 15 change blocks.
	31 lines changed or deleted		31 lines changed or added

	TEveProjectionAxesEditor.h		TEveProjectionAxesEditor.h
	// @(#)root/eve:$Id: TEveProjectionAxesEditor.h 25642 2008-10-01 11:04:06Z matevz $		// @(#)root/eve:$Id: TEveProjectionAxesEditor.h 27341 2009-02-03 19:47:35Z matevz $
	// Author: Matevz Tadel 2007		// Author: Matevz Tadel 2007
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 34		skipping to change at line 34
	{		{
	private:		private:
	TEveProjectionAxesEditor(const TEveProjectionAxesEditor&); // Not implemented		TEveProjectionAxesEditor(const TEveProjectionAxesEditor&); // Not implemented
	TEveProjectionAxesEditor& operator=(const TEveProjectionAxesEditor&); // Not implemented		TEveProjectionAxesEditor& operator=(const TEveProjectionAxesEditor&); // Not implemented
	protected:		protected:
	TEveProjectionAxes *fM; // Model object.		TEveProjectionAxes *fM; // Model object.
	TGComboBox *fLabMode;		TGComboBox *fLabMode;
	TGComboBox *fAxesMode;		TGComboBox *fAxesMode;
	TEveGValuator *fNdivisions; // tick-mark number widget
	TGVerticalFrame *fCenterFrame; // Parent frame for Center tab.		TGVerticalFrame *fCenterFrame; // Parent frame for Center tab.
	TGCheckButton *fDrawCenter; // draw center widget		TGCheckButton *fDrawCenter; // draw center widget
	TGCheckButton *fDrawOrigin; // draw origin widget		TGCheckButton *fDrawOrigin; // draw origin widget
	public:		public:
	TEveProjectionAxesEditor(const TGWindow* p=0, Int_t width=170, Int_t hei ght=30,		TEveProjectionAxesEditor(const TGWindow* p=0, Int_t width=170, Int_t hei ght=30,
	UInt_t options=kChildFrame, Pixel_t back=GetDef aultFrameBackground());		UInt_t options=kChildFrame, Pixel_t back=GetDef aultFrameBackground());
	virtual ~TEveProjectionAxesEditor() {}		virtual ~TEveProjectionAxesEditor() {}
	virtual void SetModel(TObject* obj);		virtual void SetModel(TObject* obj);
	// Declare callback/slot methods		// Declare callback/slot methods
	void DoLabMode(Int_t type);		void DoLabMode(Int_t type);
	void DoAxesMode(Int_t type);		void DoAxesMode(Int_t type);
	void DoNdivisions();
	void DoDrawCenter();		void DoDrawCenter();
	void DoDrawOrigin();		void DoDrawOrigin();
	ClassDef(TEveProjectionAxesEditor, 0); // GUI editor for TEveProjectionA xes.		ClassDef(TEveProjectionAxesEditor, 0); // GUI editor for TEveProjectionA xes.
	};		};
	#endif		#endif
End of changes. 3 change blocks.
	3 lines changed or deleted		1 lines changed or added

	TEveProjectionAxesGL.h		TEveProjectionAxesGL.h
	// @(#)root/eve:$Id: TEveProjectionAxesGL.h 25642 2008-10-01 11:04:06Z mate		// @(#)root/eve:$Id: TEveProjectionAxesGL.h 27370 2009-02-06 18:58:23Z mate
	vz $		vz $
	// Author: Matevz Tadel 2007		// Author: Alja Mrak-Tadel 2007
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	#ifndef ROOT_TEveProjectionAxesGL		#ifndef ROOT_TEveProjectionAxesGL
	#define ROOT_TEveProjectionAxesGL		#define ROOT_TEveProjectionAxesGL
	#include "TGLObject.h"		#include "TGLObject.h"
	#include "TGLAxisPainter.h"		#include "TGLAxisPainter.h"
	#include <vector>
	class TEveProjectionAxes;		class TEveProjectionAxes;
	class TEveProjection;		class TEveProjection;
	class TGLFont;
	class TEveProjectionAxesGL : public TGLObject		class TEveProjectionAxesGL : public TGLObject
	{		{
	private:		private:
	TEveProjectionAxesGL(const TEveProjectionAxesGL&); // Not imp lemented		TEveProjectionAxesGL(const TEveProjectionAxesGL&); // Not imp lemented
	TEveProjectionAxesGL& operator=(const TEveProjectionAxesGL&); // Not imp lemented		TEveProjectionAxesGL& operator=(const TEveProjectionAxesGL&); // Not imp lemented
	typedef std::pair<Float_t, Float_t> Lab_t; // tick-mark <pos, value>		void GetRange(Int_t ax, Float_t frustMin, Float_t frustM
	pair		ax, Float_t& start, Float_t& en) const;
	typedef std::vector<Lab_t> LabVec_t;		void SplitInterval(Float_t x1, Float_t x2, Int_t axis) c
	typedef std::vector<Float_t> TMVec_t; // vector od tick lines		onst;
			void SplitIntervalByPos(Float_t min, Float_t max, Int_t
	mutable LabVec_t fLabVec; // list of tick-mark position-value pairs		axis)const;
	mutable TMVec_t fTickMarks; // list of tick-mark position-value pairs		void SplitIntervalByVal(Float_t min, Float_t max, Int_t
			axis)const;
	mutable TGLAxisPainter fAxisPainter;		void FilterOverlappingLabels(Int_t idx, Float_t ref) con
	mutable TGLAxisAttrib fAxisAtt;		st;
	void DrawScales(Bool_t horizontal, TGLFont& font, Float_t
	tms, Float_t dtw) const;
	Bool_t GetRange(Int_t ax, Float_t frustMin, Float_t frustM
	ax, Float_t& start, Float_t& en) const;
	void SplitInterval(Float_t x1, Float_t x2, Int_t axis, Int
	_t nLabels) const;
	void SplitIntervalByPos(Float_t min, Float_t max, Int_t ax
	is, Int_t nLab)const;
	void SplitIntervalByVal(Float_t min, Float_t max, Int_t ax
	is, Int_t nLab)const;
	protected:		protected:
	TEveProjectionAxes *fM; // model object.		TEveProjectionAxes *fM; // Model object.
	mutable TEveProjection *fProjection; // cached model projection		mutable TEveProjection *fProjection; // Cached model projection
			mutable TGLAxisPainter fAxisPainter;
	public:		public:
	TEveProjectionAxesGL();		TEveProjectionAxesGL();
	virtual ~TEveProjectionAxesGL() {}		virtual ~TEveProjectionAxesGL() {}
	virtual Bool_t SetModel(TObject* obj, const Option_t* opt=0);		virtual Bool_t SetModel(TObject* obj, const Option_t* opt = 0);
	virtual void SetBBox();		virtual void SetBBox();
	virtual void DirectDraw(TGLRnrCtx & rnrCtx) const;		virtual void DirectDraw(TGLRnrCtx & rnrCtx) const;
	Bool_t IgnoreSizeForOfInterest() const { return kTRUE;}		Bool_t IgnoreSizeForOfInterest() const {
			return kTRUE;
			}
	ClassDef(TEveProjectionAxesGL, 0); // GL renderer class for TEveProjecti onAxes.		ClassDef(TEveProjectionAxesGL, 0); // GL renderer class for TEveProjecti onAxes.
	};		};
	#endif		#endif
End of changes. 7 change blocks.
	31 lines changed or deleted		20 lines changed or added

	TEveQuadSet.h		TEveQuadSet.h
	// @(#)root/eve:$Id: TEveQuadSet.h 25245 2008-08-25 21:44:09Z matevz $		// @(#)root/eve:$Id: TEveQuadSet.h 27157 2009-01-15 14:05:12Z brun $
	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007		// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 89		skipping to change at line 89
	Float_t fDefWidth; // Breadth assigned to first coordinate (A)		Float_t fDefWidth; // Breadth assigned to first coordinate (A)
	Float_t fDefHeight; // Breadth assigned to second coordinat e (B)		Float_t fDefHeight; // Breadth assigned to second coordinat e (B)
	Float_t fDefCoord; // Default value for third coordinate (C)		Float_t fDefCoord; // Default value for third coordinate (C)
	Bool_t fAntiFlick; // Make extra render pass to avoid flic kering when quads are too small.		Bool_t fAntiFlick; // Make extra render pass to avoid flic kering when quads are too small.
	static Int_t SizeofAtom(EQuadType_e qt);		static Int_t SizeofAtom(EQuadType_e qt);
	public:		public:
	TEveQuadSet(const Text_t* n="TEveQuadSet", const Text_t* t="");		TEveQuadSet(const char* n="TEveQuadSet", const char* t="");
	TEveQuadSet(EQuadType_e quadType, Bool_t valIsCol, Int_t chunkSize,		TEveQuadSet(EQuadType_e quadType, Bool_t valIsCol, Int_t chunkSize,
	const Text_t* n="TEveQuadSet", const Text_t* t="");		const char* n="TEveQuadSet", const char* t="");
	virtual ~TEveQuadSet() {}		virtual ~TEveQuadSet() {}
	void Reset(EQuadType_e quadType, Bool_t valIsCol, Int_t chunkSize);		void Reset(EQuadType_e quadType, Bool_t valIsCol, Int_t chunkSize);
	Float_t GetDefWidth() const { return fDefWidth; }		Float_t GetDefWidth() const { return fDefWidth; }
	Float_t GetDefHeight() const { return fDefHeight; }		Float_t GetDefHeight() const { return fDefHeight; }
	Float_t GetDefCoord() const { return fDefCoord; }		Float_t GetDefCoord() const { return fDefCoord; }
	Bool_t GetAntiFlick() const { return fAntiFlick; }		Bool_t GetAntiFlick() const { return fAntiFlick; }
	void SetDefWidth(Float_t v) { fDefWidth = v; }		void SetDefWidth(Float_t v) { fDefWidth = v; }
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	TEveScalableStraightLineSet.h		TEveScalableStraightLineSet.h
	// @(#)root/eve:$Id: TEveScalableStraightLineSet.h 25245 2008-08-25 21:44:0 9Z matevz $		// @(#)root/eve:$Id: TEveScalableStraightLineSet.h 27157 2009-01-15 14:05:1 2Z brun $
	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007		// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 28		skipping to change at line 28
	{		{
	private:		private:
	TEveScalableStraightLineSet(const TEveScalableStraightLineSet&); // Not implemented		TEveScalableStraightLineSet(const TEveScalableStraightLineSet&); // Not implemented
	TEveScalableStraightLineSet& operator=(const TEveScalableStraightLineSet &); // Not implemented		TEveScalableStraightLineSet& operator=(const TEveScalableStraightLineSet &); // Not implemented
	protected:		protected:
	Double_t fCurrentScale;		Double_t fCurrentScale;
	Float_t fScaleCenter[3];		Float_t fScaleCenter[3];
	public:		public:
	TEveScalableStraightLineSet(const Text_t* n="ScalableStraightLineSet", c onst Text_t* t="");		TEveScalableStraightLineSet(const char* n="ScalableStraightLineSet", con st char* t="");
	virtual ~TEveScalableStraightLineSet() {}		virtual ~TEveScalableStraightLineSet() {}
	void SetScaleCenter(Float_t x, Float_t y, Float_t z);		void SetScaleCenter(Float_t x, Float_t y, Float_t z);
	void SetScale(Double_t scale);		void SetScale(Double_t scale);
	Double_t GetScale() const;		Double_t GetScale() const;
	ClassDef(TEveScalableStraightLineSet, 1); // Straight-line-set with extr a scaling.		ClassDef(TEveScalableStraightLineSet, 1); // Straight-line-set with extr a scaling.
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	TEveScene.h		TEveScene.h
	// @(#)root/eve:$Id: TEveScene.h 26367 2008-11-21 18:08:30Z matevz $		// @(#)root/eve:$Id: TEveScene.h 27157 2009-01-15 14:05:12Z brun $
	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007		// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 38		skipping to change at line 38
	TEveScene& operator=(const TEveScene&); // Not implemented		TEveScene& operator=(const TEveScene&); // Not implemented
	protected:		protected:
	TEvePad *fPad;		TEvePad *fPad;
	TGLScenePad *fGLScene;		TGLScenePad *fGLScene;
	Bool_t fChanged;		Bool_t fChanged;
	Bool_t fSmartRefresh;		Bool_t fSmartRefresh;
	public:		public:
	TEveScene(const Text_t* n="TEveScene", const Text_t* t="");		TEveScene(const char* n="TEveScene", const char* t="");
	virtual ~TEveScene();		virtual ~TEveScene();
	virtual void CollectSceneParents(List_t& scenes);		virtual void CollectSceneParents(List_t& scenes);
	void Changed() { fChanged = kTRUE; }		void Changed() { fChanged = kTRUE; }
	Bool_t IsChanged() const { return fChanged; }		Bool_t IsChanged() const { return fChanged; }
	void Repaint(Bool_t dropLogicals=kFALSE);		void Repaint(Bool_t dropLogicals=kFALSE);
	TGLScenePad* GetGLScene() const { return fGLScene; }		TGLScenePad* GetGLScene() const { return fGLScene; }
	void SetGLScene(TGLScenePad* s) { fGLScene = s; }		void SetGLScene(TGLScenePad* s) { fGLScene = s; }
	virtual void SetName(const Text_t* n);		virtual void SetName(const char* n);
	virtual void Paint(Option_t* option = "");		virtual void Paint(Option_t* option = "");
	void DestroyElementRenderers(TEveElement* element);		void DestroyElementRenderers(TEveElement* element);
	void DestroyElementRenderers(TObject* rnrObj);		void DestroyElementRenderers(TObject* rnrObj);
	virtual const TGPicture* GetListTreeIcon(Bool_t open=kFALSE);		virtual const TGPicture* GetListTreeIcon(Bool_t open=kFALSE);
	ClassDef(TEveScene, 0); // Reve representation of TGLScene.		ClassDef(TEveScene, 0); // Reve representation of TGLScene.
	};		};
	skipping to change at line 74		skipping to change at line 74
	class TEveSceneList : public TEveElementList		class TEveSceneList : public TEveElementList
	{		{
	private:		private:
	TEveSceneList(const TEveSceneList&); // Not implemented		TEveSceneList(const TEveSceneList&); // Not implemented
	TEveSceneList& operator=(const TEveSceneList&); // Not implemented		TEveSceneList& operator=(const TEveSceneList&); // Not implemented
	protected:		protected:
	public:		public:
	TEveSceneList(const Text_t* n="TEveSceneList", const Text_t* t="");		TEveSceneList(const char* n="TEveSceneList", const char* t="");
	virtual ~TEveSceneList() {}		virtual ~TEveSceneList() {}
	void DestroyScenes();		void DestroyScenes();
	void RepaintChangedScenes(Bool_t dropLogicals);		void RepaintChangedScenes(Bool_t dropLogicals);
	void RepaintAllScenes(Bool_t dropLogicals);		void RepaintAllScenes(Bool_t dropLogicals);
	void DestroyElementRenderers(TEveElement* element);		void DestroyElementRenderers(TEveElement* element);
	void ProcessSceneChanges(Bool_t dropLogicals, Set_t& stampSet);		void ProcessSceneChanges(Bool_t dropLogicals, Set_t& stampSet);
End of changes. 4 change blocks.
	4 lines changed or deleted		4 lines changed or added

	TEveSelection.h		TEveSelection.h
	// @(#)root/eve:$Id: TEveSelection.h 24147 2008-06-04 19:48:39Z matevz $		// @(#)root/eve:$Id: TEveSelection.h 27157 2009-01-15 14:05:12Z brun $
	// Author: Matevz Tadel 2007		// Author: Matevz Tadel 2007
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 57		skipping to change at line 57
	SelMap_t fImpliedSelected;		SelMap_t fImpliedSelected;
	Select_foo fSelElement;		Select_foo fSelElement;
	ImplySelect_foo fIncImpSelElement;		ImplySelect_foo fIncImpSelElement;
	ImplySelect_foo fDecImpSelElement;		ImplySelect_foo fDecImpSelElement;
	void DoElementSelect (SelMap_i entry);		void DoElementSelect (SelMap_i entry);
	void DoElementUnselect(SelMap_i entry);		void DoElementUnselect(SelMap_i entry);
	public:		public:
	TEveSelection(const Text_t* n="TEveSelection", const Text_t* t="");		TEveSelection(const char* n="TEveSelection", const char* t="");
	virtual ~TEveSelection() {}		virtual ~TEveSelection() {}
	void SetHighlightMode();		void SetHighlightMode();
	Int_t GetPickToSelect() const { return fPickToSelect; }		Int_t GetPickToSelect() const { return fPickToSelect; }
	void SetPickToSelect(Int_t ps) { fPickToSelect = ps; }		void SetPickToSelect(Int_t ps) { fPickToSelect = ps; }
	Bool_t GetIsMaster() const { return fIsMaster; }		Bool_t GetIsMaster() const { return fIsMaster; }
	void SetIsMaster(Bool_t m) { fIsMaster = m; }		void SetIsMaster(Bool_t m) { fIsMaster = m; }
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	TEveStraightLineSet.h		TEveStraightLineSet.h
	// @(#)root/eve:$Id: TEveStraightLineSet.h 24449 2008-06-20 21:37:48Z matev z $		// @(#)root/eve:$Id: TEveStraightLineSet.h 27157 2009-01-15 14:05:12Z brun $
	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007		// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 83		skipping to change at line 83
	Bool_t fOwnLinesIds; // Flag specifying if id-objects are owned by the TEveQuadSet		Bool_t fOwnLinesIds; // Flag specifying if id-objects are owned by the TEveQuadSet
	Bool_t fOwnMarkersIds; // Flag specifying if id-objects are owned by the TEveQuadSet		Bool_t fOwnMarkersIds; // Flag specifying if id-objects are owned by the TEveQuadSet
	Bool_t fRnrMarkers;		Bool_t fRnrMarkers;
	Bool_t fRnrLines;		Bool_t fRnrLines;
	Line_t* fLastLine; //!		Line_t* fLastLine; //!
	public:		public:
	TEveStraightLineSet(const Text_t* n="StraightLineSet", const Text_t* t=" ");		TEveStraightLineSet(const char* n="StraightLineSet", const char* t="");
	virtual ~TEveStraightLineSet() {}		virtual ~TEveStraightLineSet() {}
	virtual void SetLineColor(Color_t col) { SetMainColor(col); }		virtual void SetLineColor(Color_t col) { SetMainColor(col); }
	void AddLine(Float_t x1, Float_t y1, Float_t z1, Float_t x2, Float_t y2, Float_t z2);		void AddLine(Float_t x1, Float_t y1, Float_t z1, Float_t x2, Float_t y2, Float_t z2);
	void AddMarker(Int_t lineID, Float_t pos);		void AddMarker(Int_t lineID, Float_t pos);
	TEveChunkManager& GetLinePlex() { return fLinePlex; }		TEveChunkManager& GetLinePlex() { return fLinePlex; }
	TEveChunkManager& GetMarkerPlex() { return fMarkerPlex; }		TEveChunkManager& GetMarkerPlex() { return fMarkerPlex; }
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	TEveText.h		TEveText.h
	// @(#)root/eve:$Id: TEveText.h 25245 2008-08-25 21:44:09Z matevz $		// @(#)root/eve:$Id: TEveText.h 27157 2009-01-15 14:05:12Z brun $
	// Authors: Alja & Matevz Tadel 2008		// Authors: Alja & Matevz Tadel 2008
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 44		skipping to change at line 44
	Int_t fFontSize; // FTFont face size		Int_t fFontSize; // FTFont face size
	Int_t fFontFile; // FTFont file name		Int_t fFontFile; // FTFont file name
	Int_t fFontMode; // FTFont FTGL class id		Int_t fFontMode; // FTFont FTGL class id
	Float_t fExtrude; // extrude depth		Float_t fExtrude; // extrude depth
	Bool_t fAutoLighting; // use default lighting		Bool_t fAutoLighting; // use default lighting
	Bool_t fLighting; // force lighting		Bool_t fLighting; // force lighting
	public:		public:
	TEveText(const Text_t* txt="");		TEveText(const char* txt="");
	virtual ~TEveText() {}		virtual ~TEveText() {}
	Int_t GetFontSize() const { return fFontSize; }		Int_t GetFontSize() const { return fFontSize; }
	Int_t GetFontFile() const { return fFontFile; }		Int_t GetFontFile() const { return fFontFile; }
	Int_t GetFontMode() const { return fFontMode; }		Int_t GetFontMode() const { return fFontMode; }
	void SetFontSize(Int_t size, Bool_t validate = kTRUE);		void SetFontSize(Int_t size, Bool_t validate = kTRUE);
	void SetFontFile(Int_t file){ fFontFile = file; }		void SetFontFile(Int_t file){ fFontFile = file; }
	void SetFontFile(const char* name);		void SetFontFile(const char* name);
	void SetFontMode(Int_t mode);		void SetFontMode(Int_t mode);
	const Text_t* GetText() const { return fText.Data(); }		const char* GetText() const { return fText.Data(); }
	void SetText(const Text_t* t) { fText = t; }		void SetText(const char* t) { fText = t; }
	Bool_t GetLighting() const { return fLighting; }		Bool_t GetLighting() const { return fLighting; }
	void SetLighting(Bool_t isOn) { fLighting = isOn; }		void SetLighting(Bool_t isOn) { fLighting = isOn; }
	Bool_t GetAutoLighting() const { return fAutoLighting; }		Bool_t GetAutoLighting() const { return fAutoLighting; }
	void SetAutoLighting(Bool_t isOn) { fAutoLighting = isOn; }		void SetAutoLighting(Bool_t isOn) { fAutoLighting = isOn; }
	Float_t GetExtrude() const { return fExtrude; }		Float_t GetExtrude() const { return fExtrude; }
	void SetExtrude(Float_t x) { fExtrude = x; }		void SetExtrude(Float_t x) { fExtrude = x; }
End of changes. 3 change blocks.
	4 lines changed or deleted		4 lines changed or added

	TEveTextEditor.h		TEveTextEditor.h
	// @(#)root/eve:$Id: TEveTextEditor.h 22539 2008-03-08 14:36:37Z rdm $		// @(#)root/eve:$Id: TEveTextEditor.h 27157 2009-01-15 14:05:12Z brun $
	// Authors: Alja & Matevz Tadel 2008		// Authors: Alja & Matevz Tadel 2008
	/*************************************************************************		/*************************************************************************
	* 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 51		skipping to change at line 51
	TGCheckButton *fLighting;		TGCheckButton *fLighting;
	TGCheckButton *fAutoLighting;		TGCheckButton *fAutoLighting;
	public:		public:
	TEveTextEditor(const TGWindow* p=0, Int_t width=170, Int_t height=30,		TEveTextEditor(const TGWindow* p=0, Int_t width=170, Int_t height=30,
	UInt_t options=kChildFrame, Pixel_t back=GetDefaultFrameB ackground());		UInt_t options=kChildFrame, Pixel_t back=GetDefaultFrameB ackground());
	virtual ~TEveTextEditor() {}		virtual ~TEveTextEditor() {}
	virtual void SetModel(TObject* obj);		virtual void SetModel(TObject* obj);
	void DoText(const Text_t*);		void DoText(const char*);
	void DoFontSize();		void DoFontSize();
	void DoFontFile();		void DoFontFile();
	void DoFontMode();		void DoFontMode();
	void DoLighting();		void DoLighting();
	void DoAutoLighting();		void DoAutoLighting();
	void DoExtrude();		void DoExtrude();
	ClassDef(TEveTextEditor, 0); // GUI editor for TEveText.		ClassDef(TEveTextEditor, 0); // GUI editor for TEveText.
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	TEveTrack.h		TEveTrack.h
	// @(#)root/eve:$Id: TEveTrack.h 25515 2008-09-23 17:20:48Z matevz $		// @(#)root/eve:$Id: TEveTrack.h 27556 2009-02-20 17:38:28Z matevz $
	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007		// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 52		skipping to change at line 52
	protected:		protected:
	TEveVector fV; // Starting vertex		TEveVector fV; // Starting vertex
	TEveVector fP; // Starting momentum		TEveVector fP; // Starting momentum
	TEveVector fPEnd; // Momentum at the last point of extrapo lation		TEveVector fPEnd; // Momentum at the last point of extrapo lation
	Double_t fBeta; // Relativistic beta factor		Double_t fBeta; // Relativistic beta factor
	Int_t fPdg; // PDG code		Int_t fPdg; // PDG code
	Int_t fCharge; // Charge in units of e0		Int_t fCharge; // Charge in units of e0
	Int_t fLabel; // Simulation label		Int_t fLabel; // Simulation label
	Int_t fIndex; // Reconstruction index		Int_t fIndex; // Reconstruction index
			Bool_t fLockPoints; // Lock points that are currently in - d o nothing in MakeTrack().
	vPathMark_t fPathMarks; // TEveVector of known points along the track		vPathMark_t fPathMarks; // TEveVector of known points along the track
	TEveTrackPropagator *fPropagator; // Pointer to shared render-style		TEveTrackPropagator *fPropagator; // Pointer to shared render-style
	UChar_t fBreakProjectedTracks; // How to handle breaks durin g projection - track specific settings.		UChar_t fBreakProjectedTracks; // How to handle breaks durin g projection - track specific settings.
	static Bool_t fgDefaultBreakProjectedTracks; // How to handle break s during projection - global setting.		static Bool_t fgDefaultBreakProjectedTracks; // How to handle break s during projection - global setting.
	public:		public:
	TEveTrack();		TEveTrack();
	skipping to change at line 83		skipping to change at line 84
	virtual void MakeTrack(Bool_t recurse=kTRUE);		virtual void MakeTrack(Bool_t recurse=kTRUE);
	TEveTrackPropagator* GetPropagator() const { return fPropagator; }		TEveTrackPropagator* GetPropagator() const { return fPropagator; }
	void SetPropagator(TEveTrackPropagator* rs);		void SetPropagator(TEveTrackPropagator* rs);
	void SetAttLineAttMarker(TEveTrackList* tl);		void SetAttLineAttMarker(TEveTrackList* tl);
	const TEveVector& GetVertex() const { return fV; }		const TEveVector& GetVertex() const { return fV; }
	const TEveVector& GetMomentum() const { return fP; }		const TEveVector& GetMomentum() const { return fP; }
	const TEveVector& GetEndMomentum() const { return fPEnd; }		const TEveVector& GetEndMomentum() const { return fPEnd; }
	Int_t GetPdg() const { return fPdg; }		Int_t GetPdg() const { return fPdg; }
	void SetPdg(Int_t pdg) { fPdg = pdg; }		void SetPdg(Int_t pdg) { fPdg = pdg; }
	Int_t GetCharge() const { return fCharge; }		Int_t GetCharge() const { return fCharge; }
	void SetCharge(Int_t chg) { fCharge = chg; }		void SetCharge(Int_t chg) { fCharge = chg; }
	Int_t GetLabel() const { return fLabel; }		Int_t GetLabel() const { return fLabel; }
	void SetLabel(Int_t lbl) { fLabel = lbl; }		void SetLabel(Int_t lbl) { fLabel = lbl; }
	Int_t GetIndex() const { return fIndex; }		Int_t GetIndex() const { return fIndex; }
	void SetIndex(Int_t idx) { fIndex = idx; }		void SetIndex(Int_t idx) { fIndex = idx; }
	void AddPathMark(const TEvePathMark& pm) { fPathMarks.push_back(pm); }		void AddPathMark(const TEvePathMark& pm) { fPathMarks.push_back(pm); }
	void SortPathMarksByTime();		void SortPathMarksByTime();
	vPathMark_t& RefPathMarks() { return fPathMarks; }		vPathMark_t& RefPathMarks() { return fPathMarks; }
	const vPathMark_t& RefPathMarks() const { return fPathMarks; }		const vPathMark_t& RefPathMarks() const { return fPathMarks; }
	//--------------------------------		void PrintPathMarks(); // *MENU*
	void ImportHits(); // *MENU*		void SetLockPoints(Bool_t l) { fLockPoints = l; }
	void ImportClusters(); // *MENU*		Bool_t GetLockPoints() const { return fLockPoints; }
	void ImportClustersFromIndex(); // *MENU*
	void ImportKine(); // *MENU*
	void ImportKineWithArgs(Bool_t importMother=kTRUE, Bool_t impDaugters=kT
	RUE,
	Bool_t colorPdg =kTRUE, Bool_t recurse =kT
	RUE); // *MENU*
	void PrintKineStack(); // *MENU*
	void PrintPathMarks(); // *MENU*
	//--------------------------------		//-------------------------------------------------------------------
	virtual void SecSelected(TEveTrack*); // *SIGNAL*		virtual void SecSelected(TEveTrack*); // *SIGNAL*
	virtual void SetLineStyle(Style_t lstyle);		virtual void SetLineStyle(Style_t lstyle);
	virtual const TGPicture* GetListTreeIcon(Bool_t open=kFALSE);		virtual const TGPicture* GetListTreeIcon(Bool_t open=kFALSE);
	virtual void CopyVizParams(const TEveElement* el);		virtual void CopyVizParams(const TEveElement* el);
	virtual void WriteVizParams(ostream& out, const TString& var);		virtual void WriteVizParams(ostream& out, const TString& var);
	virtual TClass* ProjectedClass() const;		virtual TClass* ProjectedClass() const;
	skipping to change at line 167		skipping to change at line 162
	Float_t fMinP; // Minimum track p for display selecti on.		Float_t fMinP; // Minimum track p for display selecti on.
	Float_t fMaxP; // Maximum track p for display selecti on.		Float_t fMaxP; // Maximum track p for display selecti on.
	Float_t fLimP; // Highest track p in the container.		Float_t fLimP; // Highest track p in the container.
	void FindMomentumLimits(TEveElement* el, Bool_t recurse=kTRUE);		void FindMomentumLimits(TEveElement* el, Bool_t recurse=kTRUE);
	Float_t RoundMomentumLimit(Float_t x);		Float_t RoundMomentumLimit(Float_t x);
	void SanitizeMinMaxCuts();		void SanitizeMinMaxCuts();
	public:		public:
	TEveTrackList(TEveTrackPropagator* rs=0);		TEveTrackList(TEveTrackPropagator* rs=0);
	TEveTrackList(const Text_t* name, TEveTrackPropagator* rs=0);		TEveTrackList(const char* name, TEveTrackPropagator* rs=0);
	virtual ~TEveTrackList();		virtual ~TEveTrackList();
	void MakeTracks(Bool_t recurse=kTRUE);		void MakeTracks(Bool_t recurse=kTRUE);
	void FindMomentumLimits(Bool_t recurse=kTRUE);		void FindMomentumLimits(Bool_t recurse=kTRUE);
	void SetPropagator(TEveTrackPropagator* rs);		void SetPropagator(TEveTrackPropagator* rs);
	TEveTrackPropagator* GetPropagator() { return fPropagator; }		TEveTrackPropagator* GetPropagator() { return fPropagator; }
	Bool_t GetRecurse() const { return fRecurse; }		Bool_t GetRecurse() const { return fRecurse; }
	void SetRecurse(Bool_t x) { fRecurse = x; }		void SetRecurse(Bool_t x) { fRecurse = x; }
	skipping to change at line 216		skipping to change at line 211
	void SelectByP (Float_t min_p, Float_t max_p);		void SelectByP (Float_t min_p, Float_t max_p);
	void SelectByP (Float_t min_p, Float_t max_p, TEveElement* el);		void SelectByP (Float_t min_p, Float_t max_p, TEveElement* el);
	Float_t GetMinPt() const { return fMinPt; }		Float_t GetMinPt() const { return fMinPt; }
	Float_t GetMaxPt() const { return fMaxPt; }		Float_t GetMaxPt() const { return fMaxPt; }
	Float_t GetLimPt() const { return fLimPt; }		Float_t GetLimPt() const { return fLimPt; }
	Float_t GetMinP() const { return fMinP; }		Float_t GetMinP() const { return fMinP; }
	Float_t GetMaxP() const { return fMaxP; }		Float_t GetMaxP() const { return fMaxP; }
	Float_t GetLimP() const { return fLimP; }		Float_t GetLimP() const { return fLimP; }
	//--------------------------------		//-------------------------------------------------------------------
	TEveTrack* FindTrackByLabel(Int_t label); // *MENU*		TEveTrack* FindTrackByLabel(Int_t label); // *MENU*
	TEveTrack* FindTrackByIndex(Int_t index); // *MENU*		TEveTrack* FindTrackByIndex(Int_t index); // *MENU*
	void ImportHits(); // *MENU*
	void ImportClusters(); // *MENU*
	virtual void CopyVizParams(const TEveElement* el);		virtual void CopyVizParams(const TEveElement* el);
	virtual void WriteVizParams(ostream& out, const TString& var);		virtual void WriteVizParams(ostream& out, const TString& var);
	virtual TClass* ProjectedClass() const;		virtual TClass* ProjectedClass() const;
	ClassDef(TEveTrackList, 1); // A list of tracks supporting change of com mon attributes and selection based on track parameters.		ClassDef(TEveTrackList, 1); // A list of tracks supporting change of com mon attributes and selection based on track parameters.
	};		};
	#endif		#endif
End of changes. 9 change blocks.
	26 lines changed or deleted		16 lines changed or added

	TEveTrackPropagator.h		TEveTrackPropagator.h
	// @(#)root/eve:$Id: TEveTrackPropagator.h 26778 2008-12-09 21:56:51Z matev z $		// @(#)root/eve:$Id: TEveTrackPropagator.h 27157 2009-01-15 14:05:12Z brun $
	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007		// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 48		skipping to change at line 48
	virtual void PrintField(Float_t x, Float_t y, Float_t z) const		virtual void PrintField(Float_t x, Float_t y, Float_t z) const
	{		{
	TEveVector b = GetField(x, y, z);		TEveVector b = GetField(x, y, z);
	printf("v(%f, %f, %f) B(%f, %f, %f) \n", x, y, z, b.fX, b.fY, b.fZ);		printf("v(%f, %f, %f) B(%f, %f, %f) \n", x, y, z, b.fX, b.fY, b.fZ);
	}		}
	virtual TEveVector GetField(const TEveVector &v) const { return GetField (v.fX, v.fY, v.fZ);}		virtual TEveVector GetField(const TEveVector &v) const { return GetField (v.fX, v.fY, v.fZ);}
	virtual TEveVector GetField(Float_t x, Float_t y, Float_t z) const = 0;		virtual TEveVector GetField(Float_t x, Float_t y, Float_t z) const = 0;
	virtual Float_t GetMaxFieldMag() const = 0;
	ClassDef(TEveMagField, 0); // Abstract interface to magnetic field		ClassDef(TEveMagField, 0); // Abstract interface to magnetic field
	};		};
	//========================================================================= =====		//========================================================================= =====
	// TEveMagFieldConst		// TEveMagFieldConst
	//========================================================================= =====		//========================================================================= =====
	class TEveMagFieldConst : public TEveMagField		class TEveMagFieldConst : public TEveMagField
	{		{
	protected:		protected:
	TEveVector fB;		TEveVector fB;
	public:		public:
	TEveMagFieldConst(Float_t x, Float_t y, Float_t z) : TEveMagField(), fB(x, y, z)		TEveMagFieldConst(Float_t x, Float_t y, Float_t z) : TEveMagField(), fB( x, y, z)
	{ fFieldConstant = kTRUE; }		{ fFieldConstant = kTRUE; }
	virtual ~TEveMagFieldConst() {}		virtual ~TEveMagFieldConst() {}
	using TEveMagField::GetField;		using TEveMagField::GetField;
	virtual TEveVector GetField(Float_t /*x*/, Float_t /*y*/, Float_t /*z*/) const { return fB; }		virtual TEveVector GetField(Float_t /*x*/, Float_t /*y*/, Float_t /*z*/) const { return fB; }
	virtual Float_t GetMaxFieldMag() const { return fB.Mag(); }
	ClassDef(TEveMagFieldConst, 0); // Interface to constant magnetic field.		ClassDef(TEveMagFieldConst, 0); // Interface to constant magnetic field.
	};		};
	//========================================================================= =====		//========================================================================= =====
	// TEveMagFieldDuo		// TEveMagFieldDuo
	//========================================================================= =====		//========================================================================= =====
	class TEveMagFieldDuo : public TEveMagField		class TEveMagFieldDuo : public TEveMagField
	{		{
	protected:		protected:
	skipping to change at line 98		skipping to change at line 94
	fBIn(0,0,bIn), fBOut(0,0,bOut), fR2(r*r)		fBIn(0,0,bIn), fBOut(0,0,bOut), fR2(r*r)
	{		{
	fFieldConstant = kFALSE;		fFieldConstant = kFALSE;
	}		}
	virtual ~TEveMagFieldDuo() {}		virtual ~TEveMagFieldDuo() {}
	using TEveMagField::GetField;		using TEveMagField::GetField;
	virtual TEveVector GetField(Float_t x, Float_t y, Float_t /*z*/) const		virtual TEveVector GetField(Float_t x, Float_t y, Float_t /*z*/) const
	{ return ((x*x+y*y)<fR2) ? fBIn : fBOut; }		{ return ((x*x+y*y)<fR2) ? fBIn : fBOut; }
	virtual Float_t GetMaxFieldMag() const { return TMath::Max(fBIn.Mag()
	, fBOut.Mag()); }
	ClassDef(TEveMagFieldDuo, 0); // Interface to magnetic field with two di fferent values depending of radius.		ClassDef(TEveMagFieldDuo, 0); // Interface to magnetic field with two di fferent values depending of radius.
	};		};
	//========================================================================= =====		//========================================================================= =====
	// TEveTrackPropagator		// TEveTrackPropagator
	//========================================================================= =====		//========================================================================= =====
	class TEveTrackPropagator : public TEveElementList,		class TEveTrackPropagator : public TEveElementList,
	public TEveRefBackPtr		public TEveRefBackPtr
	{		{
	friend class TEveTrackPropagatorSubEditor;		friend class TEveTrackPropagatorSubEditor;
	public:		public:
	struct Helix_t		struct Helix_t
	{		{
	Int_t fCharge; // Charge of tracked particle.		Int_t fCharge; // Charge of tracked particle.
	Float_t fMinAng; // Minimal angular step between two helix points.		Float_t fMinAng; // Minimal angular step between two helix points.
	Float_t fDelta; // Maximal error at the mid-point of the line conn ecting two helix points.		Float_t fDelta; // Maximal error at the mid-point of the line conn ecting two helix points.
			Float_t fMaxStep; // Maximum allowed step size.
			Float_t fCurrentStep;
	Float_t fPhi; // Accumulated angle to check fMaxOrbs by propagat or.		Float_t fPhi; // Accumulated angle to check fMaxOrbs by propagat or.
	Bool_t fValid; // Corner case pT~0 or B~0, possible in variable m ag field.		Bool_t fValid; // Corner case pT~0 or B~0, possible in variable m ag field.
	// ----------------------------------------------------------------		// ----------------------------------------------------------------
	// helix parameters		// helix parameters
	Float_t fLam; // Momentum ratio pT/pZ.		Float_t fLam; // Momentum ratio pT/pZ.
	Float_t fR; // Helix radius in cm.		Float_t fR; // Helix radius in cm.
	Float_t fPhiStep; // Caluclated from fMinAng and fDelta.		Float_t fPhiStep; // Caluclated from fMinAng and fDelta.
	Float_t fSin, fCos; // Current sin/cos(phistep).		Float_t fSin, fCos; // Current sin/cos(phistep).
	// cached		// cached
	TEveVector fB; // Current magnetic field, cached.		TEveVector fB; // Current magnetic field, cached.
	TEveVector fE1, fE2, fE3; // Base vectors: E1 -> B dir, E2->pT dir, E 3 = E1xE2.		TEveVector fE1, fE2, fE3; // Base vectors: E1 -> B dir, E2->pT dir, E 3 = E1xE2.
	TEveVector fPt, fPl; // Transverse and longitudinal momentum.		TEveVector fPt, fPl; // Transverse and longitudinal momentum.
	Float_t fPtMag; // Magnitude of pT		Float_t fPtMag; // Magnitude of pT
	Float_t fPlDir; // Momentum parallel to mag field.		Float_t fPlDir; // Momentum parallel to mag field.
	Float_t fTStep; // Transverse step arc-length in cm.		Float_t fLStep; // Transverse step arc-length in cm.
	// ----------------------------------------------------------------		// ----------------------------------------------------------------
	Helix_t();		Helix_t();
	void UpdateHelix(const TEveVector & p, const TEveVector& b, Bool_t fu		void UpdateHelix(const TEveVector & p, const TEveVector& b, Bool_t fu
	llUpdate, Float_t fraction = -1);		llUpdate);
	void UpdateRG (const TEveVector & p, const TEveVector& b, Float_t b		void UpdateRK (const TEveVector & p, const TEveVector& b);
	Max = -1, Float_t maxStep = -1);
	void Step (const TEveVector4& v, const TEveVector& p, TEveVector4& v Out, TEveVector& pOut);		void Step (const TEveVector4& v, const TEveVector& p, TEveVector4& v Out, TEveVector& pOut);
	Float_t GetStep() { return fTStep * TMath::Sqrt(1 + fLam*fLam); }		Float_t GetStep() { return fLStep * TMath::Sqrt(1 + fLam*fLam); }
	Float_t GetStep2() { return fTStep * fTStep * (1 + fLam*fLam); }		Float_t GetStep2() { return fLStep * fLStep * (1 + fLam*fLam); }
	};		};
	enum EStepper_e { kHelix, kRungeKutta };		enum EStepper_e { kHelix, kRungeKutta };
	private:		private:
	TEveTrackPropagator(const TEveTrackPropagator&); // Not imple mented		TEveTrackPropagator(const TEveTrackPropagator&); // Not imple mented
	TEveTrackPropagator& operator=(const TEveTrackPropagator&); // Not imple mented		TEveTrackPropagator& operator=(const TEveTrackPropagator&); // Not imple mented
	protected:		protected:
	EStepper_e fStepper;		EStepper_e fStepper;
	TEveMagField* fMagFieldObj;		TEveMagField* fMagFieldObj;
	// Track extrapolation limits		// Track extrapolation limits
	Float_t fMaxR; // Max radius for track extrapo lation		Float_t fMaxR; // Max radius for track extrapo lation
	Float_t fMaxZ; // Max z-coordinate for track e xtrapolation.		Float_t fMaxZ; // Max z-coordinate for track e xtrapolation.
	Int_t fNMax; // max steps		Int_t fNMax; // max steps
	// Helix limits		// Helix limits
	Float_t fMaxOrbs; // Maximal angular path of trac ks' orbits (1 ~ 2Pi).		Float_t fMaxOrbs; // Maximal angular path of trac ks' orbits (1 ~ 2Pi).
	Float_t fMaxStepRG; // Maximum step size in stepper
	RungeKuta.
	// Path-mark / first-vertex control		// Path-mark / first-vertex control
	Bool_t fEditPathMarks; // Show widgets for path-mark c ontrol in GUI editor.		Bool_t fEditPathMarks; // Show widgets for path-mark c ontrol in GUI editor.
	Bool_t fFitDaughters; // Pass through daughter creati on points when extrapolating a track.		Bool_t fFitDaughters; // Pass through daughter creati on points when extrapolating a track.
	Bool_t fFitReferences; // Pass through given track-ref erences when extrapolating a track.		Bool_t fFitReferences; // Pass through given track-ref erences when extrapolating a track.
	Bool_t fFitDecay; // Pass through decay point whe n extrapolating a track.		Bool_t fFitDecay; // Pass through decay point whe n extrapolating a track.
	Bool_t fFitCluster2Ds; // Pass through 2D-clusters whe n extrapolating a track.		Bool_t fFitCluster2Ds; // Pass through 2D-clusters whe n extrapolating a track.
	Bool_t fRnrDaughters; // Render daughter path-marks.		Bool_t fRnrDaughters; // Render daughter path-marks.
	Bool_t fRnrReferences; // Render track-reference path- marks.		Bool_t fRnrReferences; // Render track-reference path- marks.
	Bool_t fRnrDecay; // Render decay path-marks.		Bool_t fRnrDecay; // Render decay path-marks.
	Bool_t fRnrCluster2Ds; // Render 2D-clusters.		Bool_t fRnrCluster2Ds; // Render 2D-clusters.
	skipping to change at line 191		skipping to change at line 185
	TMarker fFVAtt; // Marker attributes for fits v ertex.		TMarker fFVAtt; // Marker attributes for fits v ertex.
	// ----------------------------------------------------------------		// ----------------------------------------------------------------
	// Propagation, state of current track		// Propagation, state of current track
	std::vector<TEveVector4> fPoints; // Calculated point.		std::vector<TEveVector4> fPoints; // Calculated point.
	TEveVector fV; // Start vertex.		TEveVector fV; // Start vertex.
	Helix_t fH; // Helix.		Helix_t fH; // Helix.
	void RebuildTracks();		void RebuildTracks();
	void Step(TEveVector4 &v, TEveVector &p, TEveVector4 &vOut, TEveVecto r &pOut, Float_t fraction);		void Step(TEveVector4 &v, TEveVector &p, TEveVector4 &vOut, TEveVecto r &pOut);
	Bool_t LoopToVertex(TEveVector& v, TEveVector& p);		Bool_t LoopToVertex(TEveVector& v, TEveVector& p);
	void LoopToBounds(TEveVector& p);		void LoopToBounds(TEveVector& p);
	Bool_t LineToVertex (TEveVector& v);		Bool_t LineToVertex (TEveVector& v);
	void LineToBounds (TEveVector& p);		void LineToBounds (TEveVector& p);
	void OneStepRungeKutta(Double_t charge, Double_t step, Double_t* vect , Double_t* vout);		void OneStepRungeKutta(Double_t charge, Double_t step, Double_t* vect , Double_t* vout);
	Bool_t HelixIntersectPlane(const TEveVector& p, const TEveVector& point , const TEveVector& normal,		Bool_t HelixIntersectPlane(const TEveVector& p, const TEveVector& point , const TEveVector& normal,
	TEveVector& itsect);		TEveVector& itsect);
	Bool_t LineIntersectPlane(const TEveVector& p, const TEveVector& point, const TEveVector& normal,		Bool_t LineIntersectPlane(const TEveVector& p, const TEveVector& point, const TEveVector& normal,
	TEveVector& itsect);		TEveVector& itsect);
	Bool_t PointOverVertex(const TEveVector4& v0, const TEveVector4& v);		Bool_t PointOverVertex(const TEveVector4& v0, const TEveVector4& v);
	public:		public:
	TEveTrackPropagator(const Text_t* n="TEveTrackPropagator", const Text_t* t="",		TEveTrackPropagator(const char* n="TEveTrackPropagator", const char* t=" ",
	TEveMagField* field=0);		TEveMagField* field=0);
	virtual ~TEveTrackPropagator();		virtual ~TEveTrackPropagator();
	virtual void OnZeroRefCount();		virtual void OnZeroRefCount();
	virtual void CheckReferenceCount(const TEveException& eh="TEveElement::C heckReferenceCount ");		virtual void CheckReferenceCount(const TEveException& eh="TEveElement::C heckReferenceCount ");
	virtual void ElementChanged(Bool_t update_scenes=kTRUE, Bool_t redraw=kF ALSE);		virtual void ElementChanged(Bool_t update_scenes=kTRUE, Bool_t redraw=kF ALSE);
	// propagation		// propagation
	skipping to change at line 241		skipping to change at line 235
	void SetMagField(Float_t bX, Float_t bY, Float_t bZ);		void SetMagField(Float_t bX, Float_t bY, Float_t bZ);
	void SetMagField(Float_t b) { SetMagField(0.f, 0.f, b); }		void SetMagField(Float_t b) { SetMagField(0.f, 0.f, b); }
	void SetMagFieldObj(TEveMagField * x);		void SetMagFieldObj(TEveMagField * x);
	void SetMaxR(Float_t x);		void SetMaxR(Float_t x);
	void SetMaxZ(Float_t x);		void SetMaxZ(Float_t x);
	void SetMaxOrbs(Float_t x);		void SetMaxOrbs(Float_t x);
	void SetMinAng(Float_t x);		void SetMinAng(Float_t x);
	void SetDelta(Float_t x);		void SetDelta(Float_t x);
			void SetMaxStep(Float_t x);
	void SetEditPathMarks(Bool_t x) { fEditPathMarks = x; }		void SetEditPathMarks(Bool_t x) { fEditPathMarks = x; }
	void SetRnrDaughters(Bool_t x);		void SetRnrDaughters(Bool_t x);
	void SetRnrReferences(Bool_t x);		void SetRnrReferences(Bool_t x);
	void SetRnrDecay(Bool_t x);		void SetRnrDecay(Bool_t x);
	void SetRnrCluster2Ds(Bool_t x);		void SetRnrCluster2Ds(Bool_t x);
	void SetFitDaughters(Bool_t x);		void SetFitDaughters(Bool_t x);
	void SetFitReferences(Bool_t x);		void SetFitReferences(Bool_t x);
	void SetFitDecay(Bool_t x);		void SetFitDecay(Bool_t x);
	void SetFitCluster2Ds(Bool_t x);		void SetFitCluster2Ds(Bool_t x);
	skipping to change at line 263		skipping to change at line 258
	TEveVector GetMagField(Float_t x, Float_t y, Float_t z) { return fMagFie ldObj->GetField(x, y, z); }		TEveVector GetMagField(Float_t x, Float_t y, Float_t z) { return fMagFie ldObj->GetField(x, y, z); }
	void PrintMagField(Float_t x, Float_t y, Float_t z) const;		void PrintMagField(Float_t x, Float_t y, Float_t z) const;
	EStepper_e GetStepper() const { return fStepper;}		EStepper_e GetStepper() const { return fStepper;}
	Float_t GetMaxR() const { return fMaxR; }		Float_t GetMaxR() const { return fMaxR; }
	Float_t GetMaxZ() const { return fMaxZ; }		Float_t GetMaxZ() const { return fMaxZ; }
	Float_t GetMaxOrbs() const { return fMaxOrbs; }		Float_t GetMaxOrbs() const { return fMaxOrbs; }
	Float_t GetMinAng() const { return fH.fMinAng; }		Float_t GetMinAng() const { return fH.fMinAng; }
	Float_t GetDelta() const { return fH.fDelta; }		Float_t GetDelta() const { return fH.fDelta; }
			Float_t GetMaxStep() const { return fH.fMaxStep; }
	Bool_t GetEditPathMarks() const { return fEditPathMarks; }		Bool_t GetEditPathMarks() const { return fEditPathMarks; }
	Bool_t GetRnrDaughters() const { return fRnrDaughters; }		Bool_t GetRnrDaughters() const { return fRnrDaughters; }
	Bool_t GetRnrReferences() const { return fRnrReferences; }		Bool_t GetRnrReferences() const { return fRnrReferences; }
	Bool_t GetRnrDecay() const { return fRnrDecay; }		Bool_t GetRnrDecay() const { return fRnrDecay; }
	Bool_t GetRnrCluster2Ds() const { return fRnrCluster2Ds; }		Bool_t GetRnrCluster2Ds() const { return fRnrCluster2Ds; }
	Bool_t GetFitDaughters() const { return fFitDaughters; }		Bool_t GetFitDaughters() const { return fFitDaughters; }
	Bool_t GetFitReferences() const { return fFitReferences; }		Bool_t GetFitReferences() const { return fFitReferences; }
	Bool_t GetFitDecay() const { return fFitDecay; }		Bool_t GetFitDecay() const { return fFitDecay; }
	Bool_t GetFitCluster2Ds() const { return fFitCluster2Ds; }		Bool_t GetFitCluster2Ds() const { return fFitCluster2Ds; }
End of changes. 15 change blocks.
	22 lines changed or deleted		15 lines changed or added

	TEveTrans.h		TEveTrans.h
	// @(#)root/eve:$Id: TEveTrans.h 21812 2008-01-22 20:52:31Z matevz $		// @(#)root/eve:$Id: TEveTrans.h 27157 2009-01-15 14:05:12Z brun $
	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007		// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 130		skipping to change at line 130
	void GetPos(Double_t& x, Double_t& y, Double_t& z) const;		void GetPos(Double_t& x, Double_t& y, Double_t& z) const;
	void GetPos(Double_t* x) const;		void GetPos(Double_t* x) const;
	void GetPos(Float_t * x) const;		void GetPos(Float_t * x) const;
	void GetPos(TVector3& v) const;		void GetPos(TVector3& v) const;
	TVector3 GetPos() const;		TVector3 GetPos() const;
	// Cardan angle interface		// Cardan angle interface
	void SetRotByAngles(Float_t a1, Float_t a2, Float_t a3);		void SetRotByAngles(Float_t a1, Float_t a2, Float_t a3);
	void SetRotByAnyAngles(Float_t a1, Float_t a2, Float_t a3, const Text_t* pat);		void SetRotByAnyAngles(Float_t a1, Float_t a2, Float_t a3, const char* p at);
	void GetRotAngles(Float_t* x) const;		void GetRotAngles(Float_t* x) const;
	// Scaling		// Scaling
	void Scale(Double_t sx, Double_t sy, Double_t sz);		void Scale(Double_t sx, Double_t sy, Double_t sz);
	Double_t Unscale();		Double_t Unscale();
	void Unscale(Double_t& sx, Double_t& sy, Double_t& sz);		void Unscale(Double_t& sx, Double_t& sy, Double_t& sz);
	void GetScale(Double_t& sx, Double_t& sy, Double_t& sz) const;		void GetScale(Double_t& sx, Double_t& sy, Double_t& sz) const;
	void SetScale(Double_t sx, Double_t sy, Double_t sz);		void SetScale(Double_t sx, Double_t sy, Double_t sz);
	void SetScaleX(Double_t sx);		void SetScaleX(Double_t sx);
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	TEveTreeTools.h		TEveTreeTools.h
	// @(#)root/eve:$Id: TEveTreeTools.h 21215 2007-12-05 17:19:23Z matevz $		// @(#)root/eve:$Id: TEveTreeTools.h 27157 2009-01-15 14:05:12Z brun $
	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007		// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 31		skipping to change at line 31
	class TEveSelectorToEventList : public TSelectorDraw		class TEveSelectorToEventList : public TSelectorDraw
	{		{
	TEveSelectorToEventList(const TEveSelectorToEventList&); // N ot implemented		TEveSelectorToEventList(const TEveSelectorToEventList&); // N ot implemented
	TEveSelectorToEventList& operator=(const TEveSelectorToEventList&); // N ot implemented		TEveSelectorToEventList& operator=(const TEveSelectorToEventList&); // N ot implemented
	protected:		protected:
	TEventList* fEvList;		TEventList* fEvList;
	TList fInput;		TList fInput;
	public:		public:
	TEveSelectorToEventList(TEventList* evl, const Text_t* sel);		TEveSelectorToEventList(TEventList* evl, const char* sel);
	virtual Int_t Version() const { return 1; }		virtual Int_t Version() const { return 1; }
	virtual Bool_t Process(Long64_t entry);		virtual Bool_t Process(Long64_t entry);
	ClassDef(TEveSelectorToEventList, 1); // TSelector that stores entry num bers of matching TTree entries into an event-list.		ClassDef(TEveSelectorToEventList, 1); // TSelector that stores entry num bers of matching TTree entries into an event-list.
	};		};
	/************************************************************************** ****/		/************************************************************************** ****/
	// TEvePointSelectorConsumer, TEvePointSelector		// TEvePointSelectorConsumer, TEvePointSelector
	/************************************************************************** ****/		/************************************************************************** ****/
	skipping to change at line 85		skipping to change at line 85
	TString fVarexp;		TString fVarexp;
	TString fSelection;		TString fSelection;
	TString fSubIdExp;		TString fSubIdExp;
	Int_t fSubIdNum;		Int_t fSubIdNum;
	TList fInput;		TList fInput;
	public:		public:
	TEvePointSelector(TTree* t=0, TEvePointSelectorConsumer* c=0,		TEvePointSelector(TTree* t=0, TEvePointSelectorConsumer* c=0,
	const Text_t* vexp="", const Text_t* sel="");		const char* vexp="", const char* sel="");
	virtual ~TEvePointSelector() {}		virtual ~TEvePointSelector() {}
	virtual Long64_t Select(const Text_t* selection=0);		virtual Long64_t Select(const char* selection=0);
	virtual Long64_t Select(TTree* t, const Text_t* selection=0);		virtual Long64_t Select(TTree* t, const char* selection=0);
	virtual void TakeAction();		virtual void TakeAction();
	TTree* GetTree() const { return fTree; }		TTree* GetTree() const { return fTree; }
	void SetTree(TTree* t) { fTree = t; }		void SetTree(TTree* t) { fTree = t; }
	TEvePointSelectorConsumer* GetConsumer() const { return fConsumer; }		TEvePointSelectorConsumer* GetConsumer() const { return fConsumer; }
	void SetConsumer(TEvePointSelectorConsumer* c) { fConsumer = c; }		void SetConsumer(TEvePointSelectorConsumer* c) { fConsumer = c; }
	const Text_t* GetVarexp() const { return fVarexp; }		const char* GetVarexp() const { return fVarexp; }
	void SetVarexp(const Text_t* v) { fVarexp = v; }		void SetVarexp(const char* v) { fVarexp = v; }
	const Text_t* GetSelection() const { return fSelection; }		const char* GetSelection() const { return fSelection; }
	void SetSelection(const Text_t* s) { fSelection = s; }		void SetSelection(const char* s) { fSelection = s; }
	const Text_t* GetSubIdExp() const { return fSubIdExp; }		const char* GetSubIdExp() const { return fSubIdExp; }
	void SetSubIdExp(const Text_t* s) { fSubIdExp = s; }		void SetSubIdExp(const char* s) { fSubIdExp = s; }
	Int_t GetSubIdNum() const { return fSubIdNum; }		Int_t GetSubIdNum() const { return fSubIdNum; }
	ClassDef(TEvePointSelector, 1); // TSelector for direct extraction of po int-like data from a Tree.		ClassDef(TEvePointSelector, 1); // TSelector for direct extraction of po int-like data from a Tree.
	};		};
	#endif		#endif
End of changes. 7 change blocks.
	11 lines changed or deleted		11 lines changed or added

	TEveUtil.h		TEveUtil.h
	// @(#)root/eve:$Id: TEveUtil.h 26367 2008-11-21 18:08:30Z matevz $		// @(#)root/eve:$Id: TEveUtil.h 27157 2009-01-15 14:05:12Z brun $
	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007		// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 47		skipping to change at line 47
	static TObjArray* fgDefaultColors;		static TObjArray* fgDefaultColors;
	public:		public:
	virtual ~TEveUtil() {}		virtual ~TEveUtil() {}
	// Environment, Macro functions		// Environment, Macro functions
	static void SetupEnvironment();		static void SetupEnvironment();
	static void SetupGUI();		static void SetupGUI();
	static Bool_t CheckMacro(const Text_t* mac);		static Bool_t CheckMacro(const char* mac);
	static void AssertMacro(const Text_t* mac);		static void AssertMacro(const char* mac);
	static void Macro(const Text_t* mac);		static void Macro(const char* mac);
	static void LoadMacro(const Text_t* mac);		static void LoadMacro(const char* mac);
	// Color management		// Color management
	static void ColorFromIdx(Color_t ci, UChar_t col[4], Bool_t alpha=kT RUE);		static void ColorFromIdx(Color_t ci, UChar_t col[4], Bool_t alpha=kT RUE);
	static void ColorFromIdx(Color_t ci, UChar_t col[4], UChar_t transpa rency);		static void ColorFromIdx(Color_t ci, UChar_t col[4], UChar_t transpa rency);
	static void ColorFromIdx(Float_t f1, Color_t c1, Float_t f2, Color_t c2,		static void ColorFromIdx(Float_t f1, Color_t c1, Float_t f2, Color_t c2,
	UChar_t col[4], Bool_t alpha=kTRUE);		UChar_t col[4], Bool_t alpha=kTRUE);
	static Color_t* FindColorVar(TObject* obj, const Text_t* varname);		static Color_t* FindColorVar(TObject* obj, const char* varname);
	static void SetColorBrightness(Float_t value, Bool_t full_redraw=kFA LSE);		static void SetColorBrightness(Float_t value, Bool_t full_redraw=kFA LSE);
	// Math utilities		// Math utilities
	static Bool_t IsU1IntervalContainedByMinMax (Float_t minM, Float_t maxM ,		static Bool_t IsU1IntervalContainedByMinMax (Float_t minM, Float_t maxM ,
	Float_t minQ, Float_t maxQ );		Float_t minQ, Float_t maxQ );
	static Bool_t IsU1IntervalOverlappingByMinMax(Float_t minM, Float_t maxM ,		static Bool_t IsU1IntervalOverlappingByMinMax(Float_t minM, Float_t maxM ,
	Float_t minQ, Float_t maxQ );		Float_t minQ, Float_t maxQ );
End of changes. 3 change blocks.
	6 lines changed or deleted		6 lines changed or added

	TEveVSD.h		TEveVSD.h
	// @(#)root/eve:$Id: TEveVSD.h 24122 2008-06-03 19:38:30Z matevz $		// @(#)root/eve:$Id: TEveVSD.h 27157 2009-01-15 14:05:12Z brun $
	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007		// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 50		skipping to change at line 50
	TEveMCTrack fK, *fpK; //!		TEveMCTrack fK, *fpK; //!
	TEveHit fH, *fpH; //!		TEveHit fH, *fpH; //!
	TEveCluster fC, *fpC; //!		TEveCluster fC, *fpC; //!
	TEveRecTrack fR, *fpR; //!		TEveRecTrack fR, *fpR; //!
	TEveRecKink fKK, *fpKK; //!		TEveRecKink fKK, *fpKK; //!
	TEveRecV0 fV0, *fpV0; //!		TEveRecV0 fV0, *fpV0; //!
	TEveRecCascade fCC, *fpCC; //!		TEveRecCascade fCC, *fpCC; //!
	TEveMCRecCrossRef fGI, *fpGI; //!		TEveMCRecCrossRef fGI, *fpGI; //!
	public:		public:
	TEveVSD(const Text_t* name="TEveVSD", const Text_t* title="");		TEveVSD(const char* name="TEveVSD", const char* title="");
	virtual void SetDirectory(TDirectory* dir);		virtual void SetDirectory(TDirectory* dir);
	virtual void CreateTrees();		virtual void CreateTrees();
	virtual void DeleteTrees();		virtual void DeleteTrees();
	virtual void CreateBranches();		virtual void CreateBranches();
	virtual void SetBranchAddresses();		virtual void SetBranchAddresses();
	virtual void WriteTrees();		virtual void WriteTrees();
	virtual void LoadTrees();		virtual void LoadTrees();
	virtual void LoadVSD(const Text_t* vsd_file_name,		virtual void LoadVSD(const char* vsd_file_name,
	const Text_t* dir_name="Event0");		const char* dir_name="Event0");
	static void DisableTObjectStreamersForVSDStruct();		static void DisableTObjectStreamersForVSDStruct();
	ClassDef(TEveVSD, 1); // Visualization Summary Data - a collection of tr ees holding standard event data in experiment independant format.		ClassDef(TEveVSD, 1); // Visualization Summary Data - a collection of tr ees holding standard event data in experiment independant format.
	};		};
	#endif		#endif
End of changes. 3 change blocks.
	4 lines changed or deleted		4 lines changed or added

	TEveVSDStructs.h		TEveVSDStructs.h
	// @(#)root/eve:$Id: TEveVSDStructs.h 25879 2008-10-19 20:49:34Z matevz $		// @(#)root/eve:$Id: TEveVSDStructs.h 27485 2009-02-18 12:08:07Z matevz $
	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007		// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 320		skipping to change at line 320
	Float_t Pt() { return fP.Perp(); }		Float_t Pt() { return fP.Perp(); }
	ClassDef(TEveRecTrack, 1); // Reconstructed track (also used in VSD).		ClassDef(TEveRecTrack, 1); // Reconstructed track (also used in VSD).
	};		};
	/************************************************************************** ****/		/************************************************************************** ****/
	// TEveRecKink		// TEveRecKink
	/************************************************************************** ****/		/************************************************************************** ****/
	class TEveRecKink : public TEveRecTrack		class TEveRecKink : public TObject
	{		{
	public:		public:
	Int_t fLabelSec; // Label of the secondary track
	TEveVector fVEnd; // End vertex: last point on the primary track
	TEveVector fVKink; // Kink vertex: reconstructed position of the ki
	nk
	TEveVector fPSec; // Momentum of secondary track
	TEveRecKink() : TEveRecTrack(), fLabelSec(0), fVEnd(), fVKink(), fPSec()		TEveVector fVKink; // Kink vertex: reconstructed position of t
	{}		he kink
			TEveVector fPMother; // Momentum of the mother track
			TEveVector fVMother; // Vertex of the mother track
			TEveVector fPDaughter; // Momentum of the daughter track
			TEveVector fVDaughter; // Vertex of the daughter track
			Double32_t fKinkAngle[3]; // three angles
			Int_t fSign; // sign of the track
			Int_t fStatus; // Status as exported from reconstruction
			// Data from simulation
			Int_t fKinkLabel[2]; // Labels of the mother and daughter tracks
			Int_t fKinkIndex[2]; // Indices of the mother and daughter track
			s
			Int_t fKinkPdg[2]; // PDG code of mother and daughter.
			TEveRecKink() : fVKink(), fPMother(), fVMother(), fPDaughter(), fVDaught
			er(), fSign(0), fStatus(0)
			{
			fKinkAngle[0] = fKinkAngle[1] = fKinkAngle[2] = 0;
			fKinkLabel[0] = fKinkLabel[1] = 0;
			fKinkIndex[0] = fKinkIndex[1] = 0;
			fKinkPdg[0] = fKinkPdg[1] = 0;
			}
	virtual ~TEveRecKink() {}		virtual ~TEveRecKink() {}
	ClassDef(TEveRecKink, 1); // Reconstructed kink (also used in VSD).		ClassDef(TEveRecKink, 1); // Reconstructed kink (also used in VSD).
	};		};
	/************************************************************************** ****/		/************************************************************************** ****/
	// TEveRecV0		// TEveRecV0
	/************************************************************************** ****/		/************************************************************************** ****/
	class TEveRecV0 : public TObject		class TEveRecV0 : public TObject
End of changes. 4 change blocks.
	9 lines changed or deleted		26 lines changed or added

	TEveViewer.h		TEveViewer.h
	// @(#)root/eve:$Id: TEveViewer.h 26850 2008-12-11 21:45:13Z matevz $		// @(#)root/eve:$Id: TEveViewer.h 27577 2009-02-23 14:34:36Z matevz $
	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007		// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 40		skipping to change at line 40
	{		{
	private:		private:
	TEveViewer(const TEveViewer&); // Not implemented		TEveViewer(const TEveViewer&); // Not implemented
	TEveViewer& operator=(const TEveViewer&); // Not implemented		TEveViewer& operator=(const TEveViewer&); // Not implemented
	protected:		protected:
	TGLViewer *fGLViewer;		TGLViewer *fGLViewer;
	TGFrame *fGLViewerFrame;		TGFrame *fGLViewerFrame;
	public:		public:
	TEveViewer(const Text_t* n="TEveViewer", const Text_t* t="");		TEveViewer(const char* n="TEveViewer", const char* t="");
	virtual ~TEveViewer();		virtual ~TEveViewer();
	virtual void PreUndock();		virtual void PreUndock();
	virtual void PostDock();		virtual void PostDock();
	TGLViewer* GetGLViewer() const { return fGLViewer; }		TGLViewer* GetGLViewer() const { return fGLViewer; }
	void SetGLViewer(TGLViewer* viewer, TGFrame* frame);		void SetGLViewer(TGLViewer* viewer, TGFrame* frame);
	void SpawnGLViewer(TGedEditor* ged);		void SpawnGLViewer(TGedEditor* ged);
	void SpawnGLEmbeddedViewer(Int_t border=0);		void SpawnGLEmbeddedViewer(Int_t border=0);
	void Redraw(Bool_t resetCameras=kFALSE);		void Redraw(Bool_t resetCameras=kFALSE);
	skipping to change at line 80		skipping to change at line 80
	class TEveViewerList : public TEveElementList		class TEveViewerList : public TEveElementList
	{		{
	private:		private:
	TEveViewerList(const TEveViewerList&); // Not implemented		TEveViewerList(const TEveViewerList&); // Not implemented
	TEveViewerList& operator=(const TEveViewerList&); // Not implemented		TEveViewerList& operator=(const TEveViewerList&); // Not implemented
	protected:		protected:
	Bool_t fShowTooltip;		Bool_t fShowTooltip;
	public:		public:
	TEveViewerList(const Text_t* n="TEveViewerList", const Text_t* t="");		TEveViewerList(const char* n="TEveViewerList", const char* t="");
	virtual ~TEveViewerList() {}		virtual ~TEveViewerList() {}
	virtual void AddElement(TEveElement* el);		virtual void AddElement(TEveElement* el);
	virtual void RemoveElementLocal(TEveElement* el);		virtual void RemoveElementLocal(TEveElement* el);
	virtual void RemoveElementsLocal();		virtual void RemoveElementsLocal();
	// --------------------------------		// --------------------------------
	virtual void Connect();		virtual void Connect();
	void RepaintChangedViewers(Bool_t resetCameras, Bool_t dropLogicals);		void RepaintChangedViewers(Bool_t resetCameras, Bool_t dropLogicals);
	void RepaintAllViewers(Bool_t resetCameras, Bool_t dropLogicals);		void RepaintAllViewers(Bool_t resetCameras, Bool_t dropLogicals);
			void DeleteAnnotations();
	void SceneDestructing(TEveScene* scene);		void SceneDestructing(TEveScene* scene);
	// --------------------------------		// --------------------------------
	void OnMouseOver(TGLPhysicalShape* shape, UInt_t state);		void OnMouseOver(TGLPhysicalShape* shape, UInt_t state);
	void OnClicked(TObject *obj, UInt_t button, UInt_t state);		void OnClicked(TObject *obj, UInt_t button, UInt_t state);
	// --------------------------------		// --------------------------------
End of changes. 4 change blocks.
	3 lines changed or deleted		4 lines changed or added

	TEveWindow.h		TEveWindow.h
	// @(#)root/eve:$Id: TEveWindow.h 26873 2008-12-12 12:58:21Z matevz $		// @(#)root/eve:$Id: TEveWindow.h 27157 2009-01-15 14:05:12Z brun $
	// Author: Matevz Tadel 2007		// Author: Matevz Tadel 2007
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 213		skipping to change at line 213
	static UInt_t fgMainFrameDefWidth;		static UInt_t fgMainFrameDefWidth;
	static UInt_t fgMainFrameDefHeight;		static UInt_t fgMainFrameDefHeight;
	static Pixel_t fgCurrentBackgroundColor;		static Pixel_t fgCurrentBackgroundColor;
	static Pixel_t fgMiniBarBackgroundColor;		static Pixel_t fgMiniBarBackgroundColor;
	virtual void PreDeleteElement();		virtual void PreDeleteElement();
	public:		public:
	TEveWindow(const Text_t* n="TEveWindow", const Text_t* t="");		TEveWindow(const char* n="TEveWindow", const char* t="");
	virtual ~TEveWindow();		virtual ~TEveWindow();
	virtual void NameTitleChanged();		virtual void NameTitleChanged();
	virtual TGFrame* GetGUIFrame() = 0;		virtual TGFrame* GetGUIFrame() = 0;
	virtual void PreUndock();		virtual void PreUndock();
	virtual void PostDock();		virtual void PostDock();
	virtual Bool_t CanMakeNewSlots() const { return kFALSE; }		virtual Bool_t CanMakeNewSlots() const { return kFALSE; }
	virtual TEveWindowSlot* NewSlot() { return 0; }		virtual TEveWindowSlot* NewSlot() { return 0; }
	skipping to change at line 292		skipping to change at line 292
	TEveWindowSlot(const TEveWindowSlot&); // Not implemented		TEveWindowSlot(const TEveWindowSlot&); // Not implemented
	TEveWindowSlot& operator=(const TEveWindowSlot&); // Not implemented		TEveWindowSlot& operator=(const TEveWindowSlot&); // Not implemented
	protected:		protected:
	TGTextButton *fEmptyButt;		TGTextButton *fEmptyButt;
	TGCompositeFrame *fEmbedBuffer;		TGCompositeFrame *fEmbedBuffer;
	virtual void SetCurrent(Bool_t curr);		virtual void SetCurrent(Bool_t curr);
	public:		public:
	TEveWindowSlot(const Text_t* n="TEveWindowSlot", const Text_t* t="");		TEveWindowSlot(const char* n="TEveWindowSlot", const char* t="");
	virtual ~TEveWindowSlot();		virtual ~TEveWindowSlot();
	virtual TGFrame* GetGUIFrame();		virtual TGFrame* GetGUIFrame();
	TEveWindowPack* MakePack(); // *MENU*		TEveWindowPack* MakePack(); // *MENU*
	TEveWindowTab* MakeTab(); // *MENU*		TEveWindowTab* MakeTab(); // *MENU*
	TEveWindowFrame* MakeFrame(TGFrame* frame=0);		TEveWindowFrame* MakeFrame(TGFrame* frame=0);
	TGCompositeFrame* StartEmbedding();		TGCompositeFrame* StartEmbedding();
	TEveWindowFrame* StopEmbedding(const Text_t* name=0);		TEveWindowFrame* StopEmbedding(const char* name=0);
	ClassDef(TEveWindowSlot, 0); // An unoccupied eve-window slot.		ClassDef(TEveWindowSlot, 0); // An unoccupied eve-window slot.
	};		};
	//========================================================================= =====		//========================================================================= =====
	// TEveWindowFrame		// TEveWindowFrame
	//========================================================================= =====		//========================================================================= =====
	class TEveWindowFrame : public TEveWindow		class TEveWindowFrame : public TEveWindow
	{		{
	private:		private:
	TEveWindowFrame(const TEveWindowFrame&); // Not implemented		TEveWindowFrame(const TEveWindowFrame&); // Not implemented
	TEveWindowFrame& operator=(const TEveWindowFrame&); // Not implemented		TEveWindowFrame& operator=(const TEveWindowFrame&); // Not implemented
	protected:		protected:
	TGFrame *fGUIFrame;		TGFrame *fGUIFrame;
	public:		public:
	TEveWindowFrame(TGFrame* frame, const Text_t* n="TEveWindowFrame", const Text_t* t="");		TEveWindowFrame(TGFrame* frame, const char* n="TEveWindowFrame", const c har* t="");
	virtual ~TEveWindowFrame();		virtual ~TEveWindowFrame();
	virtual TGFrame* GetGUIFrame() { return fGUIFrame; }		virtual TGFrame* GetGUIFrame() { return fGUIFrame; }
	TGCompositeFrame* GetGUICompositeFrame();		TGCompositeFrame* GetGUICompositeFrame();
	ClassDef(TEveWindowFrame, 0); // Eve-window containing any TGFrame.		ClassDef(TEveWindowFrame, 0); // Eve-window containing any TGFrame.
	};		};
	//========================================================================= =====		//========================================================================= =====
	skipping to change at line 346		skipping to change at line 346
	class TEveWindowPack : public TEveWindow		class TEveWindowPack : public TEveWindow
	{		{
	private:		private:
	TEveWindowPack(const TEveWindowPack&); // Not implemented		TEveWindowPack(const TEveWindowPack&); // Not implemented
	TEveWindowPack& operator=(const TEveWindowPack&); // Not implemented		TEveWindowPack& operator=(const TEveWindowPack&); // Not implemented
	protected:		protected:
	TGPack *fPack;		TGPack *fPack;
	public:		public:
	TEveWindowPack(TGPack* p, const Text_t* n="TEveWindowPack", const Text_t * t="");		TEveWindowPack(TGPack* p, const char* n="TEveWindowPack", const char* t= "");
	virtual ~TEveWindowPack();		virtual ~TEveWindowPack();
	virtual TGFrame* GetGUIFrame();		virtual TGFrame* GetGUIFrame();
	virtual Bool_t CanMakeNewSlots() const { return kTRUE; }		virtual Bool_t CanMakeNewSlots() const { return kTRUE; }
	virtual TEveWindowSlot* NewSlot(); // *MENU*		virtual TEveWindowSlot* NewSlot(); // *MENU*
	void FlipOrientation(); // *MENU*		void FlipOrientation(); // *MENU*
	void SetVertical(Bool_t x=kTRUE);		void SetVertical(Bool_t x=kTRUE);
	void SetHorizontal() { SetVertical(kFALSE); }		void SetHorizontal() { SetVertical(kFALSE); }
	skipping to change at line 379		skipping to change at line 379
	class TEveWindowTab : public TEveWindow		class TEveWindowTab : public TEveWindow
	{		{
	private:		private:
	TEveWindowTab(const TEveWindowTab&); // Not implemented		TEveWindowTab(const TEveWindowTab&); // Not implemented
	TEveWindowTab& operator=(const TEveWindowTab&); // Not implemented		TEveWindowTab& operator=(const TEveWindowTab&); // Not implemented
	protected:		protected:
	TGTab *fTab;		TGTab *fTab;
	public:		public:
	TEveWindowTab(TGTab* tab, const Text_t* n="TEveWindowTab", const Text_t* t="");		TEveWindowTab(TGTab* tab, const char* n="TEveWindowTab", const char* t=" ");
	virtual ~TEveWindowTab();		virtual ~TEveWindowTab();
	virtual TGFrame* GetGUIFrame();		virtual TGFrame* GetGUIFrame();
	virtual Bool_t CanMakeNewSlots() const { return kTRUE; }		virtual Bool_t CanMakeNewSlots() const { return kTRUE; }
	virtual TEveWindowSlot* NewSlot(); // *MENU*		virtual TEveWindowSlot* NewSlot(); // *MENU*
	TGTab* GetTab() const { return fTab; }		TGTab* GetTab() const { return fTab; }
	ClassDef(TEveWindowTab, 0); // Eve-window containing a TGTab.		ClassDef(TEveWindowTab, 0); // Eve-window containing a TGTab.
End of changes. 7 change blocks.
	7 lines changed or deleted		7 lines changed or added

	TEveWindowManager.h		TEveWindowManager.h
	// @(#)root/eve:$Id: TEveWindowManager.h 26927 2008-12-15 17:50:22Z brun $		// @(#)root/eve:$Id: TEveWindowManager.h 27157 2009-01-15 14:05:12Z brun $
	// Author: Matevz Tadel 2007		// Author: Matevz Tadel 2007
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 35		skipping to change at line 35
	TEveWindowManager(const TEveWindowManager&); // Not implement ed		TEveWindowManager(const TEveWindowManager&); // Not implement ed
	TEveWindowManager& operator=(const TEveWindowManager&); // Not implement ed		TEveWindowManager& operator=(const TEveWindowManager&); // Not implement ed
	protected:		protected:
	TEveWindow *fCurrentWindow;		TEveWindow *fCurrentWindow;
	TEveWindow *fDefaultContainer;		TEveWindow *fDefaultContainer;
	void DestroyWindowRecursively(TEveWindow* window);		void DestroyWindowRecursively(TEveWindow* window);
	public:		public:
	TEveWindowManager(const Text_t* n="TEveWindowManager", const Text_t* t=" ");		TEveWindowManager(const char* n="TEveWindowManager", const char* t="");
	virtual ~TEveWindowManager();		virtual ~TEveWindowManager();
	void SelectWindow(TEveWindow* w);		void SelectWindow(TEveWindow* w);
	void DeleteWindow(TEveWindow* w);		void DeleteWindow(TEveWindow* w);
	void WindowSelected(TEveWindow* window); // *SIGNAL*		void WindowSelected(TEveWindow* window); // *SIGNAL*
	void WindowDeleted (TEveWindow* window); // *SIGNAL*		void WindowDeleted (TEveWindow* window); // *SIGNAL*
	TEveWindow* GetCurrentWindow() const { return fCurrentWindow; }		TEveWindow* GetCurrentWindow() const { return fCurrentWindow; }
	Bool_t IsCurrentWindow(const TEveWindow* w) const { return w == fCurrentWindow; }		Bool_t IsCurrentWindow(const TEveWindow* w) const { return w == fCurrentWindow; }
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	TFileMerger.h		TFileMerger.h
	// @(#)root/proofplayer:$Id: TFileMerger.h 23889 2008-05-16 17:55:40Z rdm $		// @(#)root/proofplayer:$Id: TFileMerger.h 27117 2009-01-12 18:36:25Z pcana l $
	// Author: Andreas Peters + Fons Rademakers 26/5/2005		// Author: Andreas Peters + Fons Rademakers 26/5/2005
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2005, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2005, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 77		skipping to change at line 77
	//--- file management interface		//--- file management interface
	virtual Bool_t SetCWD(const char * /*path*/) { MayNotUse("SetCWD"); retu rn kFALSE; }		virtual Bool_t SetCWD(const char * /*path*/) { MayNotUse("SetCWD"); retu rn kFALSE; }
	virtual const char *GetCWD() { MayNotUse("GetCWD"); return 0; }		virtual const char *GetCWD() { MayNotUse("GetCWD"); return 0; }
	//--- file merging interface		//--- file merging interface
	virtual void Reset();		virtual void Reset();
	virtual Bool_t AddFile(const char *url);		virtual Bool_t AddFile(const char *url);
	virtual Bool_t OutputFile(const char *url);		virtual Bool_t OutputFile(const char *url);
	virtual void PrintFiles(Option_t *options);		virtual void PrintFiles(Option_t *options);
	virtual Bool_t Merge();		virtual Bool_t Merge(Bool_t progressbar = kTRUE);
	virtual Bool_t MergeRecursive(TDirectory *target, TList *sourcelist, Int _t isdir);		virtual Bool_t MergeRecursive(TDirectory *target, TList *sourcelist, Int _t isdir);
	virtual void SetFastMethod(Bool_t fast=kTRUE) {fFastMethod = fast;}		virtual void SetFastMethod(Bool_t fast=kTRUE) {fFastMethod = fast;}
	virtual void SetNotrees(Bool_t notrees=kFALSE) {fNoTrees = notrees;}		virtual void SetNotrees(Bool_t notrees=kFALSE) {fNoTrees = notrees;}
	ClassDef(TFileMerger,1) // File copying and merging services		ClassDef(TFileMerger,1) // File copying and merging services
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	TFitEditor.h		TFitEditor.h
	// @(#)root/fitpanel:$Id: TFitEditor.h 26866 2008-12-12 10:50:07Z moneta $		// @(#)root/fitpanel:$Id: TFitEditor.h 27549 2009-02-20 14:31:41Z moneta $
	// Author: Ilka Antcheva, Lorenzo Moneta, David Gonzalez Maline 10/08/2006		// Author: Ilka Antcheva, Lorenzo Moneta, David Gonzalez Maline 10/08/2006
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2006, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2006, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 128		skipping to change at line 128
	TAxis *fZaxis; // z-axis		TAxis *fZaxis; // z-axis
	// structure holding parameter value and limits		// structure holding parameter value and limits
	struct FuncParamData_t {		struct FuncParamData_t {
	FuncParamData_t() {		FuncParamData_t() {
	fP[0] = 0; fP[1] = 0; fP[2] = 0;		fP[0] = 0; fP[1] = 0; fP[2] = 0;
	}		}
	Double_t & operator[](UInt_t i) { return fP[i];}		Double_t & operator[](UInt_t i) { return fP[i];}
	Double_t fP[3];		Double_t fP[3];
	};		};
	std::vector<FuncParamData_t > fFuncPars; // function parameters (value + limits)		std::vector<FuncParamData_t> fFuncPars; // function parameters (value + limits)
	Double_t fFuncXmin; // fit function range (min and max		std::vector<TF1*> fPrevFit; // Previous succesful fits.
	) values
	Double_t fFuncXmax;
	Double_t fFuncYmin;
	Double_t fFuncYmax;
	Double_t fFuncZmin;
	Double_t fFuncZmax;
	TGRadioButton *fLibMinuit; // set default minimization libr ary (Minuit)		TGRadioButton *fLibMinuit; // set default minimization libr ary (Minuit)
	TGRadioButton *fLibMinuit2; // set Minuit2 as minimization l ibrary		TGRadioButton *fLibMinuit2; // set Minuit2 as minimization l ibrary
	TGRadioButton *fLibFumili; // set Fumili as minimization li brary		TGRadioButton *fLibFumili; // set Fumili as minimization li brary
	TGRadioButton *fMigrad; // set default minimization meth od (MIGRAD)		TGRadioButton *fMigrad; // set default minimization meth od (MIGRAD)
	TGRadioButton *fSimplex; // set Simplex as minimization m ethod		TGRadioButton *fSimplex; // set Simplex as minimization m ethod
	TGRadioButton *fFumili; // set Fumili as minimization me thod		TGRadioButton *fFumili; // set Fumili as minimization me thod
	TGRadioButton *fCombination; // set Combination as minimizati on method		TGRadioButton *fCombination; // set Combination as minimizati on method
	TGRadioButton *fScan; // set Scan as minimization meth od		TGRadioButton *fScan; // set Scan as minimization meth od
	TGNumberEntryField *fErrorScale; // contains error scale set for minimization		TGNumberEntryField *fErrorScale; // contains error scale set for minimization
End of changes. 3 change blocks.
	9 lines changed or deleted		3 lines changed or added

	TFolder.h		TFolder.h
	// @(#)root/base:$Id: TFolder.h 20877 2007-11-19 11:17:07Z rdm $		// @(#)root/base:$Id: TFolder.h 27436 2009-02-12 14:54:52Z rdm $
	// Author: Rene Brun 02/09/2000		// Author: Rene Brun 02/09/2000
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 58		skipping to change at line 58
	virtual void Clear(Option_t *option="");		virtual void Clear(Option_t *option="");
	virtual void Copy(TObject &) const { MayNotUse("Copy(TObject &)") ; }		virtual void Copy(TObject &) const { MayNotUse("Copy(TObject &)") ; }
	virtual const char *FindFullPathName(const char *name) const;		virtual const char *FindFullPathName(const char *name) const;
	virtual const char *FindFullPathName(const TObject *obj) const;		virtual const char *FindFullPathName(const TObject *obj) const;
	virtual TObject *FindObject(const char *name) const;		virtual TObject *FindObject(const char *name) const;
	virtual TObject *FindObject(const TObject *obj) const;		virtual TObject *FindObject(const TObject *obj) const;
	virtual TObject *FindObjectAny(const char *name) const;		virtual TObject *FindObjectAny(const char *name) const;
	TCollection *GetListOfFolders() const { return fFolders; }		TCollection *GetListOfFolders() const { return fFolders; }
	Bool_t IsFolder() const { return kTRUE; }		Bool_t IsFolder() const { return kTRUE; }
	Bool_t IsOwner() const;		Bool_t IsOwner() const;
	virtual void ls(Option_t *option="*") const; // *MENU*		virtual void ls(Option_t *option="") const; // *MENU*
	virtual Int_t Occurence(const TObject *obj) const;		virtual Int_t Occurence(const TObject *obj) const;
	virtual void RecursiveRemove(TObject *obj);		virtual void RecursiveRemove(TObject *obj);
	virtual void Remove(TObject *obj);		virtual void Remove(TObject *obj);
	virtual void SaveAs(const char *filename="",Option_t *option="") const; // *MENU*		virtual void SaveAs(const char *filename="",Option_t *option="") const; // *MENU*
	virtual void SetOwner(Bool_t owner=kTRUE);		virtual void SetOwner(Bool_t owner=kTRUE);
	ClassDef(TFolder,1) //Describe a folder: a list of objects and folders		ClassDef(TFolder,1) //Describe a folder: a list of objects and folders
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	TFormula.h		TFormula.h
	// @(#)root/hist:$Id: TFormula.h 20882 2007-11-19 11:31:26Z rdm $		// @(#)root/hist:$Id: TFormula.h 27022 2008-12-19 10:34:54Z pcanal $
	// Author: Nicolas Brun 19/08/95		// Author: Nicolas Brun 19/08/95
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	// ---------------------------------- Formula.h		// ---------------------------------- Formula.h
	skipping to change at line 80		skipping to change at line 80
	Int_t fNval; //Number of different variables in expressi on		Int_t fNval; //Number of different variables in expressi on
	Int_t fNstring; //Number of different constants character s trings		Int_t fNstring; //Number of different constants character s trings
	TString *fExpr; //[fNoper] List of expressions		TString *fExpr; //[fNoper] List of expressions
	private:		private:
	Int_t *fOper; //[fNoper] List of operators. (See document ation for changes made at version 7)		Int_t *fOper; //[fNoper] List of operators. (See document ation for changes made at version 7)
	protected:		protected:
	Double_t *fConst; //[fNconst] Array of fNconst formula consta nts		Double_t *fConst; //[fNconst] Array of fNconst formula consta nts
	Double_t *fParams; //[fNpar] Array of fNpar parameters		Double_t *fParams; //[fNpar] Array of fNpar parameters
	TString *fNames; //[fNpar] Array of parameter names		TString *fNames; //[fNpar] Array of parameter names
	TObjArray fFunctions; //Array of function calls to make		TObjArray fFunctions; //Array of function calls to make
	TObjArray fLinearParts; //! Linear parts if the formula is linear ( contains '|')		TObjArray fLinearParts; //Linear parts if the formula is linear (co ntains '|' or "++")
	TBits fAlreadyFound; //! cache for information		TBits fAlreadyFound; //! cache for information
	// Optimized expression		// Optimized expression
	Int_t fNOperOptimized; //!Number of operators after optim ization		Int_t fNOperOptimized; //!Number of operators after optim ization
	TString *fExprOptimized; //![fNOperOptimized] List of expre ssions		TString *fExprOptimized; //![fNOperOptimized] List of expre ssions
	Int_t *fOperOptimized; //![fNOperOptimized] List of opera tors. (See documentation for changes made at version 7)		Int_t *fOperOptimized; //![fNOperOptimized] List of opera tors. (See documentation for changes made at version 7)
	TOperOffset *fOperOffset; //![fNOperOptimized] Offse ts of operrands		TOperOffset *fOperOffset; //![fNOperOptimized] Offse ts of operrands
	TFormulaPrimitive **fPredefined; //![fNPar] predefined function		TFormulaPrimitive **fPredefined; //![fNPar] predefined function
	skipping to change at line 256		skipping to change at line 256
	Double_t p9=0,Double_t p10=0); // *MEN U*		Double_t p9=0,Double_t p10=0); // *MEN U*
	virtual void SetParName(Int_t ipar, const char *name);		virtual void SetParName(Int_t ipar, const char *name);
	virtual void SetParNames(const char *name0="p0",const char *name1 ="p1",const char		virtual void SetParNames(const char *name0="p0",const char *name1 ="p1",const char
	*name2="p2",const char *name3="p3",const char		*name2="p2",const char *name3="p3",const char
	*name4="p4", const char *name5="p5",cons t char *name6="p6",const char *name7="p7",const char		*name4="p4", const char *name5="p5",cons t char *name6="p6",const char *name7="p7",const char
	*name8="p8",const char *name9="p9",const char *name10="p10"); // *MENU*		*name8="p8",const char *name9="p9",const char *name10="p10"); // *MENU*
	virtual void Update() {;}		virtual void Update() {;}
	static void SetMaxima(Int_t maxop=1000, Int_t maxpar=1000, Int_t maxconst=1000);		static void SetMaxima(Int_t maxop=1000, Int_t maxpar=1000, Int_t maxconst=1000);
	ClassDef(TFormula,7) //The formula base class f(x,y,z,par)		ClassDef(TFormula,8) //The formula base class f(x,y,z,par)
	};		};
	#endif		#endif
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	TGLAxisPainter.h		TGLAxisPainter.h
	// @(#)root/eve:$Id: TGLAxisPainter.h 26367 2008-11-21 18:08:30Z matevz $		// @(#)root/eve:$Id: TGLAxisPainter.h 27342 2009-02-03 20:25:20Z matevz $
	// Author: Matevz Tadel 2007		// Author: Alja Mrak-Tadel 2009
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	#ifndef ROOT_TGLAxisPainter		#ifndef ROOT_TGLAxisPainter
	#define ROOT_TGLAxisPainter		#define ROOT_TGLAxisPainter
	#include "TAttAxis.h"
	#include "TGLUtil.h"		#include "TGLUtil.h"
	#include "TString.h"
	#include "TGLFontManager.h"		#include "TGLFontManager.h"
			class TAttAxis;
			class TAxis;
	class TGLRnrCtx;		class TGLRnrCtx;
	class TGLFont;
	class TGLAxisAttrib: public TAttAxis		class TGLAxisPainter
	{		{
	friend class TGLAxisPainter;
	protected:
	TGLVector3 fDir;
	Double_t fMin;
	Double_t fMax;
	Float_t fTMScale[3];
	TGLVector3 fTMOff[3];
	Int_t fTMNDim;
	TGLFont::ETextAlign_e fTextAlign;
	Bool_t fRelativeFontSize;
	Int_t fAbsLabelFontSize;
	Int_t fAbsTitleFontSize;
	TString fLabelFontName;
	TString fTitleFontName;
	TString fTitle;
	TString fTitleUnits;
	TGLVector3 fTitlePos;
	public:		public:
	TGLAxisAttrib();		typedef std::pair <Float_t, Float_t> Lab_t; // label <pos, value> pa
	virtual ~TGLAxisAttrib(){}		ir
			typedef std::vector<Lab_t> LabVec_t;
	// Getters && Setters		typedef std::pair <Float_t, Int_t> TM_t; // tick-mark <pos, order
			> pair
	TGLVector3& RefDir() { return fDir; }		typedef std::vector<TM_t> TMVec_t; // vector od tick line
	void SetRng(Double_t min, Double_t max) { fMin=min; fMax=max;}		s
	void GetRng(Double_t &min, Double_t &max) {min=fMin; max=fMax;}
	TGLVector3& RefTMOff(Int_t i) { return fTMOff[i]; }
	void SetTMNDim(Int_t i) {fTMNDim=i;}
	Int_t GetTMNDim() {return fTMNDim;}
	void SetTextAlign(TGLFont::ETextAlign_e a) {fTextAlign=a;}
	TGLFont::ETextAlign_e GetTextAlign() const { return fTextAlign;}
	void SetRelativeFontSize(Bool_t x) { fRelativeFontSize=x; }		private:
	Bool_t GetRelativeFontSize() const {return fRelativeFontSize;}		TGLAxisPainter(const TGLAxisPainter&); // Not implemented
			TGLAxisPainter& operator=(const TGLAxisPainter&); // Not implemented
	void SetAbsLabelFontSize(Int_t fs) {fAbsLabelFontSize=fs;}		// Print format derived from attributers.
	Int_t GetAbsLabelFontSize()const {return fAbsLabelFontSize;}		Int_t fExp;
	void SetAbsTitleFontSize(Int_t fs) {fAbsTitleFontSize=fs;}		Int_t fMaxDigits;
	Int_t GetAbsTitleFontSize() const {return fAbsTitleFontSize;}		Int_t fDecimals;
			char fFormat[8];
			// Font derived from axis attributes.
			TGLFont fLabelFont;
			TGLFont fTitleFont;
	void SetLabelFontName(const char* name) { fLabelFontName = name; }		// Print format.
	const char* GetLabelFontName() const {return fLabelFontName.Data();}		void LabelsLimits(const char *label, Int_t &first, Int_t &last) const;
	void SetTitleFontName(const char* name) { fTitleFontName = name; }		void FormAxisValue(Float_t x, char* lab) const;
	const char* GetTitleFontName() const {return fTitleFontName.Data();}
	void SetTitle(const char* title) {fTitle = title;}		protected:
	const char* GetTitle() const {return fTitle.Data();}		TAttAxis *fAttAxis; // Model.
			LabVec_t fLabVec; // List of Labels position-value pairs
			TMVec_t fTMVec; // List of tick-mark position-value pairs
			//
			// Additional axis attributes required for GL rendering:
			// Orientation
			TGLVector3 fDir;
			TGLVector3 fTMOff[3];
			Int_t fTMNDim;
			// Font.
			Bool_t fUseRelativeFontSize;
			Int_t fAbsoluteLabelFontSize;
			Int_t fAbsoluteTitleFontSize;
	void SetTitleUnits(const char* un) {fTitleUnits = un;}		// Labels options. Allready exist in TAttAxis, but can't be set.
	const char* GetTitleUnits() const {return fTitleUnits.Data();}		TGLFont::ETextAlign_e fLabelAlign;
	TGLVector3& RefTitlePos() {return fTitlePos;}		public:
			TGLAxisPainter();
			virtual ~TGLAxisPainter();
	// override TAttAxis function		// GetSets.
	virtual void SetNdivisions(Int_t n, Bool_t /*optim*/=kTRUE) { fNd		Int_t GetTMNDim() const { return fTMNDim; }
	ivisions =n; }		void SetTMNDim(Int_t x) { fTMNDim = x; }
	ClassDef(TGLAxisAttrib, 0); // GL axis attributes.		TGLVector3& RefDir() { return fDir; }
	};		TGLVector3& RefTMOff(Int_t i) { return fTMOff[i]; }
	/**************************************************************************		Bool_t GetUseRelativeFontSize() const { return fUseRelativeFontSiz
	/		e; }
			void SetUseRelativeFontSize( Bool_t x ) { fUseRelativeFontSize =
			x; }
	class TGLAxisPainter		void SetAbsoluteLabelFontSize(Int_t fs) { fAbsoluteLabelFontSize
	{		=fs; }
	private:		Int_t GetAbsoluteLabelFontSize() const { return fAbsoluteLabelFon
	TGLAxisPainter(const TGLAxisPainter&); // Not implemented		tSize; }
	TGLAxisPainter& operator=(const TGLAxisPainter&); // Not implemented
	protected:		void SetAbsoluteTitleFontSize(Int_t fs) { fAbsoluteTitleFontSize
	void DrawTick(TGLVector3 &tv, Int_t order) const;		=fs; }
			Int_t GetAbsoluteTitleFontSize() const { return fAbsoluteTitleFon
			tSize; }
	void RnrText(const char* txt, TGLVector3 pos, TGLFont &font) const;		TGLFont::ETextAlign_e GetLabelAlign() const { return fLabelAlign; }
	void LabelsLimits(const char *label, Int_t &first, Int_t &last) const;		void SetLabelAlign(TGLFont::ETextAlign_e x) { fLabelAlign = x; }
	TGLAxisAttrib* fAtt;		LabVec_t& RefLabVec() { return fLabVec; }
			TMVec_t& RefTMVec() { return fTMVec; }
	Int_t fMaxDigits;		void SetAttAxis(TAttAxis* a) { fAttAxis = a; }
	Int_t fDecimals; // cached		TAttAxis* GetAttAxis() { return fAttAxis; }
	char fFormat[8]; // cached
	Int_t fExp; //cached
	public:		// Utility.
	TGLAxisPainter();		void SetLabelFont(TGLRnrCtx &rnrCtx, Double_t refLength = -1);
	virtual ~TGLAxisPainter() {}		void SetTitleFont(TGLRnrCtx &rnrCtx, Double_t refLength = -1);
			void SetTextFormat(Double_t min, Double_t max, Double_t binWidth);
	void Paint(TGLRnrCtx& ctx, TGLAxisAttrib &atrib);		// Renderers.
			void RnrTitle(const char* title, Float_t pos, TGLFont::ETextAlign_e alig
			n) const;
			void RnrLabels() const;
			void RnrLines() const;
	void SetTextFormat(Double_t binWidth);		void PaintAxis(TGLRnrCtx& ctx, TAxis* ax);
	void SetAxisAtt(TGLAxisAttrib* axa){ fAtt = axa; }
	void FormAxisValue(Float_t x, char* lab) const;
	ClassDef(TGLAxisPainter, 0); // GL axis painter.		ClassDef(TGLAxisPainter, 0); // GL axis painter.
	};		};
	#endif		#endif
End of changes. 26 change blocks.
	94 lines changed or deleted		88 lines changed or added

	TGLCamera.h		TGLCamera.h
	// @(#)root/gl:$Id: TGLCamera.h 25431 2008-09-17 08:35:34Z matevz $		// @(#)root/gl:$Id: TGLCamera.h 27369 2009-02-06 17:35:54Z matevz $
	// Author: Richard Maunder 25/05/2005		// Author: Richard Maunder 25/05/2005
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 138		skipping to change at line 138
	void SetViewport(const TGLRect & viewport);		void SetViewport(const TGLRect & viewport);
	TGLRect& RefViewport() { return fViewport; }		TGLRect& RefViewport() { return fViewport; }
	// Camera manipulation interface (GL coord - origin bottom left)		// Camera manipulation interface (GL coord - origin bottom left)
	virtual void Setup(const TGLBoundingBox & box, Bool_t reset=kTRUE) = 0 ;		virtual void Setup(const TGLBoundingBox & box, Bool_t reset=kTRUE) = 0 ;
	virtual void Reset() = 0;		virtual void Reset() = 0;
	virtual Bool_t Dolly(Int_t delta, Bool_t mod1, Bool_t mod2);		virtual Bool_t Dolly(Int_t delta, Bool_t mod1, Bool_t mod2);
	virtual Bool_t Zoom (Int_t delta, Bool_t mod1, Bool_t mod2) = 0;		virtual Bool_t Zoom (Int_t delta, Bool_t mod1, Bool_t mod2) = 0;
			virtual Bool_t Truck(Double_t xDelta, Double_t yDelta);
	virtual Bool_t Truck(Int_t xDelta, Int_t yDelta, Bool_t mod1, Bool_t mod 2) = 0;		virtual Bool_t Truck(Int_t xDelta, Int_t yDelta, Bool_t mod1, Bool_t mod 2) = 0;
	virtual Bool_t Rotate(Int_t xDelta, Int_t yDelta, Bool_t mod1, Bool_t mo d2);		virtual Bool_t Rotate(Int_t xDelta, Int_t yDelta, Bool_t mod1, Bool_t mo d2);
	virtual Bool_t RotateRad(Double_t hRotate, Double_t vRotate);		virtual Bool_t RotateRad(Double_t hRotate, Double_t vRotate);
	virtual void Apply(const TGLBoundingBox & sceneBox, const TGLRect * pi ckRect = 0) const = 0;		virtual void Apply(const TGLBoundingBox & sceneBox, const TGLRect * pi ckRect = 0) const = 0;
	Bool_t AdjustAndClampVal(Double_t & val, Double_t min, Double_t max,		Bool_t AdjustAndClampVal(Double_t & val, Double_t min, Double_t max,
	Int_t screenShift, Int_t screenShiftRange,		Int_t screenShift, Int_t screenShiftRange,
	Bool_t mod1, Bool_t mod2) const;		Bool_t mod1, Bool_t mod2) const;
	Double_t AdjustDelta(Double_t screenShift, Double_t deltaFactor,		Double_t AdjustDelta(Double_t screenShift, Double_t deltaFactor,
End of changes. 2 change blocks.
	1 lines changed or deleted		2 lines changed or added

	TGLCameraOverlay.h		TGLCameraOverlay.h
	// @(#)root/eve:$Id: TGLCameraOverlay.h 25881 2008-10-20 11:29:52Z matevz $		// @(#)root/eve:$Id: TGLCameraOverlay.h 27370 2009-02-06 18:58:23Z matevz $
	// Author: Matevz Tadel 2007		// Author: Alja Mrak-Tadel 2007
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	#ifndef ROOT_TGLCameraOverlay		#ifndef ROOT_TGLCameraOverlay
	#define ROOT_TGLCameraOverlay		#define ROOT_TGLCameraOverlay
	#include "TGLOverlay.h"
	#include "TGLAxisPainter.h"
	#include "TAttAxis.h"		#include "TAttAxis.h"
			#include "TGLOverlay.h"
			#include "TGLUtil.h"
			class TGLAxisPainter;
			class TGLFont;
			class TAttAxis;
			class TAxis;
	class TGLCameraOverlay : public TGLOverlayElement		class TGLCameraOverlay : public TGLOverlayElement
	{		{
	public:		public:
	enum EMode { kPlaneIntersect, kBar, kAxis };		enum EMode { kPlaneIntersect, kBar, kAxis };
	private:		private:
	TGLCameraOverlay(const TGLCameraOverlay&); // Not implemented		TGLCameraOverlay(const TGLCameraOverlay&); // Not implemented
	TGLCameraOverlay& operator=(const TGLCameraOverlay&); // Not implemented		TGLCameraOverlay& operator=(const TGLCameraOverlay&); // Not implemented
			Double_t fFrustum[4];
	protected:		protected:
	Bool_t fShowOrthographic;		Bool_t fShowOrthographic;
	Bool_t fShowPerspective;		Bool_t fShowPerspective;
	EMode fOrthographicMode;		EMode fOrthographicMode;
	EMode fPerspectiveMode;		EMode fPerspectiveMode;
	TGLAxisPainter fAxisPainter;		TGLAxisPainter *fAxisPainter;
	TGLAxisAttrib fAxisAtt;		TAxis *fAxis;
			Float_t fAxisExtend;
	Float_t fAxisExtend;
	TGLPlane fExternalRefPlane;
	Bool_t fUseExternalRefPlane;
	Double_t fFrustum[4]; // cached		TGLPlane fExternalRefPlane;
			Bool_t fUseExternalRefPlane;
	void RenderPlaneIntersect(TGLRnrCtx& rnrCtx, const TGLFont &font);		void RenderPlaneIntersect(TGLRnrCtx& rnrCtx, const TGLFont &font);
	void RenderAxis(TGLRnrCtx& rnrCtx);		void RenderAxis(TGLRnrCtx& rnrCtx);
	void RenderBar(TGLRnrCtx& rnrCtx, const TGLFont &font);		void RenderBar(TGLRnrCtx& rnrCtx, const TGLFont &font);
	public:		public:
	TGLCameraOverlay(Bool_t showOrtho=kTRUE, Bool_t showPersp=kFALSE);		TGLCameraOverlay(Bool_t showOrtho=kTRUE, Bool_t showPersp=kFALSE);
	virtual ~TGLCameraOverlay() {}		virtual ~TGLCameraOverlay();
	virtual void Render(TGLRnrCtx& rnrCtx);		virtual void Render(TGLRnrCtx& rnrCtx);
	TGLAxisAttrib& RefAxisAttrib() { return fAxisAtt; }
	Float_t GetAxisExtend() const { return fAxisExtend; }
	void SetAxisExtend(Float_t x) { fAxisExtend = x; }
	TGLPlane& RefExternalRefPlane() { return fExternalRefPlane; }		TGLPlane& RefExternalRefPlane() { return fExternalRefPlane; }
	void UseExternalRefPlane(Bool_t x) { fUseExternalRefPlane=x; }		void UseExternalRefPlane(Bool_t x) { fUseExternalRefPlane=x; }
	Bool_t GetUseExternalRefPlane() const { return fUseExternalRefPlane; }		Bool_t GetUseExternalRefPlane() const { return fUseExternalRefPlane;
			}
	Int_t GetPerspectiveMode() const { return fPerspectiveMode;}		Int_t GetPerspectiveMode() const { return fPerspectiveMode;}
	void SetPerspectiveMode(EMode m) {fPerspectiveMode = m;}		void SetPerspectiveMode(EMode m) {fPerspectiveMode = m;}
	Int_t GetOrthographicMode() const { return fOrthographicMode;}		Int_t GetOrthographicMode() const { return fOrthographicMode;}
	void SetOrthographicMode(EMode m) {fOrthographicMode = m;}		void SetOrthographicMode(EMode m) {fOrthographicMode = m;}
	Bool_t GetShowOrthographic() const { return fShowOrthographic; }		Bool_t GetShowOrthographic() const { return fShowOrthographic; }
	void SetShowOrthographic(Bool_t x) {fShowOrthographic =x;}		void SetShowOrthographic(Bool_t x) {fShowOrthographic =x;}
	Bool_t GetShowPerspective() const { return fShowPerspective; }		Bool_t GetShowPerspective() const { return fShowPerspective; }
	void SetShowPerspective(Bool_t x) {fShowPerspective =x;}		void SetShowPerspective(Bool_t x) {fShowPerspective =x;}
			TAttAxis* GetAttAxis();
	ClassDef(TGLCameraOverlay, 1); // Show coorinates of current camera frus tum.		ClassDef(TGLCameraOverlay, 1); // Show coorinates of current camera frus tum.
	};		};
	#endif		#endif
End of changes. 11 change blocks.
	18 lines changed or deleted		24 lines changed or added

	TGLFontManager.h		TGLFontManager.h
	// @(#)root/gl:$Id: TGLFontManager.h 26772 2008-12-09 19:57:49Z matevz $		// @(#)root/gl:$Id: TGLFontManager.h 27564 2009-02-21 12:37:20Z matevz $
	// Author: Olivier Couet 12/04/2007		// Author: Olivier Couet 12/04/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 67		skipping to change at line 67
	Int_t GetSize() const { return fSize;}		Int_t GetSize() const { return fSize;}
	Int_t GetFile() const { return fFile;}		Int_t GetFile() const { return fFile;}
	EMode GetMode() const { return fMode;}		EMode GetMode() const { return fMode;}
	Int_t GetTrashCount() const { return fTrashCount; }		Int_t GetTrashCount() const { return fTrashCount; }
	void SetTrashCount(Int_t c) const { fTrashCount = c; }		void SetTrashCount(Int_t c) const { fTrashCount = c; }
	Int_t IncTrashCount() const { return ++fTrashCount; }		Int_t IncTrashCount() const { return ++fTrashCount; }
	void SetFont(FTFont *f) { fFont =f;}		void SetFont(FTFont *f) { fFont =f;}
	const FTFont* GetFont() const { return fFont; }		const FTFont* GetFont() const { return fFont; }
	void SetManager(TGLFontManager *mng) {fManager = mng;}		void SetManager(TGLFontManager *mng) { fManager = mng; }
	const TGLFontManager* GetManager() const { return fManager; }		const TGLFontManager* GetManager() const { return fManager; }
	Float_t GetDepth() const { return fDepth;}		Float_t GetDepth() const { return fDepth; }
	void SetDepth(Float_t d) { fDepth = d; }		void SetDepth(Float_t d) { fDepth = d; }
	// FTGL wrapper functions		// FTGL wrapper functions
	void BBox(const Text_t* txt,		Float_t GetAscent() const;
	Float_t& llx, Float_t& lly, Float_t& llz,		Float_t GetDescent() const;
	Float_t& urx, Float_t& ury, Float_t& urz) const;		Float_t GetLineHeight() const;
			void MeasureBaseLineParams(Float_t& ascent, Float_t& descent, Float_t
			& line_height,
			const char* txt="Xj") const;
			void BBox(const char* txt,
			Float_t& llx, Float_t& lly, Float_t& llz,
			Float_t& urx, Float_t& ury, Float_t& urz) const;
	void Render(const Text_t* txt) const;		void Render(const char* txt) const;
	void RenderBitmap(const Text_t* txt, Float_t x, Float_t y, Float_t zs,		void RenderBitmap(const char* txt, Float_t x, Float_t y, Float_t zs, ET
	ETextAlign_e align) const;		extAlign_e align) const;
	// helper gl draw functions		// helper gl draw functions
	virtual void PreRender(Bool_t autoLight=kTRUE, Bool_t lightOn=kFALSE) co nst;		virtual void PreRender(Bool_t autoLight=kTRUE, Bool_t lightOn=kFALSE) co nst;
	virtual void PostRender() const;		virtual void PostRender() const;
	Bool_t operator< (const TGLFont& o) const		Bool_t operator< (const TGLFont& o) const
	{		{
	if (fSize == o.fSize)		if (fSize == o.fSize)
	{		{
	if(fFile == o.fFile)		if(fFile == o.fFile)
	skipping to change at line 134		skipping to change at line 140
	static TObjArray fgFontFileArray; // map font-id to ttf-font-fi le		static TObjArray fgFontFileArray; // map font-id to ttf-font-fi le
	static FontSizeVec_t fgFontSizeArray; // map of valid font-size		static FontSizeVec_t fgFontSizeArray; // map of valid font-size
	static Bool_t fgStaticInitDone; // global initialization flag		static Bool_t fgStaticInitDone; // global initialization flag
	static void InitStatics();		static void InitStatics();
	public:		public:
	TGLFontManager() : fFontMap(), fFontTrash() {}		TGLFontManager() : fFontMap(), fFontTrash() {}
	virtual ~TGLFontManager();		virtual ~TGLFontManager();
	void RegisterFont(Int_t size, Int_t file, TGLFont::EMode mode, TGLFont & out);		void RegisterFont(Int_t size, Int_t file, TGLFont::EMode mode, TGLFont & out);
	void RegisterFont(Int_t size, const Text_t* name, TGLFont::EMode mode, TGLFont& out);		void RegisterFont(Int_t size, const char* name, TGLFont::EMode mode, T GLFont& out);
	void ReleaseFont(TGLFont& font);		void ReleaseFont(TGLFont& font);
	static TObjArray* GetFontFileArray();		static TObjArray* GetFontFileArray();
	static FontSizeVec_t* GetFontSizeArray();		static FontSizeVec_t* GetFontSizeArray();
	static Int_t GetFontSize(Float_t ds, Int_t min = -1, Int_t m ax = -1);		static Int_t GetFontSize(Float_t ds, Int_t min = -1, Int_t m ax = -1);
	static const char* GetFontNameFromId(Int_t);		static const char* GetFontNameFromId(Int_t);
	void ClearFontTrash();		void ClearFontTrash();
End of changes. 6 change blocks.
	11 lines changed or deleted		18 lines changed or added

	TGLLightSetEditor.h		TGLLightSetEditor.h
	// @(#)root/gl:$Id: TGLLightSetEditor.h 20882 2007-11-19 11:31:26Z rdm $		// @(#)root/gl:$Id: TGLLightSetEditor.h 27157 2009-01-15 14:05:12Z brun $
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	#ifndef ROOT_TGLLightSetEditor_H		#ifndef ROOT_TGLLightSetEditor_H
	#define ROOT_TGLLightSetEditor_H		#define ROOT_TGLLightSetEditor_H
	skipping to change at line 36		skipping to change at line 36
	TGGroupFrame *fLightFrame;		TGGroupFrame *fLightFrame;
	TGButton *fTopLight;		TGButton *fTopLight;
	TGButton *fRightLight;		TGButton *fRightLight;
	TGButton *fBottomLight;		TGButton *fBottomLight;
	TGButton *fLeftLight;		TGButton *fLeftLight;
	TGButton *fFrontLight;		TGButton *fFrontLight;
	TGButton *fSpecularLight;		TGButton *fSpecularLight;
	TGButton* MakeLampButton(const Text_t* name, Int_t wid, TGCompositeFrame * parent);		TGButton* MakeLampButton(const char* name, Int_t wid, TGCompositeFrame* parent);
	public:		public:
	TGLLightSetSubEditor(const TGWindow* p);		TGLLightSetSubEditor(const TGWindow* p);
	virtual ~TGLLightSetSubEditor() {}		virtual ~TGLLightSetSubEditor() {}
	void SetModel(TGLLightSet* m);		void SetModel(TGLLightSet* m);
	void Changed(); //*SIGNAL*		void Changed(); //*SIGNAL*
	void DoButton();		void DoButton();
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	TGLOrthoCamera.h		TGLOrthoCamera.h
	// @(#)root/gl:$Id: TGLOrthoCamera.h 25431 2008-09-17 08:35:34Z matevz $		// @(#)root/gl:$Id: TGLOrthoCamera.h 27369 2009-02-06 17:35:54Z matevz $
	// Author: Richard Maunder 25/05/2005		// Author: Richard Maunder 25/05/2005
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 85		skipping to change at line 85
	TGLOrthoCamera(EType type, const TGLVector3 & hAxis, const TGLVector3 & vAxis);		TGLOrthoCamera(EType type, const TGLVector3 & hAxis, const TGLVector3 & vAxis);
	virtual ~TGLOrthoCamera();		virtual ~TGLOrthoCamera();
	virtual Bool_t IsOrthographic() const { return kTRUE; }		virtual Bool_t IsOrthographic() const { return kTRUE; }
	virtual void Setup(const TGLBoundingBox & box, Bool_t reset=kTRUE);		virtual void Setup(const TGLBoundingBox & box, Bool_t reset=kTRUE);
	virtual void Reset();		virtual void Reset();
	virtual Bool_t Dolly(Int_t delta, Bool_t mod1, Bool_t mod2);		virtual Bool_t Dolly(Int_t delta, Bool_t mod1, Bool_t mod2);
	virtual Bool_t Zoom (Int_t delta, Bool_t mod1, Bool_t mod2);		virtual Bool_t Zoom (Int_t delta, Bool_t mod1, Bool_t mod2);
			using TGLCamera::Truck;
	virtual Bool_t Truck(Int_t xDelta, Int_t yDelta, Bool_t mod1, Bool_t mod 2);		virtual Bool_t Truck(Int_t xDelta, Int_t yDelta, Bool_t mod1, Bool_t mod 2);
	virtual Bool_t Rotate(Int_t xDelta, Int_t yDelta, Bool_t mod1, Bool_t mo d2);		virtual Bool_t Rotate(Int_t xDelta, Int_t yDelta, Bool_t mod1, Bool_t mo d2);
	virtual void Apply(const TGLBoundingBox & sceneBox, const TGLRect * pi ckRect = 0) const;		virtual void Apply(const TGLBoundingBox & sceneBox, const TGLRect * pi ckRect = 0) const;
	// External scripting control		// External scripting control
	// void Configure(Double_t left, Double_t right, Double_t top, Double_ t bottom);		// void Configure(Double_t left, Double_t right, Double_t top, Double_ t bottom);
	virtual void Configure(Double_t zoom, Double_t dolly, Double_t center[3] ,		virtual void Configure(Double_t zoom, Double_t dolly, Double_t center[3] ,
	Double_t hRotate, Double_t vRotate);		Double_t hRotate, Double_t vRotate);
	void SetEnableRotate(Bool_t x) { fEnableRotate = x; }		void SetEnableRotate(Bool_t x) { fEnableRotate = x; }
End of changes. 2 change blocks.
	1 lines changed or deleted		2 lines changed or added

	TGLPerspectiveCamera.h		TGLPerspectiveCamera.h
	// @(#)root/gl:$Id: TGLPerspectiveCamera.h 25245 2008-08-25 21:44:09Z matev z $		// @(#)root/gl:$Id: TGLPerspectiveCamera.h 27369 2009-02-06 17:35:54Z matev z $
	// Author: Richard Maunder 25/05/2005		// Author: Richard Maunder 25/05/2005
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 50		skipping to change at line 50
	public:		public:
	TGLPerspectiveCamera(const TGLVector3 & hAxis, const TGLVector3 & vAxis) ;		TGLPerspectiveCamera(const TGLVector3 & hAxis, const TGLVector3 & vAxis) ;
	virtual ~TGLPerspectiveCamera();		virtual ~TGLPerspectiveCamera();
	virtual Bool_t IsPerspective() const { return kTRUE; }		virtual Bool_t IsPerspective() const { return kTRUE; }
	virtual void Setup(const TGLBoundingBox & box, Bool_t reset=kTRUE);		virtual void Setup(const TGLBoundingBox & box, Bool_t reset=kTRUE);
	virtual void Reset();		virtual void Reset();
	virtual Bool_t Zoom (Int_t delta, Bool_t mod1, Bool_t mod2);		virtual Bool_t Zoom (Int_t delta, Bool_t mod1, Bool_t mod2);
			using TGLCamera::Truck;
	virtual Bool_t Truck(Int_t xDelta, Int_t yDelta, Bool_t mod1, Bool_t mod 2);		virtual Bool_t Truck(Int_t xDelta, Int_t yDelta, Bool_t mod1, Bool_t mod 2);
	virtual void Apply(const TGLBoundingBox & box, const TGLRect * pickRec t = 0) const;		virtual void Apply(const TGLBoundingBox & box, const TGLRect * pickRec t = 0) const;
	// External scripting control		// External scripting control
	virtual void Configure(Double_t fov, Double_t dolly, Double_t center[3],		virtual void Configure(Double_t fov, Double_t dolly, Double_t center[3],
	Double_t hRotate, Double_t vRotate);		Double_t hRotate, Double_t vRotate);
	ClassDef(TGLPerspectiveCamera,0) // Camera for perspective view.		ClassDef(TGLPerspectiveCamera,0) // Camera for perspective view.
	};		};
End of changes. 2 change blocks.
	1 lines changed or deleted		2 lines changed or added

	TGLPlotPainter.h		TGLPlotPainter.h
	// @(#)root/gl:$Id: TGLPlotPainter.h 24186 2008-06-09 11:34:54Z matevz $		// @(#)root/gl:$Id: TGLPlotPainter.h 27090 2009-01-06 10:09:43Z brun $
	// Author: Timur Pocheptsov 14/06/2006		// Author: Timur Pocheptsov 14/06/2006
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 78		skipping to change at line 78
	Bool_t IsActive()const{return fActive;}		Bool_t IsActive()const{return fActive;}
	void SetFactor(Double_t f){fFactor = f;}		void SetFactor(Double_t f){fFactor = f;}
	void DrawBox(Bool_t selectionPass, Int_t selected)const;		void DrawBox(Bool_t selectionPass, Int_t selected)const;
	void StartMovement(Int_t px, Int_t py);		void StartMovement(Int_t px, Int_t py);
	void MoveBox(Int_t px, Int_t py, Int_t axisID);		void MoveBox(Int_t px, Int_t py, Int_t axisID);
	Bool_t IsInCut(Double_t xMin, Double_t xMax, Double_t yMin, Double_t yMa x,		Bool_t IsInCut(Double_t xMin, Double_t xMax, Double_t yMin, Double_t yMa x,
	Double_t zMin, Double_t zMax)const;		Double_t zMin, Double_t zMax)const;
			template<class V>
			Bool_t IsInCut(const V * v) const
			{
			//Check, if box defined by xmin/xmax etc. is in cut.
			if (v[0] >= fXRange.first && v[0] < fXRange.second &&
			v[1] >= fYRange.first && v[1] < fYRange.second &&
			v[2] >= fZRange.first && v[2] < fZRange.second)
			return kTRUE;
			return kFALSE;
			}
	private:		private:
	void AdjustBox();		void AdjustBox();
	ClassDef(TGLBoxCut, 0)//Cuts away part of a plot.		ClassDef(TGLBoxCut, 0)//Cuts away part of a plot.
	};		};
	/*		/*
	2D contour for TH3 slicing.		2D contour for TH3 slicing.
	*/		*/
End of changes. 2 change blocks.
	1 lines changed or deleted		12 lines changed or added

	TGLRnrCtx.h		TGLRnrCtx.h
	// @(#)root/gl:$Id: TGLRnrCtx.h 24444 2008-06-20 17:52:37Z matevz $		// @(#)root/gl:$Id: TGLRnrCtx.h 27157 2009-01-15 14:05:12Z brun $
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	#ifndef ROOT_TGLRnrCtx		#ifndef ROOT_TGLRnrCtx
	#define ROOT_TGLRnrCtx		#define ROOT_TGLRnrCtx
	skipping to change at line 216		skipping to change at line 216
	void SetEventKeySym(UInt_t k) { fEventKeySym = k; }		void SetEventKeySym(UInt_t k) { fEventKeySym = k; }
	Bool_t IsDLCaptureOpen() const { return fDLCaptureOpen; }		Bool_t IsDLCaptureOpen() const { return fDLCaptureOpen; }
	void OpenDLCapture();		void OpenDLCapture();
	void CloseDLCapture();		void CloseDLCapture();
	TGLContextIdentity* GetGLCtxIdentity() const { return fGLCtxIdentity; }		TGLContextIdentity* GetGLCtxIdentity() const { return fGLCtxIdentity; }
	void SetGLCtxIdentity(TGLContextIdentity* cid) { fGLCtxIdentity = cid; }		void SetGLCtxIdentity(TGLContextIdentity* cid) { fGLCtxIdentity = cid; }
	void RegisterFont(Int_t size, Int_t file, Int_t mode, TGLFont& out);		void RegisterFont(Int_t size, Int_t file, Int_t mode, TGLFont& out);
	void RegisterFont(Int_t size, const Text_t* name, Int_t mode, TGLFont& out);		void RegisterFont(Int_t size, const char* name, Int_t mode, TGLFont& ou t);
	void ReleaseFont(TGLFont& font);		void ReleaseFont(TGLFont& font);
	GLUquadric* GetGluQuadric() { return fQuadric; }		GLUquadric* GetGluQuadric() { return fQuadric; }
	// Picture grabbing		// Picture grabbing
	void SetGrabImage(Bool_t gi) { fGrabImage = gi; }		void SetGrabImage(Bool_t gi) { fGrabImage = gi; }
	Bool_t GetGrabImage() const { return fGrabImage; }		Bool_t GetGrabImage() const { return fGrabImage; }
	UChar_t* GetGrabbedImage() const { return fGrabbedImage; }		UChar_t* GetGrabbedImage() const { return fGrabbedImage; }
	void SetGrabbedImage(UChar_t* img) { fGrabbedImage = img; }		void SetGrabbedImage(UChar_t* img) { fGrabbedImage = img; }
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	TGLTF3Painter.h		TGLTF3Painter.h
	#ifndef ROOT_TGLTF3Painter		#ifndef ROOT_TGLTF3Painter
	#define ROOT_TGLTF3Painter		#define ROOT_TGLTF3Painter
	#include <vector>		#include <vector>
	#include <list>		#include <list>
	#ifndef ROOT_TGLPlotPainter		#ifndef ROOT_TGLPlotPainter
	#include "TGLPlotPainter.h"		#include "TGLPlotPainter.h"
	#endif		#endif
			#ifndef ROOT_TGLIsoMesh
			#include "TGLIsoMesh.h"
			#endif
	#ifndef ROOT_TGLUtil		#ifndef ROOT_TGLUtil
	#include "TGLUtil.h"		#include "TGLUtil.h"
	#endif		#endif
	class TGLOrthoCamera;		class TGLOrthoCamera;
	class TF3;		class TF3;
			/*
			Draw TF3 using marching cubes.
			*/
	class TGLTF3Painter : public TGLPlotPainter {		class TGLTF3Painter : public TGLPlotPainter {
	private:		private:
	enum ETF3Style {		enum ETF3Style {
	kDefault,		kDefault,
	kMaple0,		kMaple0,
	kMaple1,		kMaple1,
	kMaple2		kMaple2
	};		};
	ETF3Style fStyle;		ETF3Style fStyle;
	public:		Rgl::Mc::TIsoMesh<Double_t> fMesh;
	struct TriFace_t {
	TGLVertex3 fXYZ[3];
	TGLVector3 fNormals[3];
	};
	private:
	std::vector<TriFace_t> fMesh;
	TF3 *fF3;		TF3 *fF3;
	TGLTH3Slice fXOZSlice;		TGLTH3Slice fXOZSlice;
	TGLTH3Slice fYOZSlice;		TGLTH3Slice fYOZSlice;
	TGLTH3Slice fXOYSlice;		TGLTH3Slice fXOYSlice;
	public:		public:
	TGLTF3Painter(TF3 *fun, TH1 *hist, TGLOrthoCamera *camera, TGLPlotCoordi nates *coord,		TGLTF3Painter(TF3 *fun, TH1 *hist, TGLOrthoCamera *camera, TGLPlotCoordi nates *coord,
	TGLPaintDevice *dev = 0);		TGLPaintDevice *dev = 0);
	char *GetPlotInfo(Int_t px, Int_t py);		char *GetPlotInfo(Int_t px, Int_t py);
	Bool_t InitGeometry();		Bool_t InitGeometry();
	void StartPan(Int_t px, Int_t py);		void StartPan(Int_t px, Int_t py);
	void Pan(Int_t px, Int_t py);		void Pan(Int_t px, Int_t py);
	void AddOption(const TString &stringOption);		void AddOption(const TString &stringOption);
	void ProcessEvent(Int_t event, Int_t px, Int_t py);		void ProcessEvent(Int_t event, Int_t px, Int_t py);
	private:		private:
	void InitGL()const;		void InitGL()const;
	void DrawPlot()const;		void DrawPlot()const;
			//
			void DrawToSelectionBuffer()const;
			void DrawDefaultPlot()const;
			void DrawMaplePlot()const;
			//
	void SetSurfaceColor()const;		void SetSurfaceColor()const;
	Bool_t HasSections()const;		Bool_t HasSections()const;
	void DrawSectionXOZ()const;		void DrawSectionXOZ()const;
	void DrawSectionYOZ()const;		void DrawSectionYOZ()const;
	void DrawSectionXOY()const;		void DrawSectionXOY()const;
	ClassDef(TGLTF3Painter, 0) // GL TF3 painter.		ClassDef(TGLTF3Painter, 0) // GL TF3 painter.
	};		};
	/*		/*
	Iso painter draws iso surfaces - "gliso" option for TH3XXX::Draw.		Iso painter draws iso surfaces - "gliso" option for TH3XXX::Draw.
	Can be one-level iso (as standard non-gl "iso" option),		Can be one-level iso (as standard non-gl "iso" option),
	or multi-level iso: equidistant contours (if you only specify		or multi-level iso: equidistant contours (if you only specify
	number of contours, or at user defined levels).		number of contours, or at user defined levels).
	*/		*/
	class TGLIsoPainter : public TGLPlotPainter {		class TGLIsoPainter : public TGLPlotPainter {
	public:
	//Triangle face of iso mesh.
	struct TriFace_t {
	TGLVertex3 fXYZ[3];
	TGLVector3 fNormal;//Flat normal.
	TGLVector3 fPerVertexNormals[3];//Smoothed normals for each vertex.
	};
	//Each of cubes (marching-cubes) has a
	//corresponding set of triangles in a mesh, possibly empty.
	//fFirst is the number of the first triangle,
	//fLast is the end of the range (excluded).
	struct Range_t {
	Range_t() : fFirst(-1), fLast(0)
	{
	}
	Range_t(Int_t f, Int_t l) : fFirst(f), fLast(l)
	{
	}
	Int_t fFirst;
	Int_t fLast;
	};
	struct Mesh_t {
	//std::vector<Range_t> fBoxRanges;
	std::vector<TriFace_t> fMesh;
	void Swap(Mesh_t &rhs)
	{
	//std::swap(fBoxRanges, rhs.fBoxRanges);
	std::swap(fMesh, rhs.fMesh);
	}
	};
	private:		private:
	TGLTH3Slice fXOZSlice;		typedef Rgl::Mc::TIsoMesh<Float_t> Mesh_t;
	TGLTH3Slice fYOZSlice;
	TGLTH3Slice fXOYSlice;
	Mesh_t fDummyMesh;
	typedef std::list<Mesh_t> MeshList_t;		typedef std::list<Mesh_t> MeshList_t;
	typedef std::list<Mesh_t>::iterator MeshIter_t;		typedef std::list<Mesh_t>::iterator MeshIter_t;
	typedef std::list<Mesh_t>::const_iterator ConstMeshIter_t;		typedef std::list<Mesh_t>::const_iterator ConstMeshIter_t;
			TGLTH3Slice fXOZSlice;
			TGLTH3Slice fYOZSlice;
			TGLTH3Slice fXOYSlice;
			Mesh_t fDummyMesh;
	//List of meshes.		//List of meshes.
	MeshList_t fIsos;		MeshList_t fIsos;
	//Cheched meshes (will be used if geometry must be rebuilt		//Cached meshes (will be used if geometry must be rebuilt
	//after TPad::PaintModified)		//after TPad::PaintModified)
	MeshList_t fCache;		MeshList_t fCache;
	//Min and max bin contents.		//Min and max bin contents.
	Rgl::Range_t fMinMax;		Rgl::Range_t fMinMax;
	//Palette. One color per iso-surface.		//Palette. One color per iso-surface.
	TGLLevelPalette fPalette;		TGLLevelPalette fPalette;
	//Iso levels. Equidistant or user-defined.		//Iso levels. Equidistant or user-defined.
	std::vector<Double_t> fColorLevels;		std::vector<Double_t> fColorLevels;
	//Now meshes are initialized only once.		//Now meshes are initialized only once.
	//To be changed in future.		//To be changed in future.
	Bool_t fInit;		Bool_t fInit;
	public:		public:
	TGLIsoPainter(TH1 *hist, TGLOrthoCamera *camera, TGLPlotCoordinates *coo rd,		TGLIsoPainter(TH1 *hist, TGLOrthoCamera *camera, TGLPlotCoordinates *coo rd,
	TGLPaintDevice *dev = 0);		TGLPaintDevice *dev = 0);
	//TGLPlotPainter final-overriders.		//TGLPlotPainter final-overriders.
	char *GetPlotInfo(Int_t px, Int_t py);		char *GetPlotInfo(Int_t px, Int_t py);
	Bool_t InitGeometry();		Bool_t InitGeometry();
	void StartPan(Int_t px, Int_t py);		void StartPan(Int_t px, Int_t py);
	void Pan(Int_t px, Int_t py);		void Pan(Int_t px, Int_t py);
	void AddOption(const TString &option);		void AddOption(const TString &option);
	void ProcessEvent(Int_t event, Int_t px, Int_t py);		void ProcessEvent(Int_t event, Int_t px, Int_t py);
	private:		private:
	//TGLPlotPainter final-overriders.		//TGLPlotPainter final-overriders.
	void InitGL()const;		void InitGL()const;
	void DrawPlot()const;		void DrawPlot()const;
	void DrawSectionXOZ()const;		void DrawSectionXOZ()const;
	void DrawSectionYOZ()const;		void DrawSectionYOZ()const;
	void DrawSectionXOY()const;		void DrawSectionXOY()const;
	//Auxiliary methods.		//Auxiliary methods.
	Bool_t HasSections()const;		Bool_t HasSections()const;
	void SetSurfaceColor(Int_t ind)const;		void SetSurfaceColor(Int_t ind)const;
	void SetMesh(Mesh_t &mesh, Double_t isoValue);		void SetMesh(Mesh_t &mesh, Double_t isoValue);
	void DrawMesh(const Mesh_t &mesh, Int_t level)const;		void DrawMesh(const Mesh_t &mesh, Int_t level)const;
	void CheckBox(const std::vector<TriFace_t> &mesh, TriFace_t &face, c onst Range_t &box);
	void FindMinMax();		void FindMinMax();
	TGLIsoPainter(const TGLIsoPainter &);		TGLIsoPainter(const TGLIsoPainter &);
	TGLIsoPainter &operator = (const TGLIsoPainter &);		TGLIsoPainter &operator = (const TGLIsoPainter &);
	ClassDef(TGLIsoPainter, 0) // Iso option for TH3.		ClassDef(TGLIsoPainter, 0) // Iso option for TH3.
	};		};
	#endif		#endif
End of changes. 15 change blocks.
	55 lines changed or deleted		26 lines changed or added

	TGLUtil.h		TGLUtil.h
	// @(#)root/gl:$Id: TGLUtil.h 26148 2008-11-11 19:58:19Z matevz $		// @(#)root/gl:$Id: TGLUtil.h 27173 2009-01-16 18:48:33Z matevz $
	// Author: Richard Maunder 25/05/2005		// Author: Richard Maunder 25/05/2005
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 759		skipping to change at line 759
	// Manipulators		// Manipulators
	void Set(const TGLVertex3 & origin, const TGLVector3 & zAxis, const TGLV ector3 & xAxis = 0);		void Set(const TGLVertex3 & origin, const TGLVector3 & zAxis, const TGLV ector3 & xAxis = 0);
	void Set(const Double_t vals[16]);		void Set(const Double_t vals[16]);
	void SetIdentity();		void SetIdentity();
	void SetTranslation(Double_t x, Double_t y, Double_t z);		void SetTranslation(Double_t x, Double_t y, Double_t z);
	void SetTranslation(const TGLVertex3 & translation);		void SetTranslation(const TGLVertex3 & translation);
	void Translate(const TGLVector3 & vect);		void Translate(const TGLVector3 & vect);
	void MoveLF(Int_t ai, Double_t amount);		void MoveLF(Int_t ai, Double_t amount);
			void Move3LF(Double_t x, Double_t y, Double_t z);
	void Scale(const TGLVector3 & scale);		void Scale(const TGLVector3 & scale);
	void Rotate(const TGLVertex3 & pivot, const TGLVector3 & axis, Double_t angle);		void Rotate(const TGLVertex3 & pivot, const TGLVector3 & axis, Double_t angle);
	void RotateLF(Int_t i1, Int_t i2, Double_t amount);		void RotateLF(Int_t i1, Int_t i2, Double_t amount);
	void RotatePF(Int_t i1, Int_t i2, Double_t amount);		void RotatePF(Int_t i1, Int_t i2, Double_t amount);
	void TransformVertex(TGLVertex3 & vertex) const;		void TransformVertex(TGLVertex3 & vertex) const;
	void Transpose3x3();		void Transpose3x3();
	Double_t Invert();		Double_t Invert();
	// Accesors		// Accesors
	TGLVector3 GetTranslation() const;		TGLVector3 GetTranslation() const;
End of changes. 2 change blocks.
	1 lines changed or deleted		3 lines changed or added

	TGLViewer.h		TGLViewer.h
	// @(#)root/gl:$Id: TGLViewer.h 26849 2008-12-11 21:39:15Z matevz $		// @(#)root/gl:$Id: TGLViewer.h 27577 2009-02-23 14:34:36Z matevz $
	// Author: Richard Maunder 25/05/2005		// Author: Richard Maunder 25/05/2005
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 105		skipping to change at line 105
	TGLManipSet *fSelectedPShapeRef; //!		TGLManipSet *fSelectedPShapeRef; //!
	// Overlay		// Overlay
	TGLOverlayElement *fCurrentOvlElm; //! current overlay element		TGLOverlayElement *fCurrentOvlElm; //! current overlay element
	TGLOvlSelectRecord fOvlSelRec; //! select record from last overlay select		TGLOvlSelectRecord fOvlSelRec; //! select record from last overlay select
	TGEventHandler *fEventHandler; //! event handler		TGEventHandler *fEventHandler; //! event handler
	// Mouse ineraction		// Mouse ineraction
	public:		public:
	enum EPushAction { kPushStd,		enum EPushAction { kPushStd,
	kPushCamCenter };		kPushCamCenter, kPushAnnotate };
	enum EDragAction { kDragNone,		enum EDragAction { kDragNone,
	kDragCameraRotate, kDragCameraTruck, kDragCameraDol ly,		kDragCameraRotate, kDragCameraTruck, kDragCameraDol ly,
	kDragOverlay };		kDragOverlay };
	protected:		protected:
	EPushAction fPushAction;		EPushAction fPushAction;
	EDragAction fDragAction;		EDragAction fDragAction;
	// Redraw timer		// Redraw timer
	TGLRedrawTimer *fRedrawTimer; //! timer for triggering redra ws		TGLRedrawTimer *fRedrawTimer; //! timer for triggering redra ws
	Float_t fMaxSceneDrawTimeHQ; //! max time for scene renderi ng at high LOD (in ms)		Float_t fMaxSceneDrawTimeHQ; //! max time for scene renderi ng at high LOD (in ms)
	skipping to change at line 221		skipping to change at line 221
	void SetCurrentCamera(ECameraType camera);		void SetCurrentCamera(ECameraType camera);
	void SetOrthoCamera(ECameraType camera, Double_t zoom, Double_t dolly,		void SetOrthoCamera(ECameraType camera, Double_t zoom, Double_t dolly,
	Double_t center[3], Double_t hRotate, Double_t vRotate);		Double_t center[3], Double_t hRotate, Double_t vRotate);
	void SetPerspectiveCamera(ECameraType camera, Double_t fov, Double_t dol ly,		void SetPerspectiveCamera(ECameraType camera, Double_t fov, Double_t dol ly,
	Double_t center[3], Double_t hRotate, Double_t vRotate);		Double_t center[3], Double_t hRotate, Double_t vRotate);
	void GetGuideState(Int_t & axesType, Bool_t & axesDepthTest, Bool_t & re ferenceOn, Double_t* referencePos) const;		void GetGuideState(Int_t & axesType, Bool_t & axesDepthTest, Bool_t & re ferenceOn, Double_t* referencePos) const;
	void SetGuideState(Int_t axesType, Bool_t axesDepthTest, Bool_t referenc eOn, const Double_t* referencePos);		void SetGuideState(Int_t axesType, Bool_t axesDepthTest, Bool_t referenc eOn, const Double_t* referencePos);
	void SetDrawCameraCenter(Bool_t x);		void SetDrawCameraCenter(Bool_t x);
	Bool_t GetDrawCameraCenter() { return fDrawCameraCenter; }		Bool_t GetDrawCameraCenter() { return fDrawCameraCenter; }
	void PickCameraCenter() { fPushAction = kPushCamCenter; RefreshPadE ditor(this); }		void PickCameraCenter() { fPushAction = kPushCamCenter; RefreshPadE ditor(this); }
			void PickAnnotate() { fPushAction = kPushAnnotate; RefreshPadE ditor(this); }
	TGLCameraOverlay* GetCameraOverlay() const { return fCameraOverlay; }		TGLCameraOverlay* GetCameraOverlay() const { return fCameraOverlay; }
	void SetCameraOverlay(TGLCameraOverlay* m) { fCameraOverlay = m; }		void SetCameraOverlay(TGLCameraOverlay* m) { fCameraOverlay = m; }
	EPushAction GetPushAction() const { return fPushAction; }		EPushAction GetPushAction() const { return fPushAction; }
	EDragAction GetDragAction() const { return fDragAction; }		EDragAction GetDragAction() const { return fDragAction; }
	const TGLPhysicalShape * GetSelected() const;		const TGLPhysicalShape * GetSelected() const;
	// Draw and selection		// Draw and selection
	skipping to change at line 286		skipping to change at line 287
	virtual void MouseOver(TGLPhysicalShape*); // *SIGNAL*		virtual void MouseOver(TGLPhysicalShape*); // *SIGNAL*
	virtual void MouseOver(TGLPhysicalShape*, UInt_t state); // *SIGNAL*		virtual void MouseOver(TGLPhysicalShape*, UInt_t state); // *SIGNAL*
	virtual void Activated() { Emit("Activated()"); } // *SIGNAL*		virtual void Activated() { Emit("Activated()"); } // *SIGNAL*
	virtual void Clicked(TObject *obj); //*SIGNAL*		virtual void Clicked(TObject *obj); //*SIGNAL*
	virtual void Clicked(TObject *obj, UInt_t button, UInt_t state); //*SIGN AL*		virtual void Clicked(TObject *obj, UInt_t button, UInt_t state); //*SIGN AL*
	virtual void DoubleClicked() { Emit("DoubleClicked()"); } // *SIGNAL*		virtual void DoubleClicked() { Emit("DoubleClicked()"); } // *SIGNAL*
	TGEventHandler *GetEventHandler() const { return fEventHandler; }		TGEventHandler *GetEventHandler() const { return fEventHandler; }
	virtual void SetEventHandler(TGEventHandler *handler);		virtual void SetEventHandler(TGEventHandler *handler);
			virtual void RemoveOverlayElement(TGLOverlayElement* el);
	TGLSelectRecord& GetSelRec() { return fSelRec; }		TGLSelectRecord& GetSelRec() { return fSelRec; }
	TGLOvlSelectRecord& GetOvlSelRec() { return fOvlSelRec; }		TGLOvlSelectRecord& GetOvlSelRec() { return fOvlSelRec; }
	TGLOverlayElement* GetCurrentOvlElm() const { return fCurrentOvlElm; }		TGLOverlayElement* GetCurrentOvlElm() const { return fCurrentOvlElm; }
	void ClearCurrentOvlElm();		void ClearCurrentOvlElm();
	ClassDef(TGLViewer,0) // Standard ROOT GL viewer.		ClassDef(TGLViewer,0) // Standard ROOT GL viewer.
	};		};
	// TODO: Find a better place/way to do this		// TODO: Find a better place/way to do this
	class TGLRedrawTimer : public TTimer		class TGLRedrawTimer : public TTimer
End of changes. 4 change blocks.
	2 lines changed or deleted		5 lines changed or added

	TGLViewerBase.h		TGLViewerBase.h
	// @(#)root/gl:$Id: TGLViewerBase.h 26394 2008-11-23 14:35:25Z matevz $		// @(#)root/gl:$Id: TGLViewerBase.h 27577 2009-02-23 14:34:36Z matevz $
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	#ifndef ROOT_TGLViewerBase		#ifndef ROOT_TGLViewerBase
	#define ROOT_TGLViewerBase		#define ROOT_TGLViewerBase
	skipping to change at line 40		skipping to change at line 40
	// Avoid TObject inheritance due to clash with TVirtualViewer3D.		// Avoid TObject inheritance due to clash with TVirtualViewer3D.
	class TGLViewerBase : public TGLLockable // : public TObject		class TGLViewerBase : public TGLLockable // : public TObject
	{		{
	private:		private:
	TGLViewerBase(const TGLViewerBase&); // Not implemented		TGLViewerBase(const TGLViewerBase&); // Not implemented
	TGLViewerBase& operator=(const TGLViewerBase&); // Not implemented		TGLViewerBase& operator=(const TGLViewerBase&); // Not implemented
	protected:		protected:
	typedef std::list<TGLSceneInfo*> SceneInfoList_t;		typedef std::list<TGLSceneInfo*> SceneInfoList_t;
	typedef std::list<TGLSceneInfo*>::iterator SceneInfoList_i;		typedef SceneInfoList_t::iterator SceneInfoList_i;
	typedef std::vector<TGLSceneInfo*> SceneInfoVec_t;		typedef std::vector<TGLSceneInfo*> SceneInfoVec_t;
	typedef std::vector<TGLSceneInfo*>::iterator SceneInfoVec_i;		typedef SceneInfoVec_t::iterator SceneInfoVec_i;
	typedef std::vector<TGLOverlayElement*> OverlayElmVec_t;		typedef std::vector<TGLOverlayElement*> OverlayElmVec_t;
			typedef OverlayElmVec_t::iterator OverlayElmVec_i;
	SceneInfoList_i FindScene(TGLSceneBase* scene);		SceneInfoList_i FindScene(TGLSceneBase* scene);
	typedef void (TGLSceneBase::* SubRender_foo) (TGLRnrCtx &);		typedef void (TGLSceneBase::* SubRender_foo) (TGLRnrCtx &);
	void SubRenderScenes(SubRender_foo render_foo);		void SubRenderScenes(SubRender_foo render_foo);
	// Members		// Members
	TGLRnrCtx *fRnrCtx;		TGLRnrCtx *fRnrCtx;
	skipping to change at line 88		skipping to change at line 89
	virtual const char* LockIdStr() const;		virtual const char* LockIdStr() const;
	TGLSceneInfo* AddScene(TGLSceneBase* scene);		TGLSceneInfo* AddScene(TGLSceneBase* scene);
	void RemoveScene(TGLSceneBase* scene);		void RemoveScene(TGLSceneBase* scene);
	void RemoveAllScenes();		void RemoveAllScenes();
	void SceneDestructing(TGLSceneBase* scene);		void SceneDestructing(TGLSceneBase* scene);
	TGLSceneInfo* GetSceneInfo(TGLSceneBase* scene);		TGLSceneInfo* GetSceneInfo(TGLSceneBase* scene);
	void AddOverlayElement(TGLOverlayElement* el);		virtual void AddOverlayElement(TGLOverlayElement* el);
	void RemoveOverlayElement(TGLOverlayElement* el);		virtual void RemoveOverlayElement(TGLOverlayElement* el);
			virtual void DeleteOverlayAnnotations();
	TGLClip* Clip() const { return fClip; }		TGLClip* Clip() const { return fClip; }
	void SetClip(TGLClip *p) { fClip = p; }		void SetClip(TGLClip *p) { fClip = p; }
	Short_t LOD() const { return fLOD; }		Short_t LOD() const { return fLOD; }
	void SetLOD(Short_t lod) { fLOD = lod; }		void SetLOD(Short_t lod) { fLOD = lod; }
	Short_t Style() const { return fStyle; }		Short_t Style() const { return fStyle; }
	void SetStyle(Short_t st) { fStyle = st; }		void SetStyle(Short_t st) { fStyle = st; }
End of changes. 5 change blocks.
	5 lines changed or deleted		7 lines changed or added

	TGLViewerEditor.h		TGLViewerEditor.h
	skipping to change at line 55		skipping to change at line 55
	TGNumberEntry *fMaxSceneDrawTimeLQ;		TGNumberEntry *fMaxSceneDrawTimeLQ;
	//"Guides" tab's controls		//"Guides" tab's controls
	TGCheckButton *fCameraCenterExt;		TGCheckButton *fCameraCenterExt;
	TGTextButton *fCaptureCenter;		TGTextButton *fCaptureCenter;
	TGCheckButton *fDrawCameraCenter;		TGCheckButton *fDrawCameraCenter;
	TGNumberEntry *fCameraCenterX;		TGNumberEntry *fCameraCenterX;
	TGNumberEntry *fCameraCenterY;		TGNumberEntry *fCameraCenterY;
	TGNumberEntry *fCameraCenterZ;		TGNumberEntry *fCameraCenterZ;
			TGCheckButton* fCaptureAnnotate;
	Int_t fAxesType;		Int_t fAxesType;
	TGButtonGroup *fAxesContainer;		TGButtonGroup *fAxesContainer;
	TGRadioButton *fAxesNone;		TGRadioButton *fAxesNone;
	TGRadioButton *fAxesEdge;		TGRadioButton *fAxesEdge;
	TGRadioButton *fAxesOrigin;		TGRadioButton *fAxesOrigin;
	TGCheckButton *fAxesDepthTest;		TGCheckButton *fAxesDepthTest;
	TGGroupFrame *fRefContainer;		TGGroupFrame *fRefContainer;
	TGCheckButton *fReferenceOn;		TGCheckButton *fReferenceOn;
	TGNumberEntry *fReferencePosX;		TGNumberEntry *fReferencePosX;
	skipping to change at line 108		skipping to change at line 110
	void SetGuides();		void SetGuides();
	void DoClearColor(Pixel_t color);		void DoClearColor(Pixel_t color);
	void DoIgnoreSizesOnUpdate();		void DoIgnoreSizesOnUpdate();
	void DoResetCamerasOnUpdate();		void DoResetCamerasOnUpdate();
	void DoResetCameraOnDoubleClick();		void DoResetCameraOnDoubleClick();
	void DoUpdateScene();		void DoUpdateScene();
	void DoCameraHome();		void DoCameraHome();
	void UpdateMaxDrawTimes();		void UpdateMaxDrawTimes();
	void DoCameraCenterExt();		void DoCameraCenterExt();
	void DoCaptureCenter();		void DoCaptureCenter();
			void DoAnnotation();
	void DoDrawCameraCenter();		void DoDrawCameraCenter();
	void UpdateCameraCenter();		void UpdateCameraCenter();
	//Axis manipulation		//Axis manipulation
	void UpdateViewerAxes(Int_t id);		void UpdateViewerAxes(Int_t id);
	void UpdateViewerReference();		void UpdateViewerReference();
	void DoCameraOverlay();		void DoCameraOverlay();
	void DetachFromPad(){fIsInPad = kFALSE;}		void DetachFromPad(){fIsInPad = kFALSE;}
	static TGNumberEntry* MakeLabeledNEntry(TGCompositeFrame* p, const char* name,		static TGNumberEntry* MakeLabeledNEntry(TGCompositeFrame* p, const char* name,
End of changes. 2 change blocks.
	0 lines changed or deleted		3 lines changed or added

	TGQt.h		TGQt.h
	// @(#)root/qt:$Id: TGQt.h 25401 2008-09-15 15:10:56Z brun $		// @(#)root/qt:$Id: TGQt.h 27157 2009-01-15 14:05:12Z brun $
	// Author: Valeri Fine 21/01/2002		// Author: Valeri Fine 21/01/2002
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
	* Copyright (C) 2002 by Valeri Fine. *		* Copyright (C) 2002 by Valeri Fine. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 195		skipping to change at line 195
	#endif		#endif
	static Int_t RegisterWid(QPaintDevice *wid); // register QWidget for the embedded TCanvas		static Int_t RegisterWid(QPaintDevice *wid); // register QWidget for the embedded TCanvas
	static Int_t UnRegisterWid(QPaintDevice *wid); // unregister QWidget o f the TCanvas		static Int_t UnRegisterWid(QPaintDevice *wid); // unregister QWidget o f the TCanvas
	static Bool_t IsRegistered(QPaintDevice *wid); // Check whether the ob ject has been registered		static Bool_t IsRegistered(QPaintDevice *wid); // Check whether the ob ject has been registered
	private:		private:
	TGQt& operator=(const TGQt&);		TGQt& operator=(const TGQt&);
	public:		public:
	TGQt();		TGQt();
	TGQt(const TGQt &vx): TVirtualX(vx) { MayNotUse("TGQt(const TGQt &)"); } // without dict does not compile? (rdm)		TGQt(const TGQt &vx): TVirtualX(vx) { MayNotUse("TGQt(const TGQt &)"); } // without dict does not compile? (rdm)
	TGQt(const Text_t *name, const Text_t *title);		TGQt(const char *name, const char *title);
	virtual ~TGQt();		virtual ~TGQt();
	// Include the base TVirtualX class interface		// Include the base TVirtualX class interface
	#include "TVirtualX.interface.h"		#include "TVirtualX.interface.h"
	#ifndef __CINT__		#ifndef __CINT__
	// extracted methods		// extracted methods
	virtual const QColor& ColorIndex(Color_t indx) const;		virtual const QColor& ColorIndex(Color_t indx) const;
	virtual QPaintDevice *GetSelectedWindow(){ return fSelectedWindow; }		virtual QPaintDevice *GetSelectedWindow(){ return fSelectedWindow; }
	virtual void SetFillStyleIndex( Int_t style, Int_t fasi);		virtual void SetFillStyleIndex( Int_t style, Int_t fasi);
	virtual void SetMarkerType( Int_t type, Int_t n, TPoint *xy );		virtual void SetMarkerType( Int_t type, Int_t n, TPoint *xy );
	virtual void SetTitle(const char *title);		virtual void SetTitle(const char *title);
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	TGedEditor.h		TGedEditor.h
	// @(#)root/ged:$Id: TGedEditor.h 20882 2007-11-19 11:31:26Z rdm $		// @(#)root/ged:$Id: TGedEditor.h 27157 2009-01-15 14:05:12Z brun $
	// Author: Marek Biskup, Ilka Antcheva 02/12/2003		// Author: Marek Biskup, Ilka Antcheva 02/12/2003
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 91		skipping to change at line 91
	void PrintFrameStat();		void PrintFrameStat();
	virtual void Update(TGedFrame* frame = 0);		virtual void Update(TGedFrame* frame = 0);
	void ReinitWorkspace();		void ReinitWorkspace();
	void ActivateEditor (TClass* cl, Bool_t recurse);		void ActivateEditor (TClass* cl, Bool_t recurse);
	void ActivateEditors(TList* bcl, Bool_t recurse);		void ActivateEditors(TList* bcl, Bool_t recurse);
	void ExcludeClassEditor(TClass* cl, Bool_t recurse = kFALSE);		void ExcludeClassEditor(TClass* cl, Bool_t recurse = kFALSE);
	void InsertGedFrame(TGedFrame* f);		void InsertGedFrame(TGedFrame* f);
	TGCanvas* GetTGCanvas() const { return fCan; }		TGCanvas* GetTGCanvas() const { return fCan; }
	TGTab* GetTab() const { return fTab; }		TGTab* GetTab() const { return fTab; }
	virtual TGCompositeFrame* GetEditorTab(const Text_t* name);		virtual TGCompositeFrame* GetEditorTab(const char* name);
	virtual TGedTabInfo* GetEditorTabInfo(const Text_t* name);		virtual TGedTabInfo* GetEditorTabInfo(const char* name);
	virtual TCanvas* GetCanvas() const { return fCanvas; }		virtual TCanvas* GetCanvas() const { return fCanvas; }
	virtual TVirtualPad* GetPad() const { return fPad; }		virtual TVirtualPad* GetPad() const { return fPad; }
	virtual TObject* GetModel() const { return fModel; }		virtual TObject* GetModel() const { return fModel; }
	virtual void CloseWindow();		virtual void CloseWindow();
	virtual void ConnectToCanvas(TCanvas *c);		virtual void ConnectToCanvas(TCanvas *c);
	virtual void DisconnectFromCanvas();		virtual void DisconnectFromCanvas();
	virtual Bool_t IsGlobal() const { return fGlobal; }		virtual Bool_t IsGlobal() const { return fGlobal; }
	virtual void Hide();		virtual void Hide();
End of changes. 2 change blocks.
	3 lines changed or deleted		3 lines changed or added

	TGedFrame.h		TGedFrame.h
	// @(#)root/ged:$Id: TGedFrame.h 20882 2007-11-19 11:31:26Z rdm $		// @(#)root/ged:$Id: TGedFrame.h 27157 2009-01-15 14:05:12Z brun $
	// Author: Ilka Antcheva 10/05/04		// Author: Ilka Antcheva 10/05/04
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2002, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2002, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 84		skipping to change at line 84
	virtual Option_t *GetDrawOption() const;		virtual Option_t *GetDrawOption() const;
	virtual TGLayoutHints* GetLayoutHints();		virtual TGLayoutHints* GetLayoutHints();
	TClass* GetModelClass() { return fModelClass; }		TClass* GetModelClass() { return fModelClass; }
	Int_t GetPriority() { return fPriority; }		Int_t GetPriority() { return fPriority; }
	TList* GetExtraTabs() { return fExtraTabs; }		TList* GetExtraTabs() { return fExtraTabs; }
	TGedEditor* GetGedEditor() { return fGedEditor; }		TGedEditor* GetGedEditor() { return fGedEditor; }
	virtual void AddExtraTab(TGedSubFrame* sf);		virtual void AddExtraTab(TGedSubFrame* sf);
	virtual TGVerticalFrame* CreateEditorTabSubFrame(const Text_t* name);		virtual TGVerticalFrame* CreateEditorTabSubFrame(const char* name);
	virtual void Refresh(TObject *model);		virtual void Refresh(TObject *model);
	virtual void SetDrawOption(Option_t *option="");		virtual void SetDrawOption(Option_t *option="");
	virtual Bool_t AcceptModel(TObject*) { return kTRUE; }		virtual Bool_t AcceptModel(TObject*) { return kTRUE; }
	void SetModelClass(TClass* mcl) { fModelClass = mcl; }		void SetModelClass(TClass* mcl) { fModelClass = mcl; }
	virtual void SetModel(TObject* obj) = 0;		virtual void SetModel(TObject* obj) = 0;
	virtual void SetGedEditor(TGedEditor* ed) { fGedEditor = ed; }		virtual void SetGedEditor(TGedEditor* ed) { fGedEditor = ed; }
	virtual void ActivateBaseClassEditors(TClass* cl);		virtual void ActivateBaseClassEditors(TClass* cl);
	ClassDef(TGedFrame, 0); //base editor's frame		ClassDef(TGedFrame, 0); //base editor's frame
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	TGenCollectionProxy.h		TGenCollectionProxy.h
	// @(#)root/io:$Id: TGenCollectionProxy.h 25450 2008-09-18 21:13:42Z pcanal $		// @(#)root/io:$Id: TGenCollectionProxy.h 27255 2009-01-27 10:59:53Z pcanal $
	// Author: Markus Frank 28/10/04		// Author: Markus Frank 28/10/04
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	#ifndef ROOT_TGenCollectionProxy		#ifndef ROOT_TGenCollectionProxy
	skipping to change at line 204		skipping to change at line 204
	*/		*/
	struct Method {		struct Method {
	typedef void* (*Call_t)(void*);		typedef void* (*Call_t)(void*);
	Call_t call;		Call_t call;
	Method() : call(0) { }		Method() : call(0) { }
	Method(Call_t c) : call(c) { }		Method(Call_t c) : call(c) { }
	Method(const Method& m) : call(m.call) { }		Method(const Method& m) : call(m.call) { }
	void* invoke(void* obj) const { return (*call)(obj); }		void* invoke(void* obj) const { return (*call)(obj); }
	};		};
			/** @class TGenCollectionProxy::Method TGenCollectionProxy.h TGenCollect
			ionProxy.h
			*
			* Small helper to execute (compiler) generated function for the
			* access to STL or other containers.
			*
			* @author M.Frank
			* @version 1.0
			* @date 10/10/2004
			*/
			struct Method0 {
			typedef void* (*Call_t)();
			Call_t call;
			Method0() : call(0) { }
			Method0(Call_t c) : call(c) { }
			Method0(const Method0& m) : call(m.call) { }
			void* invoke() const { return (*call)(); }
			};
	protected:		protected:
	typedef ROOT::TCollectionProxyInfo::Environ<char[64]> Env_t;		typedef ROOT::TCollectionProxyInfo::Environ<char[64]> Env_t;
	typedef std::vector<Env_t*> Proxies_t;		typedef ROOT::TCollectionProxyInfo::EnvironBase EnvironBase_t;
			typedef std::vector<EnvironBase_t*> Proxies_t;
	std::string fName; // Name of the class being proxied.		std::string fName; // Name of the class being proxied.
	Bool_t fPointers; // Flag to indicate if containee has pointers (key or value)		Bool_t fPointers; // Flag to indicate if containee has pointers (key or value)
	Method fClear; // Method cache for container accessors: clear container		Method fClear; // Method cache for container accessors: clear container
	Method fSize; // Container accessors: size of container		Method fSize; // Container accessors: size of container
	Method fResize; // Container accessors: resize container		Method fResize; // Container accessors: resize container
	Method fFirst; // Container accessors: generic iteration: fir st		Method fFirst; // Container accessors: generic iteration: fir st
	Method fNext; // Container accessors: generic iteration: nex t		Method fNext; // Container accessors: generic iteration: nex t
	Method fConstruct; // Container accessors: block construct		Method fConstruct; // Container accessors: block construct
	Method fDestruct; // Container accessors: block destruct		Method fDestruct; // Container accessors: block destruct
	Method fFeed; // Container accessors: block feed		Method fFeed; // Container accessors: block feed
	Method fCollect; // Method to collect objects from container		Method fCollect; // Method to collect objects from container
			Method0 fCreateEnv; // Method to allocate an Environment holder.
	Value* fValue; // Descriptor of the container value type		Value* fValue; // Descriptor of the container value type
	Value* fVal; // Descriptor of the Value_type		Value* fVal; // Descriptor of the Value_type
	Value* fKey; // Descriptor of the key_type		Value* fKey; // Descriptor of the key_type
	Env_t* fEnv; // Address of the currently proxied object		EnvironBase_t*fEnv; // Address of the currently proxied object
	int fValOffset; // Offset from key to value (in maps)		int fValOffset; // Offset from key to value (in maps)
	int fValDiff; // Offset between two consecutive value_types (memory layout).		int fValDiff; // Offset between two consecutive value_types (memory layout).
	Proxies_t fProxyList; // Stack of recursive proxies		Proxies_t fProxyList; // Stack of recursive proxies
	Proxies_t fProxyKept; // Optimization: Keep proxies once they were c reated		Proxies_t fProxyKept; // Optimization: Keep proxies once they were c reated
	int fSTL_type; // STL container type		int fSTL_type; // STL container type
	Info_t fTypeinfo; // Type information		Info_t fTypeinfo; // Type information
	TClass* fOnFileClass; // On file class		TClass* fOnFileClass; // On file class
	// Late initialization of collection proxy		// Late initialization of collection proxy
	TGenCollectionProxy* Initialize() const;		TGenCollectionProxy* Initialize() const;
End of changes. 5 change blocks.
	3 lines changed or deleted		24 lines changed or added

	TGenericTable.h		TGenericTable.h
	// @(#)root/table:$Id: TGenericTable.h 20882 2007-11-19 11:31:26Z rdm $		// @(#)root/table:$Id: TGenericTable.h 27157 2009-01-15 14:05:12Z brun $
	// Author: Valery Fine(fine@bnl.gov) 30/06/2001		// Author: Valery Fine(fine@bnl.gov) 30/06/2001
	#ifndef ROOT_TGenericTable		#ifndef ROOT_TGenericTable
	#define ROOT_TGenericTable		#define ROOT_TGenericTable
	#include "TTable.h"		#include "TTable.h"
	//////////////////////////////////////////////////////////////////////////		//////////////////////////////////////////////////////////////////////////
	// //		// //
	// TGenericTable //		// TGenericTable //
	skipping to change at line 50		skipping to change at line 50
	iterator &operator+(Int_t idx) { if (fCurrentRow) fCurrentRow+=idx*fR owSize; return *this;}		iterator &operator+(Int_t idx) { if (fCurrentRow) fCurrentRow+=idx*fR owSize; return *this;}
	iterator &operator-(Int_t idx) { if (fCurrentRow) fCurrentRow-=idx*fR owSize; return *this;}		iterator &operator-(Int_t idx) { if (fCurrentRow) fCurrentRow-=idx*fR owSize; return *this;}
	Int_t operator-(const iterator &it) const { return (fCurrentRow-it.fC urrentRow)/fRowSize; }		Int_t operator-(const iterator &it) const { return (fCurrentRow-it.fC urrentRow)/fRowSize; }
	char *operator *(){ return fCurrentRow;}		char *operator *(){ return fCurrentRow;}
	Bool_t operator==(const iterator &t) const { return (fCurrentR ow == t.fCurrentRow); }		Bool_t operator==(const iterator &t) const { return (fCurrentR ow == t.fCurrentRow); }
	Bool_t operator!=(const iterator &t) const { return !operator==(t); }		Bool_t operator!=(const iterator &t) const { return !operator==(t); }
	};		};
	TGenericTable() : TTable("TGenericTable",-1), fColDescriptors(0) {SetTyp e("generic");}		TGenericTable() : TTable("TGenericTable",-1), fColDescriptors(0) {SetTyp e("generic");}
	// Create TGenericTable by C structure name provided		// Create TGenericTable by C structure name provided
	TGenericTable(const char *structName, const Text_t *name);		TGenericTable(const char *structName, const char *name);
	TGenericTable(const char *structName, Int_t n);		TGenericTable(const char *structName, Int_t n);
	TGenericTable(const char *structName, const Text_t *name,Int_t n);		TGenericTable(const char *structName, const char *name,Int_t n);
	// Create TGenericTable by TTableDescriptor pointer		// Create TGenericTable by TTableDescriptor pointer
	TGenericTable(const TTableDescriptor &dsc, const Text_t *name);		TGenericTable(const TTableDescriptor &dsc, const char *name);
	TGenericTable(const TTableDescriptor &dsc, Int_t n);		TGenericTable(const TTableDescriptor &dsc, Int_t n);
	TGenericTable(const TTableDescriptor &dsc,const Text_t *name,Int_t n);		TGenericTable(const TTableDescriptor &dsc,const char *name,Int_t n);
	virtual ~TGenericTable();		virtual ~TGenericTable();
	char *GetTable(Int_t i=0) const { return ((char *)GetArray())+i*GetRo wSize();}		char *GetTable(Int_t i=0) const { return ((char *)GetArray())+i*GetRo wSize();}
	TTableDescriptor *GetTableDescriptors() const { return GetDescriptorPoi nter();}		TTableDescriptor *GetTableDescriptors() const { return GetDescriptorPoi nter();}
	TTableDescriptor *GetRowDescriptors() const { return GetDescriptorPoi nter();}		TTableDescriptor *GetRowDescriptors() const { return GetDescriptorPoi nter();}
	char &operator[](Int_t i){ assert(i>=0 && i < GetNRows()); return *GetTa ble(i); }		char &operator[](Int_t i){ assert(i>=0 && i < GetNRows()); return *GetTa ble(i); }
	const char &operator[](Int_t i) const { assert(i>=0 && i < GetNRows()); return *((const char *)(GetTable(i))); }		const char &operator[](Int_t i) const { assert(i>=0 && i < GetNRows()); return *((const char *)(GetTable(i))); }
	iterator begin() { return ((const TGenericTable *)this)->begin(); }		iterator begin() { return ((const TGenericTable *)this)->begin(); }
	iterator begin() const { return GetNRows() ? itera tor(*this, *GetTable(0)):end();}		iterator begin() const { return GetNRows() ? itera tor(*this, *GetTable(0)):end();}
End of changes. 5 change blocks.
	5 lines changed or deleted		5 lines changed or added

	TGeoMCGeometry.h		TGeoMCGeometry.h
	// @(#)root/vmc:$Id: TGeoMCGeometry.h 20882 2007-11-19 11:31:26Z rdm $		// @(#)root/vmc:$Id: TGeoMCGeometry.h 27157 2009-01-15 14:05:12Z brun $
	// Authors: Al;ice collaboration 25/06/2002		// Authors: Al;ice collaboration 25/06/2002
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 2006, Rene Brun and Fons Rademakers. *		* Copyright (C) 2006, Rene Brun and Fons Rademakers. *
	* Copyright (C) 2002, ALICE Experiment at CERN. *		* Copyright (C) 2002, ALICE Experiment at CERN. *
	* 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 123		skipping to change at line 123
	//virtual void DrawOneSpec(const char* name);		//virtual void DrawOneSpec(const char* name);
	//virtual void Gsatt(const char* name, const char* att, Int_t val);		//virtual void Gsatt(const char* name, const char* att, Int_t val);
	//virtual void Gdraw(const char*,Double_t theta, Double_t phi,		//virtual void Gdraw(const char*,Double_t theta, Double_t phi,
	// Double_t psi, Double_t u0, Double_t v0,		// Double_t psi, Double_t u0, Double_t v0,
	// Double_t ul, Double_t vl);		// Double_t ul, Double_t vl);
	// Euclid		// Euclid
	//virtual void WriteEuclid(const char*, const char*, Int_t, Int_t);		//virtual void WriteEuclid(const char*, const char*, Int_t, Int_t);
	// get methods		// get methods
	virtual Int_t VolId(const Text_t* volName) const;		virtual Int_t VolId(const char* volName) const;
	virtual const char* VolName(Int_t id) const;		virtual const char* VolName(Int_t id) const;
	virtual Int_t MediumId(const Text_t* mediumName) const;		virtual Int_t MediumId(const char* mediumName) const;
	virtual Int_t NofVolumes() const;		virtual Int_t NofVolumes() const;
	virtual Int_t NofVolDaughters(const char* volName) const;		virtual Int_t NofVolDaughters(const char* volName) const;
	virtual const char* VolDaughterName(const char* volName, Int_t i) const ;		virtual const char* VolDaughterName(const char* volName, Int_t i) const ;
	virtual Int_t VolDaughterCopyNo(const char* volName, Int_t i) con st;		virtual Int_t VolDaughterCopyNo(const char* volName, Int_t i) con st;
	virtual Int_t VolId2Mate(Int_t id) const;		virtual Int_t VolId2Mate(Int_t id) const;
	private:		private:
	TGeoMCGeometry(const TGeoMCGeometry& /*rhs*/);		TGeoMCGeometry(const TGeoMCGeometry& /*rhs*/);
	TGeoMCGeometry& operator=(const TGeoMCGeometry& /*rhs*/);		TGeoMCGeometry& operator=(const TGeoMCGeometry& /*rhs*/);
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	TGeoNavigator.h		TGeoNavigator.h
	// @(#)root/geom:$Id: TGeoNavigator.h 26991 2008-12-17 15:16:28Z brun $		// @(#)root/geom:$Id: TGeoNavigator.h 27434 2009-02-12 14:01:16Z brun $
	// Author: Mihaela Gheata 30/05/07		// Author: Mihaela Gheata 30/05/07
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 82		skipping to change at line 82
	Bool_t fIsOnBoundary; //! flag that current point is on some boundary		Bool_t fIsOnBoundary; //! flag that current point is on some boundary
	Bool_t fIsSameLocation; //! flag that a new point is in the same node as previous		Bool_t fIsSameLocation; //! flag that a new point is in the same node as previous
	Bool_t fIsNullStep; //! flag that last geometric st ep was null		Bool_t fIsNullStep; //! flag that last geometric st ep was null
	TGeoManager *fGeometry; //! current geometry		TGeoManager *fGeometry; //! current geometry
	TGeoNodeCache *fCache; //! cache of states		TGeoNodeCache *fCache; //! cache of states
	TGeoVolume *fCurrentVolume; //! current volume		TGeoVolume *fCurrentVolume; //! current volume
	TGeoNode *fCurrentNode; //! current node		TGeoNode *fCurrentNode; //! current node
	TGeoNode *fTopNode; //! top physical node		TGeoNode *fTopNode; //! top physical node
	TGeoNode *fLastNode; //! last searched node		TGeoNode *fLastNode; //! last searched node
	TGeoNode *fNextNode; //! next node that will be cros sed		TGeoNode *fNextNode; //! next node that will be cros sed
			TGeoNode *fForcedNode; //! current point is supposed t o be inside this node
	TGeoCacheState *fBackupState; //! backup state		TGeoCacheState *fBackupState; //! backup state
	TGeoHMatrix *fCurrentMatrix; //! current stored global matri x		TGeoHMatrix *fCurrentMatrix; //! current stored global matri x
	TGeoHMatrix *fGlobalMatrix; //! current pointer to cached g lobal matrix		TGeoHMatrix *fGlobalMatrix; //! current pointer to cached g lobal matrix
	TString fPath; //! path to current node		TString fPath; //! path to current node
	public :		public :
	TGeoNavigator();		TGeoNavigator();
	TGeoNavigator(TGeoManager* geom);		TGeoNavigator(TGeoManager* geom);
	virtual ~TGeoNavigator();		virtual ~TGeoNavigator();
End of changes. 2 change blocks.
	1 lines changed or deleted		2 lines changed or added

	TGeoPolygon.h		TGeoPolygon.h
	// @(#)root/geom:$Id: TGeoPolygon.h 21425 2007-12-17 15:59:27Z brun $		// @(#)root/geom:$Id: TGeoPolygon.h 27466 2009-02-17 12:53:37Z brun $
	// Author: Mihaela Gheata 05/01/04		// Author: Mihaela Gheata 05/01/04
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 69		skipping to change at line 69
	// methods		// methods
	Double_t Area() const;		Double_t Area() const;
	Bool_t Contains(Double_t *point) const;		Bool_t Contains(Double_t *point) const;
	void FinishPolygon();		void FinishPolygon();
	Int_t GetNvert() const {return fNvert;}		Int_t GetNvert() const {return fNvert;}
	Double_t *GetX() {return fX;}		Double_t *GetX() {return fX;}
	Double_t *GetY() {return fY;}		Double_t *GetY() {return fY;}
	Bool_t IsClockwise() const {return !TObject::TestBit(kGeoAC W);}		Bool_t IsClockwise() const {return !TObject::TestBit(kGeoAC W);}
	Bool_t IsConvex() const {return TObject::TestBit(kGeoConvex );}		Bool_t IsConvex() const {return TObject::TestBit(kGeoConvex );}
	Bool_t IsFinished() const {return TObject::TestBit(kGeoFini shPolygon);}		Bool_t IsFinished() const {return TObject::TestBit(kGeoFini shPolygon);}
			Bool_t IsIllegalCheck() const;
	Double_t Safety(Double_t *point, Int_t &isegment) const;		Double_t Safety(Double_t *point, Int_t &isegment) const;
	void SetConvex(Bool_t flag=kTRUE) {TObject::SetBit(kGeoCo nvex,flag);}		void SetConvex(Bool_t flag=kTRUE) {TObject::SetBit(kGeoCo nvex,flag);}
	void SetXY(Double_t *x, Double_t *y);		void SetXY(Double_t *x, Double_t *y);
	void SetNextIndex(Int_t index=-1);		void SetNextIndex(Int_t index=-1);
	ClassDef(TGeoPolygon, 2) // class for handling arbitrary polygon s		ClassDef(TGeoPolygon, 2) // class for handling arbitrary polygon s
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	1 lines changed or deleted		2 lines changed or added

	TGeoShape.h		TGeoShape.h
	// @(#)root/geom:$Id: TGeoShape.h 24870 2008-07-17 16:30:58Z brun $		// @(#)root/geom:$Id: TGeoShape.h 27466 2009-02-17 12:53:37Z brun $
	// Author: Andrei Gheata 31/01/02		// Author: Andrei Gheata 31/01/02
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 39		skipping to change at line 39
	// TGeoShape - base class for geometric shapes. Provides virtual methods / /		// TGeoShape - base class for geometric shapes. Provides virtual methods / /
	// for point and segment classification that has to be implemented by / /		// for point and segment classification that has to be implemented by / /
	// all classes inheriting from it. / /		// all classes inheriting from it. / /
	// / /		// / /
	/////////////////////////////////////////////////////////////////////////// /		/////////////////////////////////////////////////////////////////////////// /
	class TGeoShape : public TNamed		class TGeoShape : public TNamed
	{		{
	private:		private:
	static TGeoMatrix *fgTransform; // current transformation matrix th at applies to shape		static TGeoMatrix *fgTransform; // current transformation matrix th at applies to shape
			static Double_t fgEpsMch; // Machine round-off error
	public:		public:
	enum EShapeType {		enum EShapeType {
	kBitMask32 = 0xffffffff,		kBitMask32 = 0xffffffff,
	kGeoNoShape = 0,		kGeoNoShape = 0,
	kGeoBad = BIT(0),		kGeoBad = BIT(0),
	kGeoRSeg = BIT(1),		kGeoRSeg = BIT(1),
	kGeoPhiSeg = BIT(2),		kGeoPhiSeg = BIT(2),
	kGeoThetaSeg = BIT(3),		kGeoThetaSeg = BIT(3),
	kGeoVisX = BIT(4),		kGeoVisX = BIT(4),
	kGeoVisY = BIT(5),		kGeoVisY = BIT(5),
	skipping to change at line 99		skipping to change at line 100
	TGeoShape();		TGeoShape();
	TGeoShape(const char *name);		TGeoShape(const char *name);
	// destructor		// destructor
	virtual ~TGeoShape();		virtual ~TGeoShape();
	// methods		// methods
	static Double_t Big() {return 1.E30;}		static Double_t Big() {return 1.E30;}
	static TGeoMatrix *GetTransform();		static TGeoMatrix *GetTransform();
	static void SetTransform(TGeoMatrix *matrix);		static void SetTransform(TGeoMatrix *matrix);
	static Double_t Tolerance() {return 1.E-10;}		static Double_t Tolerance() {return 1.E-10;}
			static Double_t ComputeEpsMch();
			static Double_t EpsMch();
	virtual Double_t Capacity() const = 0;		virtual Double_t Capacity() const = 0;
	virtual void ComputeBBox() = 0;		virtual void ComputeBBox() = 0;
	virtual void ComputeNormal(Double_t *point, Double_t *dir, Doub le_t *norm) = 0;		virtual void ComputeNormal(Double_t *point, Double_t *dir, Doub le_t *norm) = 0;
	virtual Bool_t Contains(Double_t *point) const = 0;		virtual Bool_t Contains(Double_t *point) const = 0;
	virtual Bool_t CouldBeCrossed(Double_t *point, Double_t *dir) con st = 0;		virtual Bool_t CouldBeCrossed(Double_t *point, Double_t *dir) con st = 0;
	virtual Int_t DistancetoPrimitive(Int_t px, Int_t py) = 0;		virtual Int_t DistancetoPrimitive(Int_t px, Int_t py) = 0;
	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 = 0;		Double_t step=TGeoShape::Big(), Double_t *safe=0) const = 0;
	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 = 0;		Double_t step=TGeoShape::Big(), Double_t *safe=0) const = 0;
	skipping to change at line 132		skipping to change at line 135
	Int_t GetId() const {return fShapeId;}		Int_t GetId() const {return fShapeId;}
	virtual TGeoShape *GetMakeRuntimeShape(TGeoShape *mother, TGeoMatrix *mat) const = 0;		virtual TGeoShape *GetMakeRuntimeShape(TGeoShape *mother, TGeoMatrix *mat) const = 0;
	virtual void GetMeshNumbers(Int_t &/*nvert*/, Int_t &/*nsegs*/, Int_t &/*npols*/) const {;}		virtual void GetMeshNumbers(Int_t &/*nvert*/, Int_t &/*nsegs*/, Int_t &/*npols*/) const {;}
	virtual const char *GetName() const;		virtual const char *GetName() const;
	virtual Int_t GetNmeshVertices() const {return 0;}		virtual Int_t GetNmeshVertices() const {return 0;}
	char *GetPointerName() const;		char *GetPointerName() const;
	virtual Bool_t IsComposite() const {return kFALSE;}		virtual Bool_t IsComposite() const {return kFALSE;}
	virtual Bool_t IsCylType() const = 0;		virtual Bool_t IsCylType() const = 0;
	static Bool_t IsCloseToPhi(Double_t epsil, Double_t *point, Doub le_t c1, Double_t s1, Double_t c2, Double_t s2);		static Bool_t IsCloseToPhi(Double_t epsil, Double_t *point, Doub le_t c1, Double_t s1, Double_t c2, Double_t s2);
	static Bool_t IsCrossingSemiplane(Double_t *point, Double_t *dir , Double_t cphi, Double_t sphi, Double_t &snext, Double_t &rxy);		static Bool_t IsCrossingSemiplane(Double_t *point, Double_t *dir , Double_t cphi, Double_t sphi, Double_t &snext, Double_t &rxy);
			static Bool_t IsSegCrossing(Double_t x1, Double_t y1, Double_t x 2, Double_t y2,Double_t x3, Double_t y3,Double_t x4, Double_t y4);
	static Bool_t IsInPhiRange(Double_t *point, Double_t phi1, Doubl e_t phi2);		static Bool_t IsInPhiRange(Double_t *point, Double_t phi1, Doubl e_t phi2);
	virtual Bool_t IsReflected() const {return kFALSE;}		virtual Bool_t IsReflected() const {return kFALSE;}
	Bool_t IsRunTimeShape() const {return TestShapeBit(kGeoRu nTimeShape);}		Bool_t IsRunTimeShape() const {return TestShapeBit(kGeoRu nTimeShape);}
	Bool_t IsValid() const {return !TestShapeBit(kGeoInvalidS hape);}		Bool_t IsValid() const {return !TestShapeBit(kGeoInvalidS hape);}
	virtual Bool_t IsValidBox() const = 0;		virtual Bool_t IsValidBox() const = 0;
	virtual void InspectShape() const = 0;		virtual void InspectShape() const = 0;
	virtual TBuffer3D *MakeBuffer3D() const {return 0;}		virtual TBuffer3D *MakeBuffer3D() const {return 0;}
	static void NormalPhi(Double_t *point, Double_t *dir, Double_t *norm, Double_t c1, Double_t s1, Double_t c2, Double_t s2);		static void NormalPhi(Double_t *point, Double_t *dir, Double_t *norm, Double_t c1, Double_t s1, Double_t c2, Double_t s2);
	virtual void Paint(Option_t *option="");		virtual void Paint(Option_t *option="");
	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 ;
End of changes. 4 change blocks.
	1 lines changed or deleted		5 lines changed or added

	TH2.h		TH2.h
	// @(#)root/hist:$Id: TH2.h 25487 2008-09-22 12:44:13Z moneta $		// @(#)root/hist:$Id: TH2.h 27184 2009-01-19 16:14:21Z moneta $
	// Author: Rene Brun 26/12/94		// Author: Rene Brun 26/12/94
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 43		skipping to change at line 43
	class TProfile;		class TProfile;
	class TH2 : public TH1 {		class TH2 : public TH1 {
	protected:		protected:
	Double_t fScalefactor; //Scale factor		Double_t fScalefactor; //Scale factor
	Double_t fTsumwy; //Total Sum of weight*Y		Double_t fTsumwy; //Total Sum of weight*Y
	Double_t fTsumwy2; //Total Sum of weight*Y*Y		Double_t fTsumwy2; //Total Sum of weight*Y*Y
	Double_t fTsumwxy; //Total Sum of weight*X*Y		Double_t fTsumwxy; //Total Sum of weight*X*Y
	virtual Int_t BufferFill(Double_t, Double_t) {return -2;} //may not
	use
	virtual Int_t BufferFill(Double_t x, Double_t y, Double_t w);
	virtual TH1D *DoProjection(bool onX, const char *name, Int_t firstbi
	n, Int_t lastbin, Option_t *option) const;
	virtual TProfile *DoProfile(bool onX, const char *name, Int_t firstbin,
	Int_t lastbin, Option_t *option) const;
	virtual void DoFitSlices(bool onX, TF1 *f1, Int_t firstbin, Int_t l
	astbin, Int_t cut, Option_t *option, TObjArray* arr);
	public:
	TH2();		TH2();
	TH2(const char *name,const char *title,Int_t nbinsx,Double_t xlow,Double _t xup		TH2(const char *name,const char *title,Int_t nbinsx,Double_t xlow,Double _t xup
	,Int_t nbinsy,Double_t ylow,Double _t yup);		,Int_t nbinsy,Double_t ylow,Double _t yup);
	TH2(const char *name,const char *title,Int_t nbinsx,const Double_t *xbin s		TH2(const char *name,const char *title,Int_t nbinsx,const Double_t *xbin s
	,Int_t nbinsy,Double_t ylow,Double _t yup);		,Int_t nbinsy,Double_t ylow,Double _t yup);
	TH2(const char *name,const char *title,Int_t nbinsx,Double_t xlow,Double _t xup		TH2(const char *name,const char *title,Int_t nbinsx,Double_t xlow,Double _t xup
	,Int_t nbinsy,const Double_t *ybin s);		,Int_t nbinsy,const Double_t *ybin s);
	TH2(const char *name,const char *title,Int_t nbinsx,const Double_t *xbin s		TH2(const char *name,const char *title,Int_t nbinsx,const Double_t *xbin s
	,Int_t nbinsy,const Double_t *ybin s);		,Int_t nbinsy,const Double_t *ybin s);
	TH2(const char *name,const char *title,Int_t nbinsx,const Float_t *xbin s		TH2(const char *name,const char *title,Int_t nbinsx,const Float_t *xbin s
	,Int_t nbinsy,const Float_t *ybin s);		,Int_t nbinsy,const Float_t *ybin s);
			virtual Int_t BufferFill(Double_t, Double_t) {return -2;} //may not
			use
			virtual Int_t BufferFill(Double_t x, Double_t y, Double_t w);
			virtual TH1D *DoProjection(bool onX, const char *name, Int_t firstbi
			n, Int_t lastbin, Option_t *option) const;
			virtual TProfile *DoProfile(bool onX, const char *name, Int_t firstbin,
			Int_t lastbin, Option_t *option) const;
			virtual void DoFitSlices(bool onX, TF1 *f1, Int_t firstbin, Int_t l
			astbin, Int_t cut, Option_t *option, TObjArray* arr);
			public:
	TH2(const TH2&);		TH2(const TH2&);
	virtual ~TH2();		virtual ~TH2();
	virtual Int_t BufferEmpty(Int_t action=0);		virtual Int_t BufferEmpty(Int_t action=0);
	virtual void Copy(TObject &hnew) const;		virtual void Copy(TObject &hnew) const;
	Int_t Fill(Double_t) {return -1;} //MayNotUse		Int_t Fill(Double_t) {return -1;} //MayNotUse
	Int_t Fill(const char*, Double_t) {return -1;} //MayNotUse		Int_t Fill(const char*, Double_t) {return -1;} //MayNotUse
	virtual Int_t Fill(Double_t x, Double_t y);		virtual Int_t Fill(Double_t x, Double_t y);
	virtual Int_t Fill(Double_t x, Double_t y, Double_t w);		virtual Int_t Fill(Double_t x, Double_t y, Double_t w);
	virtual Int_t Fill(Double_t x, const char *namey, Double_t w);		virtual Int_t Fill(Double_t x, const char *namey, Double_t w);
	virtual Int_t Fill(const char *namex, Double_t y, Double_t w);		virtual Int_t Fill(const char *namex, Double_t y, Double_t w);
End of changes. 3 change blocks.
	12 lines changed or deleted		13 lines changed or added

	TH2GL.h		TH2GL.h
	// @(#)root/gl:$Id: TH2GL.h 21252 2007-12-07 01:39:32Z matevz $		// @(#)root/gl:$Id: TH2GL.h 27471 2009-02-18 09:36:09Z couet $
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	#ifndef ROOT_TH2GL		#ifndef ROOT_TH2GL
	#define ROOT_TH2GL		#define ROOT_TH2GL
	#include <TGLObject.h>		#include <TGLObject.h>
	class TGLRnrCtx;		class TGLRnrCtx;
	class TH2;		class TH1;
	#include "TGLPlotPainter.h"		#include "TGLPlotPainter.h"
	class TH2GL : public TGLObject		class TH2GL : public TGLObject
	{		{
	private:		private:
	TH2GL(const TH2GL&); // Not implemented		TH2GL(const TH2GL&); // Not implemented
	TH2GL& operator=(const TH2GL&); // Not implemented		TH2GL& operator=(const TH2GL&); // Not implemented
	protected:		protected:
	TH2 *fM; // fModel dynamic-casted to TH2		TH1 *fM; // fModel dynamic-casted to TH2
	TGLPlotPainter *fPlotPainter;		TGLPlotPainter *fPlotPainter;
	TGLPlotCoordinates fCoord;		TGLPlotCoordinates fCoord;
	public:		public:
	TH2GL();		TH2GL();
	virtual ~TH2GL();		virtual ~TH2GL();
	virtual Bool_t SetModel(TObject* obj, const Option_t* opt=0);		virtual Bool_t SetModel(TObject* obj, const Option_t* opt=0);
	virtual void SetBBox();		virtual void SetBBox();
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	TH3.h		TH3.h
	// @(#)root/hist:$Id: TH3.h 25433 2008-09-17 15:02:18Z brun $		// @(#)root/hist:$Id: TH3.h 27184 2009-01-19 16:14:21Z moneta $
	// Author: Rene Brun 27/10/95		// Author: Rene Brun 27/10/95
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 44		skipping to change at line 44
	protected:		protected:
	Double_t fTsumwy; //Total Sum of weight*Y		Double_t fTsumwy; //Total Sum of weight*Y
	Double_t fTsumwy2; //Total Sum of weight*Y*Y		Double_t fTsumwy2; //Total Sum of weight*Y*Y
	Double_t fTsumwxy; //Total Sum of weight*X*Y		Double_t fTsumwxy; //Total Sum of weight*X*Y
	Double_t fTsumwz; //Total Sum of weight*Z		Double_t fTsumwz; //Total Sum of weight*Z
	Double_t fTsumwz2; //Total Sum of weight*Z*Z		Double_t fTsumwz2; //Total Sum of weight*Z*Z
	Double_t fTsumwxz; //Total Sum of weight*X*Z		Double_t fTsumwxz; //Total Sum of weight*X*Z
	Double_t fTsumwyz; //Total Sum of weight*Y*Z		Double_t fTsumwyz; //Total Sum of weight*Y*Z
	virtual Int_t BufferFill(Double_t, Double_t) {return -2;} //may not u
	se
	virtual Int_t BufferFill(Double_t, Double_t, Double_t) {return -2;} /
	/may not use
	virtual Int_t BufferFill(Double_t x, Double_t y, Double_t z, Double_t
	w);
	public:
	TH3();		TH3();
	TH3(const char *name,const char *title,Int_t nbinsx,Double_t xlow,Double _t xup		TH3(const char *name,const char *title,Int_t nbinsx,Double_t xlow,Double _t xup
	,Int_t nbinsy,Double_t ylow,Double_t yup		,Int_t nbinsy,Double_t ylow,Double_t yup
	,Int_t nbinsz,Double_t zlow,Double_t zup) ;		,Int_t nbinsz,Double_t zlow,Double_t zup) ;
	TH3(const char *name,const char *title,Int_t nbinsx,const Float_t *xbins		TH3(const char *name,const char *title,Int_t nbinsx,const Float_t *xbins
	,Int_t nbinsy,const Float_t *ybins		,Int_t nbinsy,const Float_t *ybins
	,Int_t nbinsz,const Float_t *zbins );		,Int_t nbinsz,const Float_t *zbins );
	TH3(const char *name,const char *title,Int_t nbinsx,const Double_t *xbin s		TH3(const char *name,const char *title,Int_t nbinsx,const Double_t *xbin s
	,Int_t nbinsy,const Double_t *ybin s		,Int_t nbinsy,const Double_t *ybin s
	,Int_t nbinsz,const Double_t *zbin s);		,Int_t nbinsz,const Double_t *zbin s);
			virtual Int_t BufferFill(Double_t, Double_t) {return -2;} //may not u
			se
			virtual Int_t BufferFill(Double_t, Double_t, Double_t) {return -2;} /
			/may not use
			virtual Int_t BufferFill(Double_t x, Double_t y, Double_t z, Double_t
			w);
			public:
	TH3(const TH3&);		TH3(const TH3&);
	virtual ~TH3();		virtual ~TH3();
	virtual Int_t BufferEmpty(Int_t action=0);		virtual Int_t BufferEmpty(Int_t action=0);
	virtual void Copy(TObject &hnew) const;		virtual void Copy(TObject &hnew) const;
	Int_t Fill(Double_t) {return -1;} //MayNotUse		Int_t Fill(Double_t) {return -1;} //MayNotUse
	Int_t Fill(Double_t,Double_t) {return -1;} //MayNotUse		Int_t Fill(Double_t,Double_t) {return -1;} //MayNotUse
	Int_t Fill(const char*, Double_t) {return -1;} //MayNotUse		Int_t Fill(const char*, Double_t) {return -1;} //MayNotUse
	Int_t Fill(Double_t,const char*,Double_t) {return -1;} //MayN otUse		Int_t Fill(Double_t,const char*,Double_t) {return -1;} //MayN otUse
	Int_t Fill(const char*,Double_t,Double_t) {return -1;} //MayN otUse		Int_t Fill(const char*,Double_t,Double_t) {return -1;} //MayN otUse
	Int_t Fill(const char*,const char*,Double_t) {return -1;} //M ayNotUse		Int_t Fill(const char*,const char*,Double_t) {return -1;} //M ayNotUse
End of changes. 3 change blocks.
	9 lines changed or deleted		9 lines changed or added

	THnSparse.h		THnSparse.h
	// @(#)root/hist:$Id: THnSparse.h 23881 2008-05-16 15:21:54Z moneta $		// @(#)root/hist:$Id: THnSparse.h 27184 2009-01-19 16:14:21Z moneta $
	// Author: Axel Naumann (2007-09-11)		// Author: Axel Naumann (2007-09-11)
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 126		skipping to change at line 126
	enum {		enum {
	kNoInt,		kNoInt,
	kValidInt,		kValidInt,
	kInvalidInt		kInvalidInt
	} fIntegralStatus; //! status of integral		} fIntegralStatus; //! status of integral
	THnSparse(const THnSparse&); // Not implemented		THnSparse(const THnSparse&); // Not implemented
	THnSparse& operator=(const THnSparse&); // Not implemented		THnSparse& operator=(const THnSparse&); // Not implemented
	protected:		protected:
			THnSparse();
			THnSparse(const char* name, const char* title, Int_t dim,
			const Int_t* nbins, const Double_t* xmin, const Double_t* xmax
			,
			Int_t chunksize);
	Int_t GetChunkSize() const { return fChunkSize; }		Int_t GetChunkSize() const { return fChunkSize; }
	THnSparseCompactBinCoord* GetCompactCoord() const;		THnSparseCompactBinCoord* GetCompactCoord() const;
	THnSparseArrayChunk* GetChunk(Int_t idx) const {		THnSparseArrayChunk* GetChunk(Int_t idx) const {
	return (THnSparseArrayChunk*) fBinContent[idx]; }		return (THnSparseArrayChunk*) fBinContent[idx]; }
	THnSparseArrayChunk* AddChunk();		THnSparseArrayChunk* AddChunk();
	virtual TArray* GenerateArray() const = 0;		virtual TArray* GenerateArray() const = 0;
	Long_t GetBinIndexForCurrentBin(Bool_t allocate);		Long_t GetBinIndexForCurrentBin(Bool_t allocate);
	Long_t Fill(Long_t bin, Double_t w) {		Long_t Fill(Long_t bin, Double_t w) {
	// Increment the bin content of "bin" by "w",		// Increment the bin content of "bin" by "w",
	skipping to change at line 158		skipping to change at line 163
	const TObjArray* axes, Int_t chunksize) const;		const TObjArray* axes, Int_t chunksize) const;
	Bool_t CheckConsistency(const THnSparse *h, const char *tag) const;		Bool_t CheckConsistency(const THnSparse *h, const char *tag) const;
	Bool_t IsInRange(Int_t *coord) const;		Bool_t IsInRange(Int_t *coord) const;
	TH1* CreateHist(const char* name, const char* title,		TH1* CreateHist(const char* name, const char* title,
	const TObjArray* axes) const;		const TObjArray* axes) const;
	TObject* ProjectionAny(Int_t ndim, const Int_t* dim,		TObject* ProjectionAny(Int_t ndim, const Int_t* dim,
	Bool_t wantSparse, Option_t* option = "") const;		Bool_t wantSparse, Option_t* option = "") const;
	public:		public:
	THnSparse(const char* name, const char* title, Int_t dim,
	const Int_t* nbins, const Double_t* xmin, const Double_t* xmax
	,
	Int_t chunksize);
	THnSparse();
	virtual ~THnSparse();		virtual ~THnSparse();
	Int_t GetNChunks() const { return fBinContent.GetEntriesFast(); }		Int_t GetNChunks() const { return fBinContent.GetEntriesFast(); }
	TObjArray* GetListOfAxes() { return &fAxes; }		TObjArray* GetListOfAxes() { return &fAxes; }
	TAxis* GetAxis(Int_t dim) const { return (TAxis*)fAxes[dim]; }		TAxis* GetAxis(Int_t dim) const { return (TAxis*)fAxes[dim]; }
	Long_t Fill(const Double_t *x, Double_t w = 1.) {		Long_t Fill(const Double_t *x, Double_t w = 1.) {
	if (GetCalculateErrors()) {		if (GetCalculateErrors()) {
	for (Int_t d = 0; d < fNdimensions; ++d) {		for (Int_t d = 0; d < fNdimensions; ++d) {
	const Double_t xd = x[d];		const Double_t xd = x[d];
End of changes. 3 change blocks.
	6 lines changed or deleted		7 lines changed or added

	THtml.h		THtml.h
	// @(#)root/html:$Id: THtml.h 26944 2008-12-16 10:27:55Z brun $		// @(#)root/html:$Id: THtml.h 27453 2009-02-15 11:38:11Z axel $
	// Author: Nenad Buncic 18/10/95		// Author: Nenad Buncic 18/10/95
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 251		skipping to change at line 251
	int numthreads = 1);		int numthreads = 1);
	void MakeClass(const char *className, Bool_t force=kFALSE);		void MakeClass(const char *className, Bool_t force=kFALSE);
	void MakeIndex(const char *filter="*");		void MakeIndex(const char *filter="*");
	void MakeTree(const char *className, Bool_t force=kFALSE);		void MakeTree(const char *className, Bool_t force=kFALSE);
	// Configuration setters		// Configuration setters
	void SetModuleDefinition(const TModuleDefinition& md);		void SetModuleDefinition(const TModuleDefinition& md);
	void SetFileDefinition(const TFileDefinition& fd);		void SetFileDefinition(const TFileDefinition& fd);
	void SetPathDefinition(const TPathDefinition& pd);		void SetPathDefinition(const TPathDefinition& pd);
	void SetProductName(const char* product) { fProductName = produ ct; }		void SetProductName(const char* product) { fProductName = produ ct; }
	void SetOutputDir(const char *dir) { fPathInfo.fOutputDir = dir ; }		void SetOutputDir(const char *dir);
	void SetInputDir(const char *dir);		void SetInputDir(const char *dir);
			void SetSourceDir(const char *dir) { SetInputDir(dir); }
	void SetEtcDir(const char* dir) { fPathInfo.fEtcDir = dir; }		void SetEtcDir(const char* dir) { fPathInfo.fEtcDir = dir; }
	void SetDocPath(const char* path) { fPathInfo.fDocPath = path; }		void SetDocPath(const char* path) { fPathInfo.fDocPath = path; }
	void SetDotDir(const char* dir) { fPathInfo.fDotDir = dir; fPat hInfo.fFoundDot = PathInfo_t::kDotUnknown; }		void SetDotDir(const char* dir) { fPathInfo.fDotDir = dir; fPat hInfo.fFoundDot = PathInfo_t::kDotUnknown; }
	void SetRootURL(const char* url) { fLinkInfo.fROOTURL = url; }		void SetRootURL(const char* url) { fLinkInfo.fROOTURL = url; }
	void SetLibURL(const char* lib, const char* url) { fLinkInfo.fL ibURLs[lib] = url; }		void SetLibURL(const char* lib, const char* url) { fLinkInfo.fL ibURLs[lib] = url; }
	void SetXwho(const char *xwho) { fLinkInfo.fXwho = xwho; }		void SetXwho(const char *xwho) { fLinkInfo.fXwho = xwho; }
	void SetMacroPath(const char* path) {fPathInfo.fMacroPath = pat h;}		void SetMacroPath(const char* path) {fPathInfo.fMacroPath = pat h;}
	void AddMacroPath(const char* path);		void AddMacroPath(const char* path);
	void SetCounterFormat(const char* format) { fCounterFormat = fo rmat; }		void SetCounterFormat(const char* format) { fCounterFormat = fo rmat; }
	void SetClassDocTag(const char* tag) { fDocSyntax.fClassDocTag = tag; }		void SetClassDocTag(const char* tag) { fDocSyntax.fClassDocTag = tag; }
End of changes. 3 change blocks.
	2 lines changed or deleted		3 lines changed or added

	TIndexTable.h		TIndexTable.h
	// @(#)root/table:$Id: TIndexTable.h 21565 2007-12-28 12:28:46Z brun $		// @(#)root/table:$Id: TIndexTable.h 27157 2009-01-15 14:05:12Z brun $
	// Author: Valery Fine(fine@bnl.gov) 01/03/2001		// Author: Valery Fine(fine@bnl.gov) 01/03/2001
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
	* Copyright (C) 2001 [BNL] Brookhaven National Laboratory. *		* Copyright (C) 2001 [BNL] Brookhaven National Laboratory. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 75		skipping to change at line 75
	protected:		protected:
	static TTableDescriptor *CreateDescriptor();		static TTableDescriptor *CreateDescriptor();
	// define ClassDefTable(TIndexTable,int)		// define ClassDefTable(TIndexTable,int)
	protected:		protected:
	static TTableDescriptor *fgColDescriptors;		static TTableDescriptor *fgColDescriptors;
	virtual TTableDescriptor *GetDescriptorPointer() const;		virtual TTableDescriptor *GetDescriptorPointer() const;
	virtual void SetDescriptorPointer(TTableDescriptor *list);		virtual void SetDescriptorPointer(TTableDescriptor *list);
	public:		public:
	TIndexTable() : TTable("TIndexTable",sizeof(int)) {SetType("int");}		TIndexTable() : TTable("TIndexTable",sizeof(int)) {SetType("int");}
	TIndexTable(const Text_t *name) : TTable(name,sizeof(int)) {SetType("int ");}		TIndexTable(const char *name) : TTable(name,sizeof(int)) {SetType("int") ;}
	TIndexTable(Int_t n) : TTable("TIndexTable",n,sizeof(int)) {SetType("int ");}		TIndexTable(Int_t n) : TTable("TIndexTable",n,sizeof(int)) {SetType("int ");}
	TIndexTable(const Text_t *name,Int_t n) : TTable(name,n,sizeof(int)) {Se tType("int");}		TIndexTable(const char *name,Int_t n) : TTable(name,n,sizeof(int)) {SetT ype("int");}
	virtual ~TIndexTable() {}		virtual ~TIndexTable() {}
	const int *GetTable(Int_t i=0) const;		const int *GetTable(Int_t i=0) const;
	int &operator[](Int_t i){ assert(i>=0 && i < GetNRows()); return *GetTab le(i); }		int &operator[](Int_t i){ assert(i>=0 && i < GetNRows()); return *GetTab le(i); }
	const int &operator[](Int_t i) const { assert(i>=0 && i < GetNRows()); r eturn *((const int *)(GetTable(i))); }		const int &operator[](Int_t i) const { assert(i>=0 && i < GetNRows()); r eturn *((const int *)(GetTable(i))); }
	ClassDef(TIndexTable,4) // "Index" array for TTable object		ClassDef(TIndexTable,4) // "Index" array for TTable object
	};		};
	//_________________________________________________________________________ __________________________________		//_________________________________________________________________________ __________________________________
	inline int *TIndexTable::GetTable(Int_t i) { return ((int *)GetArray())+i ;}		inline int *TIndexTable::GetTable(Int_t i) { return ((int *)GetArray())+i ;}
	//_________________________________________________________________________ __________________________________		//_________________________________________________________________________ __________________________________
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	TLinearFitter.h		TLinearFitter.h
	// @(#)root/minuit:$Id: TLinearFitter.h 22564 2008-03-10 14:01:37Z moneta $		// @(#)root/minuit:$Id: TLinearFitter.h 27022 2008-12-19 10:34:54Z pcanal $
	// Author: Anna Kreshuk 04/03/2005		// Author: Anna Kreshuk 04/03/2005
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2005, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2005, 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 182		skipping to change at line 182
	TVectorD fAtbTemp2; //!		TVectorD fAtbTemp2; //!
	TVectorD fAtbTemp3; //!		TVectorD fAtbTemp3; //!
	TObjArray fFunctions; //array of basis functions		TObjArray fFunctions; //array of basis functions
	TVectorD fY; //the values being fit		TVectorD fY; //the values being fit
	Double_t fY2; //sum of square of y, used for chisquare		Double_t fY2; //sum of square of y, used for chisquare
	Double_t fY2Temp; //! temporary variable used for num.stabil ity		Double_t fY2Temp; //! temporary variable used for num.stabil ity
	TMatrixD fX; //values of x		TMatrixD fX; //values of x
	TVectorD fE; //the errors if they are known		TVectorD fE; //the errors if they are known
	TFormula *fInputFunction; //the function being fit		TFormula *fInputFunction; //the function being fit
			Double_t fVal[1000]; //! temporary
	Int_t fNpoints; //number of points		Int_t fNpoints; //number of points
	Int_t fNfunctions; //number of basis functions		Int_t fNfunctions; //number of basis functions
	Int_t fFormulaSize; //length of the formula		Int_t fFormulaSize; //length of the formula
	Int_t fNdim; //number of dimensions in the formula		Int_t fNdim; //number of dimensions in the formula
	Int_t fNfixed; //number of fixed parameters		Int_t fNfixed; //number of fixed parameters
	Int_t fSpecial; //=100+n if fitting a polynomial of deg.n		Int_t fSpecial; //=100+n if fitting a polynomial of deg.n
	//=200+n if fitting an n-dimensional hyper plane		//=200+n if fitting an n-dimensional hyper plane
	char *fFormula; //the formula		char *fFormula; //the formula
	Bool_t fIsSet; //Has the formula been set?		Bool_t fIsSet; //Has the formula been set?
	Bool_t fStoreData; //Is the data stored?		Bool_t fStoreData; //Is the data stored?
	Double_t fChisquare; //Chisquare of the fit		Double_t fChisquare; //Chisquare of the fit
	Int_t fH; //number of good points in robust fit		Int_t fH; //number of good points in robust fit
	Bool_t fRobust; //true when performing a robust fit		Bool_t fRobust; //true when performing a robust fit
	TBits fFitsample; //indices of points, used in the robust fi t		TBits fFitsample; //indices of points, used in the robust fi t
	Bool_t *fFixedParams; //[fNfixed] array of fixed/released params		Bool_t *fFixedParams; //[fNfixed] array of fixed/released params
	void AddToDesign(Double_t *x, Double_t y, Double_t e);		void AddToDesign(Double_t *x, Double_t y, Double_t e);
	void ComputeTValues();		void ComputeTValues();
	Int_t GraphLinearFitter(Double_t h);		Int_t GraphLinearFitter(Double_t h);
	Int_t Graph2DLinearFitter(Double_t h);		Int_t Graph2DLinearFitter(Double_t h);
	Int_t HistLinearFitter();		Int_t HistLinearFitter();
	Int_t MultiGraphLinearFitter(Double_t h);		Int_t MultiGraphLinearFitter(Double_t h);
	//robust fitting functions:		//robust fitting functions:
	Int_t Partition(Int_t nmini, Int_t *indsubdat);		Int_t Partition(Int_t nmini, Int_t *indsubdat);
	void RDraw(Int_t *subdat, Int_t *indsubdat);		void RDraw(Int_t *subdat, Int_t *indsubdat);
	void CreateSubset(Int_t ntotal, Int_t h, Int_t *index);		void CreateSubset(Int_t ntotal, Int_t h, Int_t *index);
	Double_t CStep(Int_t step, Int_t h, Double_t *residuals, Int_t *index, Int_t *subdat, Int_t start, Int_t end);		Double_t CStep(Int_t step, Int_t h, Double_t *residuals, Int_t *index, Int_t *subdat, Int_t start, Int_t end);
	skipping to change at line 226		skipping to change at line 227
	TLinearFitter();		TLinearFitter();
	TLinearFitter(Int_t ndim, const char *formula, Option_t *opt="D");		TLinearFitter(Int_t ndim, const char *formula, Option_t *opt="D");
	TLinearFitter(Int_t ndim);		TLinearFitter(Int_t ndim);
	TLinearFitter(TFormula *function, Option_t *opt="D");		TLinearFitter(TFormula *function, Option_t *opt="D");
	TLinearFitter(const TLinearFitter& tlf);		TLinearFitter(const TLinearFitter& tlf);
	virtual ~TLinearFitter();		virtual ~TLinearFitter();
	TLinearFitter& operator=(const TLinearFitter& tlf);		TLinearFitter& operator=(const TLinearFitter& tlf);
	virtual void Add(TLinearFitter *tlf);		virtual void Add(TLinearFitter *tlf);
	virtual void AddPoint(Double_t *x, Double_t y, Double_t e=1);		virtual void AddPoint(Double_t *x, Double_t y, Double_t e=1);
			virtual void AddTempMatrices();
	virtual void AssignData(Int_t npoints, Int_t xncols, Double_t *x, Double_t *y, Double_t *e=0);		virtual void AssignData(Int_t npoints, Int_t xncols, Double_t *x, Double_t *y, Double_t *e=0);
	virtual void Clear(Option_t *option="");		virtual void Clear(Option_t *option="");
	virtual void ClearPoints();		virtual void ClearPoints();
	virtual void Chisquare();		virtual void Chisquare();
	virtual Int_t Eval();		virtual Int_t Eval();
	virtual Int_t EvalRobust(Double_t h=-1);		virtual Int_t EvalRobust(Double_t h=-1);
	virtual Int_t ExecuteCommand(const char *command, Double_t *args, I nt_t nargs);		virtual Int_t ExecuteCommand(const char *command, Double_t *args, I nt_t nargs);
	virtual void FixParameter(Int_t ipar);		virtual void FixParameter(Int_t ipar);
	virtual void FixParameter(Int_t ipar, Double_t parvalue);		virtual void FixParameter(Int_t ipar, Double_t parvalue);
	skipping to change at line 256		skipping to change at line 258
	virtual Int_t GetNumberFreeParameters() const {return fNfunctions-f Nfixed;}		virtual Int_t GetNumberFreeParameters() const {return fNfunctions-f Nfixed;}
	virtual Int_t GetNpoints() { return fNpoints; }		virtual Int_t GetNpoints() { return fNpoints; }
	virtual void GetParameters(TVectorD &vpar);		virtual void GetParameters(TVectorD &vpar);
	virtual Double_t GetParameter(Int_t ipar) const {return fParams(ipar); }		virtual Double_t GetParameter(Int_t ipar) const {return fParams(ipar); }
	virtual Int_t GetParameter(Int_t ipar,char* name,Double_t& value,Do uble_t& /*verr*/,Double_t& /*vlow*/, Double_t& /*vhigh*/) const;		virtual Int_t GetParameter(Int_t ipar,char* name,Double_t& value,Do uble_t& /*verr*/,Double_t& /*vlow*/, Double_t& /*vhigh*/) const;
	virtual const char *GetParName(Int_t ipar) const;		virtual const char *GetParName(Int_t ipar) const;
	virtual Double_t GetParError(Int_t ipar) const;		virtual Double_t GetParError(Int_t ipar) const;
	virtual Double_t GetParTValue(Int_t ipar);		virtual Double_t GetParTValue(Int_t ipar);
	virtual Double_t GetParSignificance(Int_t ipar);		virtual Double_t GetParSignificance(Int_t ipar);
	virtual void GetFitSample(TBits& bits);		virtual void GetFitSample(TBits& bits);
			virtual Double_t GetY2() const {return fY2;}
	virtual Bool_t IsFixed(Int_t ipar) const {return fFixedParams[ipar]; }		virtual Bool_t IsFixed(Int_t ipar) const {return fFixedParams[ipar]; }
	virtual Int_t Merge(TCollection *list);		virtual Int_t Merge(TCollection *list);
	virtual void PrintResults(Int_t level, Double_t amin=0) const;		virtual void PrintResults(Int_t level, Double_t amin=0) const;
	virtual void ReleaseParameter(Int_t ipar);		virtual void ReleaseParameter(Int_t ipar);
	virtual void SetBasisFunctions(TObjArray * functions);		virtual void SetBasisFunctions(TObjArray * functions);
	virtual void SetDim(Int_t n);		virtual void SetDim(Int_t n);
	virtual void SetFormula(const char* formula);		virtual void SetFormula(const char* formula);
	virtual void SetFormula(TFormula *function);		virtual void SetFormula(TFormula *function);
	virtual void StoreData(Bool_t store) {fStoreData=store;}		virtual void StoreData(Bool_t store) {fStoreData=store;}
	virtual Bool_t UpdateMatrix();		virtual Bool_t UpdateMatrix();
	//dummy functions for TVirtualFitter:		//dummy functions for TVirtualFitter:
	virtual Double_t Chisquare(Int_t /*npar*/, Double_t * /*params*/) const {return 0;}		virtual Double_t Chisquare(Int_t /*npar*/, Double_t * /*params*/) const {return 0;}
	virtual Int_t GetErrors(Int_t /*ipar*/,Double_t & /*eplus*/, Double_ t & /*eminus*/, Double_t & /*eparab*/, Double_t & /*globcc*/) const {return 0;}		virtual Int_t GetErrors(Int_t /*ipar*/,Double_t & /*eplus*/, Double_ t & /*eminus*/, Double_t & /*eparab*/, Double_t & /*globcc*/) const {return 0;}
	virtual Int_t GetStats(Double_t& /*amin*/, Double_t& /*edm*/, Double _t& /*errdef*/, Int_t& /*nvpar*/, Int_t& /*nparx*/) const {return 0;}		virtual Int_t GetStats(Double_t& /*amin*/, Double_t& /*edm*/, Double _t& /*errdef*/, Int_t& /*nvpar*/, Int_t& /*nparx*/) const {return 0;}
	virtual Double_t GetSumLog(Int_t /*i*/) {return 0;}		virtual Double_t GetSumLog(Int_t /*i*/) {return 0;}
	virtual void SetFitMethod(const char * /*name*/) {;}		virtual void SetFitMethod(const char * /*name*/) {;}
	virtual Int_t SetParameter(Int_t /*ipar*/,const char * /*parname*/,D ouble_t /*value*/,Double_t /*verr*/,Double_t /*vlow*/, Double_t /*vhigh*/) {return 0;}		virtual Int_t SetParameter(Int_t /*ipar*/,const char * /*parname*/,D ouble_t /*value*/,Double_t /*verr*/,Double_t /*vlow*/, Double_t /*vhigh*/) {return 0;}
	ClassDef(TLinearFitter, 1) //fit a set of data points with a linear comb ination of functions		ClassDef(TLinearFitter, 2) //fit a set of data points with a linear comb ination of functions
	};		};
	#endif		#endif
End of changes. 7 change blocks.
	4 lines changed or deleted		8 lines changed or added

	TMySQLStatement.h		TMySQLStatement.h
	// @(#)root/mysql:$Id: TMySQLStatement.h 20882 2007-11-19 11:31:26Z rdm $		// @(#)root/mysql:$Id: TMySQLStatement.h 27302 2009-01-30 07:25:32Z brun $
	// Author: Sergey Linev 6/02/2006		// Author: Sergey Linev 6/02/2006
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2006, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2006, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 64		skipping to change at line 64
	Int_t fNumBuffers; //! number of statement parameters		Int_t fNumBuffers; //! number of statement parameters
	MYSQL_BIND *fBind; //! array of bind data		MYSQL_BIND *fBind; //! array of bind data
	TParamData *fBuffer; //! parameter definition structur es		TParamData *fBuffer; //! parameter definition structur es
	Int_t fWorkingMode; //! 1 - setting parameters, 2 - re trieving results		Int_t fWorkingMode; //! 1 - setting parameters, 2 - re trieving results
	Int_t fIterationCount;//! number of iteration		Int_t fIterationCount;//! number of iteration
	Bool_t fNeedParBind; //! indicates when parameters bind should be called		Bool_t fNeedParBind; //! indicates when parameters bind should be called
	Bool_t IsSetParsMode() const { return fWorkingMode==1; }		Bool_t IsSetParsMode() const { return fWorkingMode==1; }
	Bool_t IsResultSetMode() const { return fWorkingMode==2; }		Bool_t IsResultSetMode() const { return fWorkingMode==2; }
	Bool_t SetSQLParamType(Int_t npar, int sqltype, bool sig, int sqlsi ze = 0);		Bool_t SetSQLParamType(Int_t npar, int sqltype, bool sig, unsigned long sqlsize = 0);
	long double ConvertToNumeric(Int_t npar);		long double ConvertToNumeric(Int_t npar);
	const char *ConvertToString(Int_t npar);		const char *ConvertToString(Int_t npar);
	void FreeBuffers();		void FreeBuffers();
	void SetBuffersNumber(Int_t n);		void SetBuffersNumber(Int_t n);
	void *BeforeSet(const char* method, Int_t npar, Int_t sqltype, Boo		void *BeforeSet(const char* method, Int_t npar, Int_t sqltype, Boo
	l_t sig = kTRUE, Int_t size = 0);		l_t sig = kTRUE, unsigned long size = 0);
			static ULong64_t fgAllocSizeLimit;
	public:		public:
	TMySQLStatement(MYSQL_STMT* stmt, Bool_t errout = kTRUE);		TMySQLStatement(MYSQL_STMT* stmt, Bool_t errout = kTRUE);
	virtual ~TMySQLStatement();		virtual ~TMySQLStatement();
			static unsigned long GetAllocSizeLimit() { return fgAllocSizeLimit; }
			static void SetAllocSizeLimit(unsigned long sz) { fgAllocSizeLimit = sz;
			}
	virtual void Close(Option_t * = "");		virtual void Close(Option_t * = "");
	virtual Int_t GetBufferLength() const { return 1; }		virtual Int_t GetBufferLength() const { return 1; }
	virtual Int_t GetNumParameters();		virtual Int_t GetNumParameters();
	virtual Bool_t SetNull(Int_t npar);		virtual Bool_t SetNull(Int_t npar);
	virtual Bool_t SetInt(Int_t npar, Int_t value);		virtual Bool_t SetInt(Int_t npar, Int_t value);
	virtual Bool_t SetUInt(Int_t npar, UInt_t value);		virtual Bool_t SetUInt(Int_t npar, UInt_t value);
	virtual Bool_t SetLong(Int_t npar, Long_t value);		virtual Bool_t SetLong(Int_t npar, Long_t value);
	virtual Bool_t SetLong64(Int_t npar, Long64_t value);		virtual Bool_t SetLong64(Int_t npar, Long64_t value);
End of changes. 4 change blocks.
	4 lines changed or deleted		10 lines changed or added

	TPDGCode.h		TPDGCode.h
	// @(#)root/vmc:$Id: TPDGCode.h 26965 2008-12-16 17:32:41Z brun $		// @(#)root/vmc:$Id: TPDGCode.h 27089 2009-01-05 20:13:29Z brun $
	// Author: Andreas Morsch 13/04/2002		// Author: Andreas Morsch 13/04/2002
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 2006, Rene Brun and Fons Rademakers. *		* Copyright (C) 2006, Rene Brun and Fons Rademakers. *
	* Copyright (C) 2002, ALICE Experiment at CERN. *		* Copyright (C) 2002, ALICE Experiment at CERN. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 34		skipping to change at line 34
	kSd1=3103,kSd1Bar=-3103,kSu0=3201,kSu0Bar=-3201,kSu1=3203,		kSd1=3103,kSd1Bar=-3103,kSu0=3201,kSu0Bar=-3201,kSu1=3203,
	kSu1Bar=-3203,kSearches0=7,kElectron=11,kPositron=-11,kNuE=12,		kSu1Bar=-3203,kSearches0=7,kElectron=11,kPositron=-11,kNuE=12,
	kNuEBar=-12,kMuonMinus=13,kMuonPlus=-13,kNuMu=14,kNuMuBar=-14,		kNuEBar=-12,kMuonMinus=13,kMuonPlus=-13,kNuMu=14,kNuMuBar=-14,
	kTauMinus=15,kTauPlus=-15,kNuTau=16,kNuTauBar=-16,kGamma=22,		kTauMinus=15,kTauPlus=-15,kNuTau=16,kNuTauBar=-16,kGamma=22,
	kZ0=23,kWPlus=24,kWMinus=-24,kPi0=111,kRho770_0=113,		kZ0=23,kWPlus=24,kWMinus=-24,kPi0=111,kRho770_0=113,
	kA2_1320_0=115,kRho3_1690_0=117,kK0Long=130,kPiPlus=211,		kA2_1320_0=115,kRho3_1690_0=117,kK0Long=130,kPiPlus=211,
	kPiMinus=-211,kRho770Plus=213,kRho770Minus=-213,		kPiMinus=-211,kRho770Plus=213,kRho770Minus=-213,
	kA2_1320Plus=215,kProton=2212,kProtonBar=-2212,		kA2_1320Plus=215,kProton=2212,kProtonBar=-2212,
	kNeutron=2112,kNeutronBar=-2112,kK0Short=310,kK0=311,		kNeutron=2112,kNeutronBar=-2112,kK0Short=310,kK0=311,
	kK0Bar=-311,kKPlus=321,kKMinus=-321,kLambda0=3122,		kK0Bar=-311,kKPlus=321,kKMinus=-321,kLambda0=3122,
	kLambda0Bar=-3122,kSigmaMinus=3112,kSigmaBarPlus=-3112,		kLambda1520=3124,kLambda0Bar=-3122,kSigmaMinus=3112,kSigmaBarPlus= -3112,
	kSigmaPlus=3222,kSigmaBarMinus=-3222,kSigma0=3212,		kSigmaPlus=3222,kSigmaBarMinus=-3222,kSigma0=3212,
	kSigma0Bar=-3212,kXiMinus=3312,kXiPlusBar=-3312,		kSigma0Bar=-3212,kXiMinus=3312,kXiPlusBar=-3312,
	kOmegaMinus=3334,kOmegaPlusBar=-3334}		kOmegaMinus=3334,kOmegaPlusBar=-3334}
	PDG_t;		PDG_t;
	/*		/*
	"a(2)(1320)-", -215		"a(2)(1320)-", -215
	"rho(3)(1690)+", 217		"rho(3)(1690)+", 217
	"rho(3)(1690)-", -217		"rho(3)(1690)-", -217
	"eta0", 221		"eta0", 221
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	TPad.h		TPad.h
	// @(#)root/gpad:$Id: TPad.h 26760 2008-12-09 15:56:43Z brun $		// @(#)root/gpad:$Id: TPad.h 27547 2009-02-20 14:09:12Z brun $
	// Author: Rene Brun 12/12/94		// Author: Rene Brun 12/12/94
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 372		skipping to change at line 372
	virtual void DeleteToolTip(TObject *tip);		virtual void DeleteToolTip(TObject *tip);
	virtual void ResetToolTip(TObject *tip);		virtual void ResetToolTip(TObject *tip);
	virtual void CloseToolTip(TObject *tip);		virtual void CloseToolTip(TObject *tip);
	virtual void x3d(Option_t *type=""); // Depreciated		virtual void x3d(Option_t *type=""); // Depreciated
	virtual TVirtualViewer3D *GetViewer3D(Option_t * type = "");		virtual TVirtualViewer3D *GetViewer3D(Option_t * type = "");
	virtual Bool_t HasViewer3D() const { return (fViewer3D); }		virtual Bool_t HasViewer3D() const { return (fViewer3D); }
	virtual void ReleaseViewer3D(Option_t * type = "");		virtual void ReleaseViewer3D(Option_t * type = "");
			virtual void RecordPave(const TObject *obj); // *SIGNA
			L*
			virtual void RecordLatex(const TObject *obj); // *SIGNA
			L*
			virtual void EventPave() { Emit("EventPave()"); } // *SIGNA
			L*
			virtual void StartEditing() { Emit("StartEditing()"); } // *SIGNA
			L*
	ClassDef(TPad,10) //A Graphics pad		ClassDef(TPad,10) //A Graphics pad
	};		};
	//---- inlines ------------------------------------------------------------ -----		//---- inlines ------------------------------------------------------------ -----
	//_________________________________________________________________________ _____		//_________________________________________________________________________ _____
	inline void TPad::Modified(Bool_t flag)		inline void TPad::Modified(Bool_t flag)
	{		{
	if (!fModified && flag) Emit("Modified()");		if (!fModified && flag) Emit("Modified()");
	fModified = flag;		fModified = flag;
End of changes. 2 change blocks.
	1 lines changed or deleted		10 lines changed or added

	TPaletteAxis.h		TPaletteAxis.h
	// @(#)root/histpainter:$Id: TPaletteAxis.h 26620 2008-12-03 10:44:54Z coue t $		// @(#)root/histpainter:$Id: TPaletteAxis.h 27028 2008-12-19 12:45:24Z coue t $
	// Author: Rene Brun 15/11/2002		// Author: Rene Brun 15/11/2002
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 55		skipping to change at line 55
	TPaletteAxis(const TPaletteAxis &palette);		TPaletteAxis(const TPaletteAxis &palette);
	virtual ~TPaletteAxis();		virtual ~TPaletteAxis();
	void Copy(TObject &palette) const;		void Copy(TObject &palette) const;
	virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);		virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);
	virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);		virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);
	TGaxis *GetAxis() {return &fAxis;}		TGaxis *GetAxis() {return &fAxis;}
	Int_t GetBinColor(Int_t i, Int_t j);		Int_t GetBinColor(Int_t i, Int_t j);
	Option_t *GetName() const {return fName.Data();}		Option_t *GetName() const {return fName.Data();}
	virtual char *GetObjectInfo(Int_t px, Int_t py) const;		virtual char *GetObjectInfo(Int_t px, Int_t py) const;
			Int_t GetValueColor(Double_t zc);
	virtual void Paint(Option_t *option="");		virtual void Paint(Option_t *option="");
	virtual void SavePrimitive(ostream &out, Option_t *option = "");		virtual void SavePrimitive(ostream &out, Option_t *option = "");
	virtual void SetName(const char *name="") {fName = name;} // *MENU*		virtual void SetName(const char *name="") {fName = name;} // *MENU*
	virtual void SetLabelColor(Int_t labelcolor) {fAxis.SetLabelColor(label color);} // *MENU*		virtual void SetLabelColor(Int_t labelcolor) {fAxis.SetLabelColor(label color);} // *MENU*
	virtual void SetLabelFont(Int_t labelfont) {fAxis.SetLabelFont(labelfon t);} // *MENU*		virtual void SetLabelFont(Int_t labelfont) {fAxis.SetLabelFont(labelfon t);} // *MENU*
	virtual void SetLabelOffset(Float_t labeloffset) {fAxis.SetLabelOffset( labeloffset);} // *MENU*		virtual void SetLabelOffset(Float_t labeloffset) {fAxis.SetLabelOffset( labeloffset);} // *MENU*
	virtual void SetLabelSize(Float_t labelsize) {fAxis.SetLabelSize(labels ize);} // *MENU*		virtual void SetLabelSize(Float_t labelsize) {fAxis.SetLabelSize(labels ize);} // *MENU*
	virtual void SetTitleOffset(Float_t titleoffset=1) {fAxis.SetTitleOffse t(titleoffset);} // *MENU*		virtual void SetTitleOffset(Float_t titleoffset=1) {fAxis.SetTitleOffse t(titleoffset);} // *MENU*
	virtual void SetTitleSize(Float_t titlesize) {fAxis.SetTitleSize(titles ize);} // *MENU*		virtual void SetTitleSize(Float_t titlesize) {fAxis.SetTitleSize(titles ize);} // *MENU*
	virtual void SetLineColor(Color_t linecolor) {fAxis.SetLineColor(lineco lor);} // *MENU*		virtual void SetLineColor(Color_t linecolor) {fAxis.SetLineColor(lineco lor);} // *MENU*
End of changes. 2 change blocks.
	1 lines changed or deleted		2 lines changed or added

	TPointSet3D.h		TPointSet3D.h
	// @(#)root/g3d:$Id: TPointSet3D.h 26168 2008-11-12 21:21:29Z matevz $		// @(#)root/g3d:$Id: TPointSet3D.h 27556 2009-02-20 17:38:28Z matevz $
	// Author: Matevz Tadel 7/4/2006		// Author: Matevz Tadel 7/4/2006
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2006, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2006, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 30		skipping to change at line 30
	#endif		#endif
	#include "TRefArray.h"		#include "TRefArray.h"
	class TPointSet3D : public TPolyMarker3D, public TAttBBox		class TPointSet3D : public TPolyMarker3D, public TAttBBox
	{		{
	protected:		protected:
	Bool_t fOwnIds; //Flag specifying id-objects are owned by the point-s et		Bool_t fOwnIds; //Flag specifying id-objects are owned by the point-s et
	TRefArray fIds; //User-provided point identifications		TRefArray fIds; //User-provided point identifications
			void CopyIds(const TPointSet3D& t);
	public:		public:
	TPointSet3D() :		TPointSet3D() :
	TPolyMarker3D(), fOwnIds(kFALSE), fIds() { fName="TPointSet3D"; }		TPolyMarker3D(), fOwnIds(kFALSE), fIds() { fName="TPointSet3D"; }
	TPointSet3D(Int_t n, Marker_t m=1, Option_t *opt="") :		TPointSet3D(Int_t n, Marker_t m=1, Option_t *opt="") :
	TPolyMarker3D(n, m, opt), fOwnIds(kFALSE), fIds() { fName="TPointSet3 D"; }		TPolyMarker3D(n, m, opt), fOwnIds(kFALSE), fIds() { fName="TPointSet3 D"; }
	TPointSet3D(Int_t n, Float_t *p, Marker_t m=1, Option_t *opt="") :		TPointSet3D(Int_t n, Float_t *p, Marker_t m=1, Option_t *opt="") :
	TPolyMarker3D(n, p, m, opt), fOwnIds(kFALSE), fIds() { fName="TPointS et3D"; }		TPolyMarker3D(n, p, m, opt), fOwnIds(kFALSE), fIds() { fName="TPointS et3D"; }
	TPointSet3D(Int_t n, Double_t *p, Marker_t m=1, Option_t *opt="") :		TPointSet3D(Int_t n, Double_t *p, Marker_t m=1, Option_t *opt="") :
	TPolyMarker3D(n, p, m, opt), fOwnIds(kFALSE), fIds() { fName="TPointS et3D"; }		TPolyMarker3D(n, p, m, opt), fOwnIds(kFALSE), fIds() { fName="TPointS et3D"; }
	TPointSet3D(const TPointSet3D &t);		TPointSet3D(const TPointSet3D &t);
End of changes. 2 change blocks.
	1 lines changed or deleted		3 lines changed or added

	TPolyLine3D.h		TPolyLine3D.h
	// @(#)root/g3d:$Id: TPolyLine3D.h 20882 2007-11-19 11:31:26Z rdm $		// @(#)root/g3d:$Id: TPolyLine3D.h 27556 2009-02-20 17:38:28Z matevz $
	// Author: Nenad Buncic 17/08/95		// Author: Nenad Buncic 17/08/95
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 39		skipping to change at line 39
	#ifndef ROOT_TTString		#ifndef ROOT_TTString
	#include "TString.h"		#include "TString.h"
	#endif		#endif
	#ifndef ROOT_TAttLine		#ifndef ROOT_TAttLine
	#include "TAttLine.h"		#include "TAttLine.h"
	#endif		#endif
	#ifndef ROOT_TAtt3D		#ifndef ROOT_TAtt3D
	#include "TAtt3D.h"		#include "TAtt3D.h"
	#endif		#endif
	class TPolyLine3D : public TObject, public TAttLine, public TAtt3D {		class TPolyLine3D : public TObject, public TAttLine, public TAtt3D
			{
	protected:		protected:
	Int_t fN; //Number of points		Int_t fN; //Number of points
	Float_t *fP; //[3*fN] Array of 3-D coordinates (x,y,z)		Float_t *fP; //[3*fN] Array of 3-D coordinates (x,y,z)
	TString fOption; //options		TString fOption; //options
	UInt_t fGLList; //!The list number for OpenGL view
	Int_t fLastPoint; //The index of the last filled point		Int_t fLastPoint; //The index of the last filled point
	public:		public:
	TPolyLine3D();		TPolyLine3D();
	TPolyLine3D(Int_t n, Option_t *option="");		TPolyLine3D(Int_t n, Option_t *option="");
	TPolyLine3D(Int_t n, Float_t *p, Option_t *option="");		TPolyLine3D(Int_t n, Float_t *p, Option_t *option="");
	TPolyLine3D(Int_t n, Double_t *p, Option_t *option="");		TPolyLine3D(Int_t n, Double_t *p, Option_t *option="");
	TPolyLine3D(Int_t n, Float_t *x, Float_t *y, Float_t *z, Option_t *optio n="");		TPolyLine3D(Int_t n, Float_t *x, Float_t *y, Float_t *z, Option_t *optio n="");
	TPolyLine3D(Int_t n, Double_t *x, Double_t *y, Double_t *z, Option_t *op tion="");		TPolyLine3D(Int_t n, Double_t *x, Double_t *y, Double_t *z, Option_t *op tion="");
	TPolyLine3D(const TPolyLine3D &polylin);		TPolyLine3D(const TPolyLine3D &polylin);
End of changes. 3 change blocks.
	4 lines changed or deleted		3 lines changed or added

	TPolyMarker3D.h		TPolyMarker3D.h
	// @(#)root/g3d:$Id: TPolyMarker3D.h 26168 2008-11-12 21:21:29Z matevz $		// @(#)root/g3d:$Id: TPolyMarker3D.h 27556 2009-02-20 17:38:28Z matevz $
	// Author: Nenad Buncic 21/08/95		// Author: Nenad Buncic 21/08/95
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 39		skipping to change at line 39
	#ifndef ROOT_TAtt3D		#ifndef ROOT_TAtt3D
	#include "TAtt3D.h"		#include "TAtt3D.h"
	#endif		#endif
	#ifndef ROOT_TString		#ifndef ROOT_TString
	#include "TString.h"		#include "TString.h"
	#endif		#endif
	class TH1;		class TH1;
	class TCollection;		class TCollection;
	class TPolyMarker3D : public TObject, public TAttMarker, public TAtt3D {		class TPolyMarker3D : public TObject, public TAttMarker, public TAtt3D
			{
	protected:		protected:
	Int_t fN; //number of points		Int_t fN; //number of points
	Float_t *fP; //[3*fN] Array of X,Y,Z coordinates		Float_t *fP; //[3*fN] Array of X,Y,Z coordinates
	TString fOption; //options		TString fOption; //options
	UInt_t fGLList; //!The list number for OpenGL view
	Int_t fLastPoint; //The index of the last filled point		Int_t fLastPoint; //The index of the last filled point
	TString fName; //name of polymarker		TString fName; //name of polymarker
	TPolyMarker3D& operator=(const TPolyMarker3D&);		TPolyMarker3D& operator=(const TPolyMarker3D&);
	public:		public:
	TPolyMarker3D();		TPolyMarker3D();
	TPolyMarker3D(Int_t n, Marker_t marker=1, Option_t *option="");		TPolyMarker3D(Int_t n, Marker_t marker=1, Option_t *option="");
	TPolyMarker3D(Int_t n, Float_t *p, Marker_t marker=1, Option_t *option=" ");		TPolyMarker3D(Int_t n, Float_t *p, Marker_t marker=1, Option_t *option=" ");
	TPolyMarker3D(Int_t n, Double_t *p, Marker_t marker=1, Option_t *option= "");		TPolyMarker3D(Int_t n, Double_t *p, Marker_t marker=1, Option_t *option= "");
End of changes. 3 change blocks.
	4 lines changed or deleted		3 lines changed or added

	TProof.h		TProof.h
	// @(#)root/proof:$Id: TProof.h 26951 2008-12-16 12:04:38Z ganis $		// @(#)root/proof:$Id: TProof.h 27443 2009-02-12 19:18:17Z ganis $
	// Author: Fons Rademakers 13/02/97		// Author: Fons Rademakers 13/02/97
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 115		skipping to change at line 115
	// 11 -> 12: new progress message		// 11 -> 12: new progress message
	// 12 -> 13: exchange version/architecture/compiler info		// 12 -> 13: exchange version/architecture/compiler info
	// 13 -> 14: new proofserv environment setting		// 13 -> 14: new proofserv environment setting
	// 14 -> 15: add support for entry lists; new version of TFileInfo		// 14 -> 15: add support for entry lists; new version of TFileInfo
	// 15 -> 16: add support for generic non-data based processing		// 15 -> 16: add support for generic non-data based processing
	// 16 -> 17: new dataset handling system; support for TFileCollection proce ssing		// 16 -> 17: new dataset handling system; support for TFileCollection proce ssing
	// 17 -> 18: support for reconnection on daemon restarts		// 17 -> 18: support for reconnection on daemon restarts
	// 18 -> 19: TProofProgressStatus used in kPROOF_PROGRESS, kPROOF_STOPPROCE SS		// 18 -> 19: TProofProgressStatus used in kPROOF_PROGRESS, kPROOF_STOPPROCE SS
	// and kPROOF_GETNEXTPACKET messages in Master - worker communica tion		// and kPROOF_GETNEXTPACKET messages in Master - worker communica tion
	// 19 -> 20: Fix the asynchronous mode (required changes in some messages)		// 19 -> 20: Fix the asynchronous mode (required changes in some messages)
			// 20 -> 21: Add support for session queuing
	// PROOF magic constants		// PROOF magic constants
	const Int_t kPROOF_Protocol = 20; // protocol versi on number		const Int_t kPROOF_Protocol = 21; // protocol versi on number
	const Int_t kPROOF_Port = 1093; // IANA registere d PROOF port		const Int_t kPROOF_Port = 1093; // IANA registere d PROOF port
	const char* const kPROOF_ConfFile = "proof.conf"; // default config file		const char* const kPROOF_ConfFile = "proof.conf"; // default config file
	const char* const kPROOF_ConfDir = "/usr/local/root"; // default c onfig dir		const char* const kPROOF_ConfDir = "/usr/local/root"; // default c onfig dir
	const char* const kPROOF_WorkDir = ".proof"; // default workin g directory		const char* const kPROOF_WorkDir = ".proof"; // default workin g directory
	const char* const kPROOF_CacheDir = "cache"; // file cache dir , under WorkDir		const char* const kPROOF_CacheDir = "cache"; // file cache dir , under WorkDir
	const char* const kPROOF_PackDir = "packages"; // package dir, u nder WorkDir		const char* const kPROOF_PackDir = "packages"; // package dir, u nder WorkDir
	const char* const kPROOF_QueryDir = "queries"; // query dir, und er WorkDir		const char* const kPROOF_QueryDir = "queries"; // query dir, und er WorkDir
	const char* const kPROOF_DataSetDir = "datasets"; // dataset dir, u nder WorkDir		const char* const kPROOF_DataSetDir = "datasets"; // dataset dir, u nder WorkDir
	const char* const kPROOF_CacheLockFile = "proof-cache-lock-"; // cache lock file		const char* const kPROOF_CacheLockFile = "proof-cache-lock-"; // cache lock file
	const char* const kPROOF_PackageLockFile = "proof-package-lock-"; // packag e lock file		const char* const kPROOF_PackageLockFile = "proof-package-lock-"; // packag e lock file
	skipping to change at line 154		skipping to change at line 155
	const char* const kUNTAR = "...";		const char* const kUNTAR = "...";
	const char* const kUNTAR2 = "...";		const char* const kUNTAR2 = "...";
	const char* const kUNTAR3 = "...";		const char* const kUNTAR3 = "...";
	const char* const kGUNZIP = "gunzip";		const char* const kGUNZIP = "gunzip";
	#endif		#endif
	R__EXTERN TVirtualMutex *gProofMutex;		R__EXTERN TVirtualMutex *gProofMutex;
	typedef void (*PrintProgress_t)(Long64_t tot, Long64_t proc, Float_t procti me);		typedef void (*PrintProgress_t)(Long64_t tot, Long64_t proc, Float_t procti me);
	// Helper classes used for parallel startup
	class TProofThreadArg {
	public:
	TUrl *fUrl;
	TString fOrd;
	Int_t fPerf;
	TString fImage;
	TString fWorkdir;
	TString fMsd;
	TList *fSlaves;
	TProof *fProof;
	TCondorSlave *fCslave;
	TList *fClaims;
	Int_t fType;
	TProofThreadArg(const char *h, Int_t po, const char *o, Int_t pe,
	const char *i, const char *w,
	TList *s, TProof *prf);
	TProofThreadArg(TCondorSlave *csl, TList *clist,
	TList *s, TProof *prf);
	TProofThreadArg(const char *h, Int_t po, const char *o,
	const char *i, const char *w, const char *m,
	TList *s, TProof *prf);
	virtual ~TProofThreadArg() { if (fUrl) delete fUrl; }
	private:
	TProofThreadArg(const TProofThreadArg&); // Not implemented
	TProofThreadArg& operator=(const TProofThreadArg&); // Not implemented
	};
	// PROOF Thread class for parallel startup
	class TProofThread {
	public:
	TThread *fThread;
	TProofThreadArg *fArgs;
	TProofThread(TThread *t, TProofThreadArg *a): fThread(t), fArgs(a) {}
	virtual ~TProofThread() { SafeDelete(fThread); SafeDelete(fArgs); }
	private:
	TProofThread(const TProofThread&); // Not implemented
	TProofThread& operator=(const TProofThread&); // Not implemented
	};
	// PROOF Interrupt signal handler		// PROOF Interrupt signal handler
	class TProofInterruptHandler : public TSignalHandler {		class TProofInterruptHandler : public TSignalHandler {
	private:		private:
	TProofInterruptHandler(const TProofInterruptHandler&); // Not implemente d		TProofInterruptHandler(const TProofInterruptHandler&); // Not implemente d
	TProofInterruptHandler& operator=(const TProofInterruptHandler&); // Not implemented		TProofInterruptHandler& operator=(const TProofInterruptHandler&); // Not implemented
	TProof *fProof;		TProof *fProof;
	public:		public:
	TProofInterruptHandler(TProof *p)		TProofInterruptHandler(TProof *p)
	skipping to change at line 399		skipping to change at line 350
	};		};
	Bool_t fValid; //is this a valid proof object		Bool_t fValid; //is this a valid proof object
	TString fMaster; //master server ("" if a master); used in the browser		TString fMaster; //master server ("" if a master); used in the browser
	TString fWorkDir; //current work directory on remote ser vers		TString fWorkDir; //current work directory on remote ser vers
	Int_t fLogLevel; //server debug logging level		Int_t fLogLevel; //server debug logging level
	Int_t fStatus; //remote return status (part of kPROOF _LOGDONE)		Int_t fStatus; //remote return status (part of kPROOF _LOGDONE)
	Int_t fCheckFileStatus; //remote return status after kPROOF_CH ECKFILE		Int_t fCheckFileStatus; //remote return status after kPROOF_CH ECKFILE
	TList *fRecvMessages; //Messages received during collect not yet processed		TList *fRecvMessages; //Messages received during collect not yet processed
	TList *fSlaveInfo; //!list returned by kPROOF_GETSLAVEINF O		TList *fSlaveInfo; //!list returned by kPROOF_GETSLAVEINF O
	Bool_t fMasterServ; //true if we are a master server
	Bool_t fSendGroupView; //if true send new group view		Bool_t fSendGroupView; //if true send new group view
	TList *fActiveSlaves; //list of active slaves (subset of all slaves)		TList *fActiveSlaves; //list of active slaves (subset of all slaves)
	TList *fInactiveSlaves; //list of inactive slaves (good but no t used for processing)		TList *fInactiveSlaves; //list of inactive slaves (good but no t used for processing)
	TList *fUniqueSlaves; //list of all active slaves with uniqu e file systems		TList *fUniqueSlaves; //list of all active slaves with uniqu e file systems
	TList *fAllUniqueSlaves; //list of all active slaves with uniq ue file systems, including all submasters		TList *fAllUniqueSlaves; //list of all active slaves with uniq ue file systems, including all submasters
	TList *fNonUniqueMasters; //list of all active masters with a n onunique file system		TList *fNonUniqueMasters; //list of all active masters with a n onunique file system
	TMonitor *fActiveMonitor; //monitor activity on all active slave sockets		TMonitor *fActiveMonitor; //monitor activity on all active slave sockets
	TMonitor *fUniqueMonitor; //monitor activity on all unique slave sockets		TMonitor *fUniqueMonitor; //monitor activity on all unique slave sockets
	TMonitor *fAllUniqueMonitor; //monitor activity on all unique slav e sockets, including all submasters		TMonitor *fAllUniqueMonitor; //monitor activity on all unique slav e sockets, including all submasters
	TMonitor *fCurrentMonitor; //currently active monitor		TMonitor *fCurrentMonitor; //currently active monitor
	skipping to change at line 430		skipping to change at line 380
	TMD5 fMD5; //file's md5		TMD5 fMD5; //file's md5
	Long_t fModtime; //file's modification time		Long_t fModtime; //file's modification time
	};		};
	typedef std::map<TString, MD5Mod_t> FileMap_t;		typedef std::map<TString, MD5Mod_t> FileMap_t;
	FileMap_t fFileMap; //map keeping track of a file's md5 an d mod time		FileMap_t fFileMap; //map keeping track of a file's md5 an d mod time
	TDSet *fDSet; //current TDSet being validated		TDSet *fDSet; //current TDSet being validated
	Int_t fNotIdle; //Number of non-idle sub-nodes		Int_t fNotIdle; //Number of non-idle sub-nodes
	Bool_t fSync; //true if type of currently processed query is sync		Bool_t fSync; //true if type of currently processed query is sync
	ERunStatus fRunStatus; //run status		ERunStatus fRunStatus; //run status
			Bool_t fIsWaiting; //true if queries have been enqueued
	Bool_t fRedirLog; //redirect received log info		Bool_t fRedirLog; //redirect received log info
	TString fLogFileName; //name of the temp file for redirected logs		TString fLogFileName; //name of the temp file for redirected logs
	FILE *fLogFileW; //temp file to redirect logs		FILE *fLogFileW; //temp file to redirect logs
	FILE *fLogFileR; //temp file to read redirected logs		FILE *fLogFileR; //temp file to read redirected logs
	Bool_t fLogToWindowOnly; //send log to window only		Bool_t fLogToWindowOnly; //send log to window only
	TList *fWaitingSlaves; //stores a TPair of the slaves's TSock et and TMessage		TList *fWaitingSlaves; //stores a TPair of the slaves's TSock et and TMessage
	TList *fQueries; //list of TProofQuery objects		TList *fQueries; //list of TProofQuery objects
	Int_t fOtherQueries; //number of queries in list from previ ous sessions		Int_t fOtherQueries; //number of queries in list from previ ous sessions
	skipping to change at line 466		skipping to change at line 417
	PrintProgress_t fPrintProgress; //Function function to display progres s info in batch mode		PrintProgress_t fPrintProgress; //Function function to display progres s info in batch mode
	TVirtualMutex *fCloseMutex; // Avoid crashes in MarkBad or alike w hile closing		TVirtualMutex *fCloseMutex; // Avoid crashes in MarkBad or alike w hile closing
	TList *fLoadedMacros; // List of loaded macros (just file na mes)		TList *fLoadedMacros; // List of loaded macros (just file na mes)
	static TList *fgProofEnvList; // List of TNameds defining environmen t		static TList *fgProofEnvList; // List of TNameds defining environmen t
	// variables to pass to proofserv		// variables to pass to proofserv
	protected:		protected:
	enum ESlaves { kAll, kActive, kUnique, kAllUnique };		enum ESlaves { kAll, kActive, kUnique, kAllUnique };
			Bool_t fMasterServ; //true if we are a master server
	TUrl fUrl; //Url of the master		TUrl fUrl; //Url of the master
	TString fConfFile; //file containing config information		TString fConfFile; //file containing config information
	TString fConfDir; //directory containing cluster config i nformation		TString fConfDir; //directory containing cluster config i nformation
	TString fImage; //master's image name		TString fImage; //master's image name
	Int_t fProtocol; //remote PROOF server protocol version number		Int_t fProtocol; //remote PROOF server protocol version number
	TList *fSlaves; //list of all slave servers as in confi g file		TList *fSlaves; //list of all slave servers as in confi g file
	TList *fBadSlaves; //dead slaves (subset of all slaves)		TList *fBadSlaves; //dead slaves (subset of all slaves)
	TMonitor *fAllMonitor; //monitor activity on all valid slave s ockets		TMonitor *fAllMonitor; //monitor activity on all valid slave s ockets
	Bool_t fDataReady; //true if data is ready to be analyzed		Bool_t fDataReady; //true if data is ready to be analyzed
	Long64_t fBytesReady; //number of bytes staged		Long64_t fBytesReady; //number of bytes staged
	skipping to change at line 587		skipping to change at line 539
	Int_t GetQueryReference(Int_t qry, TString &ref);		Int_t GetQueryReference(Int_t qry, TString &ref);
	void PrintProgress(Long64_t total, Long64_t processed, Float_t procT ime = -1.);		void PrintProgress(Long64_t total, Long64_t processed, Float_t procT ime = -1.);
	protected:		protected:
	TProof(); // For derived classes to use		TProof(); // For derived classes to use
	Int_t Init(const char *masterurl, const char *conffile,		Int_t Init(const char *masterurl, const char *conffile,
	const char *confdir, Int_t loglevel,		const char *confdir, Int_t loglevel,
	const char *alias = 0);		const char *alias = 0);
	virtual Bool_t StartSlaves(Bool_t parallel, Bool_t attach = kFALSE);		virtual Bool_t StartSlaves(Bool_t attach = kFALSE);
	Int_t AddWorkers(TList *wrks);		Int_t AddWorkers(TList *wrks);
	Int_t RemoveWorkers(TList *wrks);		Int_t RemoveWorkers(TList *wrks);
	void SetPlayer(TVirtualProofPlayer *player);		void SetPlayer(TVirtualProofPlayer *player);
	TVirtualProofPlayer *GetPlayer() const { return fPlayer; }		TVirtualProofPlayer *GetPlayer() const { return fPlayer; }
	virtual TVirtualProofPlayer *MakePlayer(const char *player = 0, TSocket *s = 0);		virtual TVirtualProofPlayer *MakePlayer(const char *player = 0, TSocket *s = 0);
	void UpdateDialog();		void UpdateDialog();
	void HandleLibIncPath(const char *what, Bool_t add, const char *dirs) ;		void HandleLibIncPath(const char *what, Bool_t add, const char *dirs) ;
	skipping to change at line 691		skipping to change at line 643
	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();
	void ShowPackages(Bool_t all = kFALSE);		void ShowPackages(Bool_t all = kFALSE);
	void ShowEnabledPackages(Bool_t all = kFALSE);		void ShowEnabledPackages(Bool_t all = kFALSE);
	Int_t ClearPackages();		Int_t ClearPackages();
	Int_t ClearPackage(const char *package);		Int_t ClearPackage(const char *package);
	Int_t EnablePackage(const char *package, Bool_t notOnClient = kFAL SE);		Int_t EnablePackage(const char *package, Bool_t notOnClient = kFAL SE);
	Int_t UploadPackage(const char *par, EUploadPackageOpt opt = kUnta r);		Int_t UploadPackage(const char *par, EUploadPackageOpt opt = kUnta r);
	Int_t Load(const char *macro, Bool_t notOnClient = kFALSE, Bool_t		Int_t Load(const char *macro, Bool_t notOnClient = kFALSE, Bool_t
	uniqueOnly = kTRUE);		uniqueOnly = kTRUE,
			TList *wrks = 0);
	Int_t AddDynamicPath(const char *libpath, Bool_t onClient = kFALSE		Int_t AddDynamicPath(const char *libpath, Bool_t onClient = kFALSE
	);		, TList *wrks = 0);
	Int_t AddIncludePath(const char *incpath, Bool_t onClient = kFALSE		Int_t AddIncludePath(const char *incpath, Bool_t onClient = kFALSE
	);		, TList *wrks = 0);
	Int_t RemoveDynamicPath(const char *libpath, Bool_t onClient = kFA LSE);		Int_t RemoveDynamicPath(const char *libpath, Bool_t onClient = kFA LSE);
	Int_t RemoveIncludePath(const char *incpath, Bool_t onClient = kFA LSE);		Int_t RemoveIncludePath(const char *incpath, Bool_t onClient = kFA LSE);
	//-- dataset management		//-- dataset management
	Int_t UploadDataSet(const char *dataset,		Int_t UploadDataSet(const char *dataset,
	TList *files,		TList *files,
	const char *dest = 0,		const char *dest = 0,
	Int_t opt = kAskUser,		Int_t opt = kAskUser,
	TList *skippedFiles = 0);		TList *skippedFiles = 0);
	Int_t UploadDataSet(const char *dataset,		Int_t UploadDataSet(const char *dataset,
	skipping to change at line 762		skipping to change at line 715
	Float_t GetRealTime() const { return fRealTime; }		Float_t GetRealTime() const { return fRealTime; }
	Float_t GetCpuTime() const { return fCpuTime; }		Float_t GetCpuTime() const { return fCpuTime; }
	Bool_t IsLite() const { return (fServType == TProofMgr::kProofLite) ; }		Bool_t IsLite() const { return (fServType == TProofMgr::kProofLite) ; }
	Bool_t IsProofd() const { return (fServType == TProofMgr::kProofd); }		Bool_t IsProofd() const { return (fServType == TProofMgr::kProofd); }
	Bool_t IsFolder() const { return kTRUE; }		Bool_t IsFolder() const { return kTRUE; }
	Bool_t IsMaster() const { return fMasterServ; }		Bool_t IsMaster() const { return fMasterServ; }
	Bool_t IsValid() const { return fValid; }		Bool_t IsValid() const { return fValid; }
	Bool_t IsParallel() const { return GetParallel() > 0 ? kTRUE : kFAL SE; }		Bool_t IsParallel() const { return GetParallel() > 0 ? kTRUE : kFAL SE; }
	Bool_t IsIdle() const { return (fNotIdle <= 0) ? kTRUE : kFALSE; }		Bool_t IsIdle() const { return (fNotIdle <= 0) ? kTRUE : kFALSE; }
			Bool_t IsWaiting() const { return fIsWaiting; }
	ERunStatus GetRunStatus() const { return fRunStatus; }		ERunStatus GetRunStatus() const { return fRunStatus; }
	TList *GetLoadedMacros() const { return fLoadedMacros; }		TList *GetLoadedMacros() const { return fLoadedMacros; }
	//-- input list parameter handling		//-- input list parameter handling
	void SetParameter(const char *par, const char *value);		void SetParameter(const char *par, const char *value);
	void SetParameter(const char *par, Int_t value);		void SetParameter(const char *par, Int_t value);
	void SetParameter(const char *par, Long_t value);		void SetParameter(const char *par, Long_t value);
	void SetParameter(const char *par, Long64_t value);		void SetParameter(const char *par, Long64_t value);
	void SetParameter(const char *par, Double_t value);		void SetParameter(const char *par, Double_t value);
End of changes. 11 change blocks.
	60 lines changed or deleted		14 lines changed or added

	TProofCondor.h		TProofCondor.h
	// @(#)root/proof:$Id: TProofCondor.h 22582 2008-03-11 07:15:26Z brun $		// @(#)root/proof:$Id: TProofCondor.h 27171 2009-01-16 16:04:00Z ganis $
	// Author: Fons Rademakers 13/02/97		// Author: Fons Rademakers 13/02/97
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 45		skipping to change at line 45
	class TProofCondor : public TProof {		class TProofCondor : public TProof {
	friend class TCondor;		friend class TCondor;
	private:		private:
	TCondor *fCondor; //proxy for our Condor pool		TCondor *fCondor; //proxy for our Condor pool
	TTimer *fTimer; //timer for delayed Condor COD suspend		TTimer *fTimer; //timer for delayed Condor COD suspend
	protected:		protected:
	Bool_t StartSlaves(Bool_t parallel, Bool_t);		Bool_t StartSlaves(Bool_t);
	TString GetJobAd();		TString GetJobAd();
	public:		public:
	TProofCondor(const char *masterurl, const char *conffile = kPROOF_ConfFi le,		TProofCondor(const char *masterurl, const char *conffile = kPROOF_ConfFi le,
	const char *confdir = kPROOF_ConfDir, Int_t loglevel = 0,		const char *confdir = kPROOF_ConfDir, Int_t loglevel = 0,
	const char *alias = 0, TProofMgr *mgr = 0);		const char *alias = 0, TProofMgr *mgr = 0);
	virtual ~TProofCondor();		virtual ~TProofCondor();
	virtual void SetActive() { TProof::SetActive(); }		virtual void SetActive() { TProof::SetActive(); }
	virtual void SetActive(Bool_t active);		virtual void SetActive(Bool_t active);
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	TProofDraw.h		TProofDraw.h
	// @(#)root/proofplayer:$Id: TProofDraw.h 20882 2007-11-19 11:31:26Z rdm $		// @(#)root/proofplayer:$Id: TProofDraw.h 27345 2009-02-04 10:00:29Z ganis $
	// Author: Maarten Ballintijn 24/09/2003		// Author: Maarten Ballintijn 24/09/2003
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2003, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2003, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 71		skipping to change at line 71
	TString fSelection;		TString fSelection;
	TString fInitialExp;		TString fInitialExp;
	TTreeFormulaManager *fManager;		TTreeFormulaManager *fManager;
	TTree *fTree;		TTree *fTree;
	TTreeFormula *fVar[4]; // Pointer to variable formula		TTreeFormula *fVar[4]; // Pointer to variable formula
	TTreeFormula *fSelect; // Pointer to selection formula		TTreeFormula *fSelect; // Pointer to selection formula
	Int_t fMultiplicity; // Indicator of the variability o f the size of entries		Int_t fMultiplicity; // Indicator of the variability o f the size of entries
	Bool_t fObjEval; // true if fVar1 returns an objec t (or pointer to).		Bool_t fObjEval; // true if fVar1 returns an objec t (or pointer to).
	Int_t fDimension; // Dimension of the current expre ssion		Int_t fDimension; // Dimension of the current expre ssion
			void SetCanvas(const char *objname);
	void SetError(const char *sub, const char *mesg);		void SetError(const char *sub, const char *mesg);
	protected:		protected:
	enum { kWarn = BIT(12) };		enum { kWarn = BIT(12) };
	virtual Bool_t CompileVariables();		virtual Bool_t CompileVariables();
	virtual void ClearFormula();		virtual void ClearFormula();
	virtual Bool_t ProcessSingle(Long64_t /*entry*/, Int_t /*i*/);		virtual Bool_t ProcessSingle(Long64_t /*entry*/, Int_t /*i*/);
	virtual void DoFill(Long64_t entry, Double_t w, const Double_t *v ) = 0;		virtual void DoFill(Long64_t entry, Double_t w, const Double_t *v ) = 0;
	virtual void DefVar() = 0;		virtual void DefVar() = 0;
End of changes. 2 change blocks.
	1 lines changed or deleted		2 lines changed or added

	TProofMgr.h		TProofMgr.h
	// @(#)root/proof:$Id: TProofMgr.h 26951 2008-12-16 12:04:38Z ganis $		// @(#)root/proof:$Id: TProofMgr.h 27442 2009-02-12 19:15:43Z ganis $
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2005, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2005, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	#ifndef ROOT_TProofMgr		#ifndef ROOT_TProofMgr
	#define ROOT_TProofMgr		#define ROOT_TProofMgr
	skipping to change at line 119		skipping to change at line 119
	class TProofDesc : public TNamed {		class TProofDesc : public TNamed {
	public:		public:
	enum EStatus { kUnknown = -1, kIdle = 0, kRunning =1, kShutdown = 2};		enum EStatus { kUnknown = -1, kIdle = 0, kRunning =1, kShutdown = 2};
	private:		private:
	TProofDesc(const TProofDesc&); // Not implemented		TProofDesc(const TProofDesc&); // Not implemented
	TProofDesc& operator=(const TProofDesc&); // Not implemented		TProofDesc& operator=(const TProofDesc&); // Not implemented
	Int_t fLocalId; // ID in the local list		Int_t fLocalId; // ID in the local list
	Int_t fStatus; // Session status (see EStatus)		Int_t fStatus; // Session status (see EStatus)
	TProof *fProof; // Related instance of TProof		TProof *fProof; // Related instance of TProof
	Int_t fRemoteId; // Remote ID assigned by the coordinator to th e proofserv		Int_t fRemoteId; // Remote ID assigned by the coordinator to th e proofserv
	TString fUrl; // Url of the connection		TString fUrl; // Url of the connection
	public:		public:
	TProofDesc(const char *tag = 0, const char *alias = 0, const char *url = 0,		TProofDesc(const char *tag = 0, const char *alias = 0, const char *url = 0,
	Int_t id = -1, Int_t remid = -1, Int_t status = kIdle, TProof *p = 0)		Int_t id = -1, Int_t remid = -1, Int_t status = kIdle, TProof *p = 0)
	: TNamed(tag, alias),		: TNamed(tag, alias),
	fLocalId(id), fStatus(0), fProof(p), fRemoteId(remid), fUrl(url) { Set Status(status); }		fLocalId(id), fStatus(0), fProof(p), fRemoteId(remid), fUrl(url) { Set Status(status); }
	virtual ~TProofDesc() { }		virtual ~TProofDesc() { }
	Int_t GetLocalId() const { return fLocalId; }		Int_t GetLocalId() const { return fLocalId; }
	TProof *GetProof() const { return fProof; }		TProof *GetProof() const { return fProof; }
	Int_t GetRemoteId() const { return fRemoteId; }		Int_t GetRemoteId() const { return fRemoteId; }
	Int_t GetStatus() const { return fStatus; }		Int_t GetStatus() const { return fStatus; }
	const char *GetUrl() const { return fUrl; }		const char *GetUrl() const { return fUrl; }
	Bool_t IsIdle() const { return (fStatus == kIdle) ? kTRUE : kFAL SE; }		Bool_t IsIdle() const { return (fStatus == kIdle) ? kTRUE : kFAL SE; }
	Bool_t IsRunning() const { return (fStatus == kRunning) ? kTRUE : kFALSE; }		Bool_t IsRunning() const { return (fStatus == kRunning) ? kTRUE : kFALSE; }
	Bool_t IsShuttingDown() const { return (fStatus == kShutdown) ? kTRUE : kFALSE; }		Bool_t IsShuttingDown() const { return (fStatus == kShutdown) ? kTRUE : kFALSE; }
	Bool_t MatchId(Int_t id) const { return (fLocalId == id); }		Bool_t MatchId(Int_t id) const { return (fLocalId == id); }
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	TProofPlayer.h		TProofPlayer.h
	// @(#)root/proofplayer:$Id: TProofPlayer.h 26381 2008-11-22 17:15:24Z gani s $		// @(#)root/proofplayer:$Id: TProofPlayer.h 27234 2009-01-26 07:57:14Z gani s $
	// Author: Maarten Ballintijn 07/01/02		// Author: Maarten Ballintijn 07/01/02
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2001, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2001, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 277		skipping to change at line 277
	virtual Long64_t Finalize(TQueryResult *qr);		virtual Long64_t Finalize(TQueryResult *qr);
	Long64_t DrawSelect(TDSet *set, const char *varexp,		Long64_t DrawSelect(TDSet *set, const char *varexp,
	const char *selection, Option_t *option = "",		const char *selection, Option_t *option = "",
	Long64_t nentries = -1, Long64_t firstentry = 0);		Long64_t nentries = -1, Long64_t firstentry = 0);
	void RedirectOutput(Bool_t on = kTRUE);		void RedirectOutput(Bool_t on = kTRUE);
	void StopProcess(Bool_t abort, Int_t timeout = -1);		void StopProcess(Bool_t abort, Int_t timeout = -1);
	void StoreOutput(TList *out); // Adopts the list		void StoreOutput(TList *out); // Adopts the list
	virtual void StoreFeedback(TObject *slave, TList *out); // Adopts the list		virtual void StoreFeedback(TObject *slave, TList *out); // Adopts the list
	Int_t Incorporate(TObject *obj, TList *out, Bool_t &merged);		Int_t Incorporate(TObject *obj, TList *out, Bool_t &merged);
			TObject *HandleHistogram(TObject *obj);
	Int_t AddOutputObject(TObject *obj);		Int_t AddOutputObject(TObject *obj);
	void AddOutput(TList *out); // Incorporate a list		void AddOutput(TList *out); // Incorporate a list
	void MergeOutput();		void MergeOutput();
	void Progress(Long64_t total, Long64_t processed); // *SIGNAL*		void Progress(Long64_t total, Long64_t processed); // *SIGNAL*
	void Progress(TSlave*, Long64_t total, Long64_t processed)		void Progress(TSlave*, Long64_t total, Long64_t processed)
	{ Progress(total, processed); }		{ Progress(total, processed); }
	void Progress(Long64_t total, Long64_t processed, Long64_t byt esread,		void Progress(Long64_t total, Long64_t processed, Long64_t byt esread,
	Float_t initTime, Float_t procTime,		Float_t initTime, Float_t procTime,
	Float_t evtrti, Float_t mbrti); // *SIGNAL*		Float_t evtrti, Float_t mbrti); // *SIGNAL*
	void Progress(TSlave *, Long64_t total, Long64_t processed, Lo ng64_t bytesread,		void Progress(TSlave *, Long64_t total, Long64_t processed, Lo ng64_t bytesread,
End of changes. 2 change blocks.
	1 lines changed or deleted		2 lines changed or added

	TProofServ.h		TProofServ.h
	// @(#)root/proof:$Id: TProofServ.h 26993 2008-12-17 16:01:04Z rdm $		// @(#)root/proof:$Id: TProofServ.h 27034 2008-12-19 15:30:06Z ganis $
	// Author: Fons Rademakers 16/02/97		// Author: Fons Rademakers 16/02/97
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 74		skipping to change at line 74
	// For backward compatibility		// For backward compatibility
	typedef Int_t (*OldProofServAuthSetup_t)(TSocket *, Bool_t, Int_t,		typedef Int_t (*OldProofServAuthSetup_t)(TSocket *, Bool_t, Int_t,
	TString &, TString &, TString &);		TString &, TString &, TString &);
	class TProofServ : public TApplication {		class TProofServ : public TApplication {
	friend class TProofServLite;		friend class TProofServLite;
	friend class TXProofServ;		friend class TXProofServ;
	public:		public:
	enum EQueryAction { kQueryOK, kQueryModify, kQueryStop };		enum EQueryAction { kQueryOK, kQueryModify, kQueryStop, kQueryEnqueued } ;
	private:		private:
	TString fService; //service we are running, either "proof serv" or "proofslave"		TString fService; //service we are running, either "proof serv" or "proofslave"
	TString fUser; //user as which we run		TString fUser; //user as which we run
	TString fGroup; //group the user belongs to		TString fGroup; //group the user belongs to
	TString fConfDir; //directory containing cluster config i nformation		TString fConfDir; //directory containing cluster config i nformation
	TString fConfFile; //file containing config information		TString fConfFile; //file containing config information
	TString fWorkDir; //directory containing all proof relate d info		TString fWorkDir; //directory containing all proof relate d info
	TString fImage; //image name of the session		TString fImage; //image name of the session
	TString fSessionTag; //tag for the server session		TString fSessionTag; //tag for the server session
	skipping to change at line 179		skipping to change at line 179
	virtual void HandleCheckFile(TMessage *mess);		virtual void HandleCheckFile(TMessage *mess);
	virtual Int_t HandleDataSets(TMessage *mess);		virtual Int_t HandleDataSets(TMessage *mess);
	virtual void HandleFork(TMessage *mess);		virtual void HandleFork(TMessage *mess);
	virtual void HandleLibIncPath(TMessage *mess);		virtual void HandleLibIncPath(TMessage *mess);
	virtual void HandleProcess(TMessage *mess);		virtual void HandleProcess(TMessage *mess);
	virtual void HandleQueryList(TMessage *mess);		virtual void HandleQueryList(TMessage *mess);
	virtual void HandleRemove(TMessage *mess);		virtual void HandleRemove(TMessage *mess);
	virtual void HandleRetrieve(TMessage *mess);		virtual void HandleRetrieve(TMessage *mess);
	virtual void HandleWorkerLists(TMessage *mess);		virtual void HandleWorkerLists(TMessage *mess);
			virtual void ProcessNext();
	virtual Int_t Setup();		virtual Int_t Setup();
	Int_t SetupCommon();		Int_t SetupCommon();
	virtual void MakePlayer();		virtual void MakePlayer();
	virtual void DeletePlayer();		virtual void DeletePlayer();
	virtual Int_t Fork();		virtual Int_t Fork();
	public:		public:
	TProofServ(Int_t *argc, char **argv, FILE *flog = 0);		TProofServ(Int_t *argc, char **argv, FILE *flog = 0);
	virtual ~TProofServ();		virtual ~TProofServ();
	skipping to change at line 225		skipping to change at line 226
	Long_t GetVirtMemHWM() const { return fVirtMemHWM; }		Long_t GetVirtMemHWM() const { return fVirtMemHWM; }
	const char *GetPrefix() const { return fPrefix; }		const char *GetPrefix() const { return fPrefix; }
	void FlushLogFile();		void FlushLogFile();
	Int_t CopyFromCache(const char *name, Bool_t cpbin);		Int_t CopyFromCache(const char *name, Bool_t cpbin);
	Int_t CopyToCache(const char *name, Int_t opt = 0);		Int_t CopyToCache(const char *name, Int_t opt = 0);
	virtual EQueryAction GetWorkers(TList *workers, Int_t &prioritychange);		virtual EQueryAction GetWorkers(TList *workers, Int_t &prioritychange,
			Bool_t resume = kFALSE);
	virtual void HandleException(Int_t sig);		virtual void HandleException(Int_t sig);
	virtual Int_t HandleSocketInput(TMessage *mess, Bool_t all);		virtual Int_t HandleSocketInput(TMessage *mess, Bool_t all);
	virtual void HandleSocketInput();		virtual void HandleSocketInput();
	virtual void HandleUrgentData();		virtual void HandleUrgentData();
	virtual void HandleSigPipe();		virtual void HandleSigPipe();
	virtual void HandleTermination() { Terminate(0); }		virtual void HandleTermination() { Terminate(0); }
	void Interrupt() { fInterrupt = kTRUE; }		void Interrupt() { fInterrupt = kTRUE; }
	Bool_t IsEndMaster() const { return fEndMaster; }		Bool_t IsEndMaster() const { return fEndMaster; }
	Bool_t IsMaster() const { return fMasterServ; }		Bool_t IsMaster() const { return fMasterServ; }
	Bool_t IsParallel() const;		Bool_t IsParallel() const;
End of changes. 4 change blocks.
	4 lines changed or deleted		5 lines changed or added

	TProofSuperMaster.h		TProofSuperMaster.h
	// @(#)root/proof:$Id: TProofSuperMaster.h 25918 2008-10-22 15:00:04Z ganis $		// @(#)root/proof:$Id: TProofSuperMaster.h 27171 2009-01-16 16:04:00Z ganis $
	// Author: Fons Rademakers 13/02/97		// Author: Fons Rademakers 13/02/97
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 41		skipping to change at line 41
	#endif		#endif
	class TVirtualProofPlayer;		class TVirtualProofPlayer;
	class TDSet;		class TDSet;
	class TProofSuperMaster : public TProof {		class TProofSuperMaster : public TProof {
	friend class TProofPlayerSuperMaster;		friend class TProofPlayerSuperMaster;
	protected:		protected:
	Bool_t StartSlaves(Bool_t, Bool_t);		Bool_t StartSlaves(Bool_t);
	void ValidateDSet(TDSet *dset);		void ValidateDSet(TDSet *dset);
	virtual TVirtualProofPlayer *MakePlayer(const char *player = 0, TSocke t *s = 0);		virtual TVirtualProofPlayer *MakePlayer(const char *player = 0, TSocke t *s = 0);
	public:		public:
	TProofSuperMaster(const char *masterurl, const char *conffile = kPROOF_C onfFile,		TProofSuperMaster(const char *masterurl, const char *conffile = kPROOF_C onfFile,
	const char *confdir = kPROOF_ConfDir, Int_t loglevel = 0,		const char *confdir = kPROOF_ConfDir, Int_t loglevel = 0,
	const char *alias = 0, TProofMgr *mgr = 0);		const char *alias = 0, TProofMgr *mgr = 0);
	virtual ~TProofSuperMaster() { }		virtual ~TProofSuperMaster() { }
	Long64_t Process(TDSet *set, const char *selector,		Long64_t Process(TDSet *set, const char *selector,
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	TRecorder.h		TRecorder.h
	// @(#)root/gui:$Id: TRecorder.h 26135 2008-11-11 09:37:55Z bellenot $		// @(#)root/gui:$Id: TRecorder.h 27550 2009-02-20 14:38:05Z bellenot $
	// Author: Katerina Opocenska 11/09/2008		// Author: Katerina Opocenska 11/09/2008
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 134		skipping to change at line 134
	#endif		#endif
	#ifndef ROOT_TTimer		#ifndef ROOT_TTimer
	#include "TTimer.h"		#include "TTimer.h"
	#endif		#endif
	#ifndef ROOT_TGClient		#ifndef ROOT_TGClient
	#include "TGClient.h"		#include "TGClient.h"
	#endif		#endif
	#ifndef ROOT_TGFrame		#ifndef ROOT_TGFrame
	#include "TGFrame.h"		#include "TGFrame.h"
	#endif		#endif
			#ifndef ROOT_TCanvas
			#include "TCanvas.h"
			#endif
			#ifndef ROOT_THashList
			#include "THashList.h"
			#endif
	#include <time.h>		#include <time.h>
	class TMutex;		class TMutex;
	class TTree;		class TTree;
	class TFile;		class TFile;
	class TGPictureButton;		class TGPictureButton;
	class TGCheckButton;		class TGCheckButton;
	class TGLabel;		class TGLabel;
	class TRecorderState;		class TRecorderState;
	skipping to change at line 166		skipping to change at line 172
	class TRecEvent : public TObject		class TRecEvent : public TObject
	{		{
	private:		private:
	TTime fEventTime; // Time of original event execution		TTime fEventTime; // Time of original event execution
	public:		public:
	//---- Types of events recorded in ROOT.		//---- Types of events recorded in ROOT.
	enum ERecEventType {		enum ERecEventType {
	kCmdEvent, // Commandline event		kCmdEvent, // Commandline event
	kGuiEvent // GUI event		kGuiEvent, // GUI event
			kExtraEvent
	};		};
	// Replays (executes) the stored event again		// Replays (executes) the stored event again
	virtual void ReplayEvent(Bool_t showMouseCursor = kTRUE) = 0;		virtual void ReplayEvent(Bool_t showMouseCursor = kTRUE) = 0;
	// Returns what kind of event it stores		// Returns what kind of event it stores
	virtual ERecEventType GetType() const = 0;		virtual ERecEventType GetType() const = 0;
	virtual TTime GetTime() const {		virtual TTime GetTime() const {
	// Returns time of original execution of stored event		// Returns time of original execution of stored event
	skipping to change at line 229		skipping to change at line 236
	// Returns what kind of event it stores (commandline event)		// Returns what kind of event it stores (commandline event)
	return TRecEvent::kCmdEvent;		return TRecEvent::kCmdEvent;
	}		}
	virtual void ReplayEvent(Bool_t) {		virtual void ReplayEvent(Bool_t) {
	// Stored command is executed again		// Stored command is executed again
	cout << GetText() << endl;		cout << GetText() << endl;
	gApplication->ProcessLine(GetText());		gApplication->ProcessLine(GetText());
	}		}
	ClassDef(TRecCmdEvent,1) // Class stores information about 1 commandli		ClassDef(TRecCmdEvent,1) // Class stores information about 1 commandline
	ne event (= 1 command typed by user in commandline)		event (= 1 command typed by user in commandline)
			};
			//////////////////////////////////////////////////////////////////////////
			// //
			// TRecExtraEvent //
			// //
			// Class used for storing information about 1 extra event. //
			// It means 1 TPaveLabel or 1 TLatex event produced in the Canvas //
			// //
			//////////////////////////////////////////////////////////////////////////
			class TRecExtraEvent : public TRecEvent
			{
			private:
			TString fText; // Text of stored command
			public:
			TRecExtraEvent() {
			// Creates new empty TRecExtraEvent
			}
			void SetText(TString text) {
			// Saves text of a command (PaveLabel or Text)
			fText = text;
			}
			TString GetText() const {
			// Returns stored text of the command
			return fText;
			}
			virtual ERecEventType GetType() const {
			// Returns what kind of event it stores (Especial event)
			return TRecEvent::kExtraEvent;
			}
			virtual void ReplayEvent(Bool_t) {
			// Stored event is executed again
			gApplication->ProcessLine(GetText());
			}
			ClassDef(TRecExtraEvent,1) // Class stores information about extra event
			s
	};		};
	//////////////////////////////////////////////////////////////////////////		//////////////////////////////////////////////////////////////////////////
	// //		// //
	// TRecGuiEvent //		// TRecGuiEvent //
	// //		// //
	// Class used for storing information about 1 GUI event in ROOT. //		// Class used for storing information about 1 GUI event in ROOT. //
	// For list of possible GUI events see EGEventType. //		// For list of possible GUI events see EGEventType. //
	// //		// //
	//////////////////////////////////////////////////////////////////////////		//////////////////////////////////////////////////////////////////////////
	skipping to change at line 287		skipping to change at line 336
	};		};
	virtual ERecEventType GetType() const {		virtual ERecEventType GetType() const {
	// Returns what kind of event it stores (GUI event)		// Returns what kind of event it stores (GUI event)
	return TRecEvent::kGuiEvent;		return TRecEvent::kGuiEvent;
	}		}
	virtual void ReplayEvent(Bool_t showMouseCursor = kTRUE);		virtual void ReplayEvent(Bool_t showMouseCursor = kTRUE);
	static Event_t *CreateEvent(TRecGuiEvent *ge);		static Event_t *CreateEvent(TRecGuiEvent *ge);
	ClassDef(TRecGuiEvent,1) // Class stores information about 1 GUI event in ROOT		ClassDef(TRecGuiEvent,1) // Class stores information about 1 GUI event i n ROOT
	};		};
	//////////////////////////////////////////////////////////////////////////		//////////////////////////////////////////////////////////////////////////
	// //		// //
	// TRecWinPair //		// TRecWinPair //
	// //		// //
	// Class used for storing of window IDs mapping. //		// Class used for storing of window IDs mapping. //
	// Remapping of window IDs is needed for replaying events. //		// Remapping of window IDs is needed for replaying events. //
	// - ID of original window is stored in fKey. //		// - ID of original window is stored in fKey. //
	// - ID of a new window is stored in fValue. //		// - ID of a new window is stored in fValue. //
	skipping to change at line 443		skipping to change at line 492
	// Prints out the list of recorded commandline events		// Prints out the list of recorded commandline events
	void ListCmd(const char *filename);		void ListCmd(const char *filename);
	// Prints out the list of recorded GUI events		// Prints out the list of recorded GUI events
	void ListGui(const char *filename);		void ListGui(const char *filename);
	// Gets current state of recorder		// Gets current state of recorder
	virtual TRecorder::ERecorderState GetState() const;		virtual TRecorder::ERecorderState GetState() const;
	ClassDef(TRecorder,1) // Class provides direct recorder/repl		// Saves all the canvases previous to the TRecorder
	ayer interface for a user.		void PrevCanvases(const char *filename, Option_t *option);
			ClassDef(TRecorder,1) // Class provides direct recorder/replayer interfa
			ce for a user.
	};		};
	//////////////////////////////////////////////////////////////////////////		//////////////////////////////////////////////////////////////////////////
	// //		// //
	// TRecorderState //		// TRecorderState //
	// //		// //
	// Abstract class that defines interface for a state of recorder. //		// Abstract class that defines interface for a state of recorder. //
	// Inherited classes are: //		// Inherited classes are: //
	// - TRecorderInactive //		// - TRecorderInactive //
	// - TRecorderRecording //		// - TRecorderRecording //
	skipping to change at line 468		skipping to change at line 520
	// changing and deleting states. //		// changing and deleting states. //
	// //		// //
	//////////////////////////////////////////////////////////////////////////		//////////////////////////////////////////////////////////////////////////
	class TRecorderState		class TRecorderState
	{		{
	protected:		protected:
	friend class TRecorder;		friend class TRecorder;
	void ChangeState(TRecorder *r, TRecorderState *s, Bool_t deletePreviousS tate) { r->ChangeState(s, deletePreviousState); }		void ChangeState(TRecorder *r, TRecorderState *s, Bool_t deletePreviousS tate) { r->ChangeState(s, deletePreviousState); }
	public:		public:
	virtual ~TRecorderState() {}		virtual ~TRecorderState() {}
	virtual void Start(TRecorder *, const char *, Option_t *, Window_t *, Int_t) {}		virtual void Start(TRecorder *, const char *, Option_t *, Window_t *, Int_t) {}
	virtual void Stop(TRecorder *, Bool_t ) {}		virtual void Stop(TRecorder *, Bool_t ) {}
	virtual Bool_t Replay(TRecorder *, const char *, Bool_t, TRecorder::ERep layModes) { return false; }		virtual Bool_t Replay(TRecorder *, const char *, Bool_t, TRecorder::ERep layModes) { return false; }
	virtual void Pause(TRecorder *) {}		virtual void Pause(TRecorder *) {}
	virtual void Resume(TRecorder *) {}		virtual void Resume(TRecorder *) {}
	virtual void ReplayStop(TRecorder *) {}		virtual void ReplayStop(TRecorder *) {}
	virtual void ListCmd(const char *) {}		virtual void ListCmd(const char *) {}
	virtual void ListGui(const char *) {}		virtual void ListGui(const char *) {}
			virtual void PrevCanvases(const char *, Option_t *) {}
	virtual TRecorder::ERecorderState GetState() const = 0;		virtual TRecorder::ERecorderState GetState() const = 0;
	ClassDef(TRecorderState, 0) // Abstract class that defines interface for a state of recorder		ClassDef(TRecorderState, 0) // Abstract class that defines interface for a state of recorder
	};		};
	//////////////////////////////////////////////////////////////////////////		//////////////////////////////////////////////////////////////////////////
	// //		// //
	// TRecorderReplaying //		// TRecorderReplaying //
	// //		// //
	// Represents state of TRecorder when replaying previously recorded //		// Represents state of TRecorder when replaying previously recorded //
	skipping to change at line 509		skipping to change at line 563
	Bool_t PrepareNextEvent();		Bool_t PrepareNextEvent();
	Bool_t RemapWindowReferences();		Bool_t RemapWindowReferences();
	Bool_t CanOverlap();		Bool_t CanOverlap();
	Bool_t FilterEvent(TRecGuiEvent *e);		Bool_t FilterEvent(TRecGuiEvent *e);
	TRecorder *fRecorder; // Reference to recorder (owner of this state) i s kept in order to switch		TRecorder *fRecorder; // Reference to recorder (owner of this state) i s kept in order to switch
	// recorder to INACTIVE state after replaying is finished		// recorder to INACTIVE state after replaying is finished
	TFile *fFile; // ROOT file which the recorded events are being read from		TFile *fFile; // ROOT file which the recorded events are being read from
			TCanvas *fCanv; // Used to record the previous canvases
	TTimer *fTimer; // Timer used for replaying		TTimer *fTimer; // Timer used for replaying
	TTree *fWinTree; // TTree with recorded windows (=registered duri ng recording)		TTree *fWinTree; // TTree with recorded windows (=registered duri ng recording)
	TTree *fGuiTree; // TTree with recorded GUI events		TTree *fGuiTree; // TTree with recorded GUI events
	TTree *fCmdTree; // TTree with recorded commandline events		TTree *fCmdTree; // TTree with recorded commandline events
			TTree *fExtraTree; // TTree with recorded extra events (PaveLabels and Texts)
	ULong64_t fWin; // Window ID being currenty mapped		ULong64_t fWin; // Window ID being currenty mapped
	TRecGuiEvent *fGuiEvent; // GUI event being currently replayed		TRecGuiEvent *fGuiEvent; // GUI event being currently replayed
	TRecCmdEvent *fCmdEvent; // Commandline event being currently replayed		TRecCmdEvent *fCmdEvent; // Commandline event being currently re
			played
	Int_t fRegWinCounter; // Counter of registered windows when repl		TRecExtraEvent *fExtraEvent; // Extra event being currently replayed
	aying
	Int_t fGuiTreeCounter; // Counter of GUI events that have been re		Int_t fRegWinCounter; // Counter of registered windows when r
	played		eplaying
	Int_t fCmdTreeCounter; // Counter of commandline events that have		Int_t fGuiTreeCounter; // Counter of GUI events that have been
	been replayed		replayed
			Int_t fCmdTreeCounter; // Counter of commandline events that h
			ave been replayed
			Int_t fExtraTreeCounter; // Counter of extra events that have be
			en replayed
	Int_t fWinTreeEntries; // Number of registered windows during _re cording_		Int_t fWinTreeEntries; // Number of registered windows during _recording_
	TMutex *fMutex;		TMutex *fMutex;
	TList *fWindowList; // List of TRecWinPair objects. Mapping of window IDs is stored here.		TList *fWindowList; // List of TRecWinPair objects. Mapping of window IDs is stored here.
	TRecEvent *fNextEvent; // The next event that is going to be re played (GUI event or commandline)		TRecEvent *fNextEvent; // The next event that is going to be r eplayed (GUI event or commandline)
	TTime fPreviousEventTime; // Execution time of the previous ly replayed event.		TTime fPreviousEventTime; // Execution time of the previously rep layed event.
	// It is used for computing time difference between two events.		// It is used for computing time difference between two events.
	Bool_t fWaitingForWindow; // Signalizes that we wait for a		Bool_t fWaitingForWindow; // Signalizes that we wait for a window
	window to be registered in order		to be registered in order
	// to replay the next event fNext		// to replay the next event fNextEvent.
	Event.		// Registraion of windows can last diff
	// Registraion of windows can las		erent time when recording and replaying.
	t different time when recording and replaying.		// If there is an event ready to be rep
	// If there is an event ready to		layed but the corresponding windows has not been yet
	be replayed but the corresponding windows has not been yet		// registered, we wait (postopone fNext
	// registered, we wait (postopone		Event) until it is registered.
	fNextEvent) until it is registered.
			Bool_t fEventReplayed; // Signalizes that the last event sent
	Bool_t fEventReplayed; // Signalizes that the last event		to the replaying has been already replayed.
	sent to the replaying has been already replayed.		// Sometimes an execution of an event c
	// Sometimes an execution of an e		an take more time than during recording.
	vent can take more time than during recording.		// This ensures that the next event is
	// This ensures that the next eve		sent to replaying AFTER
	nt is sent to replaying AFTER		// the replaying of the previous one fi
	// the replaying of the previous		nishes and not earlier.
	one finishes and not earlier.		// Exceptions: ButtonPress and ButtonRe
	// Exceptions: ButtonPress and Bu		lease events (See TRecorderReplaying::CanBeOverlapped)
	ttonRelease events (See TRecorderReplaying::CanBeOverlapped)
	Bool_t fShowMouseCursor; // Specifies if mouse cursor shou		Bool_t fShowMouseCursor; // Specifies if mouse cursor should be
	ld be also replayed		also replayed
			Bool_t fFilterStatusBar; // Special flag to filter status bar el
			ement
	protected:		protected:
	friend class TRecorderInactive;		friend class TRecorderInactive;
	friend class TRecorderPaused;		friend class TRecorderPaused;
	TRecorderReplaying(const char *filename);		TRecorderReplaying(const char *filename);
	Bool_t Initialize(TRecorder *r, Bool_t showMouseCursor, TRecorder::E ReplayModes mode);		Bool_t Initialize(TRecorder *r, Bool_t showMouseCursor, TRecorder::E ReplayModes mode);
	public:		public:
	virtual TRecorder::ERecorderState GetState() const { return TRecorder::k Replaying; }		virtual TRecorder::ERecorderState GetState() const { return TRecorder::k Replaying; }
	virtual void Pause(TRecorder *r);		virtual void Pause(TRecorder *r);
	virtual void Continue();		virtual void Continue();
	virtual void ReplayStop(TRecorder *r);		virtual void ReplayStop(TRecorder *r);
	void RegisterWindow(Window_t w); //SLOT		void RegisterWindow(Window_t w); //SLOT
	void ReplayRealtime(); //SLOT		void ReplayRealtime(); //SLOT
	ClassDef(TRecorderReplaying, 0) // Represents state of TRecorder when re playing		ClassDef(TRecorderReplaying, 0) // Represents state of TRecorder when re playing
	};		};
	//////////////////////////////////////////////////////////////////////////		//////////////////////////////////////////////////////////////////////////
	// //		// //
	// TRecorderRecording //		// TRecorderRecording //
	// //		// //
	// Represents state of TRecorder when recording events. //		// Represents state of TRecorder when recording events. //
	// //		// //
	skipping to change at line 590		skipping to change at line 652
	virtual ~TRecorderRecording();		virtual ~TRecorderRecording();
	Bool_t IsFiltered(Window_t id);		Bool_t IsFiltered(Window_t id);
	void SetTypeOfConfigureNotify(Event_t *e);		void SetTypeOfConfigureNotify(Event_t *e);
	void CopyEvent(Event_t *e, Window_t wid);		void CopyEvent(Event_t *e, Window_t wid);
	TRecorder *fRecorder; // Reference to recorder (owner o f this state) is kept in order to switch		TRecorder *fRecorder; // Reference to recorder (owner o f this state) is kept in order to switch
	// recorder back to INACTIVE stat e after recording is finished		// recorder back to INACTIVE stat e after recording is finished
	TFile *fFile; // ROOT file to store recorded ev ents in		TFile *fFile; // ROOT file to store recorded ev ents in
	TTimer *fTimer; // Timer used for recording		TTimer *fTimer; // Timer used for recording
			ULong_t fBeginPave; // TLatex/TPaveLabel edition star ting time
	TTree *fWinTree; // TTree with registered windows		TTree *fWinTree; // TTree with registered windows
	TTree *fGuiTree; // TTree with recorded GUI events		TTree *fGuiTree; // TTree with recorded GUI events
	TTree *fCmdTree; // TTree with recorded commandlin e events		TTree *fCmdTree; // TTree with recorded commandlin e events
			TTree *fExtraTree; // TTree with recorded extra even ts (PaveLabels and Texts)
	ULong64_t fWin; // The newest registered window t o be stored in TTree		ULong64_t fWin; // The newest registered window t o be stored in TTree
	TRecGuiEvent *fGuiEvent; // The newest GUI event to be sto red in TTree		TRecGuiEvent *fGuiEvent; // The newest GUI event to be sto red in TTree
	TRecCmdEvent *fCmdEvent; // The newest commandline event t o be stored in TTree		TRecCmdEvent *fCmdEvent; // The newest commandline event t o be stored in TTree
			TRecExtraEvent *fExtraEvent; // The newest extra event to be s tored in TTree
	Bool_t fCmdEventPending; // Indication if there is a still pending commandline event that should be stored.		Bool_t fCmdEventPending; // Indication if there is a still pending commandline event that should be stored.
	// Commandline events are stored with 1 event delay to ensure skipping		// Commandline events are stored with 1 event delay to ensure skipping
	// the last event 'TRecorder::Sto p' that is not supposed to be recorded		// the last event 'TRecorder::Sto p' that is not supposed to be recorded
	Int_t fRegWinCounter; // Counter of registered ROOT win dows.		Int_t fRegWinCounter; // Counter of registered ROOT win dows.
	// It is increased every time whe n a new window is registered		// It is increased every time whe n a new window is registered
	Int_t fFilteredIdsCount; // Only when GUI for recorder is used: Count of windows in GUI recorder		Int_t fFilteredIdsCount; // Only when GUI for recorder is used: Count of windows in GUI recorder
	Window_t *fFilteredIds; // Only when GUI for recorer is u sed: IDs of windows that creates that GUI.		Window_t *fFilteredIds; // Only when GUI for recorer is u sed: IDs of windows that creates that GUI.
	// Events for GUI recorder are no t recorded.		// Events for GUI recorder are no t recorded.
			Bool_t fFilterEventPave; // Special flag to filter events
			during the pave recording
	protected:		protected:
	friend class TRecorderInactive;		friend class TRecorderInactive;
	TRecorderRecording(TRecorder *r, const char *filename, Option_t *option, Window_t *w, Int_t winCount);		TRecorderRecording(TRecorder *r, const char *filename, Option_t *option, Window_t *w, Int_t winCount);
	Bool_t StartRecording();		Bool_t StartRecording();
	public:		public:
	virtual TRecorder::ERecorderState GetState() const { return TRecorder::k Recording; }		virtual TRecorder::ERecorderState GetState() const { return TRecorder::k Recording; }
	virtual void Stop(TRecorder *r, Bool_t guiCommand);		virtual void Stop(TRecorder *r, Bool_t guiCommand);
	void RegisterWindow(Window_t w); //SLOT		void RegisterWindow(Window_t w); //SLOT
	void RecordCmdEvent(const char* line); //SLOT		void RecordCmdEvent(const char* line); //SLOT
	void RecordGuiEvent(Event_t* e, Window_t wid); //SLOT		void RecordGuiEvent(Event_t* e, Window_t wid); //SLOT
	void RecordGuiCNEvent(Event_t* e); //SLOT		void RecordGuiCNEvent(Event_t* e); //SLOT
			void RecordPave(const TObject* obj); //SLOT
			void RecordText(const TObject* obj); //SLOT
			void FilterEventPave(); //SLOT
			void StartEditing(); //SLOT
			void RecordExtraEvent(TString line, ULong_t ExtTime);
	ClassDef(TRecorderRecording, 0) // Represents state of TRecorder when re cording events		ClassDef(TRecorderRecording, 0) // Represents state of TRecorder when re cording events
	};		};
	//////////////////////////////////////////////////////////////////////////		//////////////////////////////////////////////////////////////////////////
	// //		// //
	// TRecorderInactive //		// TRecorderInactive //
	// //		// //
	// Represents state of TRecorder just after its creation. //		// Represents state of TRecorder just after its creation. //
	// Nor recording neither replaying is being executed in this state. //		// Nor recording neither replaying is being executed in this state. //
	// //		// //
	// Not intended to be used by a user directly. //		// Not intended to be used by a user directly. //
	// //		// //
	//////////////////////////////////////////////////////////////////////////		//////////////////////////////////////////////////////////////////////////
	class TRecorderInactive : public TRecorderState		class TRecorderInactive : public TRecorderState
	{		{
			private:
			TSeqCollection *fCollect;
	public:		public:
	virtual ~TRecorderInactive() {}		virtual ~TRecorderInactive() {}
	TRecorderInactive(){}		TRecorderInactive(){}
	virtual void ListCmd(const char *filename);		virtual void ListCmd(const char *filename);
	virtual void ListGui(const char *filename);		virtual void ListGui(const char *filename);
	virtual void Start(TRecorder *r, const char *filename, Option_t *optio n, Window_t *w = 0, Int_t winCount = 0);		virtual void Start(TRecorder *r, const char *filename, Option_t *optio n, Window_t *w = 0, Int_t winCount = 0);
	virtual Bool_t Replay(TRecorder *r, const char *filename, Bool_t showMou seCursor, TRecorder::EReplayModes mode);		virtual Bool_t Replay(TRecorder *r, const char *filename, Bool_t showMou seCursor, TRecorder::EReplayModes mode);
	virtual TRecorder::ERecorderState GetState() const { return TRecorder::k Inactive; }		virtual TRecorder::ERecorderState GetState() const { return TRecorder::k Inactive; }
	static void DumpRootEvent(TRecGuiEvent *e, Int_t n);		static void DumpRootEvent(TRecGuiEvent *e, Int_t n);
	static long DisplayValid(Long_t n) { return ( n < 0 ? -1 : n); }		static long DisplayValid(Long_t n) { return ( n < 0 ? -1 : n); }
			void PrevCanvases(const char *filename, Option_t *option);
	ClassDef(TRecorderInactive, 0) // Represents state of TRecorder after it s creation		ClassDef(TRecorderInactive, 0) // Represents state of TRecorder after it s creation
	};		};
	//////////////////////////////////////////////////////////////////////////		//////////////////////////////////////////////////////////////////////////
	// //		// //
	// TRecorderPaused //		// TRecorderPaused //
	// //		// //
	// Represents state of TRecorder when replaying was paused //		// Represents state of TRecorder when replaying was paused //
	// by a user. //		// by a user. //
	// The paused replaying is remembered and after Resume call can //		// The paused replaying is remembered and after Resume call can //
	skipping to change at line 725		skipping to change at line 804
	void SetDefault();		void SetDefault();
	public:		public:
	TGRecorder(const TGWindow *p = 0, UInt_t w = 230, UInt_t h = 150);		TGRecorder(const TGWindow *p = 0, UInt_t w = 230, UInt_t h = 150);
	virtual ~TGRecorder();		virtual ~TGRecorder();
	void StartStop();		void StartStop();
	void Update();		void Update();
	void Replay();		void Replay();
	ClassDef(TGRecorder,0) // GUI class of the event recorder.		ClassDef(TGRecorder,0) // GUI class of the event recorder.
	};		};
End of changes. 27 change blocks.
	51 lines changed or deleted		134 lines changed or added

	TRefTable.h		TRefTable.h
	// @(#)root/cont:$Id: TRefTable.h 22689 2008-03-17 16:21:23Z rdm $		// @(#)root/cont:$Id: TRefTable.h 27262 2009-01-27 18:35:12Z pcanal $
	// Author: Rene Brun 17/08/2004		// Author: Rene Brun 17/08/2004
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 50		skipping to change at line 50
	Int_t *fN; //![fNumPIDs] current maximum number of I Ds in array fParentIDs for each ProcessID		Int_t *fN; //![fNumPIDs] current maximum number of I Ds in array fParentIDs for each ProcessID
	Int_t **fParentIDs; //![fNumPIDs][fAllocSize] array of Parent IDs		Int_t **fParentIDs; //![fNumPIDs][fAllocSize] array of Parent IDs
	Int_t fParentID; //!current parent ID in fParents (latest call to SetParent)		Int_t fParentID; //!current parent ID in fParents (latest call to SetParent)
	Int_t fDefaultSize;//!default size for a new PID array		Int_t fDefaultSize;//!default size for a new PID array
	UInt_t fUID; //!Current uid (set by TRef::GetObject)		UInt_t fUID; //!Current uid (set by TRef::GetObject)
	TProcessID *fUIDContext; //!TProcessID the current uid is referrin g to		TProcessID *fUIDContext; //!TProcessID the current uid is referrin g to
	Int_t fSize; //dummy for backward compatibility		Int_t fSize; //dummy for backward compatibility
	TObjArray *fParents; //array of Parent objects (eg TTree bran ch) holding the referenced objects		TObjArray *fParents; //array of Parent objects (eg TTree bran ch) holding the referenced objects
	TObject *fOwner; //Object owning this TRefTable		TObject *fOwner; //Object owning this TRefTable
	std::vector<std::string> fProcessGUIDs; // UUIDs of TProcessIDs used in fParentIDs		std::vector<std::string> fProcessGUIDs; // UUIDs of TProcessIDs used in fParentIDs
	std::vector<Int_t> fMapPIDtoInternal; //! cache of pid to index in fProc essGUIDs		std::vector<Int_t> fMapPIDtoInternal; //! cache of pid to index in fPr ocessGUIDs
	static TRefTable *fgRefTable; //Pointer to current TRefTable		static TRefTable *fgRefTable; //Pointer to current TRefTable
	Int_t AddInternalIdxForPID(TProcessID* procid);		Int_t AddInternalIdxForPID(TProcessID* procid);
	virtual Int_t ExpandForIID(Int_t iid, Int_t newsize);		virtual Int_t ExpandForIID(Int_t iid, Int_t newsize);
	void ExpandPIDs(Int_t numpids);		void ExpandPIDs(Int_t numpids);
	Int_t FindPIDGUID(const char* guid) const;		Int_t FindPIDGUID(const char* guid) const;
	Int_t GetInternalIdxForPID(TProcessID* procid) const;		Int_t GetInternalIdxForPID(TProcessID* procid) const;
	Int_t GetInternalIdxForPID(Int_t pid) const;		Int_t GetInternalIdxForPID(Int_t pid) const;
	public:		public:
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	TRolke.h		TRolke.h
	// @(#)root/physics:$Id: TRolke.h 20882 2007-11-19 11:31:26Z rdm $
	// Author: Jan Conrad 9/2/2004
	/*************************************************************************		///////////////////////////////////////////////////////////////////////////
	* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *		///
	* All rights reserved. *		//
	* *		// TRolke
	* For the licensing terms see $ROOTSYS/LICENSE. *		//
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		// This class computes confidence intervals for the rate of a Poisson
	*************************************************************************/		// in the presence of background and efficiency with a fully frequentist
			// treatment of the uncertainties in the efficiency and background estimat
			e
			// using the profile likelihood method.
			//
			// Author: Jan Conrad (CERN) 2004
			// Updated: Johan Lundberg (CERN) 2009
			//
			// Copyright CERN 2004,2009 Jan.Conrad@cern.ch,
			// Johan.Lundberg@cern.ch
			//
			// This file lists the methods and their syntax. For information about
			// the statistical meaning of the parameters, consult TRolke.cxx.
			// -------------------
			// Examples are found in the file Rolke.C
			// --------------------------------------
			//
			///////////////////////////////////////////////////////////////////////////
			///
	#ifndef ROOT_TRolke		#ifndef ROOT_TRolke
	#define ROOT_TRolke		#define ROOT_TRolke
	#ifndef ROOT_TObject
	#include "TObject.h"		#include "TObject.h"
	#endif		#include "TMath.h"
	class TRolke : public TObject {		// Class definition. This class is not intended to be used as a base class.
			class TRolke : public TObject
			{
	protected:		private:
	Double_t fCL; // confidence level as a fraction [e.g. 90% = 0.9]		Double_t fCL; // confidence level as a fraction [0.9 for 90% ]
	Double_t fUpperLimit; // the calculated upper limit		Double_t fUpperLimit; // the calculated upper limit
	Double_t fLowerLimit; // the calculated lower limit		Double_t fLowerLimit; // the calculated lower limit
	Int_t fSwitch; // 0: for unbounded likelihood		bool fBounding; // false for unbounded likelihood
	// 1: for bounded likelihood		// true for bounded likelihood
			Int_t fNumWarningsDeprecated1;
			Int_t fNumWarningsDeprecated2;
			/* ----------------------------------------------------------------- */
			/* These variables are set by the Set methods for the various models */
			Int_t f_x;
			Int_t f_y;
			Int_t f_z;
			Double_t f_bm;
			Double_t f_em;
			Double_t f_e;
			Int_t f_mid;
			Double_t f_sde;
			Double_t f_sdb;
			Double_t f_tau;
			Double_t f_b;
			Int_t f_m;
			/* ----------------------------------------------------------------- */
			/* Internal helper functions and methods */
	// The Calculator		// The Calculator
			Double_t Interval(Int_t x, Int_t y, Int_t z, Double_t bm, Double_t em, D
	Double_t Interval(Int_t x, Int_t y, Int_t z, Double_t bm, Double_t em, D		ouble_t e, Int_t mid, Double_t sde, Double_t sdb, Double_t tau, Double_t b,
	ouble_t e, Int_t mid, Double_t sde, Double_t sdb, Double_t tau, Double_t b,		Int_t m);
	Int_t m);
	// LIKELIHOOD ROUTINE		// LIKELIHOOD ROUTINE
	Double_t Likelihood(Double_t mu, Int_t x, Int_t y, Int_t z, Double_t bm, Double_t em, Double_t e, Int_t mid, Double_t sde, Double_t sdb, Double_t t au, Double_t b, Int_t m, Int_t what);		Double_t Likelihood(Double_t mu, Int_t x, Int_t y, Int_t z, Double_t bm, Double_t em, Double_t e, Int_t mid, Double_t sde, Double_t sdb, Double_t t au, Double_t b, Int_t m, Int_t what);
	//MODEL 1		//MODEL 1
	Double_t EvalLikeMod1(Double_t mu, Int_t x, Int_t y, Int_t z, Double_t e		Double_t EvalLikeMod1(Double_t mu, Int_t x, Int_t y, Int_t z, Double_t t
	, Double_t tau, Double_t b, Int_t m, Int_t what);		au, Int_t m, Int_t what);
	Double_t LikeMod1(Double_t mu,Double_t b, Double_t e, Int_t x, Int_t y,		Double_t LikeMod1(Double_t mu, Double_t b, Double_t e, Int_t x, Int_t y,
	Int_t z, Double_t tau, Int_t m);		Int_t z, Double_t tau, Int_t m);
	void ProfLikeMod1(Double_t mu,Double_t &b, Double_t &e,Int_t x,Int_t		void ProfLikeMod1(Double_t mu, Double_t &b, Double_t &e, Int_t x, In
	y, Int_t z,Double_t tau,Int_t m);		t_t y, Int_t z, Double_t tau, Int_t m);
	Double_t LikeGradMod1(Double_t e, Double_t mu, Int_t x,Int_t y,Int_t z,D		Double_t LikeGradMod1(Double_t e, Double_t mu, Int_t x, Int_t y, Int_t z
	ouble_t tau,Int_t m);		, Double_t tau, Int_t m);
	//MODEL 2		//MODEL 2
	Double_t EvalLikeMod2(Double_t mu, Int_t x, Int_t y, Double_t em, Double _t e,Double_t sde, Double_t tau, Double_t b, Int_t what);		Double_t EvalLikeMod2(Double_t mu, Int_t x, Int_t y, Double_t em, Double _t sde, Double_t tau, Int_t what);
	Double_t LikeMod2(Double_t mu, Double_t b, Double_t e,Int_t x,Int_t y,Do uble_t em,Double_t tau, Double_t v);		Double_t LikeMod2(Double_t mu, Double_t b, Double_t e, Int_t x, Int_t y, Double_t em, Double_t tau, Double_t v);
	//MODEL 3		//MODEL 3
	Double_t EvalLikeMod3(Double_t mu, Int_t x, Double_t bm, Double_t em, Do		Double_t EvalLikeMod3(Double_t mu, Int_t x, Double_t bm, Double_t em, Do
	uble_t e, Double_t sde, Double_t sdb, Double_t b, Int_t what);		uble_t sde, Double_t sdb, Int_t what);
	Double_t LikeMod3(Double_t mu,Double_t b,Double_t e,Int_t x,Double_t bm,		Double_t LikeMod3(Double_t mu, Double_t b, Double_t e, Int_t x, Double_t
	Double_t em,Double_t u,Double_t v);		bm, Double_t em, Double_t u, Double_t v);
	//MODEL 4		//MODEL 4
	Double_t EvalLikeMod4(Double_t mu, Int_t x, Int_t y, Double_t tau, Doubl		Double_t EvalLikeMod4(Double_t mu, Int_t x, Int_t y, Double_t tau, Int_t
	e_t b, Int_t what);		what);
	Double_t LikeMod4(Double_t mu,Double_t b,Int_t x,Int_t y,Double_t tau);		Double_t LikeMod4(Double_t mu, Double_t b, Int_t x, Int_t y, Double_t ta
			u);
	//MODEL 5		//MODEL 5
	Double_t EvalLikeMod5(Double_t mu, Int_t x, Double_t bm, Double_t sdb, D		Double_t EvalLikeMod5(Double_t mu, Int_t x, Double_t bm, Double_t sdb, I
	ouble_t b, Int_t what);		nt_t what);
	Double_t LikeMod5(Double_t mu,Double_t b,Int_t x,Double_t bm,Double_t u)		Double_t LikeMod5(Double_t mu, Double_t b, Int_t x, Double_t bm, Double_
	;		t u);
	//MODEL 6		//MODEL 6
	Double_t EvalLikeMod6(Double_t mu, Int_t x, Int_t z, Double_t e, Double_		Double_t EvalLikeMod6(Double_t mu, Int_t x, Int_t z, Double_t b, Int_t m
	t b, Int_t m, Int_t what);		, Int_t what);
	Double_t LikeMod6(Double_t mu,Double_t b,Double_t e,Int_t x,Int_t z,Int_		Double_t LikeMod6(Double_t mu, Double_t b, Double_t e, Int_t x, Int_t z,
	t m);		Int_t m);
	//MODEL 7		//MODEL 7
	Double_t EvalLikeMod7(Double_t mu, Int_t x, Double_t em, Double_t e, Dou		Double_t EvalLikeMod7(Double_t mu, Int_t x, Double_t em, Double_t sde, D
	ble_t sde, Double_t b, Int_t what);		ouble_t b, Int_t what);
	Double_t LikeMod7(Double_t mu,Double_t b,Double_t e,Int_t x,Double_t em,		Double_t LikeMod7(Double_t mu, Double_t b, Double_t e, Int_t x, Double_t
	Double_t v);		em, Double_t v);
	//MISC		//MISC
	static Double_t EvalPolynomial(Double_t x, const Int_t coef[], Int_t N);		static Double_t EvalPolynomial(Double_t x, const Int_t coef[], Int_t N);
	static Double_t EvalMonomial (Double_t x, const Int_t coef[], Int_t N);		static Double_t EvalMonomial(Double_t x, const Int_t coef[], Int_t N);
	Double_t LogFactorial(Int_t n);		Double_t LogFactorial(Int_t n);
			Double_t ComputeInterval(Int_t x, Int_t y, Int_t z, Double_t bm, Double_
			t em, Double_t e, Int_t mid, Double_t sde, Double_t sdb, Double_t tau, Doub
			le_t b, Int_t m);
			void SetModelParameters(Int_t x, Int_t y, Int_t z, Double_t bm, Double_t
			em, Double_t e, Int_t mid, Double_t sde, Double_t sdb, Double_t tau, Doubl
			e_t b, Int_t m);
			void SetModelParameters();
			Double_t GetBackground();
	public:		public:
	TRolke(Double_t CL=0.9, Option_t *option = "");		/* Constructor with optional Confidence Level argument.
			'option' is not used. */
			TRolke(Double_t CL = 0.9, Option_t *option = "");
			/* Destructor */
	virtual ~TRolke();		virtual ~TRolke();
	Double_t CalculateInterval(Int_t x, Int_t y, Int_t z, Double_t bm, Doubl		/* Get and set the Confidence Level */
	e_t em, Double_t e, Int_t mid, Double_t sde, Double_t sdb, Double_t tau, Do		Double_t GetCL() const {
	uble_t b,Int_t m);		return fCL;
	Double_t GetUpperLimit(void) const { return fUpperLimit;}		}
	Double_t GetLowerLimit(void) const { return fLowerLimit;}		void SetCL(Double_t CL) {
	Int_t GetSwitch(void) const { return fSwitch;}		fCL = CL;
	void SetSwitch(Int_t sw) { fSwitch = sw; }		}
	Double_t GetCL(void) const { return fCL;}
	void SetCL(Double_t CL) { fCL = CL; }		/* Set the Confidence Level in terms of Sigmas. */
			void SetCLSigmas(Double_t CLsigmas) {
			fCL = TMath::Erf(CLsigmas / TMath::Sqrt(2.0)) ;
			}
			// The Set methods for the different models are described in Rolke.cxx
			// model 1
			void SetPoissonBkgBinomEff(Int_t x, Int_t y, Int_t z, Double_t tau, Int_
			t m);
			// model 2
			void SetPoissonBkgGaussEff(Int_t x, Int_t y, Double_t em, Double_t tau,
			Double_t sde);
			// model 3
			void SetGaussBkgGaussEff(Int_t x, Double_t bm, Double_t em, Double_t sde
			, Double_t sdb);
			// model 4
			void SetPoissonBkgKnownEff(Int_t x, Int_t y, Double_t tau, Double_t e);
			// model 5
			void SetGaussBkgKnownEff(Int_t x, Double_t bm, Double_t sdb, Double_t e)
			;
			// model 6
			void SetKnownBkgBinomEff(Int_t x, Int_t z, Int_t m, Double_t b);
			// model 7
			void SetKnownBkgGaussEff(Int_t x, Double_t em, Double_t sde, Double_t b)
			;
			/* Deprecated interface method (read Rolke.cxx). May be removed from fut
			ure releases */
			Double_t CalculateInterval(Int_t x, Int_t y, Int_t z, Double_t bm, Doubl
			e_t em, Double_t e, Int_t mid, Double_t sde, Double_t sdb, Double_t tau, Do
			uble_t b, Int_t m);
			// get the upper and lower limits based on the specified model
			bool GetLimits(Double_t& low, Double_t& high);
			Double_t GetUpperLimit();
			Double_t GetLowerLimit();
			/* get the upper and lower average limits based on the specified model.
			No uncertainties are considered for the Poisson weights in the averag
			ing sum */
			bool GetSensitivity(Double_t& low, Double_t& high, Double_t pPrecision =
			0.00001);
			/* get the upper and lower limits for the outcome corresponding to
			a given quantile. For integral=0.5 this gives the median limits
			in repeated experiments. The returned out_x is the corresponding
			(e.g. median) value of x.
			No uncertainties are considered for the Poisson weights when calculat
			ing
			the Poisson integral */
			bool GetLimitsQuantile(Double_t& low, Double_t& high, Int_t& out_x, Doub
			le_t integral = 0.5);
			/* get the upper and lower limits for the most likely outcome.
			The returned out_x is the corresponding value of x
			No uncertainties are considered for the Poisson weights when finding
			ML */
			bool GetLimitsML(Double_t& low, Double_t& high, Int_t& out_x);
			/* get the value of x corresponding to rejection of the null hypothesis.
			This means a lower limit >0 with the pre-specified Confidence Level.
			maxtry is the maximum value of x to try. maxtry<0 gives automatic mod
			e. */
			bool GetCriticalNumber(Int_t& ncrit,Int_t maxtry=-1);
			/* Set the bounding mode flag. Read TRolke.cxx for details. */
			bool GetBounding() const {
			return fBounding;
			}
			void SetBounding(const bool bnd) {
			fBounding = bnd;
			}
			/* Deprecated name for SetBounding. */
			void SetSwitch(bool bnd) ;
	ClassDef(TRolke,1) //calculate confidence limits using the Rolke method		/* Dump internals. Option is not used */
			void Print(Option_t*) const;
			ClassDef(TRolke, 2)
	};		};
			//calculate confidence limits using the Rolke method
	#endif		#endif
End of changes. 25 change blocks.
	62 lines changed or deleted		197 lines changed or added

	TSlave.h		TSlave.h
	// @(#)root/proof:$Id: TSlave.h 25918 2008-10-22 15:00:04Z ganis $		// @(#)root/proof:$Id: TSlave.h 27576 2009-02-23 12:15:26Z ganis $
	// Author: Fons Rademakers 14/02/97		// Author: Fons Rademakers 14/02/97
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 141		skipping to change at line 141
	Int_t GetPerfIdx() const { return fPerfIdx; }		Int_t GetPerfIdx() const { return fPerfIdx; }
	Int_t GetProtocol() const { return fProtocol; }		Int_t GetProtocol() const { return fProtocol; }
	TSocket *GetSocket() const { return fSocket; }		TSocket *GetSocket() const { return fSocket; }
	TProof *GetProof() const { return fProof; }		TProof *GetProof() const { return fProof; }
	Long64_t GetBytesRead() const { return fBytesRead; }		Long64_t GetBytesRead() const { return fBytesRead; }
	Float_t GetRealTime() const { return fRealTime; }		Float_t GetRealTime() const { return fRealTime; }
	Float_t GetCpuTime() const { return fCpuTime; }		Float_t GetCpuTime() const { return fCpuTime; }
	Int_t GetSlaveType() const { return (Int_t)fSlaveType; }		Int_t GetSlaveType() const { return (Int_t)fSlaveType; }
	Int_t GetStatus() const { return fStatus; }		Int_t GetStatus() const { return fStatus; }
	Int_t GetParallel() const { return fParallel; }		Int_t GetParallel() const { return fParallel; }
	TString GetMsd() const { return fMsd; }		const char *GetMsd() const { return fMsd; }
	TFileHandler *GetInputHandler() const { return fInput; }		TFileHandler *GetInputHandler() const { return fInput; }
	void SetInputHandler(TFileHandler *ih);		void SetInputHandler(TFileHandler *ih);
	const char *GetArchCompiler() const { return fArchComp; }		const char *GetArchCompiler() const { return fArchComp; }
	const char *GetROOTVersion() const { return fROOTVers; }		const char *GetROOTVersion() const { return fROOTVers; }
	virtual Bool_t IsValid() const { return fSocket ? kTRUE : kFALSE; }		virtual Bool_t IsValid() const { return fSocket ? kTRUE : kFALSE; }
	virtual void Print(Option_t *option="") const;		virtual void Print(Option_t *option="") const;
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	TSpline.h		TSpline.h
	// @(#)root/hist:$Id: TSpline.h 24714 2008-07-08 14:20:13Z brun $		// @(#)root/hist:$Id: TSpline.h 27193 2009-01-20 11:18:46Z brun $
	// Author: Federico Carminati 28/02/2000		// Author: Federico Carminati 28/02/2000
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 191		skipping to change at line 191
	inline TSplinePoly5::TSplinePoly5(TSplinePoly5 const &other)		inline TSplinePoly5::TSplinePoly5(TSplinePoly5 const &other)
	:		:
	TSplinePoly(other), fB(0), fC(0), fD(0), fE(0), fF(0)		TSplinePoly(other), fB(0), fC(0), fD(0), fE(0), fF(0)
	{		{
	CopyPoly(other);		CopyPoly(other);
	}		}
	//_________________________________________________________________________ _____		//_________________________________________________________________________ _____
	class TSpline3 : public TSpline		class TSpline3 : public TSpline
	{		{
	private:		protected:
	TSplinePoly3 *fPoly; //[fNp] Array of polynomial terms		TSplinePoly3 *fPoly; //[fNp] Array of polynomial terms
	Double_t fValBeg; // Initial value of first or second derivati ve		Double_t fValBeg; // Initial value of first or second derivati ve
	Double_t fValEnd; // End value of first or second derivative		Double_t fValEnd; // End value of first or second derivative
	Int_t fBegCond; // 0=no beg cond, 1=first derivative, 2=seco nd derivative		Int_t fBegCond; // 0=no beg cond, 1=first derivative, 2=seco nd derivative
	Int_t fEndCond; // 0=no end cond, 1=first derivative, 2=seco nd derivative		Int_t fEndCond; // 0=no end cond, 1=first derivative, 2=seco nd derivative
	void BuildCoeff();		void BuildCoeff();
	void SetCond(const char *opt);		void SetCond(const char *opt);
	public:		public:
	skipping to change at line 246		skipping to change at line 246
	virtual void SetPoint(Int_t i, Double_t x, Double_t y);		virtual void SetPoint(Int_t i, Double_t x, Double_t y);
	virtual void SetPointCoeff(Int_t i, Double_t b, Double_t c, Double_ t d);		virtual void SetPointCoeff(Int_t i, Double_t b, Double_t c, Double_ t d);
	static void Test();		static void Test();
	ClassDef (TSpline3,2) // Class to create third natural splines		ClassDef (TSpline3,2) // Class to create third natural splines
	};		};
	//_________________________________________________________________________ _____		//_________________________________________________________________________ _____
	class TSpline5 : public TSpline		class TSpline5 : public TSpline
	{		{
	private:		protected:
	TSplinePoly5 *fPoly; //[fNp] Array of polynomial terms		TSplinePoly5 *fPoly; //[fNp] Array of polynomial terms
	void BuildCoeff();		void BuildCoeff();
	void BoundaryConditions(const char *opt, Int_t &beg, Int_t &end,		void BoundaryConditions(const char *opt, Int_t &beg, Int_t &end,
	const char *&cb1, const char *&ce1, const char * &cb2,		const char *&cb1, const char *&ce1, const char * &cb2,
	const char *&ce2);		const char *&ce2);
	void SetBoundaries(Double_t b1, Double_t e1, Double_t b2, Double_t e2,		void SetBoundaries(Double_t b1, Double_t e1, Double_t b2, Double_t e2,
	const char *cb1, const char *ce1, const char *cb2,		const char *cb1, const char *ce1, const char *cb2,
	const char *ce2);		const char *ce2);
	public:		public:
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	TStreamerInfo.h		TStreamerInfo.h
	// @(#)root/io:$Id: TStreamerInfo.h 26606 2008-12-02 20:36:09Z pcanal $		// @(#)root/io:$Id: TStreamerInfo.h 27177 2009-01-18 03:38:13Z pcanal $
	// Author: Rene Brun 12/10/2000		// Author: Rene Brun 12/10/2000
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 175		skipping to change at line 175
	TStreamerInfo();		TStreamerInfo();
	TStreamerInfo(TClass *cl);		TStreamerInfo(TClass *cl);
	virtual ~TStreamerInfo();		virtual ~TStreamerInfo();
	void Build();		void Build();
	void BuildCheck();		void BuildCheck();
	void BuildEmulated(TFile *file);		void BuildEmulated(TFile *file);
	void BuildOld();		void BuildOld();
	virtual Bool_t BuildFor( const TClass *cl );		virtual Bool_t BuildFor( const TClass *cl );
	void Clear(Option_t *);		void Clear(Option_t *);
			Bool_t CompareContent(TClass *cl,TVirtualStreamerInfo *info , Bool_t warn, Bool_t complete);
	void Compile();		void Compile();
	void ComputeSize();		void ComputeSize();
	void ForceWriteInfo(TFile *file, Bool_t force=kFALSE);		void ForceWriteInfo(TFile *file, Bool_t force=kFALSE);
	Int_t GenerateHeaderFile(const char *dirname, const TList *subClasses = 0);		Int_t GenerateHeaderFile(const char *dirname, const TList *subClasses = 0);
	TClass *GetClass() const {return fClass;}		TClass *GetClass() const {return fClass;}
	UInt_t GetCheckSum() const {return fCheckSum;}		UInt_t GetCheckSum() const {return fCheckSum;}
	UInt_t GetCheckSum(UInt_t code) const;		UInt_t GetCheckSum(UInt_t code) const;
	Int_t GetClassVersion() const {return fClassVersion;}		Int_t GetClassVersion() const {return fClassVersion;}
	Int_t GetDataMemberOffset(TDataMember *dm, TMemberStreamer *&streamer) const;		Int_t GetDataMemberOffset(TDataMember *dm, TMemberStreamer *&streamer) const;
	TObjArray *GetElements() const {return fElements;}		TObjArray *GetElements() const {return fElements;}
End of changes. 2 change blocks.
	1 lines changed or deleted		2 lines changed or added

	TString.h		TString.h
	// @(#)root/base:$Id: TString.h 24963 2008-07-28 13:49:23Z rdm $		// @(#)root/base:$Id: TString.h 27131 2009-01-13 16:08:04Z rdm $
	// Author: Fons Rademakers 04/08/95		// Author: Fons Rademakers 04/08/95
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 304		skipping to change at line 304
	TString &Append(const TString &s, Ssiz_t n);		TString &Append(const TString &s, Ssiz_t n);
	TString &Append(char c, Ssiz_t rep = 1); // Append c rep times		TString &Append(char c, Ssiz_t rep = 1); // Append c rep times
	Int_t Atoi() const;		Int_t Atoi() const;
	Long64_t Atoll() const;		Long64_t Atoll() const;
	Double_t Atof() const;		Double_t Atof() const;
	Bool_t BeginsWith(const char *s, ECaseCompare cmp = kExact) c onst;		Bool_t BeginsWith(const char *s, ECaseCompare cmp = kExact) c onst;
	Bool_t BeginsWith(const TString &pat, ECaseCompare cmp = kExact) c onst;		Bool_t BeginsWith(const TString &pat, ECaseCompare cmp = kExact) c onst;
	Ssiz_t Capacity() const { return Pref()->Capacity(); }		Ssiz_t Capacity() const { return Pref()->Capacity(); }
	Ssiz_t Capacity(Ssiz_t n);		Ssiz_t Capacity(Ssiz_t n);
	TString &Chop();		TString &Chop();
			void Clear();
	int CompareTo(const char *cs, ECaseCompare cmp = kExact) con st;		int CompareTo(const char *cs, ECaseCompare cmp = kExact) con st;
	int CompareTo(const TString &st, ECaseCompare cmp = kExact) con st;		int CompareTo(const TString &st, ECaseCompare cmp = kExact) con st;
	Bool_t Contains(const char *pat, ECaseCompare cmp = kExact) con st;		Bool_t Contains(const char *pat, ECaseCompare cmp = kExact) con st;
	Bool_t Contains(const TString &pat, ECaseCompare cmp = kExact) con st;		Bool_t Contains(const TString &pat, ECaseCompare cmp = kExact) con st;
	Bool_t Contains(const TRegexp &pat) const;		Bool_t Contains(const TRegexp &pat) const;
	Bool_t Contains(TPRegexp &pat) const;		Bool_t Contains(TPRegexp &pat) const;
	Int_t CountChar(Int_t c) const;		Int_t CountChar(Int_t c) const;
	TString Copy() const;		TString Copy() const;
	const char *Data() const { return fData; }		const char *Data() const { return fData; }
	Bool_t EndsWith(const char *pat, ECaseCompare cmp = kExact) con st;		Bool_t EndsWith(const char *pat, ECaseCompare cmp = kExact) con st;
End of changes. 2 change blocks.
	1 lines changed or deleted		2 lines changed or added

	TSystem.h		TSystem.h
	// @(#)root/base:$Id: TSystem.h 26872 2008-12-12 12:21:49Z rdm $		// @(#)root/base:$Id: TSystem.h 27497 2009-02-18 16:16:06Z rdm $
	// Author: Fons Rademakers 15/09/95		// Author: Fons Rademakers 15/09/95
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 387		skipping to change at line 387
	virtual void AddTimer(TTimer *t);		virtual void AddTimer(TTimer *t);
	virtual TTimer *RemoveTimer(TTimer *t);		virtual TTimer *RemoveTimer(TTimer *t);
	virtual void ResetTimer(TTimer *) { }		virtual void ResetTimer(TTimer *) { }
	virtual Long_t NextTimeOut(Bool_t mode);		virtual Long_t NextTimeOut(Bool_t mode);
	virtual void Sleep(UInt_t milliSec);		virtual void Sleep(UInt_t milliSec);
	//---- Processes		//---- Processes
	virtual Int_t Exec(const char *shellcmd);		virtual Int_t Exec(const char *shellcmd);
	virtual FILE *OpenPipe(const char *command, const char *mode);		virtual FILE *OpenPipe(const char *command, const char *mode);
	virtual int ClosePipe(FILE *pipe);		virtual int ClosePipe(FILE *pipe);
			virtual TString GetFromPipe(const char *command);
	virtual void Exit(int code, Bool_t mode = kTRUE);		virtual void Exit(int code, Bool_t mode = kTRUE);
	virtual void Abort(int code = 0);		virtual void Abort(int code = 0);
	virtual int GetPid();		virtual int GetPid();
	virtual void StackTrace();		virtual void StackTrace();
	//---- Directories		//---- Directories
	virtual int MakeDirectory(const char *name);		virtual int MakeDirectory(const char *name);
	virtual void *OpenDirectory(const char *name);		virtual void *OpenDirectory(const char *name);
	virtual void FreeDirectory(void *dirp);		virtual void FreeDirectory(void *dirp);
	virtual const char *GetDirEntry(void *dirp);		virtual const char *GetDirEntry(void *dirp);
	skipping to change at line 527		skipping to change at line 528
	virtual void SetFlagsDebug(const char *);		virtual void SetFlagsDebug(const char *);
	virtual void SetFlagsOpt(const char *);		virtual void SetFlagsOpt(const char *);
	virtual void SetIncludePath(const char *includePath);		virtual void SetIncludePath(const char *includePath);
	virtual void SetMakeExe(const char *directives);		virtual void SetMakeExe(const char *directives);
	virtual void SetAclicMode(EAclicMode mode);		virtual void SetAclicMode(EAclicMode mode);
	virtual void SetMakeSharedLib(const char *directives);		virtual void SetMakeSharedLib(const char *directives);
	virtual void SetLinkedLibs(const char *linkedLibs);		virtual void SetLinkedLibs(const char *linkedLibs);
	virtual void SetLinkdefSuffix(const char *suffix);		virtual void SetLinkdefSuffix(const char *suffix);
	virtual void SetSoExt(const char *soExt);		virtual void SetSoExt(const char *soExt);
	virtual void SetObjExt(const char *objExt);		virtual void SetObjExt(const char *objExt);
	virtual TString SplitAclicMode(const char* filename, TString &mo de, TString &args, TString &io) const;		virtual TString SplitAclicMode(const char *filename, TString &mo de, TString &args, TString &io) const;
	virtual void CleanCompiledMacros();		virtual void CleanCompiledMacros();
	ClassDef(TSystem,0) //ABC defining a generic interface to the OS		ClassDef(TSystem,0) //ABC defining a generic interface to the OS
	};		};
	R__EXTERN TSystem *gSystem;		R__EXTERN TSystem *gSystem;
	R__EXTERN TFileHandler *gXDisplay; // Display server (X11) input event han dler		R__EXTERN TFileHandler *gXDisplay; // Display server (X11) input event han dler
	#endif		#endif
End of changes. 3 change blocks.
	2 lines changed or deleted		3 lines changed or added

	TTable.h		TTable.h
	// @(#)root/table:$Id: TTable.h 23631 2008-05-01 10:50:11Z rdm $		// @(#)root/table:$Id: TTable.h 27157 2009-01-15 14:05:12Z brun $
	// Author: Valery Fine(fine@mail.cern.ch) 03/07/98		// Author: Valery Fine(fine@mail.cern.ch) 03/07/98
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 75		skipping to change at line 75
	Bool_t OutOfBoundsError(const char *where, Int_t i) const;		Bool_t OutOfBoundsError(const char *where, Int_t i) const;
	void CopyStruct(Char_t *dest, const Char_t *src);		void CopyStruct(Char_t *dest, const Char_t *src);
	Char_t *Create();		Char_t *Create();
	virtual void Clear(Option_t *opt="");		virtual void Clear(Option_t *opt="");
	virtual void Delete(Option_t *opt="");		virtual void Delete(Option_t *opt="");
	virtual Bool_t EntryLoop(const Char_t *exprFileName,Int_t &action, TObj ect *obj, Int_t nentries=1000000000, Int_t firstentry=0, Option_t *option=" ");		virtual Bool_t EntryLoop(const Char_t *exprFileName,Int_t &action, TObj ect *obj, Int_t nentries=1000000000, Int_t firstentry=0, Option_t *option=" ");
	Int_t SetfN(Long_t len);		Int_t SetfN(Long_t len);
	void SetTablePointer(void *table);		void SetTablePointer(void *table);
	void SetUsedRows(Int_t n);		void SetUsedRows(Int_t n);
	virtual void SetType(const Text_t *const type);		virtual void SetType(const char *const type);
	void StreamerHeader(TBuffer &b,Version_t version=3);		void StreamerHeader(TBuffer &b,Version_t version=3);
	void StreamerTable(TBuffer &b,Version_t version=3);		void StreamerTable(TBuffer &b,Version_t version=3);
	virtual TTableDescriptor *GetDescriptorPointer() const;		virtual TTableDescriptor *GetDescriptorPointer() const;
	virtual void SetDescriptorPointer(TTableDescriptor *list);		virtual void SetDescriptorPointer(TTableDescriptor *list);
	void ReAlloc(Int_t newsize);		void ReAlloc(Int_t newsize);
	static const char *TableDictionary(const char *className,const char *str uctName,TTableDescriptor *&ColDescriptors);		static const char *TableDictionary(const char *className,const char *str uctName,TTableDescriptor *&ColDescriptors);
	public:		public:
	enum EColumnType {kNAN, kFloat, kInt, kLong, kShort, kDouble, kUInt		enum EColumnType {kNAN, kFloat, kInt, kLong, kShort, kDouble, kUInt
	,kULong, kUShort, kUChar, kChar, kPtr, kBool		,kULong, kUShort, kUChar, kChar, kPtr, kBool
	,kEndColumnType };		,kEndColumnType };
	enum ETableBits {		enum ETableBits {
	kIsNotOwn = BIT(23) // if the TTable wrapper doesn't own the S TAF table		kIsNotOwn = BIT(23) // if the TTable wrapper doesn't own the S TAF table
	// As result of the Update() method for ex ample		// As result of the Update() method for ex ample
	};		};
	static const char *fgTypeName[kEndColumnType];		static const char *fgTypeName[kEndColumnType];
	TTable(const Text_t *name=0, Int_t size=0);		TTable(const char *name=0, Int_t size=0);
	TTable(const Text_t *name, Int_t n,Int_t size);		TTable(const char *name, Int_t n,Int_t size);
	TTable(const Text_t *name, Int_t n, Char_t *array,Int_t size);		TTable(const char *name, Int_t n, Char_t *array,Int_t size);
	TTable(const Text_t *name, const Text_t *type, Int_t n, Char_t *array, I		TTable(const char *name, const char *type, Int_t n, Char_t *array, Int_t
	nt_t size);		size);
	TTable(const TTable &table);		TTable(const TTable &table);
	TTable &operator=(const TTable &rhs);		TTable &operator=(const TTable &rhs);
	virtual ~TTable();		virtual ~TTable();
	virtual void Adopt(Int_t n, void *array);		virtual void Adopt(Int_t n, void *array);
	virtual Int_t AddAt(const void *c);		virtual Int_t AddAt(const void *c);
	virtual void AddAt(const void *c, Int_t i);		virtual void AddAt(const void *c, Int_t i);
	virtual void AddAt(TDataSet *dataset,Int_t idx=0);		virtual void AddAt(TDataSet *dataset,Int_t idx=0);
	virtual Long_t AppendRows(const void *row, UInt_t nRows);		virtual Long_t AppendRows(const void *row, UInt_t nRows);
	virtual void AsString(void *buf, EColumnType type, Int_t width , ostream &out) const;		virtual void AsString(void *buf, EColumnType type, Int_t width , ostream &out) const;
	const void *At(Int_t i) const;		const void *At(Int_t i) const;
	virtual void Browse(TBrowser *b);		virtual void Browse(TBrowser *b);
	virtual void CopySet(TTable &array);		virtual void CopySet(TTable &array);
	Int_t CopyRows(const TTable *srcTable,Long_t srcRow=0, Long_t dstRow=0, Long_t nRows=0, Bool_t expand=kFALSE);		Int_t CopyRows(const TTable *srcTable,Long_t srcRow=0, Long_t dstRow=0, Long_t nRows=0, Bool_t expand=kFALSE);
	virtual void DeleteRows(Long_t indx,UInt_t nRows=1);		virtual void DeleteRows(Long_t indx,UInt_t nRows=1);
	virtual void Draw(Option_t *opt);		virtual void Draw(Option_t *opt);
	virtual TH1 *Draw(TCut varexp, TCut selection, Option_t *optio n=""		virtual TH1 *Draw(TCut varexp, TCut selection, Option_t *optio n=""
	,Int_t nentries=1000000000, Int_t firstentry=0);		,Int_t nentries=1000000000, Int_t firstentry=0);
	virtual TH1 *Draw(const Text_t *varexp, const Text_t *selectio n, Option_t *option=""		virtual TH1 *Draw(const char *varexp, const char *selection, O ption_t *option=""
	,Int_t nentries=1000000000, Int_t firstentry= 0); // *MENU*		,Int_t nentries=1000000000, Int_t firstentry= 0); // *MENU*
	void *GetArray() const ;		void *GetArray() const ;
	virtual TClass *GetRowClass() const ;		virtual TClass *GetRowClass() const ;
	Int_t GetSize() const { return fN; }		Int_t GetSize() const { return fN; }
	virtual Long_t GetNRows() const;		virtual Long_t GetNRows() const;
	virtual Long_t GetRowSize() const;		virtual Long_t GetRowSize() const;
	virtual Long_t GetTableSize() const;		virtual Long_t GetTableSize() const;
	virtual TTableDescriptor *GetTableDescriptors() const;		virtual TTableDescriptor *GetTableDescriptors() const;
	virtual TTableDescriptor *GetRowDescriptors() const;		virtual TTableDescriptor *GetRowDescriptors() const;
	virtual const Char_t *GetType() const;		virtual const Char_t *GetType() const;
	virtual void Fit(const Text_t *formula ,const Text_t *varexp, const Text_t *selection="",Option_t *option="" ,Option_t *goption=""		virtual void Fit(const char *formula ,const char *varexp, cons t char *selection="",Option_t *option="" ,Option_t *goption=""
	,Int_t nentries=1000000000, Int_t firstentry= 0); // *MENU*		,Int_t nentries=1000000000, Int_t firstentry= 0); // *MENU*
	virtual Long_t HasData() const { return 1; }		virtual Long_t HasData() const { return 1; }
	virtual Long_t InsertRows(const void *rows, Long_t indx, UInt_t nRows=1);		virtual Long_t InsertRows(const void *rows, Long_t indx, UInt_t nRows=1);
	virtual Bool_t IsFolder() const;		virtual Bool_t IsFolder() const;
	Int_t NaN();		Int_t NaN();
	static TTable *New(const Char_t *name, const Char_t *type, void *array, UInt_t size);		static TTable *New(const Char_t *name, const Char_t *type, void *array, UInt_t size);
	virtual Char_t *MakeExpression(const Char_t *expressions[],Int_t nExpressions);		virtual Char_t *MakeExpression(const Char_t *expressions[],Int_t nExpressions);
	virtual Char_t *Print(Char_t *buf,Int_t n) const ;		virtual Char_t *Print(Char_t *buf,Int_t n) const ;
	virtual void Print(Option_t *opt="") const;		virtual void Print(Option_t *opt="") const;
	virtual const Char_t *Print(Int_t row, Int_t rownumber=10,		virtual const Char_t *Print(Int_t row, Int_t rownumber=10,
	const Char_t *colfirst="", const Char_t *co llast="") const; // *MENU*		const Char_t *colfirst="", const Char_t *co llast="") const; // *MENU*
	virtual void PrintContents(Option_t *opt="") const;		virtual void PrintContents(Option_t *opt="") const;
	virtual const Char_t *PrintHeader() const; // *MENU*		virtual const Char_t *PrintHeader() const; // *MENU*
	virtual void Project(const Text_t *hname, const Text_t *varexp , const Text_t *selection="", Option_t *option=""		virtual void Project(const char *hname, const char *varexp, co nst char *selection="", Option_t *option=""
	,Int_t nentries=1000000000, Int_t firstent ry=0);		,Int_t nentries=1000000000, Int_t firstent ry=0);
	virtual Int_t Purge(Option_t *opt="");		virtual Int_t Purge(Option_t *opt="");
	void *ReAllocate(Int_t newsize);		void *ReAllocate(Int_t newsize);
	void *ReAllocate();		void *ReAllocate();
	virtual void SavePrimitive(ostream &out, Option_t *option = "" );		virtual void SavePrimitive(ostream &out, Option_t *option = "" );
	virtual void Set(Int_t n);		virtual void Set(Int_t n);
	virtual void Set(Int_t n, Char_t *array);		virtual void Set(Int_t n, Char_t *array);
	virtual void SetNRows(Int_t n);		virtual void SetNRows(Int_t n);
End of changes. 6 change blocks.
	10 lines changed or deleted		10 lines changed or added

	TTableDescriptor.h		TTableDescriptor.h
	// @(#)root/table:$Id: TTableDescriptor.h 21566 2007-12-28 16:15:28Z brun $		// @(#)root/table:$Id: TTableDescriptor.h 27157 2009-01-15 14:05:12Z brun $
	// Author: Valery Fine 09/08/99 (E-mail: fine@bnl.gov)		// Author: Valery Fine 09/08/99 (E-mail: fine@bnl.gov)
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 82		skipping to change at line 82
	TDataSet *MakeCommentField(Bool_t createFlag=kTRUE);		TDataSet *MakeCommentField(Bool_t createFlag=kTRUE);
	// ClassDefTable(TTableDescriptor,tableDescriptor_st)		// ClassDefTable(TTableDescriptor,tableDescriptor_st)
	protected:		protected:
	static TTableDescriptor *fgColDescriptors;		static TTableDescriptor *fgColDescriptors;
	virtual TTableDescriptor *GetDescriptorPointer() const;		virtual TTableDescriptor *GetDescriptorPointer() const;
	virtual void SetDescriptorPointer(TTableDescriptor *list);		virtual void SetDescriptorPointer(TTableDescriptor *list);
	public:		public:
	typedef tableDescriptor_st* iterator;		typedef tableDescriptor_st* iterator;
	TTableDescriptor() : TTable("TTableDescriptor",sizeof(tableDescriptor_st )), fRowClass(0), fSecondDescriptor(0) {SetType("tableDescriptor_st");}		TTableDescriptor() : TTable("TTableDescriptor",sizeof(tableDescriptor_st )), fRowClass(0), fSecondDescriptor(0) {SetType("tableDescriptor_st");}
	TTableDescriptor(const Text_t *name) : TTable(name,sizeof(tableDescripto r_st)), fRowClass(0), fSecondDescriptor(0) {SetType("tableDescriptor_st");}		TTableDescriptor(const char *name) : TTable(name,sizeof(tableDescriptor_ st)), fRowClass(0), fSecondDescriptor(0) {SetType("tableDescriptor_st");}
	TTableDescriptor(Int_t n) : TTable("TTableDescriptor",n,sizeof(tableDesc riptor_st)), fRowClass(0), fSecondDescriptor(0) {SetType("tableDescriptor_s t");}		TTableDescriptor(Int_t n) : TTable("TTableDescriptor",n,sizeof(tableDesc riptor_st)), fRowClass(0), fSecondDescriptor(0) {SetType("tableDescriptor_s t");}
	TTableDescriptor(const Text_t *name,Int_t n) : TTable(name,n,sizeof(tabl eDescriptor_st)), fRowClass(0), fSecondDescriptor(0) {SetType("tableDescrip tor_st");}		TTableDescriptor(const char *name,Int_t n) : TTable(name,n,sizeof(tableD escriptor_st)), fRowClass(0), fSecondDescriptor(0) {SetType("tableDescripto r_st");}
	tableDescriptor_st *GetTable(Int_t i=0) const { return ((tableDescriptor _st *)GetArray())+i;}		tableDescriptor_st *GetTable(Int_t i=0) const { return ((tableDescriptor _st *)GetArray())+i;}
	tableDescriptor_st &operator[](Int_t i){ assert(i>=0 && i < GetNRows()); return *GetTable(i); }		tableDescriptor_st &operator[](Int_t i){ assert(i>=0 && i < GetNRows()); return *GetTable(i); }
	const tableDescriptor_st &operator[](Int_t i) const { assert(i>=0 && i < GetNRows()); return *((const tableDescriptor_st *)(GetTable(i))); }		const tableDescriptor_st &operator[](Int_t i) const { assert(i>=0 && i < GetNRows()); return *((const tableDescriptor_st *)(GetTable(i))); }
	tableDescriptor_st *begin() const { return GetNRow s()? GetTable(0):0;}		tableDescriptor_st *begin() const { return GetNRow s()? GetTable(0):0;}
	tableDescriptor_st *end() const {Long_t i = GetNRows(); return i? GetTable(i):0;}		tableDescriptor_st *end() const {Long_t i = GetNRows(); return i? GetTable(i):0;}
	static const char *TableDictionary();		static const char *TableDictionary();
	ClassDef(TTableDescriptor,0) // descrpitor defining the internal layout of TTable objects		ClassDef(TTableDescriptor,0) // descrpitor defining the internal layout of TTable objects
	};		};
	//_________________________________________________________________________ _____		//_________________________________________________________________________ _____
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	TTableSorter.h		TTableSorter.h
	// @(#)root/table:$Id: TTableSorter.h 20882 2007-11-19 11:31:26Z rdm $		// @(#)root/table:$Id: TTableSorter.h 27157 2009-01-15 14:05:12Z brun $
	// Author: Valery Fine 26/01/99 (E-mail: fine@bnl.gov)		// Author: Valery Fine 26/01/99 (E-mail: fine@bnl.gov)
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	#ifndef ROOT_TTableSorter		#ifndef ROOT_TTableSorter
	skipping to change at line 166		skipping to change at line 166
	Int_t BinarySearch(ULong_t value ) const;		Int_t BinarySearch(ULong_t value ) const;
	Int_t BinarySearch(Long_t value ) const;		Int_t BinarySearch(Long_t value ) const;
	Int_t BinarySearch(UInt_t value ) const;		Int_t BinarySearch(UInt_t value ) const;
	Int_t BinarySearch(Short_t value ) const;		Int_t BinarySearch(Short_t value ) const;
	Int_t BinarySearch(Double_t value ) const;		Int_t BinarySearch(Double_t value ) const;
	Int_t BinarySearch(UShort_t value ) const;		Int_t BinarySearch(UShort_t value ) const;
	Int_t BinarySearch(UChar_t value ) const;		Int_t BinarySearch(UChar_t value ) const;
	Int_t BinarySearch(Char_t value ) const;		Int_t BinarySearch(Char_t value ) const;
	Int_t BinarySearch(Bool_t value ) const;		Int_t BinarySearch(Bool_t value ) const;
	virtual const Text_t *GetColumnName() const { return fColName.Data();}		virtual const char *GetColumnName() const { return fColName.Data();}
	Int_t GetIndex(UInt_t sortedIndex) const;		Int_t GetIndex(UInt_t sortedIndex) const;
	virtual const void *GetKeyAddress(Int_t indx) { return (fSortIndex & & indx >= 0) ?fSortIndex[indx]:(void *)(-1);}		virtual const void *GetKeyAddress(Int_t indx) { return (fSortIndex & & indx >= 0) ?fSortIndex[indx]:(void *)(-1);}
	virtual Int_t GetLastFound() const { return fLastFound; }		virtual Int_t GetLastFound() const { return fLastFound; }
	virtual const Text_t *GetTableName() const;		virtual const char *GetTableName() const;
	virtual const Text_t *GetTableTitle() const;		virtual const char *GetTableTitle() const;
	virtual const Text_t *GetTableType() const;		virtual const char *GetTableType() const;
	virtual TTable *GetTable() const;		virtual TTable *GetTable() const;
	virtual Int_t GetNRows() const { return fNumberOfRows;}		virtual Int_t GetNRows() const { return fNumberOfRows;}
	virtual Int_t GetFirstRow() const { return fFirstRow;}		virtual Int_t GetFirstRow() const { return fFirstRow;}
	Int_t operator[](Int_t value) const;		Int_t operator[](Int_t value) const;
	Int_t operator[](Long_t value) const;		Int_t operator[](Long_t value) const;
	Int_t operator[](Double_t value) const;		Int_t operator[](Double_t value) const;
	Int_t operator[](void *value) const;		Int_t operator[](void *value) const;
	// Int_t operator[](const Char_t *value) const;		// Int_t operator[](const Char_t *value) const;
	// Int_t operator[](TString &value) const { return BSearch(value); } // to be implemented		// Int_t operator[](TString &value) const { return BSearch(value); } // to be implemented
End of changes. 3 change blocks.
	5 lines changed or deleted		5 lines changed or added

	TUnfold.h		TUnfold.h
	// Author: Stefan Schmitt		// Author: Stefan Schmitt
	// DESY, 13/10/08		// DESY, 13/10/08
	// Version 6, completely remove definition of class XY		// Version 13, new methods for derived classes
	//		//
	// History:		// History:
			// Version 12, with support for preconditioned matrix inversion
			// Version 11, regularisation methods have return values
			// Version 10, with bug-fix in TUnfold.cxx
			// Version 9, implements method for optimized inversion of sparse matrix
			// Version 8, replace all TMatrixSparse matrix operations by private cod
			e
			// Version 7, fix problem with TMatrixDSparse,TMatrixD multiplication
			// Version 6, completely remove definition of class XY
	// Version 5, move definition of class XY from TUnfold.C to this file		// Version 5, move definition of class XY from TUnfold.C to this file
	// Version 4, with bug-fix in TUnfold.C		// Version 4, with bug-fix in TUnfold.C
	// Version 3, with bug-fix in TUnfold.C		// Version 3, with bug-fix in TUnfold.C
	// Version 2, with changed ScanLcurve() arguments		// Version 2, with changed ScanLcurve() arguments
	// Version 1, added ScanLcurve() method		// Version 1, added ScanLcurve() method
	// Version 0, stable version of basic unfolding algorithm		// Version 0, stable version of basic unfolding algorithm
	#ifndef ROOT_TUnfold		#ifndef ROOT_TUnfold
	#define ROOT_TUnfold		#define ROOT_TUnfold
	skipping to change at line 54		skipping to change at line 61
	// //		// //
	//////////////////////////////////////////////////////////////////////////		//////////////////////////////////////////////////////////////////////////
	#include <TH1D.h>		#include <TH1D.h>
	#include <TH2D.h>		#include <TH2D.h>
	#include <TObject.h>		#include <TObject.h>
	#include <TArrayI.h>		#include <TArrayI.h>
	#include <TSpline.h>		#include <TSpline.h>
	#include <TMatrixDSparse.h>		#include <TMatrixDSparse.h>
	#include <TMatrixD.h>		#include <TMatrixD.h>
			#include <TObjArray.h>
	class TUnfold:public TObject {		class TUnfold:public TObject {
	private:		private:
	void ClearTUnfold(void); // initialize all data members		void InitTUnfold(void); // initialize all data members
	protected:		protected:
	TMatrixDSparse * fA; // Input: matrix		TMatrixDSparse * fA; // Input: matrix
	TMatrixDSparse *fLsquared; // Input: regularisation conditions squared		TMatrixDSparse *fLsquared; // Input: regularisation conditions squared
	TMatrixDSparse *fV; // Input: covariance matrix for y		TMatrixDSparse *fV; // Input: covariance matrix for y
	TMatrixD *fY; // Input: y		TMatrixD *fY; // Input: y
	TMatrixD *fX0; // Input: x0		TMatrixD *fX0; // Input: x0
	Double_t fTau; // Input: regularisation parameter		Double_t fTau; // Input: regularisation parameter
	Double_t fBiasScale; // Input: scale factor for the bias		Double_t fBiasScale; // Input: scale factor for the bias
	TArrayI fXToHist; // Input: matrix indices -> histogram bins		TArrayI fXToHist; // Input: matrix indices -> histogram bins
	TArrayI fHistToX; // Input: histogram bins -> matrix indices		TArrayI fHistToX; // Input: histogram bins -> matrix indices
			TArrayD fSumOverY; // Input: sum of all columns
	TMatrixDSparse *fEinv; // Result: inverse error matrix		TMatrixDSparse *fEinv; // Result: inverse error matrix
			TMatrixDSparse *fAtV; // Result: fA# times fV
	TMatrixD *fE; // Result: error matrix		TMatrixD *fE; // Result: error matrix
	TMatrixD *fX; // Result: x		TMatrixD *fX; // Result: x
	TMatrixDSparse *fAx; // Result: Ax		TMatrixDSparse *fAx; // Result: Ax
	Double_t fChi2A; // Result: chi**2 contribution from (y-Ax)V (y-Ax)		Double_t fChi2A; // Result: chi**2 contribution from (y-Ax)V (y-Ax)
	Double_t fChi2L; // Result: chi**2 contribution from tau(x-s *x0)Lsquared(x-s*x0)		Double_t fChi2L; // Result: chi**2 contribution from tau(x-s *x0)Lsquared(x-s*x0)
	Double_t fRhoMax; // Result: maximum global correlation		Double_t fRhoMax; // Result: maximum global correlation
	Double_t fRhoAvg; // Result: average global correlation		Double_t fRhoAvg; // Result: average global correlation
			Int_t fNdf; // Result: number of degrees of freedom
	protected:		protected:
	TUnfold(void); // for derived classes		TUnfold(void); // for derived classes
	virtual Double_t DoUnfold(void); // the unfolding algorithm		virtual Double_t DoUnfold(void); // the unfolding algorithm
	virtual void CalculateChi2Rho(void); // supplementory calculations		virtual void CalculateChi2Rho(void); // supplementory calculations
	static TMatrixDSparse *CreateSparseMatrix(Int_t nr, Int_t nc, Int_t * ro		virtual void ClearResults(void); // clear all results
	w, Int_t * col, Double_t const *data); // create matrices
			static TMatrixDSparse *MultiplyMSparseM(TMatrixDSparse const &a,TMatrixD
			const &b); // multiply sparse and non-sparse matrix
			static TMatrixDSparse *MultiplyMSparseMSparse(TMatrixDSparse const &a,TM
			atrixDSparse const &b); // multiply sparse and sparse matrix
			static TMatrixDSparse *MultiplyMSparseTranspMSparse(TMatrixDSparse const
			&a,TMatrixDSparse const &b); // multiply transposed sparse and sparse matr
			ix
			static Double_t MultiplyVecMSparseVec(TMatrixDSparse const &a,TMatrixD c
			onst &v); // scalar product of v and Av
			static TMatrixD *InvertMSparse(TMatrixDSparse const &A); // invert spars
			e matrix
			static Bool_t InvertMConditioned(TMatrixD &A); // invert matrix includin
			g preconditioning
			static void AddMSparse(TMatrixDSparse &dest,Double_t const &f,TMatrixDSp
			arse const &src); // replacement for dest += f*src
	inline Int_t GetNx(void) const {		inline Int_t GetNx(void) const {
	return fA->GetNcols();		return fA->GetNcols();
	} // number of non-zero output bins		} // number of non-zero output bins
	inline Int_t GetNy(void) const {		inline Int_t GetNy(void) const {
	return fA->GetNrows();		return fA->GetNrows();
	} // number of input bins		} // number of input bins
			void ErrorMatrixToHist(TH2 *ematrix,TMatrixD const *emat,Int_t const *bi
			nMap,
			Bool_t doClear) const; // return an error matrix
			as histogram
	public:		public:
	enum EHistMap { // mapping between unfolding matrix and TH2 axes		enum EHistMap { // mapping between unfolding matrix and TH2 axes
	kHistMapOutputHoriz = 0, // map unfolding output to x-axis of TH2 ma trix		kHistMapOutputHoriz = 0, // map unfolding output to x-axis of TH2 ma trix
	kHistMapOutputVert = 1 // map unfolding output to y-axis of TH2 ma trix		kHistMapOutputVert = 1 // map unfolding output to y-axis of TH2 ma trix
	};		};
	enum ERegMode { // regularisation scheme		enum ERegMode { // regularisation scheme
	kRegModeNone = 0, // no regularisation		kRegModeNone = 0, // no regularisation
	kRegModeSize = 1, // regularise the size of the output		kRegModeSize = 1, // regularise the size of the output
	kRegModeDerivative = 2, // regularize the 1st derivative of the out put		kRegModeDerivative = 2, // regularize the 1st derivative of the out put
	kRegModeCurvature = 3 // regularize the 2nd derivative of the out put		kRegModeCurvature = 3, // regularize the 2nd derivative of the out put
	};		};
	TUnfold(TH2 const *hist_A, EHistMap histmap, ERegMode regmode = kRegMode Size); // constructor		TUnfold(TH2 const *hist_A, EHistMap histmap, ERegMode regmode = kRegMode Size); // constructor
	virtual ~ TUnfold(void); // delete data members		virtual ~ TUnfold(void); // delete data members
			static void DeleteMatrix(TMatrixD **m); // delete and invalidate pointer
			static void DeleteMatrix(TMatrixDSparse **m); // delete and invalidate p
			ointer
	void SetBias(TH1 const *bias); // set alternative bias		void SetBias(TH1 const *bias); // set alternative bias
	void RegularizeSize(int bin, Double_t const &scale = 1.0); // regulari		Int_t RegularizeSize(int bin, Double_t const &scale = 1.0); // regular
	se the size of one output bin		ise the size of one output bin
	void RegularizeDerivative(int left_bin, int right_bin, Double_t const &s		Int_t RegularizeDerivative(int left_bin, int right_bin, Double_t const &
	cale = 1.0); // regularize difference of two output bins (1st derivative)		scale = 1.0); // regularize difference of two output bins (1st derivative)
	void RegularizeCurvature(int left_bin, int center_bin, int right_bin, Do		Int_t RegularizeCurvature(int left_bin, int center_bin, int right_bin, D
	uble_t const &scale_left = 1.0, Double_t const &scale_right = 1.0); // reg		ouble_t const &scale_left = 1.0, Double_t const &scale_right = 1.0); // re
	ularize curvature of three output bins (2nd derivative)		gularize curvature of three output bins (2nd derivative)
	void RegularizeBins(int start, int step, int nbin, ERegMode regmode);		Int_t RegularizeBins(int start, int step, int nbin, ERegMode regmode);
	// regularize a 1-dimensional curve		// regularize a 1-dimensional curve
	void RegularizeBins2D(int start_bin, int step1, int nbin1, int step2, in		Int_t RegularizeBins2D(int start_bin, int step1, int nbin1, int step2, i
	t nbin2, ERegMode regmode); // regularize a 2-dimensional grid		nt nbin2, ERegMode regmode); // regularize a 2-dimensional grid
	Double_t DoUnfold(Double_t const &tau,		Double_t DoUnfold(Double_t const &tau,
	TH1 const *hist_y, Double_t const &scaleBias=0.0); // do the unfolding		TH1 const *hist_y, Double_t const &scaleBias=0.0); // do the unfolding
	void SetInput(TH1 const *hist_y, Double_t const &scaleBias=0.0); // defi ne input distribution for ScanLCurve		Int_t SetInput(TH1 const *hist_y, Double_t const &scaleBias=0.0,Double_t oneOverZeroError=0.0); // define input distribution for ScanLCurve
	virtual Double_t DoUnfold(Double_t const &tau); // Unfold with given cho ice of tau		virtual Double_t DoUnfold(Double_t const &tau); // Unfold with given cho ice of tau
	virtual Int_t ScanLcurve(Int_t nPoint,Double_t const &tauMin,		virtual Int_t ScanLcurve(Int_t nPoint,Double_t const &tauMin,
	Double_t const &tauMax,TGraph **lCurve,		Double_t const &tauMax,TGraph **lCurve,
	TSpline **logTauX=0,TSpline **logTauY=0); // sca n the L curve using successive calls to DoUnfold(Double_t)		TSpline **logTauX=0,TSpline **logTauY=0); // sca n the L curve using successive calls to DoUnfold(Double_t)
	TH1D *GetOutput(char const *name, char const *title, Double_t x0 = 0.0, Double_t x1 = 0.0) const; // get unfolding result		TH1D *GetOutput(char const *name, char const *title, Double_t x0 = 0.0, Double_t x1 = 0.0) const; // get unfolding result
	TH1D *GetBias(char const *name, char const *title, Double_t x0 = 0.0, Do uble_t x1 = 0.0) const; // get bias		TH1D *GetBias(char const *name, char const *title, Double_t x0 = 0.0, Do uble_t x1 = 0.0) const; // get bias
	TH1D *GetFoldedOutput(char const *name, char const *title, Double_t y0 = 0.0, Double_t y1 = 0.0) const; // get folded unfolding result		TH1D *GetFoldedOutput(char const *name, char const *title, Double_t y0 = 0.0, Double_t y1 = 0.0) const; // get folded unfolding result
	TH1D *GetInput(char const *name, char const *title, Double_t y0 = 0.0, D ouble_t y1 = 0.0) const; // get unfolding input		TH1D *GetInput(char const *name, char const *title, Double_t y0 = 0.0, D ouble_t y1 = 0.0) const; // get unfolding input
	TH2D *GetRhoIJ(char const *name, char const *title, Double_t x0 = 0.0, D ouble_t x1 = 0.0) const; // get correlation coefficients		TH2D *GetRhoIJ(char const *name, char const *title, Double_t x0 = 0.0, D ouble_t x1 = 0.0) const; // get correlation coefficients
	TH2D *GetEmatrix(char const *name, char const *title, Double_t x0 = 0.0, Double_t x1 = 0.0) const; // get error matrix		TH2D *GetEmatrix(char const *name, char const *title, Double_t x0 = 0.0, Double_t x1 = 0.0) const; // get error matrix
	TH1D *GetRhoI(char const *name, char const *title, Double_t x0 = 0.0, Do uble_t x1 = 0.0) const; // get global correlation coefficients		TH1D *GetRhoI(char const *name, char const *title, Double_t x0 = 0.0, Do uble_t x1 = 0.0) const; // get global correlation coefficients
	TH2D *GetLsquared(char const *name, char const *title, Double_t x0 = 0.0 , Double_t x1 = 0.0) const; // get regularisation conditions squared		TH2D *GetLsquared(char const *name, char const *title, Double_t x0 = 0.0 , Double_t x1 = 0.0) const; // get regularisation conditions squared
	void GetOutput(TH1 *output,Int_t const *binMap=0) const; // get output d istribution, averaged over bins		void GetOutput(TH1 *output,Int_t const *binMap=0) const; // get output d istribution, averaged over bins
	void GetEmatrix(TH2 *ematrix,Int_t const *binMap=0) const; // get error matrix, averaged over bins		void GetEmatrix(TH2 *ematrix,Int_t const *binMap=0) const; // get error matrix, averaged over bins
	Double_t GetRhoI(TH1 *rhoi,TH2 *ematrixinv=0,Int_t const *binMap=0) cons t; // get global correlation coefficients and inverse of error matrix, aver aged over bins		Double_t GetRhoI(TH1 *rhoi,TH2 *ematrixinv=0,Int_t const *binMap=0) cons t; // get global correlation coefficients and inverse of error matrix, aver aged over bins
	void GetRhoIJ(TH2 *rhoij,Int_t const *binMap=0) const; // get correlatio n coefficients, averaged over bins		void GetRhoIJ(TH2 *rhoij,Int_t const *binMap=0) const; // get correlatio n coefficients, averaged over bins
	Double_t const &GetTau(void) const; // regularisation parameter		Double_t const &GetTau(void) const; // regularisation parameter
	Double_t const &GetRhoMax(void) const; // maximum global correlati on		Double_t const &GetRhoMax(void) const; // maximum global correlati on
	Double_t const &GetRhoAvg(void) const; // average global correlati on		Double_t const &GetRhoAvg(void) const; // average global correlati on
	Double_t const &GetChi2A(void) const; // chi**2 contribution from A		Double_t const &GetChi2A(void) const; // chi**2 contribution from A
	Double_t const &GetChi2L(void) const; // chi**2 contribution from L		Double_t const &GetChi2L(void) const; // chi**2 contribution from L
	Double_t GetLcurveX(void) const; // x axis of L curve		Double_t GetLcurveX(void) const; // x axis of L curve
	Double_t GetLcurveY(void) const; // y axis of L curve		Double_t GetLcurveY(void) const; // y axis of L curve
			Int_t GetNdf(void) const; // number of degrees of freedom
			Int_t GetNpar(void) const; // number of parameters
	ClassDef(TUnfold, 0)		ClassDef(TUnfold, 0) //Unfolding with support for L-curve analysis
	};		};
	#endif		#endif
End of changes. 16 change blocks.
	19 lines changed or deleted		54 lines changed or added

	TVirtualMC.h		TVirtualMC.h
	// @(#)root/vmc:$Name: $:$Id: TVirtualMC.h 21565 2007-12-28 12:28:46Z brun $		// @(#)root/vmc:$Name: $:$Id: TVirtualMC.h 27260 2009-01-27 16:26:34Z ivan a $
	// Authors: Ivana Hrivnacova, Rene Brun, Federico Carminati 13/04/2002		// Authors: Ivana Hrivnacova, Rene Brun, Federico Carminati 13/04/2002
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 2006, Rene Brun and Fons Rademakers. *		* Copyright (C) 2006, Rene Brun and Fons Rademakers. *
	* Copyright (C) 2002, ALICE Experiment at CERN. *		* Copyright (C) 2002, ALICE Experiment at CERN. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 30		skipping to change at line 30
	// //		// //
	// //		// //
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#include "TMCProcess.h"		#include "TMCProcess.h"
	#include "TMCParticleType.h"		#include "TMCParticleType.h"
	#include "TMCOptical.h"		#include "TMCOptical.h"
	#include "TVirtualMCApplication.h"		#include "TVirtualMCApplication.h"
	#include "TVirtualMCStack.h"		#include "TVirtualMCStack.h"
	#include "TVirtualMCDecayer.h"		#include "TVirtualMCDecayer.h"
			#include "TVirtualMagField.h"
	#include "TRandom.h"		#include "TRandom.h"
	#include "TString.h"		#include "TString.h"
	#include "TError.h"		#include "TError.h"
	class TLorentzVector;		class TLorentzVector;
	class TGeoHMatrix;		class TGeoHMatrix;
	class TArrayI;		class TArrayI;
	class TArrayD;		class TArrayD;
	class TVirtualMC : public TNamed {		class TVirtualMC : public TNamed {
	skipping to change at line 429		skipping to change at line 430
	// Set geometry from Root (built via TGeo)		// Set geometry from Root (built via TGeo)
	virtual void SetRootGeometry() = 0;		virtual void SetRootGeometry() = 0;
	//		//
	// get methods		// get methods
	// ------------------------------------------------		// ------------------------------------------------
	//		//
	// Return the unique numeric identifier for volume name volName		// Return the unique numeric identifier for volume name volName
	virtual Int_t VolId(const Text_t* volName) const = 0;		virtual Int_t VolId(const char* volName) const = 0;
	// Return the volume name for a given volume identifier id		// Return the volume name for a given volume identifier id
	virtual const char* VolName(Int_t id) const = 0;		virtual const char* VolName(Int_t id) const = 0;
	// Return the unique numeric identifier for medium name mediumName		// Return the unique numeric identifier for medium name mediumName
	virtual Int_t MediumId(const Text_t* mediumName) const;		virtual Int_t MediumId(const char* mediumName) const = 0;
	// Return total number of volumes in the geometry		// Return total number of volumes in the geometry
	virtual Int_t NofVolumes() const = 0;		virtual Int_t NofVolumes() const = 0;
	// Return material number for a given volume id		// Return material number for a given volume id
	virtual Int_t VolId2Mate(Int_t id) const = 0;		virtual Int_t VolId2Mate(Int_t id) const = 0;
	// Return number of daughters of the volume specified by volName		// Return number of daughters of the volume specified by volName
	virtual Int_t NofVolDaughters(const char* volName) const = 0;		virtual Int_t NofVolDaughters(const char* volName) const = 0;
	skipping to change at line 496		skipping to change at line 497
	// lepton lepton number		// lepton lepton number
	// baryon baryon number		// baryon baryon number
	// stable stability		// stable stability
	// shortlived is shorlived?		// shortlived is shorlived?
	// subType particle subType as in Geant4		// subType particle subType as in Geant4
	// antiEncoding anti encoding		// antiEncoding anti encoding
	// magMoment magnetic moment		// magMoment magnetic moment
	// excitation excitation energy [GeV]		// excitation excitation energy [GeV]
	virtual Bool_t DefineParticle(Int_t pdg, const char* name,		virtual Bool_t DefineParticle(Int_t pdg, const char* name,
	TMCParticleType mcType,		TMCParticleType mcType,
	Double_t mass, Double_t charge, Double_t lifetime);		Double_t mass, Double_t charge, Double_t lifetime) = 0;
	// Set a user defined particle		// Set a user defined particle
	// Function is ignored if particle with specified pdg		// Function is ignored if particle with specified pdg
	// already exists and error report is printed.		// already exists and error report is printed.
	// pdg PDG encoding		// pdg PDG encoding
	// name particle name		// name particle name
	// mcType VMC Particle type		// mcType VMC Particle type
	// mass mass [GeV]		// mass mass [GeV]
	// charge charge [eplus]		// charge charge [eplus]
	// lifetime time of life [s]		// lifetime time of life [s]
	skipping to change at line 533		skipping to change at line 534
	virtual Bool_t DefineParticle(Int_t pdg, const char* name,		virtual Bool_t DefineParticle(Int_t pdg, const char* name,
	TMCParticleType mcType,		TMCParticleType mcType,
	Double_t mass, Double_t charge, Double_t lifetime,		Double_t mass, Double_t charge, Double_t lifetime,
	const TString& pType, Double_t width,		const TString& pType, Double_t width,
	Int_t iSpin, Int_t iParity, Int_t iConjugation,		Int_t iSpin, Int_t iParity, Int_t iConjugation,
	Int_t iIsospin, Int_t iIsospinZ, Int_t gParity,		Int_t iIsospin, Int_t iIsospinZ, Int_t gParity,
	Int_t lepton, Int_t baryon,		Int_t lepton, Int_t baryon,
	Bool_t stable, Bool_t shortlived = kFALSE,		Bool_t stable, Bool_t shortlived = kFALSE,
	const TString& subType = "",		const TString& subType = "",
	Int_t antiEncoding = 0, Double_t magMoment = 0.0,		Int_t antiEncoding = 0, Double_t magMoment = 0.0,
	Double_t excitation = 0.0);		Double_t excitation = 0.0) = 0;
	// Set a user defined ion.		// Set a user defined ion.
	// name ion name		// name ion name
	// Z atomic number		// Z atomic number
	// A atomic mass		// A atomic mass
	// Q charge [eplus}		// Q charge [eplus}
	// excitation excitation energy [GeV]		// excitation excitation energy [GeV]
	// mass mass [GeV] (if not specified by user, approximative		// mass mass [GeV] (if not specified by user, approximative
	// mass is calculated)		// mass is calculated)
	virtual Bool_t DefineIon(const char* name, Int_t Z, Int_t A,		virtual Bool_t DefineIon(const char* name, Int_t Z, Int_t A,
	Int_t Q, Double_t excEnergy, Double_t mass = 0.) = 0;		Int_t Q, Double_t excEnergy, Double_t mass = 0.) = 0;
	// Set a user phase space decay for a particle		// Set a user phase space decay for a particle
	// pdg particle PDG encoding		// pdg particle PDG encoding
	// bratios the array with branching ratios (in %)		// bratios the array with branching ratios (in %)
	// mode[6][3] the array with daughters particles PDG codes for eac h		// mode[6][3] the array with daughters particles PDG codes for eac h
	// decay channel		// decay channel
	virtual Bool_t SetDecayMode(Int_t pdg, Float_t bratio[6], Int_t mode[6 ][3]);		virtual Bool_t SetDecayMode(Int_t pdg, Float_t bratio[6], Int_t mode[6 ][3]) = 0;
	// Calculate X-sections		// Calculate X-sections
	// (Geant3 only)		// (Geant3 only)
	virtual Double_t Xsec(char*, Double_t, Int_t, Int_t) = 0;		virtual Double_t Xsec(char*, Double_t, Int_t, Int_t) = 0;
	//		//
	// particle table usage		// particle table usage
	// ------------------------------------------------		// ------------------------------------------------
	//		//
	skipping to change at line 863		skipping to change at line 864
	// Set the particle stack		// Set the particle stack
	virtual void SetStack(TVirtualMCStack* stack);		virtual void SetStack(TVirtualMCStack* stack);
	// Set the external decayer		// Set the external decayer
	virtual void SetExternalDecayer(TVirtualMCDecayer* decayer);		virtual void SetExternalDecayer(TVirtualMCDecayer* decayer);
	// Set the random number generator		// Set the random number generator
	virtual void SetRandom(TRandom* random);		virtual void SetRandom(TRandom* random);
			// Set the magnetic field
			virtual void SetMagField(TVirtualMagField* field);
	//		//
	// ------------------------------------------------		// ------------------------------------------------
	// Get methods		// Get methods
	// ------------------------------------------------		// ------------------------------------------------
	//		//
	// Return the particle stack		// Return the particle stack
	virtual TVirtualMCStack* GetStack() const { return fStack; }		virtual TVirtualMCStack* GetStack() const { return fStack; }
	// Return the external decayer		// Return the external decayer
	virtual TVirtualMCDecayer* GetDecayer() const { return fDecayer; }		virtual TVirtualMCDecayer* GetDecayer() const { return fDecayer; }
	// Return the random number generator		// Return the random number generator
	virtual TRandom* GetRandom() const { return fRandom; }		virtual TRandom* GetRandom() const { return fRandom; }
			// Return the magnetic field
			virtual TVirtualMagField* GetMagField() const { return fMagField; }
	protected:		protected:
	TVirtualMCApplication* fApplication; //! User MC application		TVirtualMCApplication* fApplication; //! User MC application
	private:		private:
	TVirtualMC(const TVirtualMC &mc);		TVirtualMC(const TVirtualMC &mc);
	TVirtualMC & operator=(const TVirtualMC &);		TVirtualMC & operator=(const TVirtualMC &);
	static TVirtualMC* fgMC; // Monte Carlo singleton instance		static TVirtualMC* fgMC; // Monte Carlo singleton instance
	TVirtualMCStack* fStack; //! Particles stack		TVirtualMCStack* fStack; //! Particles stack
	TVirtualMCDecayer* fDecayer; //! External decayer		TVirtualMCDecayer* fDecayer; //! External decayer
	TRandom* fRandom; //! Random number generator		TRandom* fRandom; //! Random number generator
			TVirtualMagField* fMagField;//! Magnetic field
	ClassDef(TVirtualMC,1) //Interface to Monte Carlo		ClassDef(TVirtualMC,1) //Interface to Monte Carlo
	};		};
	// new functions
	inline Int_t TVirtualMC::MediumId(const Text_t* /*mediumName*/) const {
	Warning("MediumId", "New function - not yet implemented.");
	return 0;
	}
	inline Bool_t TVirtualMC::DefineParticle(Int_t /*pdg*/, const char* /*name*
	/,
	TMCParticleType /*mcType*/,
	Double_t /*mass*/, Double_t /*charge*/, Double_
	t /*lifetime*/) {
	Warning("DefineParticle",
	"Deprecated function - a new function with more arguments should
	be used.");
	return false;
	}
	inline Bool_t TVirtualMC::DefineParticle(Int_t /*pdg*/, const char* /*name*
	/,
	TMCParticleType /*mcType*/,
	Double_t /*mass*/, Double_t /*charge*/, Double_
	t /*lifetime*/,
	const TString& /*pType*/, Double_t /*width*/,
	Int_t /*iSpin*/, Int_t /*iParity*/, Int_t /*iCo
	njugation*/,
	Int_t /*iIsospin*/, Int_t /*iIsospinZ*/, Int_t
	/*gParity*/,
	Int_t /*lepton*/, Int_t /*baryon*/,
	Bool_t /*stable*/, Bool_t /*shortlived*/,
	const TString& /*subType*/,
	Int_t /*antiEncoding*/, Double_t /*magMoment*/,
	Double_t /*excitation*/) {
	Warning("DefineParticle", "New function - not yet implemented.");
	return false;
	}
	inline Bool_t TVirtualMC::SetDecayMode(Int_t /*pdg*/,
	Float_t /*bratio*/[6], Int_t /*mode*/[6][3]) {
	Warning("SetDecayMode", "New function - not yet implemented.");
	return false;
	}
	R__EXTERN TVirtualMC *gMC;		R__EXTERN TVirtualMC *gMC;
	#endif //ROOT_TVirtualMC		#endif //ROOT_TVirtualMC
End of changes. 11 change blocks.
	49 lines changed or deleted		14 lines changed or added

	TVirtualMCApplication.h		TVirtualMCApplication.h
	// @(#)root/vmc:$Id: TVirtualMCApplication.h 20882 2007-11-19 11:31:26Z rdm $		// @(#)root/vmc:$Id: TVirtualMCApplication.h 27106 2009-01-09 07:55:28Z bru n $
	// Author: Ivana Hrivnacova, 23/03/2002		// Author: Ivana Hrivnacova, 23/03/2002
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 2006, Rene Brun and Fons Rademakers. *		* Copyright (C) 2006, Rene Brun and Fons Rademakers. *
	* Copyright (C) 2002, ALICE Experiment at CERN. *		* Copyright (C) 2002, ALICE Experiment at CERN. *
	* 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 97		skipping to change at line 97
	// Define actions at the end of the event		// Define actions at the end of the event
	virtual void FinishEvent() = 0;		virtual void FinishEvent() = 0;
	// Define maximum radius for tracking (optional)		// Define maximum radius for tracking (optional)
	virtual Double_t TrackingRmax() const { return DBL_MAX; }		virtual Double_t TrackingRmax() const { return DBL_MAX; }
	// Define maximum z for tracking (optional)		// Define maximum z for tracking (optional)
	virtual Double_t TrackingZmax() const { return DBL_MAX; }		virtual Double_t TrackingZmax() const { return DBL_MAX; }
	// Calculate user field \a b at point \a x		// Calculate user field \a b at point \a x
	virtual void Field(const Double_t* x, Double_t* b) const = 0;		virtual void Field(const Double_t* x, Double_t* b) const;
	private:		private:
	// static data members		// static data members
	static TVirtualMCApplication* fgInstance; // singleton instance		static TVirtualMCApplication* fgInstance; // singleton instance
	ClassDef(TVirtualMCApplication,1) //Interface to MonteCarlo application		ClassDef(TVirtualMCApplication,1) //Interface to MonteCarlo application
	};		};
			inline void TVirtualMCApplication::Field(const Double_t* /*x*/, Double_t* b
			) const {
			// No magnetic field
			b[0] = 0; b[1] = 0; b[2] = 0;
			}
	#endif //ROOT_TVirtualMCApplication		#endif //ROOT_TVirtualMCApplication
End of changes. 3 change blocks.
	2 lines changed or deleted		8 lines changed or added

	TVirtualMCGeometry.h		TVirtualMCGeometry.h
	// @(#)root/vmc:$Id: TVirtualMCGeometry.h 20882 2007-11-19 11:31:26Z rdm $		// @(#)root/vmc:$Id: TVirtualMCGeometry.h 27157 2009-01-15 14:05:12Z brun $
	// Authors: Alice collaboration 25/06/2002		// Authors: Alice collaboration 25/06/2002
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 2006, Rene Brun and Fons Rademakers. *		* Copyright (C) 2006, Rene Brun and Fons Rademakers. *
	* Copyright (C) 2002, ALICE Experiment at CERN. *		* Copyright (C) 2002, ALICE Experiment at CERN. *
	* 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 268		skipping to change at line 268
	// Euclid		// Euclid
	// virtual void WriteEuclid(const char*, const char*, Int_t, Int_t) = 0 ;		// virtual void WriteEuclid(const char*, const char*, Int_t, Int_t) = 0 ;
	//		//
	// get methods		// get methods
	// ------------------------------------------------		// ------------------------------------------------
	//		//
	// Return the unique numeric identifier for volume name volName		// Return the unique numeric identifier for volume name volName
	virtual Int_t VolId(const Text_t* volName) const = 0;		virtual Int_t VolId(const char* volName) const = 0;
	// Return the volume name for a given volume identifier id		// Return the volume name for a given volume identifier id
	virtual const char* VolName(Int_t id) const = 0;		virtual const char* VolName(Int_t id) const = 0;
	// Return the unique numeric identifier for medium name mediumName		// Return the unique numeric identifier for medium name mediumName
	virtual Int_t MediumId(const Text_t* mediumName) const = 0;		virtual Int_t MediumId(const char* mediumName) const = 0;
	// Return total number of volumes in the geometry		// Return total number of volumes in the geometry
	virtual Int_t NofVolumes() const = 0;		virtual Int_t NofVolumes() const = 0;
	// Return number of daughters of the volume specified by volName		// Return number of daughters of the volume specified by volName
	virtual Int_t NofVolDaughters(const char* volName) const = 0;		virtual Int_t NofVolDaughters(const char* volName) const = 0;
	// Return the name of i-th daughter of the volume specified by volName		// Return the name of i-th daughter of the volume specified by volName
	virtual const char* VolDaughterName(const char* volName, Int_t i) const = 0;		virtual const char* VolDaughterName(const char* volName, Int_t i) const = 0;
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	TVirtualStreamerInfo.h		TVirtualStreamerInfo.h
	// @(#)root/meta:$Id: TVirtualStreamerInfo.h 25450 2008-09-18 21:13:42Z pca nal $		// @(#)root/meta:$Id: TVirtualStreamerInfo.h 27177 2009-01-18 03:38:13Z pca nal $
	// Author: Rene Brun 05/02/2007		// Author: Rene Brun 05/02/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 104		skipping to change at line 104
	TVirtualStreamerInfo();		TVirtualStreamerInfo();
	TVirtualStreamerInfo(TClass * /*cl*/);		TVirtualStreamerInfo(TClass * /*cl*/);
	virtual ~TVirtualStreamerInfo();		virtual ~TVirtualStreamerInfo();
	virtual void Build() = 0;		virtual void Build() = 0;
	virtual void BuildCheck() = 0;		virtual void BuildCheck() = 0;
	virtual void BuildEmulated(TFile *file) = 0;		virtual void BuildEmulated(TFile *file) = 0;
	virtual void BuildOld() = 0;		virtual void BuildOld() = 0;
	virtual Bool_t BuildFor( const TClass *cl ) = 0;		virtual Bool_t BuildFor( const TClass *cl ) = 0;
	virtual void Clear(Option_t *) = 0;		virtual void Clear(Option_t *) = 0;
			virtual Bool_t CompareContent(TClass *cl,TVirtualStreamerInfo *info , Bool_t warn, Bool_t complete) = 0;
	virtual void Compile() = 0;		virtual void Compile() = 0;
	virtual void ForceWriteInfo(TFile *file, Bool_t force=kFALSE) = 0 ;		virtual void ForceWriteInfo(TFile *file, Bool_t force=kFALSE) = 0 ;
	virtual Int_t GenerateHeaderFile(const char *dirname, const TList *subClasses = 0) = 0;		virtual Int_t GenerateHeaderFile(const char *dirname, const TList *subClasses = 0) = 0;
	virtual TClass *GetClass() const = 0;		virtual TClass *GetClass() const = 0;
	virtual UInt_t GetCheckSum() const = 0;		virtual UInt_t GetCheckSum() const = 0;
	virtual Int_t GetClassVersion() const = 0;		virtual Int_t GetClassVersion() const = 0;
	virtual ULong_t *GetElems() const = 0;		virtual ULong_t *GetElems() const = 0;
	virtual TObjArray *GetElements() const = 0;		virtual TObjArray *GetElements() const = 0;
	virtual Int_t GetOffset(const char *) const = 0;		virtual Int_t GetOffset(const char *) const = 0;
	virtual Int_t *GetOffsets() const = 0;		virtual Int_t *GetOffsets() const = 0;
End of changes. 2 change blocks.
	1 lines changed or deleted		2 lines changed or added

	TVolume.h		TVolume.h
	// @(#)root/table:$Id: TVolume.h 20882 2007-11-19 11:31:26Z rdm $		// @(#)root/table:$Id: TVolume.h 27157 2009-01-15 14:05:12Z brun $
	// Author: Valery Fine 10/12/98		// Author: Valery Fine 10/12/98
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 66		skipping to change at line 66
	virtual void Add(TDataSet *dataset);		virtual void Add(TDataSet *dataset);
	virtual void Add(TVolumePosition *position);		virtual void Add(TVolumePosition *position);
	virtual TVolumePosition *Add(TVolume *node, TVolumePosition *nodePositio n);		virtual TVolumePosition *Add(TVolume *node, TVolumePosition *nodePositio n);
	virtual Int_t DistancetoNodePrimitive(Int_t px, Int_t py,TVol umePosition *position=0);		virtual Int_t DistancetoNodePrimitive(Int_t px, Int_t py,TVol umePosition *position=0);
	void SetPositionsList(TList *list=0){AddObject((TObject *)li st);}		void SetPositionsList(TList *list=0){AddObject((TObject *)li st);}
	virtual void PaintNodePosition(Option_t *option="",TVolumePo sition *postion=0);		virtual void PaintNodePosition(Option_t *option="",TVolumePo sition *postion=0);
	friend class TPolyLineShape;		friend class TPolyLineShape;
	public:		public:
	TVolume();		TVolume();
	TVolume(const Text_t *name, const Text_t *title, const Text_t *shapename		TVolume(const char *name, const char *title, const char *shapename, Opti
	, Option_t *option="");		on_t *option="");
	TVolume(const Text_t *name, const Text_t *title, TShape *shape, Option_t		TVolume(const char *name, const char *title, TShape *shape, Option_t *op
	*option="");		tion="");
	TVolume(TNode &node);		TVolume(TNode &node);
	virtual ~TVolume();		virtual ~TVolume();
	virtual TVolumePosition *Add(TVolume *node, Double_t x=0, Double_t y=0, Double_t z=0, TRotMatrix *matrix=0, UInt_t id=0, Option_t *option="");		virtual TVolumePosition *Add(TVolume *node, Double_t x=0, Double_t y=0, Double_t z=0, TRotMatrix *matrix=0, UInt_t id=0, Option_t *option="");
	virtual TVolumePosition *Add(TVolume *node, Double_t x, Double_t y, Doub le_t z, const Text_t *matrixname, UInt_t id=0, Option_t *option="");		virtual TVolumePosition *Add(TVolume *node, Double_t x, Double_t y, Doub le_t z, const char *matrixname, UInt_t id=0, Option_t *option="");
	static Int_t MapStNode2GEANTVis(ENodeSEEN vis);		static Int_t MapStNode2GEANTVis(ENodeSEEN vis);
	static Int_t MapGEANT2StNodeVis(Int_t vis);		static Int_t MapGEANT2StNodeVis(Int_t vis);
	virtual void Add(TShape *shape, Bool_t IsMaster=kFALSE);		virtual void Add(TShape *shape, Bool_t IsMaster=kFALSE);
	virtual void Browse(TBrowser *b);		virtual void Browse(TBrowser *b);
	virtual TNode *CreateTNode(const TVolumePosition *position=0);		virtual TNode *CreateTNode(const TVolumePosition *position=0);
	virtual void DeletePosition(TVolumePosition *position);		virtual void DeletePosition(TVolumePosition *position);
	virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);		virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);
	virtual void Draw(Option_t *depth="3"); // *MENU*		virtual void Draw(Option_t *depth="3"); // *MENU*
	virtual void DrawOnly(Option_t *option="");		virtual void DrawOnly(Option_t *option="");
	virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);		virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);
	static TRotMatrix *GetIdentity();		static TRotMatrix *GetIdentity();
	virtual Text_t *GetObjectInfo(Int_t px, Int_t py) const;		virtual char *GetObjectInfo(Int_t px, Int_t py) const;
	const Option_t *GetOption() const { return fOption.Data();}		const Option_t *GetOption() const { return fOption.Data();}
	TShape *GetShape() const {return fShape;}		TShape *GetShape() const {return fShape;}
	TList *GetListOfShapes() const {return fListOfShapes;}		TList *GetListOfShapes() const {return fListOfShapes;}
	virtual void GetLocalRange(Float_t *min, Float_t *max);		virtual void GetLocalRange(Float_t *min, Float_t *max);
	virtual ENodeSEEN GetVisibility() const {return fVisibility;}		virtual ENodeSEEN GetVisibility() const {return fVisibility;}
	virtual TList *GetListOfPositions() { return (TList *)(GetObject() );}		virtual TList *GetListOfPositions() { return (TList *)(GetObject() );}
	virtual ULong_t Hash() const { return TObject::Hash();}		virtual ULong_t Hash() const { return TObject::Hash();}
	virtual void ImportShapeAttributes();		virtual void ImportShapeAttributes();
	virtual Bool_t IsMarked() const;		virtual Bool_t IsMarked() const;
	virtual Bool_t Is3D() const {return kTRUE;}		virtual Bool_t Is3D() const {return kTRUE;}
End of changes. 4 change blocks.
	7 lines changed or deleted		7 lines changed or added

	TVolumePosition.h		TVolumePosition.h
	// @(#)root/table:$Id: TVolumePosition.h 20882 2007-11-19 11:31:26Z rdm $		// @(#)root/table:$Id: TVolumePosition.h 27157 2009-01-15 14:05:12Z brun $
	// Author: Valery Fine(fine@bnl.gov) 25/12/98		// Author: Valery Fine(fine@bnl.gov) 25/12/98
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 43		skipping to change at line 43
	UInt_t fId; // Unique ID of this position		UInt_t fId; // Unique ID of this position
	protected:		protected:
	void DeleteOwnMatrix();		void DeleteOwnMatrix();
	public:		public:
	enum EPositionBits {		enum EPositionBits {
	kIsOwn = BIT(23) // if the TVolumePoistion doesn't own the TR otMatrix object		kIsOwn = BIT(23) // if the TVolumePoistion doesn't own the TR otMatrix object
	};		};
	TVolumePosition(TVolume *node=0,Double_t x=0, Double_t y=0, Double_t z=0 , TRotMatrix *matrix=0);		TVolumePosition(TVolume *node=0,Double_t x=0, Double_t y=0, Double_t z=0 , TRotMatrix *matrix=0);
	TVolumePosition(TVolume *node,Double_t x, Double_t y, Double_t z, const Text_t *matrixname);		TVolumePosition(TVolume *node,Double_t x, Double_t y, Double_t z, const char *matrixname);
	TVolumePosition(const TVolumePosition* oldPosition, const TVolumePositio n* curPosition);		TVolumePosition(const TVolumePosition* oldPosition, const TVolumePositio n* curPosition);
	TVolumePosition(const TVolumePosition&pos);		TVolumePosition(const TVolumePosition&pos);
	virtual ~TVolumePosition();		virtual ~TVolumePosition();
	virtual void Browse(TBrowser *b);		virtual void Browse(TBrowser *b);
	virtual Float_t *Errmx2Local (const Float_t *masterError, Float_t *lo calError ) const;		virtual Float_t *Errmx2Local (const Float_t *masterError, Float_t *lo calError ) const;
	virtual Double_t *Errmx2Local (const Double_t *masterError, Double_t * localError) const;		virtual Double_t *Errmx2Local (const Double_t *masterError, Double_t * localError) const;
	virtual Float_t *Errmx2Master(const Float_t *localError, Float_t *mas terError ) const;		virtual Float_t *Errmx2Master(const Float_t *localError, Float_t *mas terError ) const;
	virtual Double_t *Errmx2Master(const Double_t *localError, Double_t *m asterError) const;		virtual Double_t *Errmx2Master(const Double_t *localError, Double_t *m asterError) const;
	virtual Double_t *Cormx2Local (const Double_t *masterCorr, Double_t *l ocalCorr ) const;		virtual Double_t *Cormx2Local (const Double_t *masterCorr, Double_t *l ocalCorr ) const;
	virtual Float_t *Cormx2Local (const Float_t *masterCorr, Float_t *loc alCorr ) const;		virtual Float_t *Cormx2Local (const Float_t *masterCorr, Float_t *loc alCorr ) const;
	virtual Double_t *Cormx2Master(const Double_t *localCorr, Double_t *ma sterCorr ) const;		virtual Double_t *Cormx2Master(const Double_t *localCorr, Double_t *ma sterCorr ) const;
	virtual Float_t *Cormx2Master(const Float_t *localCorr, Float_t *mast erCorr ) const;		virtual Float_t *Cormx2Master(const Float_t *localCorr, Float_t *mast erCorr ) const;
	virtual Double_t *Master2Local(const Double_t *master, Double_t *local ,Int_t nPoints=1) const;		virtual Double_t *Master2Local(const Double_t *master, Double_t *local ,Int_t nPoints=1) const;
	virtual Float_t *Master2Local(const Float_t *master, Float_t *local,I nt_t nPoints=1) const;		virtual Float_t *Master2Local(const Float_t *master, Float_t *local,I nt_t nPoints=1) const;
	virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);		virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);
	virtual TDataSet *DefineSet();		virtual TDataSet *DefineSet();
	virtual void Draw(Option_t *depth="3"); // *MENU*		virtual void Draw(Option_t *depth="3"); // *MENU*
	virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);		virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);
	virtual TVolume *GetNode() const {return fNode;}		virtual TVolume *GetNode() const {return fNode;}
	virtual Text_t *GetObjectInfo(Int_t px, Int_t py) const;		virtual char *GetObjectInfo(Int_t px, Int_t py) const;
	const Option_t *GetOption() const { return GetNode()?GetNode()->Get Option():0;}		const Option_t *GetOption() const { return GetNode()?GetNode()->Get Option():0;}
	virtual const Char_t *GetName() const;		virtual const Char_t *GetName() const;
	const TRotMatrix *GetMatrix() const;		const TRotMatrix *GetMatrix() const;
	TRotMatrix *GetMatrix();		TRotMatrix *GetMatrix();
	Int_t GetVisibility() const {return GetNode()?GetNode()->G etVisibility():0;}		Int_t GetVisibility() const {return GetNode()?GetNode()->G etVisibility():0;}
	virtual Double_t GetX(Int_t indx=0) const {return fX[indx];}		virtual Double_t GetX(Int_t indx=0) const {return fX[indx];}
	virtual const Double_t *GetXYZ() const {return fX;}		virtual const Double_t *GetXYZ() const {return fX;}
	virtual Double_t GetY() const {return fX[1];}		virtual Double_t GetY() const {return fX[1];}
	virtual Double_t GetZ() const {return fX[2];}		virtual Double_t GetZ() const {return fX[2];}
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	TVolumeView.h		TVolumeView.h
	// @(#)root/table:$Id: TVolumeView.h 20882 2007-11-19 11:31:26Z rdm $		// @(#)root/table:$Id: TVolumeView.h 27157 2009-01-15 14:05:12Z brun $
	// Author: Valery Fine(fine@bnl.gov) 25/12/98		// Author: Valery Fine(fine@bnl.gov) 25/12/98
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	#ifndef ROOT_TVolumeView		#ifndef ROOT_TVolumeView
	skipping to change at line 56		skipping to change at line 56
	virtual void Add(TVolumeView *node);		virtual void Add(TVolumeView *node);
	virtual void Add(TShape *shape, Bool_t IsMaster=kFALSE);		virtual void Add(TShape *shape, Bool_t IsMaster=kFALSE);
	virtual void Browse(TBrowser *b);		virtual void Browse(TBrowser *b);
	virtual void Draw(Option_t *depth="3"); // *MENU*		virtual void Draw(Option_t *depth="3"); // *MENU*
	virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);		virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);
	virtual TVolumePosition *GetPosition() const { return (TVolumePosition * )GetObject();}		virtual TVolumePosition *GetPosition() const { return (TVolumePosition * )GetObject();}
	virtual TVolume *GetNode() const ;		virtual TVolume *GetNode() const ;
	virtual Int_t GetGlobalRange(const TVolumeView *rootNode,Float_t *min , Float_t *max);		virtual Int_t GetGlobalRange(const TVolumeView *rootNode,Float_t *min , Float_t *max);
	virtual TList *GetListOfShapes() const;		virtual TList *GetListOfShapes() const;
	virtual void GetLocalRange(Float_t *min, Float_t *max);		virtual void GetLocalRange(Float_t *min, Float_t *max);
	virtual Text_t *GetObjectInfo(Int_t px, Int_t py) const;		virtual char *GetObjectInfo(Int_t px, Int_t py) const;
	virtual TShape *GetShape() const;		virtual TShape *GetShape() const;
	virtual Int_t GetVisibility() const;		virtual Int_t GetVisibility() const;
	virtual Bool_t IsMarked() const;		virtual Bool_t IsMarked() const;
	virtual Bool_t Is3D() const {return kTRUE;}		virtual Bool_t Is3D() const {return kTRUE;}
	virtual TVolumePosition *Local2Master(const TVolumeView *localNode,cons t TVolumeView *masterNode=0);		virtual TVolumePosition *Local2Master(const TVolumeView *localNode,cons t TVolumeView *masterNode=0);
	virtual TVolumePosition *Local2Master(const Char_t *localName, const Ch ar_t *masterName=0);		virtual TVolumePosition *Local2Master(const Char_t *localName, const Ch ar_t *masterName=0);
	virtual Float_t *Local2Master(const Float_t *local, Float_t *master,		virtual Float_t *Local2Master(const Float_t *local, Float_t *master,
	const Char_t *localName, const Char_t *mas terName=0, Int_t nVector=1);		const Char_t *localName, const Char_t *mas terName=0, Int_t nVector=1);
	virtual Float_t *Local2Master(const Float_t *local, Float_t *master,		virtual Float_t *Local2Master(const Float_t *local, Float_t *master,
	const TVolumeView *localNode,		const TVolumeView *localNode,
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	TWebFile.h		TWebFile.h
	// @(#)root/net:$Id: TWebFile.h 23091 2008-04-09 15:04:27Z rdm $		// @(#)root/net:$Id: TWebFile.h 27463 2009-02-17 08:17:49Z brun $
	// Author: Fons Rademakers 17/01/97		// Author: Fons Rademakers 17/01/97
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	skipping to change at line 41		skipping to change at line 41
	class TSocket;		class TSocket;
	class TWebSocket;		class TWebSocket;
	class TWebFile : public TFile {		class TWebFile : public TFile {
	friend class TWebSocket;		friend class TWebSocket;
	private:		private:
	mutable Long64_t fSize; // file size		mutable Long64_t fSize; // file size
	TSocket *fSocket; // socket for HTTP/1.1 (stays alive bet ween calls)		TSocket *fSocket; // socket for HTTP/1.1 (stays alive bet ween calls)
			TUrl fProxy; // proxy URL
	Bool_t fHasModRoot; // true if server has mod_root installe d		Bool_t fHasModRoot; // true if server has mod_root installe d
	Bool_t fHTTP11;		Bool_t fHTTP11; // true if server support HTTP/1.1
			Bool_t fNoProxy; // don't use proxy
			static TUrl fgProxy; // globally set proxy URL
	TWebFile() : fSocket(0) { }		TWebFile() : fSocket(0) { }
	void Init(Bool_t);		void Init(Bool_t);
			void CheckProxy();
	Int_t GetHead();		Int_t GetHead();
	Int_t GetLine(TSocket *s, char *line, Int_t size);		Int_t GetLine(TSocket *s, char *line, Int_t size);
	Int_t GetFromWeb(char *buf, Int_t len, const TString &msg);		Int_t GetFromWeb(char *buf, Int_t len, const TString &msg);
	Int_t GetFromWeb10(char *buf, Int_t len, const TString &msg);		Int_t GetFromWeb10(char *buf, Int_t len, const TString &msg);
	Bool_t ReadBuffer10(char *buf, Int_t len);		Bool_t ReadBuffer10(char *buf, Int_t len);
	Bool_t ReadBuffers10(char *buf, Long64_t *pos, Int_t *len, Int_t nbuf);		Bool_t ReadBuffers10(char *buf, Long64_t *pos, Int_t *len, Int_t nbuf);
	public:		public:
	TWebFile(const char *url);		TWebFile(const char *url, Option_t *opt="");
	TWebFile(TUrl url);		TWebFile(TUrl url, Option_t *opt="");
	virtual ~TWebFile();		virtual ~TWebFile();
	Long64_t GetSize() const;		Long64_t GetSize() const;
	Bool_t IsOpen() const;		Bool_t IsOpen() const;
	Int_t ReOpen(Option_t *mode);		Int_t ReOpen(Option_t *mode);
	Bool_t ReadBuffer(char *buf, Int_t len);		Bool_t ReadBuffer(char *buf, Int_t len);
	Bool_t ReadBuffers(char *buf, Long64_t *pos, Int_t *len, Int_t nbuf);		Bool_t ReadBuffers(char *buf, Long64_t *pos, Int_t *len, Int_t nbuf);
	void Seek(Long64_t offset, ERelativeTo pos = kBeg);		void Seek(Long64_t offset, ERelativeTo pos = kBeg);
			static void SetProxy(const char *url);
			static const char *GetProxy();
	ClassDef(TWebFile,1) //A ROOT file that reads via a http server		ClassDef(TWebFile,1) //A ROOT file that reads via a http server
	};		};
	#endif		#endif
End of changes. 6 change blocks.
	4 lines changed or deleted		12 lines changed or added

	TXProofServ.h		TXProofServ.h
	// @(#)root/proofx:$Id: TXProofServ.h 26993 2008-12-17 16:01:04Z rdm $		// @(#)root/proofx:$Id: TXProofServ.h 27034 2008-12-19 15:30:06Z ganis $
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2005, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2005, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	#ifndef ROOT_TXProofServ		#ifndef ROOT_TXProofServ
	#define ROOT_TXProofServ		#define ROOT_TXProofServ
	skipping to change at line 55		skipping to change at line 55
	public:		public:
	TXProofServ(Int_t *argc, char **argv, FILE *flog = 0);		TXProofServ(Int_t *argc, char **argv, FILE *flog = 0);
	virtual ~TXProofServ();		virtual ~TXProofServ();
	Int_t CreateServer();		Int_t CreateServer();
	// Disable / Enable read timeout		// Disable / Enable read timeout
	void DisableTimeout();		void DisableTimeout();
	void EnableTimeout();		void EnableTimeout();
	EQueryAction GetWorkers(TList *workers, Int_t &prioritychange);		EQueryAction GetWorkers(TList *workers, Int_t &prioritychange,
			Bool_t resume = kFALSE);
	Bool_t HandleError(const void *in = 0); // Error Handler		Bool_t HandleError(const void *in = 0); // Error Handler
	Bool_t HandleInput(const void *in = 0); // Input handler		Bool_t HandleInput(const void *in = 0); // Input handler
	void HandleUrgentData();		void HandleUrgentData();
	void HandleSigPipe();		void HandleSigPipe();
	void HandleTermination();		void HandleTermination();
	void ReleaseWorker(const char *ord);		void ReleaseWorker(const char *ord);
			void SetInputSocket(Bool_t on = kTRUE);
	void Terminate(Int_t status);		void Terminate(Int_t status);
	ClassDef(TXProofServ,0) //XRD PROOF Server Application Interface		ClassDef(TXProofServ,0) //XRD PROOF Server Application Interface
	};		};
	#endif		#endif
End of changes. 3 change blocks.
	2 lines changed or deleted		4 lines changed or added

	TXSocket.h		TXSocket.h
	// @(#)root/proofx:$Id: TXSocket.h 26993 2008-12-17 16:01:04Z rdm $		// @(#)root/proofx:$Id: TXSocket.h 27035 2008-12-19 15:36:44Z ganis $
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2005, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2005, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	#ifndef ROOT_TXSocket		#ifndef ROOT_TXSocket
	#define ROOT_TXSocket		#define ROOT_TXSocket
	skipping to change at line 145		skipping to change at line 145
	void PostMsg(Int_t type);		void PostMsg(Int_t type);
	// Auxilliary		// Auxilliary
	Int_t GetLowSocket() const { return (fConn ? fConn->GetLow Socket() : -1); }		Int_t GetLowSocket() const { return (fConn ? fConn->GetLow Socket() : -1); }
	static void SetLocation(const char *loc = ""); // Set location s tring		static void SetLocation(const char *loc = ""); // Set location s tring
	static void InitEnvs(); // Initialize environment variables		static void InitEnvs(); // Initialize environment variables
	public:		public:
	// Should be the same as in proofd/inc/XProofProtocol.h (local definitio
	ns)
	enum ECoordMsgType { kQuerySessions = 1000,
	kSessionTag, kSessionAlias, kGetWorkers, kQueryWork
	ers,
	kCleanupSessions,
	kQueryLogPaths,
	kReadBuffer,
	kQueryROOTVersions,
	kROOTVersion,
	kGroupProperties,
	kSendMsgToUser,
	kReleaseWorker};
	// Should be the same as in proofd/src/XrdProofdProtocol::Urgent		// Should be the same as in proofd/src/XrdProofdProtocol::Urgent
	enum EUrgentMsgType { kStopProcess = 2000 };		enum EUrgentMsgType { kStopProcess = 2000 };
	TXSocket(const char *url, Char_t mode = 'M', Int_t psid = -1, Char_t ver = -1,		TXSocket(const char *url, Char_t mode = 'M', Int_t psid = -1, Char_t ver = -1,
	const char *logbuf = 0, Int_t loglevel = -1, TXHandler *handler = 0);		const char *logbuf = 0, Int_t loglevel = -1, TXHandler *handler = 0);
	TXSocket(const TXSocket &xs);		TXSocket(const TXSocket &xs);
	TXSocket& operator=(const TXSocket& xs);		TXSocket& operator=(const TXSocket& xs);
	virtual ~TXSocket();		virtual ~TXSocket();
	virtual void Close(Option_t *opt = "");		virtual void Close(Option_t *opt = "");
End of changes. 2 change blocks.
	14 lines changed or deleted		1 lines changed or added

	TXTRU.h		TXTRU.h
	//@@(#)root/g3d:$Id: TXTRU.h 20882 2007-11-19 11:31:26Z rdm $		//@@(#)root/g3d:$Id: TXTRU.h 27157 2009-01-15 14:05:12Z brun $
	// Author: Robert Hatcher (rhatcher@fnal.gov) 2000.09.06		// Author: Robert Hatcher (rhatcher@fnal.gov) 2000.09.06
	/////////////////////////////////////////////////////////////////////////// /		/////////////////////////////////////////////////////////////////////////// /
	// $Id: TXTRU.h 20882 2007-11-19 11:31:26Z rdm $		// $Id: TXTRU.h 27157 2009-01-15 14:05:12Z brun $
	//		//
	// TXTRU		// TXTRU
	//		//
	// TXTRU is an extrusion with fixed outline shape in x-y and a sequence		// TXTRU is an extrusion with fixed outline shape in x-y and a sequence
	// of z extents (segments). The overall scale of the outline scales		// of z extents (segments). The overall scale of the outline scales
	// linearly between z points and the center can have an x-y offset.		// linearly between z points and the center can have an x-y offset.
	//		//
	// Author: R. Hatcher 2000.04.21		// Author: R. Hatcher 2000.04.21
	//		//
	/////////////////////////////////////////////////////////////////////////// /		/////////////////////////////////////////////////////////////////////////// /
	skipping to change at line 27		skipping to change at line 27
	#ifndef ROOT_TXTRU		#ifndef ROOT_TXTRU
	#define ROOT_TXTRU		#define ROOT_TXTRU
	#ifndef ROOT_TShape		#ifndef ROOT_TShape
	#include "TShape.h"		#include "TShape.h"
	#endif		#endif
	class TXTRU : public TShape {		class TXTRU : public TShape {
	public:		public:
	TXTRU();		TXTRU();
	TXTRU(const Text_t *name, const Text_t *title, const Text_t *material,		TXTRU(const char *name, const char *title, const char *material,
	Int_t nyx, Int_t nz);		Int_t nyx, Int_t nz);
	TXTRU(const TXTRU &xtru);		TXTRU(const TXTRU &xtru);
	virtual ~TXTRU();		virtual ~TXTRU();
	TXTRU& operator=(const TXTRU& rhs);		TXTRU& operator=(const TXTRU& rhs);
	virtual void Copy(TObject &xtru) const;		virtual void Copy(TObject &xtru) const;
	virtual void DefineSection(Int_t secNum, Float_t z, Float_t scale=1. ,		virtual void DefineSection(Int_t secNum, Float_t z, Float_t scale=1. ,
	Float_t x0=0., Float_t y0=0.);		Float_t x0=0., Float_t y0=0.);
	virtual void DefineVertex(Int_t pointNum, Float_t x, Float_t y);		virtual void DefineVertex(Int_t pointNum, Float_t x, Float_t y);
	virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);		virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	Tools.h		Tools.h
	// @(#)root/tmva $Id: Tools.h 26085 2008-11-05 16:34:45Z pcanal $		// @(#)root/tmva $Id: Tools.h 27320 2009-02-02 06:40:36Z brun $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss		// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss
	/************************************************************************** ********		/************************************************************************** ********
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *		* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *		* Package: TMVA *
	* Class : Tools *		* Class : Tools *
	* Web : http://tmva.sourceforge.net *		* Web : http://tmva.sourceforge.net *
	* *		* *
	* Description: *		* Description: *
	* Global auxiliary applications and data treatment routines *		* Global auxiliary applications and data treatment routines *
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	Ttypes.h		Ttypes.h
	/* @(#)root/table:$Id: Ttypes.h 20882 2007-11-19 11:31:26Z rdm $ */		/* @(#)root/table:$Id: Ttypes.h 27157 2009-01-15 14:05:12Z brun $ */
	/*************************************************************************		/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *		* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *		* All rights reserved. *
	* *		* *
	* For the licensing terms see $ROOTSYS/LICENSE. *		* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *		* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/		*************************************************************************/
	#ifndef ROOT_Ttypes		#ifndef ROOT_Ttypes
	skipping to change at line 73		skipping to change at line 73
	#define ClassDefTable(className,structName) \		#define ClassDefTable(className,structName) \
	public: \		public: \
	static const char* TableDictionary(); \		static const char* TableDictionary(); \
	protected: \		protected: \
	static TTableDescriptor *fgColDescriptors; \		static TTableDescriptor *fgColDescriptors; \
	virtual TTableDescriptor *GetDescriptorPointer() const { return fgColD escriptors;} \		virtual TTableDescriptor *GetDescriptorPointer() const { return fgColD escriptors;} \
	virtual void SetDescriptorPointer(TTableDescriptor *list) { fgColDescripto rs = list;} \		virtual void SetDescriptorPointer(TTableDescriptor *list) { fgColDescripto rs = list;} \
	public: \		public: \
	typedef structName* iterator; \		typedef structName* iterator; \
	className() : TTable(_QUOTE_(className),sizeof(structName)) {SetType (_QUOTE_(structName));} \		className() : TTable(_QUOTE_(className),sizeof(structName)) {SetType (_QUOTE_(structName));} \
	className(const Text_t *name) : TTable(name,sizeof(structName)) {SetTyp e(_QUOTE_(structName));} \		className(const char *name) : TTable(name,sizeof(structName)) {SetType( _QUOTE_(structName));} \
	className(Int_t n) : TTable(_QUOTE_(className),n,sizeof(structName)) {S etType(_QUOTE_(structName));}\		className(Int_t n) : TTable(_QUOTE_(className),n,sizeof(structName)) {S etType(_QUOTE_(structName));}\
	className(const Text_t *name,Int_t n) : TTable(name,n,sizeof(structName )) {SetType(_QUOTE_(structName));}\		className(const char *name,Int_t n) : TTable(name,n,sizeof(structName)) {SetType(_QUOTE_(structName));}\
	structName *GetTable(Int_t i=0) const { return ((structName *)GetArray( ))+i;} \		structName *GetTable(Int_t i=0) const { return ((structName *)GetArray( ))+i;} \
	structName &operator[](Int_t i){ assert(i>=0 && i < GetNRows()); return *GetTable(i); } \		structName &operator[](Int_t i){ assert(i>=0 && i < GetNRows()); return *GetTable(i); } \
	const structName &operator[](Int_t i) const { assert(i>=0 && i < GetNRo ws()); return *((const structName *)(GetTable(i))); } \		const structName &operator[](Int_t i) const { assert(i>=0 && i < GetNRo ws()); return *((const structName *)(GetTable(i))); } \
	structName *begin() const { return GetNRows()? Ge tTable(0):0;}\		structName *begin() const { return GetNRows()? Ge tTable(0):0;}\
	structName *end() const {Long_t i = GetNRows(); return i? G etTable(i):0;}		structName *end() const {Long_t i = GetNRows(); return i? G etTable(i):0;}
	// -- The member function "begin()" returns a pointer to the first table ro w		// -- The member function "begin()" returns a pointer to the first table ro w
	// (or just zero if the table is empty).		// (or just zero if the table is empty).
	// -- The member function "end()" returns a pointer to the last+1 table row		// -- The member function "end()" returns a pointer to the last+1 table row
	// (or just zero if the table is empty).		// (or just zero if the table is empty).
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	TypeBase.h		TypeBase.h
	// @(#)root/reflex:$Id: TypeBase.h 25669 2008-10-02 21:37:03Z pcanal $		// @(#)root/reflex:$Id: TypeBase.h 27579 2009-02-23 15:15:06Z pcanal $
	// Author: Stefan Roiser 2004		// Author: Stefan Roiser 2004
	// Copyright CERN, CH-1211 Geneva 23, 2004-2006, All rights reserved.		// Copyright CERN, CH-1211 Geneva 23, 2004-2006, All rights reserved.
	//		//
	// Permission to use, copy, modify, and distribute this software for any		// Permission to use, copy, modify, and distribute this software for any
	// purpose is hereby granted without fee, provided that this copyright and		// purpose is hereby granted without fee, provided that this copyright and
	// permissions notice appear in all copies and derivatives.		// permissions notice appear in all copies and derivatives.
	//		//
	// This software is provided "as is" without express or implied warranty.		// This software is provided "as is" without express or implied warranty.
	skipping to change at line 58		skipping to change at line 58
	*/		*/
	class RFLX_API TypeBase {		class RFLX_API TypeBase {
	public:		public:
	/** default constructor */		/** default constructor */
	TypeBase( const char * nam,		TypeBase( const char * nam,
	size_t size,		size_t size,
	TYPE typeTyp,		TYPE typeTyp,
	const std::type_info & ti,		const std::type_info & ti,
	const Type & finalType = Dummy::Type());		const Type & finalType = Dummy::Type(),
			REPRESTYPE represType = REPRES_NOTYPE);
	/** destructor */		/** destructor */
	virtual ~TypeBase();		virtual ~TypeBase();
	/**		/**
	* operator Scope will return the corresponding scope of this type if		* operator Scope will return the corresponding scope of this type if
	* applicable (i.e. if the Type is also a Scope e.g. Class, Union, Enu m)		* applicable (i.e. if the Type is also a Scope e.g. Class, Union, Enu m)
	*/		*/
	operator Scope () const;		operator Scope () const;
	skipping to change at line 567		skipping to change at line 568
	* MemberAt of BaseAt classes currently availabe in the system		* MemberAt of BaseAt classes currently availabe in the system
	*/		*/
	virtual void UpdateMembers() const;		virtual void UpdateMembers() const;
	public:		public:
	/**		/**
	* AddDataMember will add the information about a data MemberAt		* AddDataMember will add the information about a data MemberAt
	* @param dm pointer to data MemberAt		* @param dm pointer to data MemberAt
	*/		*/
	virtual void AddDataMember( const Member & dm ) const;		virtual void AddDataMember(const Member& dm) const;
	virtual void AddDataMember( const char * nam,		virtual void AddDataMember(const char* nam, const Type& typ, size_t o
	const Type & typ,		ffs, unsigned int modifiers = 0) const;
	size_t offs,		virtual void AddDataMember(Member& output, const char* nam, const Typ
	unsigned int modifiers = 0 ) const;		e& typ, size_t offs, unsigned int modifiers = 0, char* interpreterOffset =
			0) const;
	/**		/**
	* AddFunctionMember will add the information about a function MemberA t		* AddFunctionMember will add the information about a function MemberA t
	* @param fm pointer to function MemberAt		* @param fm pointer to function MemberAt
	*/		*/
	virtual void AddFunctionMember( const Member & fm ) const;		virtual void AddFunctionMember( const Member & fm ) const;
	virtual void AddFunctionMember( const char * nam,		virtual void AddFunctionMember( const char * nam,
	const Type & typ,		const Type & typ,
	StubFunction stubFP,		StubFunction stubFP,
	void * stubCtx = 0,		void * stubCtx = 0,
	skipping to change at line 652		skipping to change at line 651
	/**		/**
	* Hide this type from any lookup by appending the string " @HIDDEN@" to its name.		* Hide this type from any lookup by appending the string " @HIDDEN@" to its name.
	*/		*/
	virtual void HideName() const;		virtual void HideName() const;
	/**		/**
	* Un-Hide this type from any lookup by removing the string " @HIDDEN @" to its name.		* Un-Hide this type from any lookup by removing the string " @HIDDEN @" to its name.
	*/		*/
	virtual void UnhideName() const;		virtual void UnhideName() const;
			REPRESTYPE RepresType() const { return fRepresType; }
	protected:		protected:
	/**		/**
	* DetermineFinalType will return the t without typedefs		* DetermineFinalType will return the t without typedefs
	* @return type with all typedef info removed		* @return type with all typedef info removed
	*/		*/
	Type DetermineFinalType(const Type& t) const;		Type DetermineFinalType(const Type& t) const;
	/**		/**
			* Calculate the size for types based on other types,
			* if the other type was not yet available to calculate the
			* size at construction time.
			* @return The calculated size, 0 if the underlying size is unknown.
			*/
			virtual size_t CalculateSize() const;
			/**
	* Pointer to the TypeName		* Pointer to the TypeName
	* @label At Name		* @label At Name
	* @ling aggregation		* @ling aggregation
	* @link aggregation		* @link aggregation
	* @supplierCardinality 1		* @supplierCardinality 1
	* @clientCardinality 1		* @clientCardinality 1
	*/		*/
	TypeName * fTypeName;		TypeName * fTypeName;
	/** C++ type_info object */		/** C++ type_info object */
	mutable		mutable
	const std::type_info * fTypeInfo;		const std::type_info * fTypeInfo;
	private:		private:
			REPRESTYPE fRepresType;
	/**		/**
	* The Scope of the Type		* The Scope of the Type
	* @label type scope		* @label type scope
	* @link aggregation		* @link aggregation
	* @clientCardinality 1		* @clientCardinality 1
	* @supplierCardinality 1		* @supplierCardinality 1
	*/		*/
	Scope fScope;		Scope fScope;
	/** size of the type in int */		/** size of the type in int */
	skipping to change at line 762		skipping to change at line 773
	return Dummy::BaseCont().rbegin();		return Dummy::BaseCont().rbegin();
	}		}
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
	inline Reflex::Reverse_Base_Iterator Reflex::TypeBase::Base_REnd() const {		inline Reflex::Reverse_Base_Iterator Reflex::TypeBase::Base_REnd() const {
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
	return Dummy::BaseCont().rend();		return Dummy::BaseCont().rend();
	}		}
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
			inline size_t Reflex::TypeBase::CalculateSize() const {
			//-------------------------------------------------------------------------
			------
			return fSize;
			}
			//-------------------------------------------------------------------------
			------
	inline size_t Reflex::TypeBase::DataMemberSize() const {		inline size_t Reflex::TypeBase::DataMemberSize() const {
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
	return 0;		return 0;
	}		}
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
	inline Reflex::Member_Iterator Reflex::TypeBase::DataMember_Begin() const {		inline Reflex::Member_Iterator Reflex::TypeBase::DataMember_Begin() const {
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
	return Dummy::MemberCont().begin();		return Dummy::MemberCont().begin();
	}		}
	skipping to change at line 1013		skipping to change at line 1030
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
	inline Reflex::Reverse_Type_Iterator Reflex::TypeBase::FunctionParameter_RE nd() const {		inline Reflex::Reverse_Type_Iterator Reflex::TypeBase::FunctionParameter_RE nd() const {
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
	return Dummy::TypeCont().rend();		return Dummy::TypeCont().rend();
	}		}
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
	inline size_t Reflex::TypeBase::SizeOf() const {		inline size_t Reflex::TypeBase::SizeOf() const {
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
			if (!fSize) fSize = CalculateSize();
	return fSize;		return fSize;
	}		}
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
	inline size_t Reflex::TypeBase::SubScopeSize() const {		inline size_t Reflex::TypeBase::SubScopeSize() const {
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
	return 0;		return 0;
	}		}
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
	skipping to change at line 1170		skipping to change at line 1188
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
	inline void Reflex::TypeBase::AddDataMember( const char * /* nam */,		inline void Reflex::TypeBase::AddDataMember( const char * /* nam */,
	const Type & /* typ */,		const Type & /* typ */,
	size_t /* offs */,		size_t /* offs */,
	unsigned int /* modifier s */ ) const {		unsigned int /* modifier s */ ) const {
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
	throw RuntimeError("Function AddDataMember not callable on this object" );		throw RuntimeError("Function AddDataMember not callable on this object" );
	}		}
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
			inline void Reflex::TypeBase::AddDataMember(Member& /*output*/, const char*
			/*nam*/, const Type& /*typ*/, size_t /*offs*/, unsigned int /*modifiers*/,
			char* /*interpreterOffset*/) const {
			//----------------------------------------------------------------------
			---------
			throw RuntimeError("Function AddDataMember not callable on this object"
			);
			}
			//-------------------------------------------------------------------------
			------
	inline void Reflex::TypeBase::AddFunctionMember( const Member & /* fm */ ) const {		inline void Reflex::TypeBase::AddFunctionMember( const Member & /* fm */ ) const {
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
	throw RuntimeError("Function AddFunctionMember not callable on this obje ct");		throw RuntimeError("Function AddFunctionMember not callable on this obje ct");
	}		}
	//------------------------------------------------------------------------- ------		//------------------------------------------------------------------------- ------
	inline void Reflex::TypeBase::AddFunctionMember( const char * /* nam */,		inline void Reflex::TypeBase::AddFunctionMember( const char * /* nam */,
	const Type & /* typ */,		const Type & /* typ */,
	StubFunction /* stub FP */,		StubFunction /* stub FP */,
	void * /* stubCtx */ ,		void * /* stubCtx */ ,
End of changes. 9 change blocks.
	7 lines changed or deleted		41 lines changed or added

	TypeBuilder.h		TypeBuilder.h
	// @(#)root/reflex:$Id: TypeBuilder.h 23052 2008-04-08 14:44:01Z axel $		// @(#)root/reflex:$Id: TypeBuilder.h 27579 2009-02-23 15:15:06Z pcanal $
	// Author: Stefan Roiser 2004		// Author: Stefan Roiser 2004
	// Copyright CERN, CH-1211 Geneva 23, 2004-2006, All rights reserved.		// Copyright CERN, CH-1211 Geneva 23, 2004-2006, All rights reserved.
	//		//
	// Permission to use, copy, modify, and distribute this software for any		// Permission to use, copy, modify, and distribute this software for any
	// purpose is hereby granted without fee, provided that this copyright and		// purpose is hereby granted without fee, provided that this copyright and
	// permissions notice appear in all copies and derivatives.		// permissions notice appear in all copies and derivatives.
	//		//
	// This software is provided "as is" without express or implied warranty.		// This software is provided "as is" without express or implied warranty.
	#ifndef Reflex_TypeBuilder		#ifndef Reflex_TypeBuilder
	#define Reflex_TypeBuilder		#define Reflex_TypeBuilder
	// Include files		// Include files
	#include "Reflex/Type.h"		#include "Reflex/Type.h"
	#include "Reflex/Tools.h"		#include "Reflex/Tools.h"
	#include <vector>		#include <vector>
	#if defined(__ICC)		#if defined(__ICC)
	#define OffsetOf(c1,mem) (int(&((volatile const char&)((c1*)0)->mem)))		#define OffsetOf(c1,mem) (long(&((volatile const char&)((c1*)0)->mem)))
	#else		#else
	#define OffsetOf(c1,mem) ((size_t)(&reinterpret_cast<const volatile char&>( ((c1*)64)->mem))-64)		#define OffsetOf(c1,mem) ((size_t)(&reinterpret_cast<const volatile char&>( ((c1*)64)->mem))-64)
	#endif		#endif
	namespace Reflex {		namespace Reflex {
	RFLX_API Type TypeBuilder( const char * n,		RFLX_API Type TypeBuilder( const char * n,
	unsigned int modifiers = 0 );		unsigned int modifiers = 0 );
	RFLX_API Type ConstBuilder( const Type & t );		RFLX_API Type ConstBuilder( const Type & t );
	skipping to change at line 55		skipping to change at line 55
	RFLX_API Type ArrayBuilder( const Type & t,		RFLX_API Type ArrayBuilder( const Type & t,
	size_t n,		size_t n,
	const std::type_info & ti = typeid(UnknownType));		const std::type_info & ti = typeid(UnknownType));
	RFLX_API Type EnumTypeBuilder( const char *,		RFLX_API Type EnumTypeBuilder( const char *,
	const char * items = "",		const char * items = "",
	const std::type_info & ti = typeid(UnknownType),		const std::type_info & ti = typeid(UnknownType),
	unsigned int modifiers = 0 );		unsigned int modifiers = 0 );
	RFLX_API Type TypedefTypeBuilder( const char * Name,		RFLX_API Type TypedefTypeBuilder( const char * Name,
	const Type & t );		const Type & t,
			REPRESTYPE represType = REPRES_NOTYPE );
	RFLX_API Type FunctionTypeBuilder( const Type & r,		RFLX_API Type FunctionTypeBuilder( const Type & r,
	const std::vector<Reflex::Type> & p,		const std::vector<Reflex::Type> & p,
	const std::type_info & ti = typeid(UnknownType));		const std::type_info & ti = typeid(UnknownType));
	RFLX_API Type FunctionTypeBuilder(const Type & r);		RFLX_API Type FunctionTypeBuilder(const Type & r);
	RFLX_API Type FunctionTypeBuilder(const Type & r, const Type & t0);		RFLX_API Type FunctionTypeBuilder(const Type & r, const Type & t0);
	RFLX_API Type FunctionTypeBuilder(const Type & r, const Type & t0, co nst Type & t1);		RFLX_API Type FunctionTypeBuilder(const Type & r, const Type & t0, co nst Type & t1);
End of changes. 3 change blocks.
	3 lines changed or deleted		4 lines changed or added

	UnBinData.h		UnBinData.h
	// @(#)root/mathcore:$Id: UnBinData.h 24477 2008-06-23 12:58:47Z moneta $		// @(#)root/mathcore:$Id: UnBinData.h 27169 2009-01-16 09:46:05Z moneta $
	// Author: L. Moneta Wed Aug 30 11:15:23 2006		// Author: L. Moneta Wed Aug 30 11:15:23 2006
	/**********************************************************************		/**********************************************************************
	* *		* *
	* Copyright (c) 2006 LCG ROOT Math Team, CERN/PH-SFT *		* Copyright (c) 2006 LCG ROOT Math Team, CERN/PH-SFT *
	* *		* *
	* *		* *
	**********************************************************************/		**********************************************************************/
	// Header file for class UnBinData		// Header file for class UnBinData
	skipping to change at line 47		skipping to change at line 47
	@ingroup FitData		@ingroup FitData
	*/		*/
	class UnBinData : public FitData {		class UnBinData : public FitData {
	public :		public :
	/**		/**
	constructor from dimension of point and max number of points (to pre -allocate vector)		constructor from dimension of point and max number of points (to pre -allocate vector)
	*/		*/
	explicit UnBinData(unsigned int maxpoints = 0, unsigned int dim = 1 ) :		explicit UnBinData(unsigned int maxpoints = 0, unsigned int dim = 1 );
	// DataVector( dim*maxpoints ),
	FitData(),
	fDim(dim),
	fNPoints(0),
	fDataVector(0),
	fDataWrapper(0)
	{
	if (maxpoints > 0) fDataVector = new DataVector( dim * maxpoints);
	}
	/**		/**
	constructor from option and default range		constructor from option and default range
	*/		*/
	explicit UnBinData (const DataOptions & opt, unsigned int maxpoints = 0		explicit UnBinData (const DataOptions & opt, unsigned int maxpoints = 0
	, unsigned int dim = 1) :		, unsigned int dim = 1);
	FitData( opt),
	fDim(dim),
	fNPoints(0),
	fDataVector(0),
	fDataWrapper(0)
	{
	if (maxpoints > 0) fDataVector = new DataVector( dim * maxpoints);
	}
	/**		/**
	constructor from options and range		constructor from options and range
	*/		*/
	UnBinData (const DataOptions & opt, const DataRange & range, unsigned i		UnBinData (const DataOptions & opt, const DataRange & range, unsigned i
	nt maxpoints = 0, unsigned int dim = 1 ) :		nt maxpoints = 0, unsigned int dim = 1 );
	FitData( opt, range),
	fDim(dim),
	fNPoints(0),
	fDataVector(0),
	fDataWrapper(0)
	{
	if (maxpoints > 0) fDataVector = new DataVector( dim * maxpoints);
	}
	/**		/**
	constructor for 1D external data		constructor for 1D external data
	*/		*/
	UnBinData(unsigned int n, const double * dataX ) :		UnBinData(unsigned int n, const double * dataX );
	FitData( ),
	fDim(1),
	fNPoints(n),
	fDataVector(0)
	{
	fDataWrapper = new DataWrapper(dataX);
	}
	/**		/**
	constructor for 2D external data		constructor for 2D external data
	*/		*/
	UnBinData(unsigned int n, const double * dataX, const double * dataY ) :		UnBinData(unsigned int n, const double * dataX, const double * dataY );
	FitData( ),
	fDim(2),
	fNPoints(n),
	fDataVector(0)
	{
	fDataWrapper = new DataWrapper(dataX, dataY, 0, 0, 0, 0);
	}
	/**		/**
	constructor for 3D external data		constructor for 3D external data
	*/		*/
	UnBinData(unsigned int n, const double * dataX, const double * dataY, co		UnBinData(unsigned int n, const double * dataX, const double * dataY, co
	nst double * dataZ ) :		nst double * dataZ );
	FitData( ),
	fDim(3),
	fNPoints(n),
	fDataVector(0)
	{
	fDataWrapper = new DataWrapper(dataX, dataY, dataZ, 0, 0, 0, 0, 0);
	}
	/**		/**
	constructor for multi-dim external data		constructor for multi-dim external data
	Uses as argument an iterator of a list (or vector) containing the con st double * of the data		Uses as argument an iterator of a list (or vector) containing the con st double * of the data
	An example could be the std::vector<const double *>::begin		An example could be the std::vector<const double *>::begin
	*/		*/
	template<class Iterator>		template<class Iterator>
	UnBinData(unsigned int n, unsigned int dim, Iterator dataItr ) :		UnBinData(unsigned int n, unsigned int dim, Iterator dataItr ) :
	FitData( ),		FitData( ),
	fDim(dim),		fDim(dim),
	skipping to change at line 169		skipping to change at line 123
	/**		/**
	destructor, delete pointer to internal data or external data wrapper		destructor, delete pointer to internal data or external data wrapper
	*/		*/
	virtual ~UnBinData() {		virtual ~UnBinData() {
	if (fDataVector) delete fDataVector;		if (fDataVector) delete fDataVector;
	if (fDataWrapper) delete fDataWrapper;		if (fDataWrapper) delete fDataWrapper;
	}		}
	/**		/**
	preallocate a data set given size and dimension		preallocate a data set given size and dimension
			if a vector already exists with correct fimension (point size) extend
			the existing one
			keep the previous one
	*/		*/
	void Initialize(unsigned int maxpoints, unsigned int dim = 1) {		void Initialize(unsigned int maxpoints, unsigned int dim = 1);
	fDim = dim;
	assert(maxpoints > 0);
	if (fDataVector)
	(fDataVector->Data()).resize( maxpoints * PointSize() );
	else
	fDataVector = new DataVector( dim * maxpoints);
	}
	/**		/**
	return fit point size (for unbin data is equivalent to coordinate dim ension)		return fit point size (for unbin data is equivalent to coordinate dim ension)
	*/		*/
	unsigned int PointSize() const {		unsigned int PointSize() const {
	return fDim;		return fDim;
	}		}
	/**		/**
	return size of internal data vector (is 0 for external data)		return size of internal data vector (is 0 for external data)
	skipping to change at line 236		skipping to change at line 185
	const double * Coords(unsigned int ipoint) const {		const double * Coords(unsigned int ipoint) const {
	if (fDataVector)		if (fDataVector)
	return &( (fDataVector->Data()) [ ipoint*PointSize() ] );		return &( (fDataVector->Data()) [ ipoint*PointSize() ] );
	else		else
	return fDataWrapper->Coords(ipoint);		return fDataWrapper->Coords(ipoint);
	}		}
	/**		/**
	resize the vector to the given npoints		resize the vector to the given npoints
	*/		*/
	void Resize (unsigned int npoints) {		void Resize (unsigned int npoints);
	if (fDataVector) {
	fNPoints = npoints;
	(fDataVector->Data()).resize(PointSize() *npoints);
	}
	}
	/**		/**
	return number of contained points		return number of contained points
	*/		*/
	unsigned int NPoints() const { return fNPoints; }		unsigned int NPoints() const { return fNPoints; }
	/**		/**
	return number of contained points		return number of contained points
	*/		*/
	unsigned int Size() const { return fNPoints; }		unsigned int Size() const { return fNPoints; }
End of changes. 10 change blocks.
	70 lines changed or deleted		15 lines changed or added

	UnionBuilder.h		UnionBuilder.h
	// @(#)root/reflex:$Id: UnionBuilder.h 22732 2008-03-19 10:41:52Z pcanal $		// @(#)root/reflex:$Id: UnionBuilder.h 27061 2008-12-28 17:50:04Z axel $
	// Author: Stefan Roiser 2004		// Author: Stefan Roiser 2004
	// Copyright CERN, CH-1211 Geneva 23, 2004-2006, All rights reserved.		// Copyright CERN, CH-1211 Geneva 23, 2004-2006, All rights reserved.
	//		//
	// Permission to use, copy, modify, and distribute this software for any		// Permission to use, copy, modify, and distribute this software for any
	// purpose is hereby granted without fee, provided that this copyright and		// purpose is hereby granted without fee, provided that this copyright and
	// permissions notice appear in all copies and derivatives.		// permissions notice appear in all copies and derivatives.
	//		//
	// This software is provided "as is" without express or implied warranty.		// This software is provided "as is" without express or implied warranty.
	skipping to change at line 111		skipping to change at line 111
	Member fLastMember;		Member fLastMember;
	}; // class UnionBuilderImpl		}; // class UnionBuilderImpl
	/**		/**
	* @class UnionBuilder UnionBuilder.h Reflex/Builder/UnionBuilder.h		* @class UnionBuilder UnionBuilder.h Reflex/Builder/UnionBuilder.h
	* @author Stefan Roiser		* @author Stefan Roiser
	* @date 30/3/2004		* @date 30/3/2004
	* @ingroup RefBld		* @ingroup RefBld
	*/		*/
	class UnionBuilder {		class RFLX_API UnionBuilder {
	public:		public:
	/** constructor */		/** constructor */
	UnionBuilder(const char* nam, const std::type_info& ti, size_t size, uns igned int modifiers = 0, TYPE typ = UNION);		UnionBuilder(const char* nam, const std::type_info& ti, size_t size, uns igned int modifiers = 0, TYPE typ = UNION);
	/** destructor */		/** destructor */
	virtual ~UnionBuilder();		virtual ~UnionBuilder();
	/**		/**
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	VariableDecorrTransform.h		VariableDecorrTransform.h
	// @(#)root/tmva $Id: VariableDecorrTransform.h 21630 2008-01-10 19:40:44Z brun $		// @(#)root/tmva $Id: VariableDecorrTransform.h 27320 2009-02-02 06:40:36Z brun $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss		// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss
	/************************************************************************** ********		/************************************************************************** ********
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *		* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *		* Package: TMVA *
	* Class : VariableDecorrTransform *		* Class : VariableDecorrTransform *
	* Web : http://tmva.sourceforge.net *		* Web : http://tmva.sourceforge.net *
	* *		* *
	* Description: *		* Description: *
	* Decorrelation of input variables *		* Decorrelation of input variables *
	skipping to change at line 50		skipping to change at line 50
	#include "TMVA/VariableTransformBase.h"		#include "TMVA/VariableTransformBase.h"
	#endif		#endif
	namespace TMVA {		namespace TMVA {
	class VariableDecorrTransform : public VariableTransformBase {		class VariableDecorrTransform : public VariableTransformBase {
	public:		public:
	VariableDecorrTransform( std::vector<TMVA::VariableInfo>& );		VariableDecorrTransform( std::vector<TMVA::VariableInfo>& );
	virtual ~VariableDecorrTransform( void ) {}		virtual ~VariableDecorrTransform( void );
	void ApplyTransformation( Types::ESBType type = Types::kMaxSBType ) const;		void ApplyTransformation( Types::ESBType type = Types::kMaxSBType ) const;
	Bool_t PrepareTransformation( TTree* inputTree );		Bool_t PrepareTransformation( TTree* inputTree );
	void WriteTransformationToStream ( std::ostream& ) const;		void WriteTransformationToStream ( std::ostream& ) const;
	void ReadTransformationFromStream( std::istream& );		void ReadTransformationFromStream( std::istream& );
	virtual void PrintTransformation( ostream & o );		virtual void PrintTransformation( ostream & o );
	// provides string vector describing explicit transformation		// provides string vector describing explicit transformation
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	VariableGaussDecorr.h		VariableGaussDecorr.h
	// @(#)root/tmva $Id: VariableGaussDecorr.h 26050 2008-11-01 09:18:41Z brun $		// @(#)root/tmva $Id: VariableGaussDecorr.h 27320 2009-02-02 06:40:36Z brun $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss		// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss
	/************************************************************************** ********		/************************************************************************** ********
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *		* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *		* Package: TMVA *
	* Class : VariableGaussDecorr *		* Class : VariableGaussDecorr *
	* Web : http://tmva.sourceforge.net *		* Web : http://tmva.sourceforge.net *
	* *		* *
	* Description: *		* Description: *
	* Decorrelation of input variables *		* Decorrelation of input variables *
	* *		* *
	* Authors (alphabetical): *		* Authors (alphabetical): *
	* Andreas Hoecker <Andreas.Hocker@cern.ch> - CERN, Switzerland *		* Andreas Hoecker <Andreas.Hocker@cern.ch> - CERN, Switzerland *
	* Joerg Stelzer <Joerg.Stelzer@cern.ch> - CERN, Switzerland *		* Joerg Stelzer <Joerg.Stelzer@cern.ch> - CERN, Switzerland *
	* Helge Voss <Helge.Voss@cern.ch> - MPI-K Heidelberg, German y *		* Helge Voss <Helge.Voss@cern.ch> - MPI-K Heidelberg, German y *
	* *		* *
	skipping to change at line 40		skipping to change at line 40
	//////////////////////////////////////////////////////////////////////////		//////////////////////////////////////////////////////////////////////////
	// //		// //
	// Decorrelation transformation of input variables //		// Decorrelation transformation of input variables //
	// //		// //
	//////////////////////////////////////////////////////////////////////////		//////////////////////////////////////////////////////////////////////////
	#include <vector>		#include <vector>
	#include "TMatrixD.h"		#include "TMatrixD.h"
			#include "TROOT.h"
	#ifndef ROOT_TMVA_VariableTransformBase		#ifndef ROOT_TMVA_VariableTransformBase
	#include "TMVA/VariableTransformBase.h"		#include "TMVA/VariableTransformBase.h"
	#endif		#endif
	namespace TMVA {		namespace TMVA {
	class VariableGaussDecorr : public VariableTransformBase {		class VariableGaussDecorr : public VariableTransformBase {
	public:		public:
	skipping to change at line 69		skipping to change at line 70
	virtual void PrintTransformation( ostream & o );		virtual void PrintTransformation( ostream & o );
	// provides string vector describing explicit transformation		// provides string vector describing explicit transformation
	std::vector<TString>* GetTransformationStrings( Types::ESBType type ) const;		std::vector<TString>* GetTransformationStrings( Types::ESBType type ) const;
	// writer of function code		// writer of function code
	virtual void MakeFunction( std::ostream& fout, const TString& fncName , Int_t part );		virtual void MakeFunction( std::ostream& fout, const TString& fncName , Int_t part );
	private:		private:
			UInt_t fElementsPerBin;
	Bool_t fApplyGaussTransform;		Bool_t fApplyGaussTransform;
	Bool_t fApplyDecorrTransform;		Bool_t fApplyDecorrTransform;
	Bool_t fFlatNotGaussD;		Bool_t fFlatNotGaussD;
	std::vector< std::vector< TH1F* > > fCumulativeDist; //! The Cummula tive distributions		std::vector< std::vector< TH1F* > > fCumulativeDist; //! The Cummula tive distributions
	TMatrixD* fDecorrMatrix[2]; //! Decorrelation matrix [signal/back ground]		TMatrixD* fDecorrMatrix[2]; //! Decorrelation matrix [signal/back ground]
	void GetCumulativeDist( TTree* tr);		void GetCumulativeDist( TTree* tr);
	void GetSQRMats( TTree* tr );		void GetSQRMats( TTree* tr );
End of changes. 4 change blocks.
	2 lines changed or deleted		5 lines changed or added

	Version.h		Version.h
	// @(#)root/tmva $Id: Version.h 26050 2008-11-01 09:18:41Z brun $		// @(#)root/tmva $Id: Version.h 27320 2009-02-02 06:40:36Z brun $
	// Author: Andreas Hoecker, Joerg Stelzer, Fredrik Tegenfeldt, Helge Voss		// Author: Andreas Hoecker, Joerg Stelzer, Fredrik Tegenfeldt, Helge Voss
	/************************************************************************** ********		/************************************************************************** ********
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *		* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *		* Package: TMVA *
	* Class : Version *		* Class : Version *
	* Web : http://tmva.sourceforge.net *		* Web : http://tmva.sourceforge.net *
	* *		* *
	* Description: *		* Description: *
	* Current TMVA Version - filled automatically during cvs tagging *		* Current TMVA Version - filled automatically during cvs tagging *
	skipping to change at line 41		skipping to change at line 41
	#define ROOT_TMVA_Version		#define ROOT_TMVA_Version
	//////////////////////////////////////////////////////////////////////////		//////////////////////////////////////////////////////////////////////////
	// //		// //
	// Version //		// Version //
	// //		// //
	// Automatically filled by cvs tagger: development/tmvaTag.py //		// Automatically filled by cvs tagger: development/tmvaTag.py //
	// //		// //
	//////////////////////////////////////////////////////////////////////////		//////////////////////////////////////////////////////////////////////////
	#define TMVA_RELEASE "3.9.5"		#define TMVA_RELEASE "3.9.7"
	#define TMVA_RELEASE_DATE "Aug 09, 2008"		#define TMVA_RELEASE_DATE "Feb 01, 2009"
	#define TMVA_RELEASE_TIME "21:06:28"		#define TMVA_RELEASE_TIME "22:20:05"
	#define TMVA_VERSION_CODE 198917		#define TMVA_VERSION_CODE 198919
	#define TMVA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))		#define TMVA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
	#endif		#endif
End of changes. 2 change blocks.
	5 lines changed or deleted		5 lines changed or added

	WrappedMultiTF1.h		WrappedMultiTF1.h
	// @(#)root/mathmore:$Id: WrappedMultiTF1.h 24403 2008-06-20 08:31:10Z mone ta $		// @(#)root/mathmore:$Id: WrappedMultiTF1.h 27273 2009-01-28 09:07:01Z mone ta $
	// Author: L. Moneta Wed Sep 6 09:52:26 2006		// Author: L. Moneta Wed Sep 6 09:52:26 2006
	/**********************************************************************		/**********************************************************************
	* *		* *
	* Copyright (c) 2006 LCG ROOT Math Team, CERN/PH-SFT *		* Copyright (c) 2006 LCG ROOT Math Team, CERN/PH-SFT *
	* *		* *
	* *		* *
	**********************************************************************/		**********************************************************************/
	// Header file for class WrappedTFunction		// Header file for class WrappedTFunction
	skipping to change at line 94		skipping to change at line 94
	return new WrappedMultiTF1(*this);		return new WrappedMultiTF1(*this);
	}		}
	/// function dimension		/// function dimension
	unsigned int NDim() const {		unsigned int NDim() const {
	return fFunc->GetNdim();		return fFunc->GetNdim();
	}		}
	/** @name interface inherited from IParamFunction */		/** @name interface inherited from IParamFunction */
	/// get the parameter values (return values cachen inside, those inside TF1 might be different)		/// get the parameter values (return values cached inside, those inside TF1 might be different)
	const double * Parameters() const {		const double * Parameters() const {
	return &fParams.front();		return (fParams.size() > 0) ? &fParams.front() : 0;
	}		}
	/// set parameter values (only the cached one in this class,leave unchan ges those of TF1)		/// set parameter values (only the cached one in this class,leave unchan ges those of TF1)
	void SetParameters(const double * p) {		void SetParameters(const double * p) {
	std::copy(p,p+fParams.size(),fParams.begin());		std::copy(p,p+fParams.size(),fParams.begin());
	}		}
	/// return number of parameters		/// return number of parameters
	unsigned int NPar() const {		unsigned int NPar() const {
	return fParams.size();		return fParams.size();
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	WrappedTF1.h		WrappedTF1.h
	// @(#)root/mathmore:$Id: WrappedTF1.h 26946 2008-12-16 10:47:01Z moneta $		// @(#)root/mathmore:$Id: WrappedTF1.h 27273 2009-01-28 09:07:01Z moneta $
	// Author: L. Moneta Wed Sep 6 09:52:26 2006		// Author: L. Moneta Wed Sep 6 09:52:26 2006
	/**********************************************************************		/**********************************************************************
	* *		* *
	* Copyright (c) 2006 LCG ROOT Math Team, CERN/PH-SFT *		* Copyright (c) 2006 LCG ROOT Math Team, CERN/PH-SFT *
	* *		* *
	* *		* *
	**********************************************************************/		**********************************************************************/
	// Header file for class WrappedTFunction		// Header file for class WrappedTFunction
	skipping to change at line 122		skipping to change at line 122
	Clone the wrapper but not the original function		Clone the wrapper but not the original function
	*/		*/
	ROOT::Math::IGenFunction * Clone() const {		ROOT::Math::IGenFunction * Clone() const {
	return new WrappedTF1(*this);		return new WrappedTF1(*this);
	}		}
	/** @name interface inherited from IParamFunction */		/** @name interface inherited from IParamFunction */
	/// get the parameter values (return values cachen inside, those inside TF1 might be different)		/// get the parameter values (return values cachen inside, those inside TF1 might be different)
	const double * Parameters() const {		const double * Parameters() const {
	return &fParams.front();		return (fParams.size() > 0) ? &fParams.front() : 0;
	}		}
	/// set parameter values (only the cached one in this class,leave unchan ges those of TF1)		/// set parameter values (only the cached one in this class,leave unchan ges those of TF1)
	void SetParameters(const double * p) {		void SetParameters(const double * p) {
	std::copy(p,p+fParams.size(),fParams.begin());		std::copy(p,p+fParams.size(),fParams.begin());
	}		}
	/// return number of parameters		/// return number of parameters
	unsigned int NPar() const {		unsigned int NPar() const {
	return fParams.size();		return fParams.size();
	skipping to change at line 148		skipping to change at line 148
	}		}
	using BaseGradFunc::operator();		using BaseGradFunc::operator();
	/// evaluate the derivative of the function with respect to the paramete rs		/// evaluate the derivative of the function with respect to the paramete rs
	void ParameterGradient(double x, const double * par, double * grad ) co nst {		void ParameterGradient(double x, const double * par, double * grad ) co nst {
	if (!fLinear) {		if (!fLinear) {
	// need to set parameter values		// need to set parameter values
	fFunc->SetParameters( par );		fFunc->SetParameters( par );
	static const double kEps = 0.001;		static const double kEps = 0.001;
			// no need to call InitArgs (it is called in TF1::GradientPar)
	fFunc->GradientPar(&x,grad,kEps);		fFunc->GradientPar(&x,grad,kEps);
	}		}
	else {		else {
	unsigned int np = NPar();		unsigned int np = NPar();
	for (unsigned int i = 0; i < np; ++i)		for (unsigned int i = 0; i < np; ++i)
	grad[i] = DoParameterDerivative(x, par, i);		grad[i] = DoParameterDerivative(x, par, i);
	}		}
	}		}
			static void SetDerivStepSize(double eps) { fgEps = eps; }
	private:		private:
	/// evaluate function passing coordinates x and vector of parameters		/// evaluate function passing coordinates x and vector of parameters
	double DoEvalPar (double x, const double * p ) const {		double DoEvalPar (double x, const double * p ) const {
	fX[0] = x;		fX[0] = x;
	if (fFunc->GetMethodCall() ) fFunc->InitArgs(fX,p); // needed for in terpreted functions		if (fFunc->GetMethodCall() ) fFunc->InitArgs(fX,p); // needed for in terpreted functions
	return fFunc->EvalPar(fX,p);		return fFunc->EvalPar(fX,p);
	}		}
	/// evaluate function using the cached parameter values of this class (n ot of TF1)		/// evaluate function using the cached parameter values of this class (n ot of TF1)
	/// re-implement for better efficiency		/// re-implement for better efficiency
	double DoEval (double x) const {		double DoEval (double x) const {
	// no need to call InitArg for interpreted functions (done in ctor)		// no need to call InitArg for interpreted functions (done in ctor)
	// use EvalPar since it is much more efficient than Eval		// use EvalPar since it is much more efficient than Eval
	fX[0] = x;		fX[0] = x;
	return fFunc->EvalPar(fX,&fParams.front());		const double * p = (fParams.size() > 0) ? &fParams.front() : 0;
			return fFunc->EvalPar(fX, p );
	}		}
	/// return the function derivatives w.r.t. x		/// return the function derivatives w.r.t. x
	double DoDerivative( double x ) const {		double DoDerivative( double x ) const {
	static const double kEps = 0.001;
	// parameter are passed as non-const in Derivative		// parameter are passed as non-const in Derivative
	double * p = const_cast<double *>(&fParams.front() );		double * p = (fParams.size() > 0) ? const_cast<double *>( &fParams.f
	return fFunc->Derivative(x,p,kEps);		ront()) : 0;
			return fFunc->Derivative(x,p,fgEps);
	}		}
	/// evaluate the derivative of the function with respect to the paramete rs		/// evaluate the derivative of the function with respect to the paramete rs
	double DoParameterDerivative(double x, const double * p, unsigned int i par ) const {		double DoParameterDerivative(double x, const double * p, unsigned int i par ) const {
	// not very efficient - use ParameterGradient		// not very efficient - use ParameterGradient
	if (! fLinear ) {		if (! fLinear ) {
	std::vector<double> grad(NPar());		fFunc->SetParameters( p );
	ParameterGradient(x, p, &grad[0] );		return fFunc->GradientPar(ipar, &x,fgEps);
	return grad[ipar];
	}		}
	else if (fPolynomial) {		else if (fPolynomial) {
	// case of polynomial function (no parameter dependency)		// case of polynomial function (no parameter dependency)
	return std::pow(x, static_cast<int>(ipar) );		return std::pow(x, static_cast<int>(ipar) );
	}		}
	else {		else {
	// case of general linear function (bbuilt with ++ )		// case of general linear function (bbuilt with ++ )
	const TFormula * df = dynamic_cast<const TFormula*>( fFunc->GetLin earPart(ipar) );		const TFormula * df = dynamic_cast<const TFormula*>( fFunc->GetLin earPart(ipar) );
	assert(df != 0);		assert(df != 0);
	fX[0] = x;		fX[0] = x;
	// hack since TFormula::EvalPar is not const		// hack since TFormula::EvalPar is not const
	return (const_cast<TFormula*> ( df) )->EvalPar( fX ) ; // derivati ves should not depend on parameters since func is linear		return (const_cast<TFormula*> ( df) )->EvalPar( fX ) ; // derivati ves should not depend on parameters since func is linear
	}		}
	}		}
	bool fLinear; // flag for linear functions		bool fLinear; // flag for linear functions
	bool fPolynomial; // flag for polynomial functions		bool fPolynomial; // flag for polynomial functions
	TF1 * fFunc; // pointer to ROOT function		TF1 * fFunc; // pointer to ROOT function
	mutable double fX[1]; //! cached vector for x value (needed for TF1::EvalPar signature)		mutable double fX[1]; //! cached vector for x value (needed for TF1::EvalPar signature)
	std::vector<double> fParams; // cached vector with parameter values		std::vector<double> fParams; // cached vector with parameter values
			static double fgEps; // epsilon used in derivative calculation
	};		};
	} // end namespace Fit		} // end namespace Fit
	} // end namespace ROOT		} // end namespace ROOT
	#endif /* ROOT_Fit_WrappedTF1 */		#endif /* ROOT_Fit_WrappedTF1 */
End of changes. 9 change blocks.
	9 lines changed or deleted		14 lines changed or added

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