ROOT: headers diff between 5.25.02 and 5.25.04 versions

	Api.h	Api.h

	skipping to change at line 253	skipping to change at line 253
	*********************************************************************/	*********************************************************************/
	int G__ExceptionWrapper(G__InterfaceMethod funcp	int G__ExceptionWrapper(G__InterfaceMethod funcp
	,G__value* result7	,G__value* result7
	,char* funcname	,char* funcname
	,struct G__param *libp	,struct G__param *libp
	,int hash);	,int hash);
	#endif	#endif

	unsigned long G__long_random(unsigned long limit);	unsigned long G__long_random(unsigned long limit);


		/*********************************************************************
		* External readline interface
		*********************************************************************/
		typedef char* (G__pGetline_t)(const char prompt);
		typedef void (G__pHistadd_t)(char line);

		#ifndef __CINT__
		G__EXPORT
		#endif
		G__pGetline_t G__GetGetlineFunc();

		#ifndef __CINT__
		G__EXPORT
		#endif
		G__pHistadd_t G__GetHistaddFunc();

		#ifndef __CINT__
		G__EXPORT
		#endif
		void G__SetGetlineFunc(G__pGetline_t glfcn, G__pHistadd_t hafcn);

	} // namespace Cint	} // namespace Cint

	using namespace Cint;	using namespace Cint;

	#ifdef __MAKECINT__	#ifdef __MAKECINT__
	#pragma link off class $G__value;	#pragma link off class $G__value;
	#pragma link off class $G__COMPLETIONLIST;	#pragma link off class $G__COMPLETIONLIST;
	#pragma link off class $G__linked_taginfo;	#pragma link off class $G__linked_taginfo;
	#pragma link off class G__includepath;	#pragma link off class G__includepath;
	#pragma link C++ namespace Cint;	#pragma link C++ namespace Cint;

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

	AuthConst.h	AuthConst.h

	// @(#)root/auth:$Id: AuthConst.h 20882 2007-11-19 11:31:26Z rdm $	// @(#)root/auth:$Id: AuthConst.h 30815 2009-10-20 13:49:22Z rdm $
	// Author: Gerardo Ganis 3/12/2003	// Author: Gerardo Ganis 3/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 23	skipping to change at line 23
	#define ROOT_AuthConst	#define ROOT_AuthConst

	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////
	// //	// //
	// AuthConst //	// AuthConst //
	// //	// //
	// Const used in authentication business //	// Const used in authentication business //
	// //	// //
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////


		#ifndef ROOT_Rtypes
		#include "Rtypes.h"
		#endif

	// Number of security levels and masks	// Number of security levels and masks
	const Int_t kMAXSEC = 6;	const Int_t kMAXSEC = 6;
	const Int_t kMAXSECBUF = 4096;	const Int_t kMAXSECBUF = 4096;
	const Int_t kAUTH_REUSE_MSK = 0x1;	const Int_t kAUTH_REUSE_MSK = 0x1;
	const Int_t kAUTH_CRYPT_MSK = 0x2;	const Int_t kAUTH_CRYPT_MSK = 0x2;
	const Int_t kAUTH_SSALT_MSK = 0x4;	const Int_t kAUTH_SSALT_MSK = 0x4;
	const Int_t kAUTH_RSATY_MSK = 0x8;	const Int_t kAUTH_RSATY_MSK = 0x8;
	const Int_t kMAXRSATRIES = 100;	const Int_t kMAXRSATRIES = 100;
	const Int_t kPRIMELENGTH = 20;	const Int_t kPRIMELENGTH = 20;
	const Int_t kPRIMEEXP = 40;	const Int_t kPRIMEEXP = 40;

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

	BayesianCalculator.h	BayesianCalculator.h

	// @(#)root/roostats:$Id: ModelConfig.h 27519 2009-02-19 13:31:41Z pellicci $	// @(#)root/roostats:$Id: BayesianCalculator.h 31276 2009-11-18 15:06:42Z m oneta $
	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke
	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOSTATS_BayesianCalculator	#ifndef ROOSTATS_BayesianCalculator

	skipping to change at line 57	skipping to change at line 57
	const RooArgSet & POI,	const RooArgSet & POI,
	RooAbsPdf& priorPOI,	RooAbsPdf& priorPOI,
	const RooArgSet* nuisanceParameters = 0 );	const RooArgSet* nuisanceParameters = 0 );

	BayesianCalculator( RooAbsData& data,	BayesianCalculator( RooAbsData& data,
	ModelConfig & model);	ModelConfig & model);

	// destructor	// destructor
	virtual ~BayesianCalculator() ;	virtual ~BayesianCalculator() ;


	RooPlot* PlotPosterior() ;	RooPlot* GetPosteriorPlot() const;

	// return posterior pdf (object is managed by the BayesianCalculator class)	// return posterior pdf (object is managed by the BayesianCalculator class)

	RooAbsPdf * GetPosteriorPdf();	RooAbsPdf * GetPosteriorPdf() const;

	virtual SimpleInterval* GetInterval() const ;	virtual SimpleInterval* GetInterval() const ;

	virtual void SetData(RooAbsData & data) { fData = &data; }	virtual void SetData(RooAbsData & data) { fData = &data; }

	virtual void SetModel(const ModelConfig & model);	virtual void SetModel(const ModelConfig & model);

	// set the size of the test (rate of Type I error) ( Eg. 0.05 for a 9 5% Confidence Interval)	// set the size of the test (rate of Type I error) ( Eg. 0.05 for a 9 5% Confidence Interval)

	virtual void SetTestSize(Double_t size) {fSize = size;}	virtual void SetTestSize(Double_t size) {
		fSize = size;
		if (fInterval) delete fInterval; fInterval = 0;
		}
	// set the confidence level for the interval (eg. 0.95 for a 95% Conf idence Interval)	// set the confidence level for the interval (eg. 0.95 for a 95% Conf idence Interval)

	virtual void SetConfidenceLevel(Double_t cl) {fSize = 1.-cl;}	virtual void SetConfidenceLevel(Double_t cl) { SetTestSize( 1. - cl); }
	// Get the size of the test (eg. rate of Type I error)	// Get the size of the test (eg. rate of Type I error)
	virtual Double_t Size() const {return fSize;}	virtual Double_t Size() const {return fSize;}
	// Get the Confidence level for the test	// Get the Confidence level for the test
	virtual Double_t ConfidenceLevel() const {return 1.-fSize;}	virtual Double_t ConfidenceLevel() const {return 1.-fSize;}


		protected:

		void ClearAll() const;

	private:	private:

	RooAbsData* fData;	RooAbsData* fData;
	RooAbsPdf* fPdf;	RooAbsPdf* fPdf;
	RooArgSet fPOI;	RooArgSet fPOI;
	RooAbsPdf* fPriorPOI;	RooAbsPdf* fPriorPOI;
	RooArgSet fNuisanceParameters;	RooArgSet fNuisanceParameters;


	RooAbsPdf * fProductPdf;	mutable RooAbsPdf* fProductPdf;
	RooAbsReal * fLogLike;	mutable RooAbsReal* fLogLike;
	RooAbsReal * fLikelihood;	mutable RooAbsReal* fLikelihood;
	RooAbsReal * fIntegratedLikelihood;	mutable RooAbsReal* fIntegratedLikelihood;
	RooAbsPdf * fPosteriorPdf;	mutable RooAbsPdf* fPosteriorPdf;
		mutable SimpleInterval* fInterval; // cached pointer to resulting
		interval


	double fSize;	double fSize; // size used for getting the interval

	protected:	protected:

	ClassDef(BayesianCalculator,1) // BayesianCalculator class	ClassDef(BayesianCalculator,1) // BayesianCalculator class

	};	};
	}	}

	#endif	#endif

End of changes. 8 change blocks.
	11 lines changed or deleted	20 lines changed or added

	BernsteinCorrection.h	BernsteinCorrection.h

	// @(#)root/roostats:$Id: BernsteinCorrection.h 26805 2009-02-19 10:00:00 p ellicci $	// @(#)root/roostats:$Id: BernsteinCorrection.h 31276 2009-11-18 15:06:42Z moneta $
	// Author: Kyle Cranmer	// Author: Kyle Cranmer
	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOSTATS_BernsteinCorrection	#ifndef ROOSTATS_BernsteinCorrection

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 29513 2009-07-17 15:30:07Z moneta $	// @(#)root/mathcore:$Id: BinData.h 31180 2009-11-16 10:54: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 455	skipping to change at line 455
	return an array containing the upper edge of the bin for coordinate i	return an array containing the upper edge of the bin for coordinate i
	In case of empty bin they could be merged in a single larger bin	In case of empty bin they could be merged in a single larger bin
	Return a NULL pointer if the bin width is not stored	Return a NULL pointer if the bin width is not stored
	*/	*/
	const double * BinUpEdge(unsigned int icoord) const {	const double * BinUpEdge(unsigned int icoord) const {
	if (fBinEdge.size() == 0 \|\| icoord*fDim > fBinEdge.size() ) return 0;	if (fBinEdge.size() == 0 \|\| icoord*fDim > fBinEdge.size() ) return 0;
	return &fBinEdge[ icoord * fDim];	return &fBinEdge[ icoord * fDim];
	}	}

	/**	/**

		query if the data store the bin edges instead of the center
		*/
		bool HasBinEdges() const {
		return fBinEdge.size() > 0 && fBinEdge.size() == fDim*fNPoints;
		}

		/**
	add the bin width data, a pointer to an array with the bin upper edg e information.	add the bin width data, a pointer to an array with the bin upper edg e information.
	This is needed when fitting with integral options	This is needed when fitting with integral options
	The information is added for the previously inserted point.	The information is added for the previously inserted point.
	BinData::Add must be called before	BinData::Add must be called before
	*/	*/
	void AddBinUpEdge(const double * binwidth);	void AddBinUpEdge(const double * binwidth);


		/**
		retrieve the reference volume used to normalize the data when the op
		tion bin volume is set
		*/
		double RefVolume() const { return fRefVolume; }

		/**
		set the reference volume used to normalize the data when the option b
		in volume is set
		*/
		void SetRefVolume(double value) { fRefVolume = value; }

	protected:	protected:

	void SetNPoints(unsigned int n) { fNPoints = n; }	void SetNPoints(unsigned int n) { fNPoints = n; }

	private:	private:

	unsigned int fDim; // coordinate dimension	unsigned int fDim; // coordinate dimension
	unsigned int fPointSize; // total point size including value and errors (= fDim + 2 for error in only Y )	unsigned int fPointSize; // total point size including value and errors (= fDim + 2 for error in only Y )
	unsigned int fNPoints; // number of contained points in the data set ( can be different than size of vector)	unsigned int fNPoints; // number of contained points in the data set ( can be different than size of vector)

		double fRefVolume; // reference bin volume - used to normalize the bins in case of variable bins data

	DataVector * fDataVector; // pointer to the copied in data vector	DataVector * fDataVector; // pointer to the copied in data vector
	DataWrapper * fDataWrapper; // pointer to the external data wrapper str ucture	DataWrapper * fDataWrapper; // pointer to the external data wrapper str ucture

	std::vector<double> fBinEdge; // vector containing the bin upper edge ( coordinate will contain low edge)	std::vector<double> fBinEdge; // vector containing the bin upper edge ( coordinate will contain low edge)

	#ifdef USE_BINPOINT_CLASS	#ifdef USE_BINPOINT_CLASS
	mutable BinPoint fPoint;	mutable BinPoint fPoint;
	#endif	#endif


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

	Bswapcpy.h	Bswapcpy.h

	/* @(#)root/base:$Id: Bswapcpy.h 20877 2007-11-19 11:17:07Z rdm $ */	/* @(#)root/base:$Id: Bswapcpy.h 30815 2009-10-20 13:49:22Z rdm $ */

	/*************************************************************************	/*************************************************************************
	* 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_Bswapcpy	#ifndef ROOT_Bswapcpy
	#define ROOT_Bswapcpy	#define ROOT_Bswapcpy

	skipping to change at line 41	skipping to change at line 41
	// (It is not the number of bytes!) //	// (It is not the number of bytes!) //
	// //	// //
	// For arrays of short type (2 bytes in size) use bswapcpy16(). //	// For arrays of short type (2 bytes in size) use bswapcpy16(). //
	// For arrays of of 4-byte types (int, float) use bswapcpy32(). //	// For arrays of of 4-byte types (int, float) use bswapcpy32(). //
	// //	// //
	// //	// //
	// Author: Alexandre V. Vaniachine <AVVaniachine@lbl.gov> //	// Author: Alexandre V. Vaniachine <AVVaniachine@lbl.gov> //
	// //	// //
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////


		#if !defined(__CINT__)
		#include <sys/types.h>
		#endif

	extern inline void * bswapcpy16(void * to, const void * from, size_t n)	extern inline void * bswapcpy16(void * to, const void * from, size_t n)
	{	{
	int d0, d1, d2, d3;	int d0, d1, d2, d3;
	__asm__ __volatile__(	__asm__ __volatile__(
	"cld\n"	"cld\n"
	"1:\tlodsw\n\t"	"1:\tlodsw\n\t"
	"rorw $8, %%ax\n\t"	"rorw $8, %%ax\n\t"
	"stosw\n\t"	"stosw\n\t"
	"loop 1b\n\t"	"loop 1b\n\t"
	:"=&c" (d0), "=&D" (d1), "=&S" (d2), "=&a" (d3)	:"=&c" (d0), "=&D" (d1), "=&S" (d2), "=&a" (d3)

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

	Buttons.h	Buttons.h

	/* @(#)root/base:$Id: Buttons.h 20877 2007-11-19 11:17:07Z rdm $ */	/* @(#)root/base:$Id: Buttons.h 30690 2009-10-12 18:12:30Z rdm $ */

	/*************************************************************************	/*************************************************************************
	* 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_Buttons	#ifndef ROOT_Buttons
	#define ROOT_Buttons	#define ROOT_Buttons

	enum EEventType {	enum EEventType {
	kNoEvent = 0,	kNoEvent = 0,
	kButton1Down = 1, kButton2Down = 2, kButton3Down = 3, kKeyDown = 4,	kButton1Down = 1, kButton2Down = 2, kButton3Down = 3, kKeyDown = 4,

		kWheelUp = 5, kWheelDown = 6, kButton1Shift = 7,
	kButton1Up = 11, kButton2Up = 12, kButton3Up = 13, kKeyUp = 14,	kButton1Up = 11, kButton2Up = 12, kButton3Up = 13, kKeyUp = 14,
	kButton1Motion = 21, kButton2Motion = 22, kButton3Motion = 23, kKeyPress = 24,	kButton1Motion = 21, kButton2Motion = 22, kButton3Motion = 23, kKeyPress = 24,
	kButton1Locate = 41, kButton2Locate = 42, kButton3Locate = 43, kESC = 27,	kButton1Locate = 41, kButton2Locate = 42, kButton3Locate = 43, kESC = 27,
	kMouseMotion = 51, kMouseEnter = 52, kMouseLeave = 53,	kMouseMotion = 51, kMouseEnter = 52, kMouseLeave = 53,
	kButton1Double = 61, kButton2Double = 62, kButton3Double = 63	kButton1Double = 61, kButton2Double = 62, kButton3Double = 63
	};	};

	enum EEditMode {	enum EEditMode {
	kPolyLine = 1, kSPolyLine = 2, kPolyGone = 3,	kPolyLine = 1, kSPolyLine = 2, kPolyGone = 3,
	kSPolyGone = 4, kBox = 5, kDelete = 6,	kSPolyGone = 4, kBox = 5, kDelete = 6,

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

	Chi2FCN.h	Chi2FCN.h

	// @(#)root/mathcore:$Id: Chi2FCN.h 26866 2008-12-12 10:50:07Z moneta $	// @(#)root/mathcore:$Id: Chi2FCN.h 30539 2009-10-01 13:13:09Z moneta $
	// Author: L. Moneta Tue Sep 5 09:13:32 2006	// Author: L. Moneta Tue Sep 5 09:13:32 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 Chi2FCN	// Header file for class Chi2FCN

	skipping to change at line 80	skipping to change at line 80

	typedef ::ROOT::Math::BasicFitMethodFunction<FunType> BaseObjFunction;	typedef ::ROOT::Math::BasicFitMethodFunction<FunType> BaseObjFunction;
	typedef typename BaseObjFunction::BaseFunction BaseFunction;	typedef typename BaseObjFunction::BaseFunction BaseFunction;

	typedef typename ModelFunctionTrait<FunType>::ModelFunc IModelFunction;	typedef typename ModelFunctionTrait<FunType>::ModelFunc IModelFunction;
	typedef typename BaseObjFunction::Type_t Type_t;	typedef typename BaseObjFunction::Type_t Type_t;

	/**	/**
	Constructor from data set (binned ) and model function	Constructor from data set (binned ) and model function
	*/	*/

	Chi2FCN (const BinData & data, IModelFunction & func) :	Chi2FCN (const BinData & data, const IModelFunction & func) :
	BaseObjFunction(func.NPar(), data.Size() ),	BaseObjFunction(func.NPar(), data.Size() ),
	fData(data),	fData(data),
	fFunc(func),	fFunc(func),
	fNEffPoints(0),	fNEffPoints(0),
	fGrad ( std::vector<double> ( func.NPar() ) )	fGrad ( std::vector<double> ( func.NPar() ) )
	{ }	{ }

	/**	/**
	Destructor (no operations)	Destructor (no operations)
	*/	*/

	skipping to change at line 171	skipping to change at line 171
	#endif	#endif
	}	}

	// for derivatives	// for derivatives
	virtual double DoDerivative(const double * x, unsigned int icoord ) con st {	virtual double DoDerivative(const double * x, unsigned int icoord ) con st {
	Gradient(x, &fGrad[0]);	Gradient(x, &fGrad[0]);
	return fGrad[icoord];	return fGrad[icoord];
	}	}

	const BinData & fData;	const BinData & fData;

	mutable IModelFunction & fFunc;	const IModelFunction & fFunc;

	mutable unsigned int fNEffPoints; // number of effective points used in the fit	mutable unsigned int fNEffPoints; // number of effective points used in the fit

	mutable std::vector<double> fGrad; // for derivatives	mutable std::vector<double> fGrad; // for derivatives

	};	};

	// define useful typedef's	// define useful typedef's
	typedef Chi2FCN<ROOT::Math::IMultiGenFunction> Chi2Function;	typedef Chi2FCN<ROOT::Math::IMultiGenFunction> Chi2Function;
	typedef Chi2FCN<ROOT::Math::IMultiGradFunction> Chi2GradFunction;	typedef Chi2FCN<ROOT::Math::IMultiGradFunction> Chi2GradFunction;

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

	CombinedCalculator.h	CombinedCalculator.h

	// @(#)root/roostats:$Id: CombinedCalculator.h 30462 2009-09-25 16:05:55Z m oneta $	// @(#)root/roostats:$Id: CombinedCalculator.h 31276 2009-11-18 15:06:42Z m oneta $
	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke
	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOSTATS_CombinedCalculator	#ifndef ROOSTATS_CombinedCalculator

	skipping to change at line 80	skipping to change at line 80
	//	//

	namespace RooStats {	namespace RooStats {

	class CombinedCalculator : public IntervalCalculator, public HypoTestCal culator {	class CombinedCalculator : public IntervalCalculator, public HypoTestCal culator {

	public:	public:

	CombinedCalculator() :	CombinedCalculator() :
	fPdf(0),	fPdf(0),

	fData(0),	fData(0)
	fPOI(0),
	fNullParams(0),
	fAlternateParams(0),
	fNuisParams(0)
	{}	{}

	CombinedCalculator(RooAbsData& data, RooAbsPdf& pdf, const RooArgSet& paramsOfInterest,	CombinedCalculator(RooAbsData& data, RooAbsPdf& pdf, const RooArgSet& paramsOfInterest,
	Double_t size = 0.05, const RooArgSet* nullParams = 0, const RooArgSet* altParams = 0, const RooArgSet* nuisParams = 0) :	Double_t size = 0.05, const RooArgSet* nullParams = 0, const RooArgSet* altParams = 0, const RooArgSet* nuisParams = 0) :

	fPdf(&pdf),	fPdf(&pdf),
	fData(&data),	fData(&data),

	fPOI(&paramsOfInterest),	fPOI(paramsOfInterest)
	fNullParams(nullParams),
	fAlternateParams(altParams),
	fNuisParams(nuisParams)
	{	{

		if (nullParams) fNullParams.add(*nullParams);
		if (altParams) fAlternateParams.add(*altParams);
		if (nuisParams) fNuisParams.add(*nuisParams);
	SetTestSize(size);	SetTestSize(size);
	}	}

	// constructor from data and model configuration	// constructor from data and model configuration
	CombinedCalculator(RooAbsData& data, const ModelConfig& model,	CombinedCalculator(RooAbsData& data, const ModelConfig& model,
	Double_t size = 0.05) :	Double_t size = 0.05) :
	fPdf(0),	fPdf(0),

	fData(&data),	fData(&data)
	fPOI(0),
	fNullParams(0),
	fAlternateParams(0),
	fNuisParams(0)
	{	{
	SetModel(model);	SetModel(model);
	SetTestSize(size);	SetTestSize(size);
	}	}

	// destructor.	// destructor.
	virtual ~CombinedCalculator() { }	virtual ~CombinedCalculator() { }

	// if( fOwnsWorkspace && fWS) delete fWS;
	// // commented out b/c currently the calculator does not own thes
	e. Change if we clone.
	// // if (fWS) delete fWS;
	// // if (fNullParams) delete fNullParams;
	// // if (fAlternateParams) delete fAlternateParams;
	// // if (fPOI) delete fPOI;
	// // if (fNuisParams) delete fNuisParams;
	// }

	// Main interface to get a ConfInterval, pure virtual	// Main interface to get a ConfInterval, pure virtual
	virtual ConfInterval* GetInterval() const = 0;	virtual ConfInterval* GetInterval() const = 0;
	// main interface to get a HypoTestResult, pure virtual	// main interface to get a HypoTestResult, pure virtual
	virtual HypoTestResult* GetHypoTest() const = 0;	virtual HypoTestResult* GetHypoTest() const = 0;

	// set the size of the test (rate of Type I error) ( Eg. 0.05 for a 9 5% Confidence Interval)	// set the size of the test (rate of Type I error) ( Eg. 0.05 for a 9 5% Confidence Interval)
	virtual void SetTestSize(Double_t size) {fSize = size;}	virtual void SetTestSize(Double_t size) {fSize = size;}
	// set the confidence level for the interval (eg. 0.95 for a 95% Conf idence Interval)	// set the confidence level for the interval (eg. 0.95 for a 95% Conf idence Interval)
	virtual void SetConfidenceLevel(Double_t cl) {fSize = 1.-cl;}	virtual void SetConfidenceLevel(Double_t cl) {fSize = 1.-cl;}
	// Get the size of the test (eg. rate of Type I error)	// Get the size of the test (eg. rate of Type I error)
	virtual Double_t Size() const {return fSize;}	virtual Double_t Size() const {return fSize;}
	// Get the Confidence level for the test	// Get the Confidence level for the test
	virtual Double_t ConfidenceLevel() const {return 1.-fSize;}	virtual Double_t ConfidenceLevel() const {return 1.-fSize;}

	// Set the DataSet, add to the the workspace if not already there	// Set the DataSet, add to the the workspace if not already there
	virtual void SetData(RooAbsData & data) {	virtual void SetData(RooAbsData & data) {
	fData = &data;	fData = &data;
	}	}


	// set the model	// set the model (in this case can set only the parameters for the nu ll hypothesis)
	virtual void SetModel(const ModelConfig & model) {	virtual void SetModel(const ModelConfig & model) {
	fPdf = model.GetPdf();	fPdf = model.GetPdf();

	fPOI = model.GetParametersOfInterest();	if (model.GetParametersOfInterest()) SetParameters(*model.GetParam
	fNullParams = model.GetSnapshot();	etersOfInterest());
	fNuisParams = model.GetNuisanceParameters();	if (model.GetSnapshot()) SetNullParameters(*model.GetSnapshot());
		if (model.GetNuisanceParameters()) SetNuisanceParameters(*model.Ge
		tNuisanceParameters());
	}	}

	virtual void SetNullModel( const ModelConfig &) { // to be understoo d what to do	virtual void SetNullModel( const ModelConfig &) { // to be understoo d what to do
	}	}
	virtual void SetAlternateModel(const ModelConfig &) { // to be under stood what to do	virtual void SetAlternateModel(const ModelConfig &) { // to be under stood what to do
	}	}

	/* specific setting - keep for convenience- some of them could be re moved */	/* specific setting - keep for convenience- some of them could be re moved */

	// Set the Pdf	// Set the Pdf
	virtual void SetPdf(RooAbsPdf& pdf) { fPdf = &pdf; }	virtual void SetPdf(RooAbsPdf& pdf) { fPdf = &pdf; }

	// specify the parameters of interest in the interval	// specify the parameters of interest in the interval

	virtual void SetParameters(const RooArgSet& set) {fPOI = &set;}	virtual void SetParameters(const RooArgSet& set) { fPOI.removeAll();
		fPOI.add(set); }

	// specify the nuisance parameters (eg. the rest of the parameters)	// specify the nuisance parameters (eg. the rest of the parameters)

	virtual void SetNuisanceParameters(const RooArgSet& set) {fNuisParams = &set;}	virtual void SetNuisanceParameters(const RooArgSet& set) {fNuisParams .removeAll(); fNuisParams.add(set);}

	// set parameter values for the null if using a common PDF	// set parameter values for the null if using a common PDF

	virtual void SetNullParameters(const RooArgSet& set) {fNullParams = &	virtual void SetNullParameters(const RooArgSet& set) {fNullParams.rem
	set;}	oveAll(); fNullParams.add(set);}

	// set parameter values for the alternate if using a common PDF	// set parameter values for the alternate if using a common PDF

	virtual void SetAlternateParameters(const RooArgSet& set) {fAlternate Params = &set;}	virtual void SetAlternateParameters(const RooArgSet& set) {fAlternate Params.removeAll(); fAlternateParams.add(set);}

	protected:	protected:

	RooAbsPdf * GetPdf() const { return fPdf; }	RooAbsPdf * GetPdf() const { return fPdf; }
	RooAbsData * GetData() const { return fData; }	RooAbsData * GetData() const { return fData; }

	Double_t fSize; // size of the test (eg. specified rate of Type I err or)	Double_t fSize; // size of the test (eg. specified rate of Type I err or)

	RooAbsPdf * fPdf;	RooAbsPdf * fPdf;
	RooAbsData * fData;	RooAbsData * fData;

	const RooArgSet* fPOI; // RooArgSet specifying parameters of interes	RooArgSet fPOI; // RooArgSet specifying parameters of interest for i
	t for interval	nterval
	const RooArgSet* fNullParams; // RooArgSet specifying null parameters	RooArgSet fNullParams; // RooArgSet specifying null parameters for hy
	for hypothesis test	pothesis test
	const RooArgSet* fAlternateParams; // RooArgSet specifying alternate	RooArgSet fAlternateParams; // RooArgSet specifying alternate paramet
	parameters for hypothesis test // Is it used ????	ers for hypothesis test // Is it used ????
	const RooArgSet* fNuisParams;// RooArgSet specifying nuisance parame	RooArgSet fNuisParams;// RooArgSet specifying nuisance parameters fo
	ters for interval	r interval

	ClassDef(CombinedCalculator,1) // A base class that is for tools that can be both HypoTestCalculators and IntervalCalculators	ClassDef(CombinedCalculator,1) // A base class that is for tools that can be both HypoTestCalculators and IntervalCalculators

	};	};
	}	}

	#endif	#endif

End of changes. 13 change blocks.
	41 lines changed or deleted	29 lines changed or added

	ConfInterval.h	ConfInterval.h

	// @(#)root/roostats:$Id: ConfInterval.h 30512 2009-09-28 17:24:48Z moneta $	// @(#)root/roostats:$Id: ConfInterval.h 31276 2009-11-18 15:06:42Z moneta $
	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke
	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOSTATS_ConfInterval	#ifndef ROOSTATS_ConfInterval

	skipping to change at line 43	skipping to change at line 43
	// END_HTML	// END_HTML
	//	//
	//	//

	namespace RooStats {	namespace RooStats {

	class ConfInterval : public TNamed {	class ConfInterval : public TNamed {

	public:	public:


	ConfInterval() : TNamed() {}	// constructor given name and title
	ConfInterval(const char* name) : TNamed(name,name) {}	explicit ConfInterval(const char* name = 0) : TNamed(name,name) {}
	ConfInterval(const char* name, const char* title) : TNamed(name,title
	) {}	// destructor
	virtual ~ConfInterval() {}	virtual ~ConfInterval() {}


	//pure virtual? where does =0 go with const?	// check if given point is in the interval
	virtual Bool_t IsInInterval(const RooArgSet&) = 0;	virtual Bool_t IsInInterval(const RooArgSet&) const = 0;

	// used to set confidence level. Keep pure virtual	// used to set confidence level. Keep pure virtual
	virtual void SetConfidenceLevel(Double_t cl) = 0;	virtual void SetConfidenceLevel(Double_t cl) = 0;


	// return confidence level	// return confidence level
	virtual Double_t ConfidenceLevel() const = 0;	virtual Double_t ConfidenceLevel() const = 0;

	//
	// if so does this implement it?
	// private fSize;


	// do we want it to return list of parameters	// return list of parameters of interest defining this interval (retu rn a new cloned list)
	virtual RooArgSet* GetParameters() const = 0;	virtual RooArgSet* GetParameters() const = 0;


	// check if parameters are correct. (dummy implementation to start)	// check if parameters are correct (i.e. they are the POI of this int erval)
	virtual Bool_t CheckParameters(const RooArgSet&) const = 0;	virtual Bool_t CheckParameters(const RooArgSet&) const = 0;

	protected:	protected:


	ClassDef(ConfInterval,1) // Interface for Confidence Intervals	ClassDef(ConfInterval,1) // Interface for Confidence Intervals

	};	};
	}	}

	#endif	#endif

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

	ConfidenceBelt.h	ConfidenceBelt.h

	// @(#)root/roostats:$Id: ConfidenceBelt.cxx 26317 2009-01-13 15:31:05Z cra nmer $	// @(#)root/roostats:$Id: ConfidenceBelt.h 31276 2009-11-18 15:06:42Z monet a $
	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke
	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef RooStats_ConfidenceBelt	#ifndef RooStats_ConfidenceBelt

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

	DataOptions.h	DataOptions.h

	// @(#)root/mathcore:$Id: DataOptions.h 25486 2008-09-22 12:43:03Z moneta $	// @(#)root/mathcore:$Id: DataOptions.h 31180 2009-11-16 10:54:05Z moneta $
	// Author: L. Moneta Wed Aug 30 11:04:59 2006	// Author: L. Moneta Wed Aug 30 11:04:59 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 DataOptions	// Header file for class DataOptions

	skipping to change at line 33	skipping to change at line 33

	@ingroup FitData	@ingroup FitData
	*/	*/
	struct DataOptions {	struct DataOptions {

	/**	/**
	Default constructor: use the default options	Default constructor: use the default options
	*/	*/
	DataOptions () :	DataOptions () :
	fIntegral(false),	fIntegral(false),

		fBinVolume(false),
	fUseEmpty(false),	fUseEmpty(false),
	fUseRange(false),	fUseRange(false),
	fErrors1(false),	fErrors1(false),
	fCoordErrors(true),	fCoordErrors(true),
	fAsymErrors(true)	fAsymErrors(true)
	{}	{}

	bool fIntegral; // use integral of bin content instead of bin center (default is false)	bool fIntegral; // use integral of bin content instead of bin center (default is false)

		bool fBinVolume; // normalize data by the bin volume (it is used in th e Poisson likelihood fits)
	bool fUseEmpty; // use empty bins (default is false) with a fixed err or of 1	bool fUseEmpty; // use empty bins (default is false) with a fixed err or of 1
	bool fUseRange; // use the function range when creating the fit data (default is false)	bool fUseRange; // use the function range when creating the fit data (default is false)
	bool fErrors1; // use all errors equal to 1, i.e. fit without errors (default is false)	bool fErrors1; // use all errors equal to 1, i.e. fit without errors (default is false)
	bool fCoordErrors; // use errors on the x coordinates when available (de fault is true)	bool fCoordErrors; // use errors on the x coordinates when available (de fault is true)
	bool fAsymErrors; // use asymmetric errors in the value when available, selecting them according to the on sign of residual (default is true)	bool fAsymErrors; // use asymmetric errors in the value when available, selecting them according to the on sign of residual (default is true)

	};	};

	} // end namespace Fit	} // end namespace Fit


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

	DebuggingSampler.h	DebuggingSampler.h

	// @(#)root/roostats:$Id: DebuggingSampler.h 26805 2009-01-13 17:45:57Z cra nmer $	// @(#)root/roostats:$Id: DebuggingSampler.h 31276 2009-11-18 15:06:42Z mon eta $
	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke
	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOSTATS_DebuggingSampler	#ifndef ROOSTATS_DebuggingSampler

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

	DebuggingTestStat.h	DebuggingTestStat.h

	// @(#)root/roostats:$Id: DebuggingTestStat.h 26805 2009-01-13 17:45:57Z cr anmer $	// @(#)root/roostats:$Id: DebuggingTestStat.h 31276 2009-11-18 15:06:42Z mo neta $
	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke
	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOSTATS_DebuggingTestStat	#ifndef ROOSTATS_DebuggingTestStat

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

	Dinv.h	Dinv.h

	// @(#)root/smatrix:$Id: Dinv.h 30459 2009-09-25 15:38:26Z moneta $	// @(#)root/smatrix:$Id: Dinv.h 30561 2009-10-05 14:23:15Z moneta $
	// Authors: T. Glebe, L. Moneta 2005	// Authors: T. Glebe, L. Moneta 2005

	#ifndef ROOT_Math_Dinv	#ifndef ROOT_Math_Dinv
	#define ROOT_Math_Dinv	#define ROOT_Math_Dinv
	// ********************************************************************	// ********************************************************************
	//	//
	// source:	// source:
	//	//
	// type: source code	// type: source code
	//	//

	skipping to change at line 67	skipping to change at line 67
	Cramers rule.	Cramers rule.

	@author T. Glebe	@author T. Glebe
	*/	*/
	//========================================================================= =====	//========================================================================= =====
	// Inverter class	// Inverter class
	//========================================================================= =====	//========================================================================= =====
	template <unsigned int idim, unsigned int n = idim>	template <unsigned int idim, unsigned int n = idim>
	class Inverter {	class Inverter {
	public:	public:

	///	/// matrix inversion for a generic square matrix using LU factorization
		/// (code originally from CERNLIB and then ported in C++ for CLHEP)
		/// implementation is in file Math/MatrixInversion.icc
	template <class MatrixRep>	template <class MatrixRep>
	static bool Dinv(MatrixRep& rhs) {	static bool Dinv(MatrixRep& rhs) {


	#ifdef XXX
	if (n < 1 \|\| n > idim) {
	return false;
	}
	#endif

	#ifdef OLD_IMPL

	/* Initialized data */
	static unsigned int work[n];
	for(unsigned int i=0; i<n; ++i) work[i] = 0;

	static typename MatrixRep::value_type det = 0;

	/* Function Body */

	/* N.GT.3 CASES. FACTORIZE MATRIX AND INVERT. */
	if (Dfactir<MatrixRep,n,idim>(rhs,det,work) == false) {
	std::cerr << "Dfactir failed!!" << std::endl;
	return false;
	}
	return Dfinv<MatrixRep,n,idim>(rhs,work);
	#else

	/* Initialized data */	/* Initialized data */

	unsigned int work[n+1];	unsigned int work[n+1] = {0};
	for(unsigned int i=0; i<n+1; ++i) work[i] = 0;


	static typename MatrixRep::value_type det = 0;	static typename MatrixRep::value_type det(0);

	if (DfactMatrix(rhs,det,work) != 0) {	if (DfactMatrix(rhs,det,work) != 0) {
	std::cerr << "Dfact_matrix failed!!" << std::endl;	std::cerr << "Dfact_matrix failed!!" << std::endl;
	return false;	return false;
	}	}

	int ifail = DfinvMatrix(rhs,work);	int ifail = DfinvMatrix(rhs,work);
	if (ifail == 0) return true;	if (ifail == 0) return true;
	return false;	return false;

	#endif
	} // Dinv	} // Dinv


	// symmetric function (copy in a general one)	/// symmetric matrix inversion using
		/// Bunch-kaufman pivoting method
		/// implementation in Math/MatrixInversion.icc
	template <class T>	template <class T>
	static bool Dinv(MatRepSym<T,idim> & rhs) {	static bool Dinv(MatRepSym<T,idim> & rhs) {

	// not very efficient but need to re-do Dsinv for new storage of
	// symmetric matrices
	#ifdef OLD_IMPL
	MatRepStd<T,idim> tmp;
	for (unsigned int i = 0; i< idim*idim; ++i)
	tmp[i] = rhs[i];
	if (! Inverter<idim>::Dinv(tmp) ) return false;
	// recopy the data
	for (unsigned int i = 0; i< idim*n; ++i)
	rhs[i] = tmp[i];

	return true;
	#else
	int ifail = 0;	int ifail = 0;
	InvertBunchKaufman(rhs,ifail);	InvertBunchKaufman(rhs,ifail);
	if (ifail == 0) return true;	if (ifail == 0) return true;
	return false;	return false;

	#endif
	}	}

	/**	/**

	Bunch-Kaufman method for inversion of symmetric matrices	LU Factorization method for inversion of general square matrices
		(see implementation in Math/MatrixInversion.icc)
	*/	*/
	template <class T>	template <class T>
	static int DfactMatrix(MatRepStd<T,idim,n> & rhs, T & det, unsigned int * work);	static int DfactMatrix(MatRepStd<T,idim,n> & rhs, T & det, unsigned int * work);

		/**
		LU inversion of general square matrices. To be called after DFactMatri
		x
		(see implementation in Math/MatrixInversion.icc)
		*/
	template <class T>	template <class T>
	static int DfinvMatrix(MatRepStd<T,idim,n> & rhs, unsigned int * work);	static int DfinvMatrix(MatRepStd<T,idim,n> & rhs, unsigned int * work);

	/**	/**
	Bunch-Kaufman method for inversion of symmetric matrices	Bunch-Kaufman method for inversion of symmetric matrices
	*/	*/
	template <class T>	template <class T>
	static void InvertBunchKaufman(MatRepSym<T,idim> & rhs, int &ifail);	static void InvertBunchKaufman(MatRepSym<T,idim> & rhs, int &ifail);

	}; // class Inverter	}; // class Inverter

	skipping to change at line 234	skipping to change at line 203
	// Inverter<2>: Cramers rule	// Inverter<2>: Cramers rule
	//========================================================================= =====	//========================================================================= =====

	template <>	template <>
	class Inverter<2> {	class Inverter<2> {
	public:	public:
	///	///
	template <class MatrixRep>	template <class MatrixRep>
	static bool Dinv(MatrixRep& rhs) {	static bool Dinv(MatrixRep& rhs) {


	typename MatrixRep::value_type det = rhs[0] * rhs[3] - rhs[2] * rhs[1];	typedef typename MatrixRep::value_type T;
		T det = rhs[0] * rhs[3] - rhs[2] * rhs[1];


	if (det == 0.) { return false; }	if (det == T(0.) ) { return false; }


	// use 1.0f to remove warning on Windows	T s = T(1.0) / det;
	typename MatrixRep::value_type s = 1.0f / det;


	typename MatrixRep::value_type c11 = s * rhs[3];	T c11 = s * rhs[3];

	rhs[2] = -s * rhs[2];	rhs[2] = -s * rhs[2];
	rhs[1] = -s * rhs[1];	rhs[1] = -s * rhs[1];
	rhs[3] = s * rhs[0];	rhs[3] = s * rhs[0];
	rhs[0] = c11;	rhs[0] = c11;

	return true;	return true;
	}	}

	// specialization for the symmetric matrices	// specialization for the symmetric matrices
	template <class T>	template <class T>
	static bool Dinv(MatRepSym<T,2> & rep) {	static bool Dinv(MatRepSym<T,2> & rep) {

	T * rhs = rep.Array();	T * rhs = rep.Array();

	T det = rhs[0] * rhs[2] - rhs[1] * rhs[1];	T det = rhs[0] * rhs[2] - rhs[1] * rhs[1];


	if (det == 0.) { return false; }	if (det == T(0.)) { return false; }


	T s = 1.0f / det;	T s = T(1.0) / det;
	T c11 = s * rhs[2];	T c11 = s * rhs[2];

	rhs[1] = -s * rhs[1];	rhs[1] = -s * rhs[1];
	rhs[2] = s * rhs[0];	rhs[2] = s * rhs[0];
	rhs[0] = c11;	rhs[0] = c11;
	return true;	return true;
	}	}

	};	};

	/**	/**

	3x3 direct matrix inversion suing Cramer Rule	3x3 direct matrix inversion using Cramer Rule
	use only for FastInverter	use only for FastInverter
	*/	*/
	//========================================================================= =====	//========================================================================= =====
	// FastInverter<3>	// FastInverter<3>
	//========================================================================= =====	//========================================================================= =====

	template <>	template <>
	class FastInverter<3> {	class FastInverter<3> {
	public:	public:
	///	///

End of changes. 18 change blocks.
	54 lines changed or deleted	24 lines changed or added

	FCNBase.h	FCNBase.h

	// @(#)root/minuit2:$Id: FCNBase.h 21530 2007-12-20 11:14:35Z moneta $	// @(#)root/minuit2:$Id: FCNBase.h 30749 2009-10-15 16:33:04Z brun $
	// Authors: M. Winkler, F. James, L. Moneta, A. Zsenei 2003-2005	// Authors: M. Winkler, F. James, L. Moneta, A. Zsenei 2003-2005

	/**********************************************************************	/**********************************************************************
	* *	* *
	* Copyright (c) 2005 LCG ROOT Math team, CERN/PH-SFT *	* Copyright (c) 2005 LCG ROOT Math team, CERN/PH-SFT *
	* *	* *
	**********************************************************************/	**********************************************************************/

	#ifndef ROOT_Minuit2_FCNBase	#ifndef ROOT_Minuit2_FCNBase
	#define ROOT_Minuit2_FCNBase	#define ROOT_Minuit2_FCNBase

	skipping to change at line 102	skipping to change at line 102
	as Chi2(x+nsigma) = Chi2(x) + nn.	as Chi2(x+nsigma) = Chi2(x) + nn.

	\todo Comment a little bit better with links!!!!!!!!!!!!!!!!! Idem fo r ErrorDef()	\todo Comment a little bit better with links!!!!!!!!!!!!!!!!! Idem fo r ErrorDef()

	*/	*/

	virtual double Up() const = 0;	virtual double Up() const = 0;

	/**	/**
	add interface to set dynamically a new error definition	add interface to set dynamically a new error definition

	Re-implement this funciton if needed.	Re-implement this function if needed.
	*/	*/
	virtual void SetErrorDef(double ) {};	virtual void SetErrorDef(double ) {};

	};	};

	} // namespace Minuit2	} // namespace Minuit2

	} // namespace ROOT	} // namespace ROOT

	#endif // ROOT_Minuit2_FCNBase	#endif // ROOT_Minuit2_FCNBase

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

	Factory.h	Factory.h

	// @(#)root/tmva $Id: Factory.h 29122 2009-06-22 06:51:30Z brun $	// @(#)root/mathcore:$Id: Factory.h 21503 2007-12-19 17:34:54Z moneta $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss	// Author: L. Moneta Fri Dec 22 14:43:33 2006


	/**************************************************************************	/**********************************************************************
	********	* *
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis	* Copyright (c) 2006 LCG ROOT Math Team, CERN/PH-SFT *
	*	* *
	* Package: TMVA	* *
	*	**********************************************************************/
	* Class : Factory
	*	// Header file for class Factory
	* Web : http://tmva.sourceforge.net
	*	#ifndef ROOT_Math_Factory
	*	#define ROOT_Math_Factory
	*
	* Description:
	*
	* This is the main MVA steering class: it creates (books) all MVA met
	hods, *
	* and guides them through the training, testing and evaluation phases
	. *
	*
	*
	* Authors (alphabetical):
	*
	* Andreas Hoecker <Andreas.Hocker@cern.ch> - CERN, Switzerland
	*
	* Joerg Stelzer <stelzer@cern.ch> - DESY, Germany
	*
	* Peter Speckmayer <peter.speckmayer@cern.ch> - CERN, Switzerland
	*
	* Helge Voss <Helge.Voss@cern.ch> - MPI-K Heidelberg, German
	y *
	* Kai Voss <Kai.Voss@cern.ch> - U. of Victoria, Canada
	*
	*
	*
	* Copyright (c) 2005:
	*
	* CERN, Switzerland
	*
	* U. of Victoria, Canada
	*
	* MPI-K Heidelberg, Germany
	*
	*
	*
	* Redistribution and use in source and binary forms, with or without
	*
	* modification, are permitted according to the terms listed in LICENSE
	*
	* (http://tmva.sourceforge.net/LICENSE)
	*
	**************************************************************************
	********/

	#ifndef ROOT_TMVA_Factory
	#define ROOT_TMVA_Factory

	//////////////////////////////////////////////////////////////////////////
	// //
	// Factory //
	// //
	// This is the main MVA steering class: it creates all MVA methods, //
	// and guides them through the training, testing and evaluation //
	// phases //
	// //
	//////////////////////////////////////////////////////////////////////////

	#include <string>	#include <string>

	#include <vector>
	#include <map>
	#ifndef ROOT_TCut
	#include "TCut.h"
	#endif

	#ifndef ROOT_TMVA_Configurable
	#include "TMVA/Configurable.h"
	#endif
	#ifndef ROOT_TMVA_Types
	#include "TMVA/Types.h"
	#endif
	#ifndef ROOT_TMVA_DataSet
	#include "TMVA/DataSet.h"
	#endif

	class TFile;
	class TTree;
	class TDirectory;

	namespace TMVA {

	class IMethod;
	class MethodBase;
	class DataInputHandler;
	class DataSetInfo;
	class VariableTransformBase;

	class Factory : public Configurable {
	public:

	typedef std::vector<IMethod*> MVector;

	// no default constructor
	Factory( TString theJobName, TFile* theTargetFile, TString theOption
	= "" );

	// default destructor
	virtual ~Factory();

	virtual const char* GetName() const { return "Factory"; }

	// add events to training and testing trees
	void AddSignalTrainingEvent ( const std::vector<Double_t>& event,
	Double_t weight = 1.0 );
	void AddBackgroundTrainingEvent( const std::vector<Double_t>& event,
	Double_t weight = 1.0 );
	void AddSignalTestEvent ( const std::vector<Double_t>& event,
	Double_t weight = 1.0 );
	void AddBackgroundTestEvent ( const std::vector<Double_t>& event,
	Double_t weight = 1.0 );
	void AddTrainingEvent( const TString& className, const std::vector<Do
	uble_t>& event, Double_t weight );
	void AddTestEvent ( const TString& className, const std::vector<Do
	uble_t>& event, Double_t weight );
	void AddEvent ( const TString& className, Types::ETreeType tt,
	const std::vector<Double_t>& event, Double_t weight );
	Bool_t UserAssignEvents(UInt_t clIndex);
	TTree* CreateEventAssignTrees( const TString& name );

	DataSetInfo& AddDataSet( DataSetInfo& );
	DataSetInfo& AddDataSet( const TString& );

	// special case: signal/background

	// Data input related
	void SetInputTrees( const TString& signalFileName, const TString& bac
	kgroundFileName,
	Double_t signalWeight=1.0, Double_t backgroundWei
	ght=1.0 );
	void SetInputTrees( TTree* inputTree, const TCut& SigCut, const TCut&
	BgCut );
	// Set input trees at once
	void SetInputTrees( TTree* signal, TTree* background,
	Double_t signalWeight=1.0, Double_t backgroundWei
	ght=1.0) ;

	void AddSignalTree( TTree* signal, Double_t weight=1.0, Types::ETr
	eeType treetype = Types::kMaxTreeType );
	void AddSignalTree( TString datFileS, Double_t weight=1.0, Types::ETr
	eeType treetype = Types::kMaxTreeType );
	void AddSignalTree( TTree* signal, Double_t weight, const TString& tr
	eetype );

	// ... depreciated, kept for backwards compatibility
	void SetSignalTree( TTree* signal, Double_t weight=1.0);

	void AddBackgroundTree( TTree* background, Double_t weight=1.0, Types
	::ETreeType treetype = Types::kMaxTreeType );
	void AddBackgroundTree( TString datFileB, Double_t weight=1.0, Types
	::ETreeType treetype = Types::kMaxTreeType );
	void AddBackgroundTree( TTree* background, Double_t weight, const TSt
	ring & treetype );

	// ... depreciated, kept for backwards compatibility
	void SetBackgroundTree( TTree* background, Double_t weight=1.0 );

	void SetSignalWeightExpression( const TString& variable );
	void SetBackgroundWeightExpression( const TString& variable );

	// special case: regression
	void AddRegressionTree( TTree* tree, Double_t weight = 1.0,
	Types::ETreeType treetype = Types::kMaxTreeTy
	pe ) {
	AddTree( tree, "Regression", weight, "", treetype );
	}

	// general

	// Data input related
	void SetTree( TTree* tree, const TString& className, Double_t weight
	); // depreciated
	void AddTree( TTree* tree, const TString& className, Double_t weight=
	1.0,
	const TCut& cut = "",
	Types::ETreeType tt = Types::kMaxTreeType );
	void AddTree( TTree* tree, const TString& className, Double_t weight,
	const TCut& cut, const TString& treeType );

	// set input variable
	void SetInputVariables ( std::vector<TString>* theVariables ); // de
	preciated
	void AddVariable ( const TString& expression, const TString& t
	itle, const TString& unit,
	char type='F', Double_t min = 0, Double_t m
	ax = 0 );
	void AddVariable ( const TString& expression, char type='F',
	Double_t min = 0, Double_t max = 0 );
	void AddTarget ( const TString& expression, const TString& t
	itle = "", const TString& unit = "",
	Double_t min = 0, Double_t max = 0 );
	void AddRegressionTarget( const TString& expression, const TString& t
	itle = "", const TString& unit = "",
	Double_t min = 0, Double_t max = 0 )
	{
	AddTarget( expression, title, unit, min, max );
	}
	void AddSpectator ( const TString& expression, const TString&
	title = "", const TString& unit = "",
	Double_t min = 0, Double_t max = 0 );

	// set weight for class
	void SetWeightExpression( const TString& variable, const TString& cla
	ssName = "" );

	// set cut for class
	void SetCut( const TString& cut, const TString& className = "" );
	void SetCut( const TCut& cut, const TString& className = "" );
	void AddCut( const TString& cut, const TString& className = "" );
	void AddCut( const TCut& cut, const TString& className = "" );

	// prepare input tree for training
	void PrepareTrainingAndTestTree( const TCut& cut, const TString& spli
	tOpt );
	void PrepareTrainingAndTestTree( TCut sigcut, TCut bkgcut, const TStr
	ing& splitOpt );

	// ... deprecated, kept for backwards compatibility
	void PrepareTrainingAndTestTree( const TCut& cut, Int_t Ntrain, Int_t
	Ntest = -1 );

	void PrepareTrainingAndTestTree( const TCut& cut, Int_t NsigTrain, In
	t_t NbkgTrain, Int_t NsigTest, Int_t NbkgTest,
	const TString& otherOpt="SplitMode=R
	andom:!V" );

	MethodBase* BookMethod( TString theMethodName, TString methodTitle, T
	String theOption = "" );
	MethodBase* BookMethod( Types::EMVA theMethod, TString methodTitle,
	TString theOption = "" );
	MethodBase* BookMethod( TMVA::Types::EMVA /theMethod/,
	TString /methodTitle/,
	TString /methodOption/,
	TMVA::Types::EMVA /theCommittee/,
	TString /committeeOption = ""/ ) { return 0
	; }

	// training for all booked methods
	void TrainAllMethods ( TString what = "Classification
	" );
	void TrainAllMethodsForClassification( void ) { TrainAllMethods( "Cla
	ssification" ); }
	void TrainAllMethodsForRegression ( void ) { TrainAllMethods( "Reg
	ression" ); }

	// testing
	void TestAllMethods();

	// performance evaluation
	void EvaluateAllMethods( void );
	void EvaluateAllVariables( TString options = "" );

	// delete all methods and reset the method vector
	void DeleteAllMethods( void );

	// accessors
	IMethod* GetMethod( const TString& title ) const;

	Bool_t Verbose( void ) const { return fVerbose; }
	void SetVerbose( Bool_t v=kTRUE );

	// make ROOT-independent C++ class for classifier response
	// (classifier-specific implementation)
	// If no classifier name is given, help messages for all booked
	// classifiers are printed
	virtual void MakeClass( const TString& methodTitle = "" ) const;

	// prints classifier-specific hepl messages, dedicated to
	// help with the optimisation and configuration options tuning.
	// If no classifier name is given, help messages for all booked
	// classifiers are printed
	void PrintHelpMessage( const TString& methodTitle = "" ) const;

	static TDirectory* RootBaseDir() { return (TDirectory*)fgTargetFile;
	}

	private:

	// the beautiful greeting message
	void Greetings();

	void WriteDataInformation();

	DataInputHandler& DataInput() { return *fDataInputHandler; }
	DataSetInfo& DefaultDataSetInfo();
	void SetInputTreesFromEventAssignTrees();

	private:

	// data members

	static TFile* fgTargetFile; //! ROOT
	output file

	DataInputHandler* fDataInputHandler;

	std::vector<TMVA::VariableTransformBase*> fDefaultTrfs; //! list
	of transformations on default DataSet

	// cd to local directory
	TString fOptions; //! optio
	n string given by construction (presently only "V")
	TString fTransformations; //! List
	of transformations to test
	Bool_t fVerbose; //! verbo
	se mode

	MVector fMethods; //! all M
	VA methods
	TString fJobName; //! jobna
	me, used as extension in weight file names

	// flag determining the way training and test data are assigned to Fa
	ctory
	enum DataAssignType { kUndefined = 0,
	kAssignTrees,
	kAssignEvents };
	DataAssignType fDataAssignType; //! flags
	for data assigning
	std::vector<TTree*> fTrainAssignTree; //! for e
	ach class: tmp tree if user wants to assign the events directly
	std::vector<TTree*> fTestAssignTree; //! for e
	ach class: tmp tree if user wants to assign the events directly

	Int_t fATreeType; // typ
	e of event (=classIndex)
	Float_t fATreeWeight; // wei
	ght of the event
	Float_t* fATreeEvent; // eve
	nt variables


	protected:	namespace ROOT {

		namespace Math {

		class Minimizer;

		//_________________________________________________________________________
		__
		/**
		Factory class holding static functions to create the interfaces like RO
		OT::Math::Minimizer
		via the Plugin Manager
		*/
		class Factory {
		public:

		/**
		static method to create the corrisponding Minimizer given the string
		*/
		static ROOT::Math::Minimizer * CreateMinimizer(const std::string & minim
		izerType = "Minuit2", const std::string & algoType = "Migrad");

		};


	ClassDef(Factory,0) // The factory creates all MVA methods, and perf	} // end namespace Fit
	orms their training and testing
	};


	} // namespace TMVA	} // end namespace ROOT


	#endif	#endif /* ROOT_Fit_MinimizerFactory */

End of changes. 7 change blocks.
	342 lines changed or deleted	38 lines changed or added

	FastAllocString.h	FastAllocString.h

	skipping to change at line 22	skipping to change at line 22
	* For the licensing terms see the file COPYING	* For the licensing terms see the file COPYING
	*	*
	************************************************************************/	************************************************************************/

	#ifndef G__FASTALLOGSTRING_H	#ifndef G__FASTALLOGSTRING_H
	#define G__FASTALLOGSTRING_H	#define G__FASTALLOGSTRING_H

	#include <stdarg.h>	#include <stdarg.h>
	#include <stddef.h>	#include <stddef.h>


		// For G__EXPORT
		#include "G__ci.h"

	namespace Cint {	namespace Cint {
	namespace Internal {	namespace Internal {
	class G__BufferReservoir;	class G__BufferReservoir;
	}	}
	}	}

	//_____________________________________________________________	//_____________________________________________________________
	//	//
	// A tiny object representing a char array.	// A tiny object representing a char array.
	// Create it with the desired size of the char array and it	// Create it with the desired size of the char array and it

	skipping to change at line 46	skipping to change at line 49
	// the used stack size by functions previsouly using static	// the used stack size by functions previsouly using static
	// size, stack based chart arrays. It also allows to make the	// size, stack based chart arrays. It also allows to make the
	// buffer size dynamic, adopted e.g. to strlen(expression),	// buffer size dynamic, adopted e.g. to strlen(expression),
	// instead of a value defined at compile time (a la G__LONGBUF).	// instead of a value defined at compile time (a la G__LONGBUF).
	// When the G__FastAllocString object leaves the scope it will put its	// When the G__FastAllocString object leaves the scope it will put its
	// buffer (back) into the internal buffer reservoir for later	// buffer (back) into the internal buffer reservoir for later
	// use by a G__FastAllocString object requesting a same of smaller size	// use by a G__FastAllocString object requesting a same of smaller size
	// buffer. This class is optimized for both speed and low memory	// buffer. This class is optimized for both speed and low memory
	// use despite the reservoir.	// use despite the reservoir.
	//	//

	class G__FastAllocString {	class
		#ifndef __CINT__
		G__EXPORT
		#endif
		G__FastAllocString {
	public:	public:
	G__FastAllocString(int reqsize = 1024): fBuf(0), fCapacity(reqsize) {	G__FastAllocString(int reqsize = 1024): fBuf(0), fCapacity(reqsize) {
	// GetBuf takes as parameter the size in bytes	// GetBuf takes as parameter the size in bytes
	// and modify the parameter (fBucket) to hold the	// and modify the parameter (fBucket) to hold the
	// bucket number.	// bucket number.
	fBuf = GetBuf(fCapacity);	fBuf = GetBuf(fCapacity);
	}	}
	G__FastAllocString(const char* s);	G__FastAllocString(const char* s);
	G__FastAllocString(const G__FastAllocString&);	G__FastAllocString(const G__FastAllocString&);

	~G__FastAllocString();	~G__FastAllocString();


	// plenty of char* conversion fuctions:	// plenty of char* conversion functions:
	operator char*() { return fBuf; }	operator char*() { return fBuf; }
	operator const char*() const { return fBuf; }	operator const char*() const { return fBuf; }
	const char* operator()() const { return fBuf; }	const char* operator()() const { return fBuf; }

	// DON'T: these create ambiguities with ::op[char*, int] etc	// DON'T: these create ambiguities with ::op[char*, int] etc
	//char& operator[](int i) { return fBuf[i]; }	//char& operator[](int i) { return fBuf[i]; }
	//char operator[](int i) const { return fBuf[i]; }	//char operator[](int i) const { return fBuf[i]; }
	//char* operator+(int i) { return fBuf + i; }	//char* operator+(int i) { return fBuf + i; }
	//const char* operator+(int i) const { return fBuf + i; }	//const char* operator+(int i) const { return fBuf + i; }


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

	Foption.h	Foption.h

	/* @(#)root/hist:$Id: Foption.h 25487 2008-09-22 12:44:13Z moneta $ */	/* @(#)root/hist:$Id: Foption.h 31207 2009-11-16 16:52:00Z moneta $ */

	/*************************************************************************	/*************************************************************************
	* 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_Foption	#ifndef ROOT_Foption

	skipping to change at line 29	skipping to change at line 29
	// //	// //
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////

	struct Foption_t {	struct Foption_t {
	//- chopt may be the concatenation of the following options:	//- chopt may be the concatenation of the following options:
	//- =======================================================	//- =======================================================
	//-	//-
	//- The following structure members are set to 1 if the option is selec ted:	//- The following structure members are set to 1 if the option is selec ted:
	int Quiet; // "Q" Quiet mode. No print	int Quiet; // "Q" Quiet mode. No print
	int Verbose; // "V" Verbose mode. Print results after each iteratio n	int Verbose; // "V" Verbose mode. Print results after each iteratio n

	int Bound; // "B" Some or all parameters are bounded	int Bound; // "B" When using pre-defined functions user parameter
	int Like; // "L" Use Log Likelihood. Default is chisquare method	settings are used instead of default one
		int Chi2; // "X" For fitting THnsparse use chi2 method (default
		is likelihood)
		int Like; // "L" Use Log Likelihood. Default is chisquare method
		except fitting THnsparse
	int User; // "U" Use a User specified fitting algorithm (via Set FCN)	int User; // "U" Use a User specified fitting algorithm (via Set FCN)
	int W1; // "W" Set all the weights to 1. Ignore error bars	int W1; // "W" Set all the weights to 1. Ignore error bars
	int Errors; // "E" Performs a better error evaluation, calling HES SE and MINOS	int Errors; // "E" Performs a better error evaluation, calling HES SE and MINOS
	int More; // "M" Improve fit results.	int More; // "M" Improve fit results.
	int Range; // "R" Use the range stored in function	int Range; // "R" Use the range stored in function
	int Gradient; // "G" Option to compute derivatives analytically	int Gradient; // "G" Option to compute derivatives analytically
	int Nostore; // "N" If set, do not store the function graph	int Nostore; // "N" If set, do not store the function graph
	int Nograph; // "0" If set, do not display the function graph	int Nograph; // "0" If set, do not display the function graph
	int Plus; // "+" Add new function (default is replace)	int Plus; // "+" Add new function (default is replace)
	int Integral; // "I" Use function integral instead of function in ce nter of bin	int Integral; // "I" Use function integral instead of function in ce nter of bin
	int Nochisq; // "C" In case of linear fitting, don't calculate the chisquare	int Nochisq; // "C" In case of linear fitting, don't calculate the chisquare
	int Minuit; // "F" If fitting a polN, switch to minuit fitter	int Minuit; // "F" If fitting a polN, switch to minuit fitter

	int Robust; // "ROB" For a TGraph use robust fitting	int NoErrX; // "EX0" or "T" When fitting a TGraphErrors do not cons
		ider error in coordinates
		int Robust; // "ROB" or "H": For a TGraph use robust fitting
		int StoreResult; // "S": Stores the result in a TFitResult structure
	double hRobust; // value of h parameter used in robust fitting	double hRobust; // value of h parameter used in robust fitting

	Foption_t() :	Foption_t() :

	Quiet (0),	Quiet (0),
	Verbose (0),	Verbose (0),
	Bound (0),	Bound (0),
	Like (0),	Chi2 (0),
	User (0),	Like (0),
	W1 (0),	User (0),
	Errors (0),	W1 (0),
	More (0),	Errors (0),
	Range (0),	More (0),
	Gradient (0),	Range (0),
	Nostore (0),	Gradient (0),
	Nograph (0),	Nostore (0),
	Plus (0),	Nograph (0),
	Integral (0),	Plus (0),
	Nochisq (0),	Integral (0),
	Minuit (0),	Nochisq (0),
	Robust (0),	Minuit (0),
	hRobust (0)	NoErrX (0),
		Robust (0),
		StoreResult (0),
		hRobust (0)
	{}	{}
	};	};

	#endif	#endif

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

	HFitInterface.h	HFitInterface.h

	// @(#)root/hist:$Id: HFitInterface.h 26866 2008-12-12 10:50:07Z moneta $	// @(#)root/hist:$Id: HFitInterface.h 31207 2009-11-16 16:52:00Z moneta $
	// Author: L. Moneta Thu Aug 31 10:40:20 2006	// Author: L. Moneta Thu Aug 31 10:40:20 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 HFitInterface	// Header file for class HFitInterface
	// set of free functions used to couple the ROOT data object with the fitti ng classes	// set of free functions used to couple the ROOT data object with the fitti ng classes

	// avoid including this file when running CINT since free functions cannot be re-defined	// avoid including this file when running CINT since free functions cannot be re-defined
	#if !defined(__CINT__) \|\| defined(__MAKECINT__)	#if !defined(__CINT__) \|\| defined(__MAKECINT__)

	#ifndef ROOT_HFitInterface	#ifndef ROOT_HFitInterface
	#define ROOT_HFitInterface	#define ROOT_HFitInterface

	class TH1;	class TH1;

		class THnSparse;
	class TF1;	class TF1;
	class TF2;	class TF2;
	class TGraph;	class TGraph;
	class TGraphErrors;	class TGraphErrors;
	class TGraph2D;	class TGraph2D;
	class TMultiGraph;	class TMultiGraph;
	struct Foption_t;	struct Foption_t;


		#include "TFitResultPtr.h"

	namespace ROOT {	namespace ROOT {

	namespace Math {	namespace Math {
	class MinimizerOptions;	class MinimizerOptions;
	}	}

	namespace Fit {	namespace Fit {

	//class BinData;	//class BinData;
	class FitResult;	class FitResult;
	class DataRange;	class DataRange;
	class BinData;	class BinData;
	class UnBinData;	class UnBinData;

		class SparseData;

	#ifndef __CINT__ // does not link on Windows (why ??)	#ifndef __CINT__ // does not link on Windows (why ??)

	/**	/**

		Decode list of options into fitOption
		*/
		void FitOptionsMake(const char *option, Foption_t &fitOption);

		/**
	fitting function for a TH1 (called from TH1::Fit)	fitting function for a TH1 (called from TH1::Fit)
	*/	*/

	int FitObject(TH1 * h1, TF1 f1, Foption_t & option, const ROOT::Math ::MinimizerOptions & moption, const char goption, ROOT::Fit::DataRange & r ange);	TFitResultPtr FitObject(TH1 * h1, TF1 f1, Foption_t & option, const ROOT::Math::MinimizerOptions & moption, const char goption, ROOT::Fit::Dat aRange & range);

	/**	/**
	fitting function for a TGraph (called from TGraph::Fit)	fitting function for a TGraph (called from TGraph::Fit)
	*/	*/

	int FitObject(TGraph * gr, TF1 f1 , Foption_t & option , const ROOT: :Math::MinimizerOptions & moption, const char goption, ROOT::Fit::DataRang e & range);	TFitResultPtr FitObject(TGraph * gr, TF1 f1 , Foption_t & option , c onst ROOT::Math::MinimizerOptions & moption, const char goption, ROOT::Fit ::DataRange & range);

	/**	/**
	fitting function for a MultiGraph (called from TMultiGraph::Fit)	fitting function for a MultiGraph (called from TMultiGraph::Fit)
	*/	*/

	int FitObject(TMultiGraph * mg, TF1 f1 , Foption_t & option , const ROOT::Math::MinimizerOptions & moption, const char goption, ROOT::Fit::Dat aRange & range);	TFitResultPtr FitObject(TMultiGraph * mg, TF1 f1 , Foption_t & optio n , const ROOT::Math::MinimizerOptions & moption, const char goption, ROOT ::Fit::DataRange & range);

	/**	/**
	fitting function for a TGraph2D (called from TGraph2D::Fit)	fitting function for a TGraph2D (called from TGraph2D::Fit)
	*/	*/

	int FitObject(TGraph2D * gr, TF1 *f1 , Foption_t & option , const ROO	TFitResultPtr FitObject(TGraph2D * gr, TF1 *f1 , Foption_t & option ,
	T::Math::MinimizerOptions & moption, const char *goption, ROOT::Fit::DataRa	const ROOT::Math::MinimizerOptions & moption, const char *goption, ROOT::F
	nge & range);	it::DataRange & range);

		/**
		fitting function for a THnSparse (called from THnSparse::Fit)
		*/
		TFitResultPtr FitObject(THnSparse * s1, TF1 *f1, Foption_t & option,
		const ROOT::Math::MinimizerOptions & moption, const char *goption, ROOT::Fi
		t::DataRange & range);
	#endif	#endif

	/**	/**
	fit an unbin data set (from tree or from histogram buffer)	fit an unbin data set (from tree or from histogram buffer)
	using a TF1 pointer and fit options.	using a TF1 pointer and fit options.
	N.B. ownership of fit data is passed to the UnBinFit function whi ch will be responsible of	N.B. ownership of fit data is passed to the UnBinFit function whi ch will be responsible of
	deleting the data after the fit. User calling this function MUST NOT delete UnBinData after	deleting the data after the fit. User calling this function MUST NOT delete UnBinData after
	calling it.	calling it.
	*/	*/
	int UnBinFit(ROOT::Fit::UnBinData * data, TF1 * f1 , Foption_t & opti on , const ROOT::Math::MinimizerOptions & moption);	int UnBinFit(ROOT::Fit::UnBinData * data, TF1 * f1 , Foption_t & opti on , const ROOT::Math::MinimizerOptions & moption);

	/**	/**
	fill the data vector from a TH1. Pass also the TF1 function which is	fill the data vector from a TH1. Pass also the TF1 function which is
	needed in case of integral option and to reject points rejected b y the function	needed in case of integral option and to reject points rejected b y the function
	*/	*/
	void FillData ( BinData & dv, const TH1 * hist, TF1 * func = 0);	void FillData ( BinData & dv, const TH1 * hist, TF1 * func = 0);

	/**	/**

		fill the data vector from a TH1 with sparse data. Pass also the T
		F1 function which is
		needed in case of integral option and to reject points rejected b
		y the function
		*/
		void FillData ( SparseData & dv, const TH1 * hist, TF1 * func = 0);

		/**
		fill the data vector from a THnSparse. Pass also the TF1 function
		which is
		needed in case of integral option and to reject points rejected b
		y the function
		*/
		void FillData ( SparseData & dv, const THnSparse * hist, TF1 * func
		= 0);

		/**
		fill the data vector from a THnSparse. Pass also the TF1 function
		which is
		needed in case of integral option and to reject points rejected b
		y the function
		*/
		void FillData ( BinData & dv, const THnSparse * hist, TF1 * func = 0
		);

		/**
	fill the data vector from a TGraph2D. Pass also the TF1 function which is	fill the data vector from a TGraph2D. Pass also the TF1 function which is
	needed in case of integral option and to reject points rejected b y the function	needed in case of integral option and to reject points rejected b y the function
	*/	*/
	void FillData ( BinData & dv, const TGraph2D * gr, TF1 * func = 0);	void FillData ( BinData & dv, const TGraph2D * gr, TF1 * func = 0);

	/**	/**
	fill the data vector from a TGraph. Pass also the TF1 function wh ich is	fill the data vector from a TGraph. Pass also the TF1 function wh ich is
	needed in case to exclude points rejected by the function	needed in case to exclude points rejected by the function
	*/	*/
	void FillData ( BinData & dv, const TGraph * gr, TF1 * func = 0 );	void FillData ( BinData & dv, const TGraph * gr, TF1 * func = 0 );
	/**	/**
	fill the data vector from a TMultiGraph. Pass also the TF1 functi on which is	fill the data vector from a TMultiGraph. Pass also the TF1 functi on which is
	needed in case to exclude points rejected by the function	needed in case to exclude points rejected by the function
	*/	*/
	void FillData ( BinData & dv, const TMultiGraph * gr, TF1 * func = 0);	void FillData ( BinData & dv, const TMultiGraph * gr, TF1 * func = 0);

	/**	/**

		compute initial parameter for an exponential function given the f
		it data
		Set the constant and slope assuming a simple exponential going th
		rough xmin and xmax
		of the data set
		*/
		void InitExpo(const ROOT::Fit::BinData & data, TF1 * f1 );

		/**
	compute initial parameter for gaussian function given the fit dat a	compute initial parameter for gaussian function given the fit dat a
	Set the sigma limits for zero top 10* initial rms values	Set the sigma limits for zero top 10* initial rms values
	Set the initial parameter values in the TF1	Set the initial parameter values in the TF1
	*/	*/
	void InitGaus(const ROOT::Fit::BinData & data, TF1 * f1 );	void InitGaus(const ROOT::Fit::BinData & data, TF1 * f1 );

	/**	/**

		compute initial parameter for 2D gaussian function given the fit
		data
		Set the sigma limits for zero top 10* initial rms values
		Set the initial parameter values in the TF1
		*/
		void Init2DGaus(const ROOT::Fit::BinData & data, TF1 * f1 );

		/**
	compute confidence intervals at level cl for a fitted histogram h1 in a TGraphErrors gr	compute confidence intervals at level cl for a fitted histogram h1 in a TGraphErrors gr
	*/	*/
	bool GetConfidenceIntervals(const TH1 * h1, const ROOT::Fit::FitResul t & r, TGraphErrors * gr, double cl = 0.95);	bool GetConfidenceIntervals(const TH1 * h1, const ROOT::Fit::FitResul t & r, TGraphErrors * gr, double cl = 0.95);

	} // end namespace Fit	} // end namespace Fit

	} // end namespace ROOT	} // end namespace ROOT

	#endif /* ROOT_Fit_TH1Interface */	#endif /* ROOT_Fit_TH1Interface */


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

	HLFactory.h	HLFactory.h

	// @(#)root/roostats:$Id$	// @(#)root/roostats:$Id: HLFactory.h 31276 2009-11-18 15:06:42Z moneta $

	/*************************************************************************	/*************************************************************************
	* Project: RooStats *	* Project: RooStats *
	* Package: RooFit/RooStats *	* Package: RooFit/RooStats *
	* Authors: *	* Authors: *
	* Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke *	* Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke *
	*************************************************************************	*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *

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

	HelperOps.h	HelperOps.h

	// @(#)root/smatrix:$Id: HelperOps.h 20882 2007-11-19 11:31:26Z rdm $	// @(#)root/smatrix:$Id: HelperOps.h 30749 2009-10-15 16:33:04Z brun $
	// Authors: J. Palacios 2006	// Authors: J. Palacios 2006

	#ifndef ROOT_Math_HelperOps	#ifndef ROOT_Math_HelperOps
	#define ROOT_Math_HelperOps 1	#define ROOT_Math_HelperOps 1

	// Include files	// Include files

	/** @class HelperOps HelperOps.h Math/HelperOps.h	/** @class HelperOps HelperOps.h Math/HelperOps.h
	*	*
	*	*

	skipping to change at line 136	skipping to change at line 136
	{	{
	STATIC_CHECK(0==1, Cannot_assign_general_to_symmetric_matrix);	STATIC_CHECK(0==1, Cannot_assign_general_to_symmetric_matrix);
	}	}

	}; // struct Assign	}; // struct Assign

	/**	/**
	Force Expression evaluation from general to symmetric.	Force Expression evaluation from general to symmetric.
	To be used when is known (like in similarity products) that the resu lt	To be used when is known (like in similarity products) that the resu lt
	is symmetric	is symmetric

	Note this is funciton used in the simmilarity product: no check for temporary is	Note this is function used in the simmilarity product: no check for temporary is
	done since in that case is not needed	done since in that case is not needed
	*/	*/
	struct AssignSym	struct AssignSym
	{	{
	/// assign a symmetric matrix from an expression	/// assign a symmetric matrix from an expression
	template <class T,	template <class T,
	unsigned int D,	unsigned int D,
	class A,	class A,
	class R>	class R>
	static void Evaluate(SMatrix<T,D,D,MatRepSym<T,D> >& lhs, const Expr <A,T,D,D,R>& rhs)	static void Evaluate(SMatrix<T,D,D,MatRepSym<T,D> >& lhs, const Expr <A,T,D,D,R>& rhs)

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

	Hepevt.h	Hepevt.h

	/* @(#)root/eg:$Id: Hepevt.h 23336 2008-04-20 06:44:09Z brun $ */	/* @(#)root/eg:$Id: Hepevt.h 30815 2009-10-20 13:49:22Z rdm $ */

	/*************************************************************************	/*************************************************************************
	* 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_Hepevt	#ifndef ROOT_Hepevt
	#define ROOT_Hepevt	#define ROOT_Hepevt


		#ifndef ROOT_Rtypes
		#include "Rtypes.h"
		#endif

	extern "C" {	extern "C" {

	#ifndef __CFORTRAN_LOADED	#ifndef __CFORTRAN_LOADED
	#include "cfortran.h"	#include "cfortran.h"
	#endif	#endif

	typedef struct {	typedef struct {
	Int_t nevhep;	Int_t nevhep;
	Int_t nhep;	Int_t nhep;
	Int_t isthep[4000];	Int_t isthep[4000];

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

	HybridCalculator.h	HybridCalculator.h

	// @(#)root/roostats:$Id: HybridCalculator.h 30462 2009-09-25 16:05:55Z mon eta $	// @(#)root/roostats:$Id: HybridCalculator.h 31285 2009-11-18 16:38:36Z mon eta $

	/*************************************************************************	/*************************************************************************
	* Project: RooStats *	* Project: RooStats *
	* Package: RooFit/RooStats *	* Package: RooFit/RooStats *
	* Authors: *	* Authors: *
	* Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke *	* Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke *
	*************************************************************************	*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *

	skipping to change at line 25	skipping to change at line 25

	#ifndef ROOSTATS_HybridCalculator	#ifndef ROOSTATS_HybridCalculator
	#define ROOSTATS_HybridCalculator	#define ROOSTATS_HybridCalculator

	#ifndef ROOSTATS_HypoTestCalculator	#ifndef ROOSTATS_HypoTestCalculator
	#include "RooStats/HypoTestCalculator.h"	#include "RooStats/HypoTestCalculator.h"
	#endif	#endif

	#include <vector>	#include <vector>


	#ifndef ROOSTATS_HypoTestResult	#ifndef ROOSTATS_HybridResult
	#include "RooStats/HybridResult.h"	#include "RooStats/HybridResult.h"
	#endif	#endif

	#ifndef ROOSTATS_ModelConfig	#ifndef ROOSTATS_ModelConfig
	#include "RooStats/ModelConfig.h"	#include "RooStats/ModelConfig.h"
	#endif	#endif

	class TH1;	class TH1;

	namespace RooStats {	namespace RooStats {


		class HybridResult;

	class HybridCalculator : public HypoTestCalculator , public TNamed {	class HybridCalculator : public HypoTestCalculator , public TNamed {

	public:	public:


	/// Dummy Constructor with only name and title	/// Dummy Constructor with only name
	HybridCalculator(const char *name = 0,	explicit HybridCalculator(const char *name = 0);
	const char *title = 0);
		/// Constructor for HybridCalculator from pdf instances but without a
	/// Constructor for HybridCalculator	data-set
	HybridCalculator(const char *name,	HybridCalculator(RooAbsPdf& sb_model,
	const char *title,
	RooAbsPdf& sb_model,
	RooAbsPdf& b_model,	RooAbsPdf& b_model,
	RooArgList& observables,	RooArgList& observables,
	const RooArgSet* nuisance_parameters = 0,	const RooArgSet* nuisance_parameters = 0,
	RooAbsPdf* prior_pdf = 0,	RooAbsPdf* prior_pdf = 0,

	bool GenerateBinned = false); //Nils 31.7.09	bool GenerateBinned = false, int testStatistics = 1, int ntoys = 1000 );

	/// Constructor for HybridCalculator using a data set and pdf instan ces	/// Constructor for HybridCalculator using a data set and pdf instan ces
	HybridCalculator(RooAbsData& data,	HybridCalculator(RooAbsData& data,
	RooAbsPdf& sb_model,	RooAbsPdf& sb_model,
	RooAbsPdf& b_model,	RooAbsPdf& b_model,
	const RooArgSet* nuisance_parameters = 0,	const RooArgSet* nuisance_parameters = 0,
	RooAbsPdf* prior_pdf = 0,	RooAbsPdf* prior_pdf = 0,

	bool GenerateBinned = false); //Nils 31.7.09	bool GenerateBinned = false, int testStatistics = 1,
		int ntoys = 1000 );
	/// Constructor for HybridCalculator using name, title, a data set an
	d pdf instances
	HybridCalculator(const char *name,
	const char *title,
	RooAbsData& data,
	RooAbsPdf& sb_model,
	RooAbsPdf& b_model,
	const RooArgSet* nuisance_parameters = 0,
	RooAbsPdf* prior_pdf = 0,
	bool GenerateBinned = false); //Nils 31.7.09


	/// Constructor for HybridCalculator with ModelConfig	/// Constructor passing a ModelConfig for the SBmodel and a ModelConf
	HybridCalculator(const char *name,	ig for the B Model
	const char *title,	HybridCalculator(RooAbsData& data,
	RooAbsData& data,
	const ModelConfig& sb_model,	const ModelConfig& sb_model,

	const ModelConfig& b_model);	const ModelConfig& b_model,
		bool GenerateBinned = false, int testStatistics = 1,
		int ntoys = 1000 );

	public:	public:

	/// Destructor of HybridCalculator	/// Destructor of HybridCalculator
	virtual ~HybridCalculator();	virtual ~HybridCalculator();

	/// inherited methods from HypoTestCalculator interface	/// inherited methods from HypoTestCalculator interface
	virtual HybridResult* GetHypoTest() const;	virtual HybridResult* GetHypoTest() const;

	// inherited setter methods from HypoTestCalculator	// inherited setter methods from HypoTestCalculator

	skipping to change at line 120	skipping to change at line 108
	// additional methods specific for HybridCalculator	// additional methods specific for HybridCalculator
	// set a prior pdf for the nuisance parameters	// set a prior pdf for the nuisance parameters
	void SetNuisancePdf(RooAbsPdf & prior_pdf) {	void SetNuisancePdf(RooAbsPdf & prior_pdf) {
	fPriorPdf = &prior_pdf;	fPriorPdf = &prior_pdf;
	fUsePriorPdf = true; // if set by default turn it on	fUsePriorPdf = true; // if set by default turn it on
	}	}

	// set the nuisance parameters to be marginalized	// set the nuisance parameters to be marginalized
	void SetNuisanceParameters(const RooArgSet & params) { fNuisanceParam eters = &params; }	void SetNuisanceParameters(const RooArgSet & params) { fNuisanceParam eters = &params; }


	// set number of toy MC	// set number of toy MC (Default is 1000)
	void SetNumberOfToys(unsigned int ntoys) { fNToys = ntoys; }	void SetNumberOfToys(unsigned int ntoys) { fNToys = ntoys; }

		unsigned int GetNumberOfToys() { return fNToys; }

		// return number of toys used
		unsigned int GetNumberOfToys() const { return fNToys; }

	// control use of the pdf for the nuisance parameter and marginalize them	// control use of the pdf for the nuisance parameter and marginalize them
	void UseNuisance(bool on = true) { fUsePriorPdf = on; }	void UseNuisance(bool on = true) { fUsePriorPdf = on; }

	// control to use bin data generation	// control to use bin data generation
	void SetGenerateBinned(bool on = true) { fGenerateBinned = on; }	void SetGenerateBinned(bool on = true) { fGenerateBinned = on; }


	void SetTestStatistics(int index);	/// set the desired test statistics:
		/// index=1 : 2 * log( L_sb / L_b ) (DEFAULT)
		/// index=2 : number of generated events
		/// index=3 : profiled likelihood ratio
		/// if the index is different to any of those values, the default is
		used
		void SetTestStatistic(int index);

	HybridResult* Calculate(TH1& data, unsigned int nToys, bool usePriors ) const;	HybridResult* Calculate(TH1& data, unsigned int nToys, bool usePriors ) const;
	HybridResult* Calculate(RooAbsData& data, unsigned int nToys, bool us ePriors) const;	HybridResult* Calculate(RooAbsData& data, unsigned int nToys, bool us ePriors) const;
	HybridResult* Calculate(unsigned int nToys, bool usePriors) const;	HybridResult* Calculate(unsigned int nToys, bool usePriors) const;
	void PrintMore(const char* options) const;	void PrintMore(const char* options) const;

	private:	private:

	void RunToys(std::vector<double>& bVals, std::vector<double>& sbVals, unsigned int nToys, bool usePriors) const;	void RunToys(std::vector<double>& bVals, std::vector<double>& sbVals, unsigned int nToys, bool usePriors) const;


End of changes. 11 change blocks.
	30 lines changed or deleted	31 lines changed or added

	HybridPlot.h	HybridPlot.h

	// @(#)root/roostats:$Id: HybridPlot.h 30462 2009-09-25 16:05:55Z moneta $	// @(#)root/roostats:$Id: HybridPlot.h 30654 2009-10-09 15:07:52Z moneta $

	/*************************************************************************	/*************************************************************************
	* Project: RooStats *	* Project: RooStats *
	* Package: RooFit/RooStats *	* Package: RooFit/RooStats *
	* Authors: *	* Authors: *
	* Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke *	* Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke *
	*************************************************************************	*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *

	skipping to change at line 29	skipping to change at line 29
	#include <vector>	#include <vector>
	#include <iostream>	#include <iostream>

	#ifndef ROOT_TNamed	#ifndef ROOT_TNamed
	#include "TNamed.h"	#include "TNamed.h"
	#endif	#endif

	// these should be maybe forward decleared	// these should be maybe forward decleared
	// by moving implementations in source file	// by moving implementations in source file
	#include "TH1.h"	#include "TH1.h"

	#include "TCanvas.h"

	class TLine;	class TLine;
	class TLegend;	class TLegend;

		class TH1;
		class TVirtualPad;

	namespace RooStats {	namespace RooStats {

	class HybridPlot : public TNamed {	class HybridPlot : public TNamed {

	public:	public:

	/// Constructor	/// Constructor
	HybridPlot(const char* name,	HybridPlot(const char* name,
	const char* title,	const char* title,

	std::vector<double> sb_values,	const std::vector<double> & sb_values,
	std::vector<double> b_values,	const std::vector<double> & b_values,
	double testStat_data,	double testStat_data,
	int n_bins,	int n_bins,
	bool verbosity=true);	bool verbosity=true);

	/// Destructor	/// Destructor
	~HybridPlot();	~HybridPlot();


	/// Draw on canvas	/// Draw on current pad
	void Draw (const char* options="");	void Draw (const char* options="");

	/// All the objects are written to rootfile	/// All the objects are written to rootfile
	void DumpToFile (const char* RootFileName, const char* options);	void DumpToFile (const char* RootFileName, const char* options);

	/// Get B histo mean	/// Get B histo mean
	double GetBmean(){return fB_histo->GetMean();};	double GetBmean(){return fB_histo->GetMean();};

	/// Get B histo RMS	/// Get B histo RMS
	double GetBrms(){return fB_histo->GetRMS();};	double GetBrms(){return fB_histo->GetRMS();};

	skipping to change at line 92	skipping to change at line 93
	/// Get SB histo RMS	/// Get SB histo RMS
	double GetSBrms(){return fSb_histo->GetRMS();};	double GetSBrms(){return fSb_histo->GetRMS();};

	/// Get SB histo integration extremes to obtain the requested area fr action	/// Get SB histo integration extremes to obtain the requested area fr action
	double* GetSBIntExtremes(double frac)	double* GetSBIntExtremes(double frac)
	{return GetHistoPvals(fSb_histo,frac);};	{return GetHistoPvals(fSb_histo,frac);};

	/// Get B histo	/// Get B histo
	TH1F* GetSBhisto(){return fSb_histo;}	TH1F* GetSBhisto(){return fSb_histo;}


	/// from Statistical plot	/// Get the pad (or canvas) where it has been drawn
		TVirtualPad * GetCanvas() { return fPad; }
	/// Get the canvas
	TCanvas* GetCanvas(){return fCanvas;}

	/// Set the canvas
	void SetCanvas(TCanvas* new_canvas){fCanvas=new_canvas;}

	/// Write an image on disk	/// Write an image on disk

	void DumpToImage (const char* filename){fCanvas->Print(filename);}	void DumpToImage (const char* filename);

	// moved from Rsc.h

	/// Get the center of the histo	/// Get the center of the histo
	double GetHistoCenter(TH1* histo, double n_rms=1,bool display_result= false);	double GetHistoCenter(TH1* histo, double n_rms=1,bool display_result= false);

	/// Get the "effective sigmas" of the histo	/// Get the "effective sigmas" of the histo
	double* GetHistoPvals (TH1* histo, double percentage);	double* GetHistoPvals (TH1* histo, double percentage);

	/// Get the median of an histogram	/// Get the median of an histogram
	double GetMedian(TH1* histo);	double GetMedian(TH1* histo);

	private:	private:

	TH1F* fSb_histo; // The sb Histo	TH1F* fSb_histo; // The sb Histo
	TH1F* fSb_histo_shaded; // The sb Histo shaded	TH1F* fSb_histo_shaded; // The sb Histo shaded
	TH1F* fB_histo; // The b Histo	TH1F* fB_histo; // The b Histo
	TH1F* fB_histo_shaded; // The b Histo shaded	TH1F* fB_histo_shaded; // The b Histo shaded
	TLine* fData_testStat_line; // The line for the data value of the tes t statistic	TLine* fData_testStat_line; // The line for the data value of the tes t statistic
	TLegend* fLegend; // The legend of the plot	TLegend* fLegend; // The legend of the plot

		TVirtualPad * fPad; // The pad where it has been drawn
	bool fVerbose; // verbosity flag	bool fVerbose; // verbosity flag

	TCanvas* fCanvas; // plot canvas

	ClassDef(HybridPlot,1) // Provides the plots for an HybridResult	ClassDef(HybridPlot,1) // Provides the plots for an HybridResult
	};	};
	}	}

	#endif	#endif

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

	HybridResult.h	HybridResult.h

	// @(#)root/roostats:$Id: HybridResult.h 30462 2009-09-25 16:05:55Z moneta $	// @(#)root/roostats:$Id: HybridResult.h 31276 2009-11-18 15:06:42Z moneta $

	/*************************************************************************	/*************************************************************************
	* Project: RooStats *	* Project: RooStats *
	* Package: RooFit/RooStats *	* Package: RooFit/RooStats *
	* Authors: *	* Authors: *
	* Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke *	* Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke *
	*************************************************************************	*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *

	skipping to change at line 31	skipping to change at line 31
	#endif	#endif

	namespace RooStats {	namespace RooStats {

	class HybridPlot;	class HybridPlot;

	class HybridResult : public HypoTestResult {	class HybridResult : public HypoTestResult {

	public:	public:


		/// Default constructor
		explicit HybridResult(const char *name = 0);

	/// Constructor for HybridResult	/// Constructor for HybridResult

	HybridResult(const char name,const char title,std::vector<double>& testStat_sb_vals,	HybridResult(const char *name,std::vector<double>& testStat_sb_vals,
	std::vector<double>& testStat_b_vals, bool sumLargerValu es=true);	std::vector<double>& testStat_b_vals, bool sumLargerValu es=true);


	HybridResult(const char name,const char title);

	/// Default constructor for HybridResult
	HybridResult();

	/// Destructor of HybridResult	/// Destructor of HybridResult
	virtual ~HybridResult();	virtual ~HybridResult();

	void SetDataTestStatistics(double testStat_data_val);	void SetDataTestStatistics(double testStat_data_val);

	void Add(HybridResult* other);	void Add(HybridResult* other);


	HybridPlot* GetPlot(const char* name,const char* title, int n_bins);	HybridPlot* GetPlot(const char* name,const char* title, int n_bins);


	void PrintMore(const char* options);	void PrintMore(const char* options);

	/// Get test statistics values for the sb model	/// Get test statistics values for the sb model
	std::vector<double> GetTestStat_sb(){return fTestStat_sb;}	std::vector<double> GetTestStat_sb(){return fTestStat_sb;}

	/// Get test statistics values for the b model	/// Get test statistics values for the b model
	std::vector<double> GetTestStat_b(){return fTestStat_b;}	std::vector<double> GetTestStat_b(){return fTestStat_b;}

	/// Get test statistics value for data	/// Get test statistics value for data
	double GetTestStat_data(){ return fTestStat_data;}	double GetTestStat_data(){ return fTestStat_data;}

	// Return p-value for null hypothesis	// Return p-value for null hypothesis
	Double_t NullPValue() const;	Double_t NullPValue() const;

	// Return p-value for alternate hypothesis	// Return p-value for alternate hypothesis
	Double_t AlternatePValue() const;	Double_t AlternatePValue() const;


		/// The error on the "confidence level" of the null hypothesis
		Double_t CLbError() const;

		/// The error on the "confidence level" of the alternative hypothesis
		Double_t CLsplusbError() const;

		/// The error on the ratio CLs+b/CLb
		Double_t CLsError() const;

	private:	private:


	std::vector<double> fTestStat_b; // vector of results for B-only toy- MC	std::vector<double> fTestStat_b; // vector of results for B-only toy- MC
	std::vector<double> fTestStat_sb; // vector of results for S+B toy-MC	std::vector<double> fTestStat_sb; // vector of results for S+B toy-MC
	double fTestStat_data; // results (test statistics) evaluated for dat a	double fTestStat_data; // results (test statistics) evaluated for dat a

	mutable bool fComputationsNulDoneFlag; // flag if the fNullPValue com putation have been already done or not (ie need to be refreshed)	mutable bool fComputationsNulDoneFlag; // flag if the fNullPValue com putation have been already done or not (ie need to be refreshed)
	mutable bool fComputationsAltDoneFlag; // flag if the fAlternatePValu e computation have been already done or not (ie need to be refreshed)	mutable bool fComputationsAltDoneFlag; // flag if the fAlternatePValu e computation have been already done or not (ie need to be refreshed)
	bool fSumLargerValues; // p-value for velues of testStat >= testStat_ data (or testStat <= testStat_data)	bool fSumLargerValues; // p-value for velues of testStat >= testStat_ data (or testStat <= testStat_data)

	protected:	protected:


End of changes. 8 change blocks.
	7 lines changed or deleted	17 lines changed or added

	HypoTestResult.h	HypoTestResult.h

	// @(#)root/roostats:$Id: HypoTestResult.h 26434 2008-11-24 21:29:32Z monet a $	// @(#)root/roostats:$Id: HypoTestResult.h 31276 2009-11-18 15:06:42Z monet a $
	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke
	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOSTATS_HypoTestResult	#ifndef ROOSTATS_HypoTestResult

	skipping to change at line 27	skipping to change at line 27

	#ifndef ROOSTATS_RooStatsUtils	#ifndef ROOSTATS_RooStatsUtils
	#include "RooStats/RooStatsUtils.h"	#include "RooStats/RooStatsUtils.h"
	#endif	#endif

	namespace RooStats {	namespace RooStats {

	class HypoTestResult : public TNamed {	class HypoTestResult : public TNamed {

	public:	public:

	HypoTestResult();
		// default constructor
		explicit HypoTestResult(const char* name = 0);

		// constructor from name, null and alternate p values
	HypoTestResult(const char* name, Double_t nullp, Double_t altp);	HypoTestResult(const char* name, Double_t nullp, Double_t altp);

	HypoTestResult(const char* name, const char* title, Double_t nullp, D
	ouble_t altp);	// destructor
	virtual ~HypoTestResult();	virtual ~HypoTestResult();

	// Return p-value for null hypothesis	// Return p-value for null hypothesis
	virtual Double_t NullPValue() const {return fNullPValue;}	virtual Double_t NullPValue() const {return fNullPValue;}

	// Return p-value for alternate hypothesis	// Return p-value for alternate hypothesis
	virtual Double_t AlternatePValue() const {return fAlternatePValue;}	virtual Double_t AlternatePValue() const {return fAlternatePValue;}

	// Convert NullPValue into a "confidence level"	// Convert NullPValue into a "confidence level"
	virtual Double_t CLb() const {return 1.-NullPValue();}	virtual Double_t CLb() const {return 1.-NullPValue();}

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

	IntervalCalculator.h	IntervalCalculator.h

	// @(#)root/roostats:$Id: IntervalCalculator.h 30512 2009-09-28 17:24:48Z m oneta $	// @(#)root/roostats:$Id: IntervalCalculator.h 31276 2009-11-18 15:06:42Z m oneta $
	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke
	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOSTATS_IntervalCalculator	#ifndef ROOSTATS_IntervalCalculator

	skipping to change at line 61	skipping to change at line 61

	namespace RooStats {	namespace RooStats {

	class ConfInterval;	class ConfInterval;

	class ModelConfig;	class ModelConfig;

	class IntervalCalculator {	class IntervalCalculator {

	public:	public:

	//IntervalCalculator();
	virtual ~IntervalCalculator() {}	virtual ~IntervalCalculator() {}

	// Main interface to get a ConfInterval, pure virtual	// Main interface to get a ConfInterval, pure virtual
	virtual ConfInterval* GetInterval() const = 0;	virtual ConfInterval* GetInterval() const = 0;

	// Get the size of the test (eg. rate of Type I error)	// Get the size of the test (eg. rate of Type I error)
	virtual Double_t Size() const = 0;	virtual Double_t Size() const = 0;


	// Get the Confidence level for the test	// Get the Confidence level for the test
	virtual Double_t ConfidenceLevel() const = 0;	virtual Double_t ConfidenceLevel() const = 0;


	// Set the DataSet ( add to the the workspace if not already there ?)	// Set the DataSet ( add to the the workspace if not already there ?)
	virtual void SetData(RooAbsData&) = 0;	virtual void SetData(RooAbsData&) = 0;


	// Set the Model	// Set the Model

	virtual void SetModel(const ModelConfig & /* model */) = 0; // {} //	virtual void SetModel(const ModelConfig & /* model */) = 0;
	make pure virtual ? /* = 0 */
	// set the size of the test (rate of Type I error) ( Eg. 0.05 for a 9	// set the size of the test (rate of Type I error) ( e.g. 0.05 for a
	5% Confidence Interval)	95% Confidence Interval)
	virtual void SetTestSize(Double_t size) = 0;	virtual void SetTestSize(Double_t size) = 0;

	// set the confidence level for the interval (eg. 0.95 for a 95% Conf
	idence Interval)	// set the confidence level for the interval (e.g. 0.95 for a 95% Con
		fidence Interval)
	virtual void SetConfidenceLevel(Double_t cl) = 0;	virtual void SetConfidenceLevel(Double_t cl) = 0;

	protected:	protected:
	ClassDef(IntervalCalculator,1) // Interface for tools setting limit s (producing confidence intervals)	ClassDef(IntervalCalculator,1) // Interface for tools setting limit s (producing confidence intervals)
	};	};
	}	}

	#endif	#endif

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

	LikelihoodInterval.h	LikelihoodInterval.h

	// @(#)root/roostats:$Id: LikelihoodInterval.h 30512 2009-09-28 17:24:48Z m oneta $	// @(#)root/roostats:$Id: LikelihoodInterval.h 31276 2009-11-18 15:06:42Z m oneta $
	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke
	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef RooStats_LikelihoodInterval	#ifndef RooStats_LikelihoodInterval

	skipping to change at line 26	skipping to change at line 26
	#endif	#endif

	#ifndef ROO_ARG_SET	#ifndef ROO_ARG_SET
	#include "RooArgSet.h"	#include "RooArgSet.h"
	#endif	#endif

	#ifndef ROO_ABS_REAL	#ifndef ROO_ABS_REAL
	#include "RooAbsReal.h"	#include "RooAbsReal.h"
	#endif	#endif


		#ifndef ROOT_Math_IFunctionfwd
		#include "Math/IFunctionfwd.h"
		#endif

		#include <map>
		#include <memory>

		namespace ROOT {
		namespace Math {
		class Minimizer;
		}
		}

	namespace RooStats {	namespace RooStats {

	class LikelihoodInterval : public ConfInterval {	class LikelihoodInterval : public ConfInterval {

	public:	public:


	LikelihoodInterval();	// defult constructor
	LikelihoodInterval(const char* name);	explicit LikelihoodInterval(const char* name = 0);
	LikelihoodInterval(const char* name, const char* title);
	LikelihoodInterval(const char* name, RooAbsReal, const RooArgSet);	/// construct the interval from a Profile Likelihood object, paramete
	LikelihoodInterval(const char* name, const char* title, RooAbsReal*,	r of interest and optionally a snapshot of
	const RooArgSet*);	/// POI with their best fit values
		LikelihoodInterval(const char* name, RooAbsReal, const RooArgSet,
		RooArgSet * = 0);

		// destructor
	virtual ~LikelihoodInterval();	virtual ~LikelihoodInterval();


	virtual Bool_t IsInInterval(const RooArgSet&);	// check if given point is in the interval
	virtual void SetConfidenceLevel(Double_t cl) {fConfidenceLevel = cl;}	virtual Bool_t IsInInterval(const RooArgSet&) const;

		// set the confidence level for the interval (e.g 0.682 for a 1-sigma
		interval)
		virtual void SetConfidenceLevel(Double_t cl) {fConfidenceLevel = cl;
		ResetLimits(); }

		// return confidence level
	virtual Double_t ConfidenceLevel() const {return fConfidenceLevel;}	virtual Double_t ConfidenceLevel() const {return fConfidenceLevel;}


	// do we want it to return list of parameters	// return a cloned list of parameters of interest. User manages the
	virtual RooArgSet* GetParameters() const;	return object
		virtual RooArgSet* GetParameters() const;


	// check if parameters are correct. (dummy implementation to start)	// check if parameters are correct (i.e. they are the POI of this int erval)
	Bool_t CheckParameters(const RooArgSet&) const ;	Bool_t CheckParameters(const RooArgSet&) const ;


	// Method to return lower limit on a given parameter	// return the lower bound of the interval on a given parameter
	Double_t LowerLimit(RooRealVar& param) ;	Double_t LowerLimit(const RooRealVar& param) ;
	Double_t UpperLimit(RooRealVar& param) ;
		// return the upper bound of the interval on a given parameter
		Double_t UpperLimit(const RooRealVar& param) ;


		// find both lower and upper interval boundaries for a given paramete
		r
		// retun false if the bounds have not been found
		Bool_t FindLimits(const RooRealVar & param, double & lower, double &u
		pper);

		/**
		return the 2D-contour points for the given subset of parameters
		by default make the contour using 30 points. The User has to preal
		locate the x and y array which will return
		the set of x and y points defining the contour.
		The return value of the funciton specify the number of contour poi
		nt found.
		In case of error a zero is returned
		*/
		Int_t GetContourPoints(const RooRealVar & paramX, const RooRealVar &
		paramY, Double_t * x, Double_t *y, Int_t npoints = 30);

		// return the profile log-likelihood ratio function
	RooAbsReal* GetLikelihoodRatio() {return fLikelihoodRatio;}	RooAbsReal* GetLikelihoodRatio() {return fLikelihoodRatio;}


		// return a pointer to a snapshot with best fit parameter of interest
		const RooArgSet * GetBestFitParameters() const { return fBestFitParam
		s; }

		protected:

		// reset the cached limit values
		void ResetLimits();

		// internal function to create the minimizer for finding the contours
		bool CreateMinimizer();

	private:	private:


	const RooArgSet* fParameters; // parameters of interest for this inte	RooArgSet fParameters; // parameters of interest for this interval
	rval	RooArgSet * fBestFitParams; // snapshot of the model parameters with
	RooAbsReal* fLikelihoodRatio; // likelihood ratio function used to ma	best fit value (managed internally)
	ke contours	RooAbsReal* fLikelihoodRatio; // likelihood ratio function used to ma
		ke contours (managed internally)
	Double_t fConfidenceLevel; // Requested confidence level (eg. 0.95 fo r 95% CL)	Double_t fConfidenceLevel; // Requested confidence level (eg. 0.95 fo r 95% CL)

		std::map<std::string, double> fLowerLimits; // map with cached lower
		bound values
		std::map<std::string, double> fUpperLimits; // map with cached upper
		bound values
		std::auto_ptr<ROOT::Math::Minimizer > fMinimizer; //! transient point
		er to minimizer class used to find limits and contour
		std::auto_ptr<RooFunctor> fFunctor; //! transient pointer
		to functor class used by the minimizer
		std::auto_ptr<ROOT::Math::IMultiGenFunction> fMinFunc; //! transient
		pointer to the minimization function

	ClassDef(LikelihoodInterval,1) // Concrete implementation of a ConfI nterval based on a likelihood ratio	ClassDef(LikelihoodInterval,1) // Concrete implementation of a ConfI nterval based on a likelihood ratio

	};	};
	}	}

	#endif	#endif

End of changes. 11 change blocks.
	19 lines changed or deleted	88 lines changed or added

	LikelihoodIntervalPlot.h	LikelihoodIntervalPlot.h

	// @(#)root/roostats:$Id: LikelihoodIntervalPlot.h 26427 2009-06-12 15:45:3 6Z pellicci $	// @(#)root/roostats:$Id: LikelihoodIntervalPlot.h 31276 2009-11-18 15:06:4 2Z moneta $

	/*************************************************************************	/*************************************************************************
	* Project: RooStats *	* Project: RooStats *
	* Package: RooFit/RooStats *	* Package: RooFit/RooStats *
	* Authors: *	* Authors: *
	* Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke *	* Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke *
	*************************************************************************	*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *

	skipping to change at line 46	skipping to change at line 46

	// Destructor of SamplingDistribution	// Destructor of SamplingDistribution
	virtual ~LikelihoodIntervalPlot();	virtual ~LikelihoodIntervalPlot();

	void SetLikelihoodInterval(LikelihoodInterval* theInterval);	void SetLikelihoodInterval(LikelihoodInterval* theInterval);
	void SetPlotParameters(const RooArgSet *params) ;	void SetPlotParameters(const RooArgSet *params) ;

	void SetContourColor(const Color_t color) {fColor = color;}	void SetContourColor(const Color_t color) {fColor = color;}
	void SetLineColor(const Color_t color) {fLineColor = color;}	void SetLineColor(const Color_t color) {fLineColor = color;}
	void SetMaximum(const Double_t theMaximum) {fMaximum = theMaximum;}	void SetMaximum(const Double_t theMaximum) {fMaximum = theMaximum;}

		void SetNPoints(Int_t np) { fNPoints = np; }

	void Draw(const Option_t *options=0);	void Draw(const Option_t *options=0);

	private:	private:

	Int_t fColor;	Int_t fColor;
	Int_t fFillStyle;	Int_t fFillStyle;
	Int_t fLineColor;	Int_t fLineColor;
	Int_t fNdimPlot;	Int_t fNdimPlot;

		Int_t fNPoints; // number of points used to scan the PL

	Double_t fMaximum;	Double_t fMaximum;

	LikelihoodInterval *fInterval;	LikelihoodInterval *fInterval;

	RooArgSet *fParamsPlot;	RooArgSet *fParamsPlot;

	protected:	protected:

	ClassDef(LikelihoodIntervalPlot,1) // Class containing the results of the IntervalCalculator	ClassDef(LikelihoodIntervalPlot,1) // Class containing the results of the IntervalCalculator

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

	LogLikelihoodFCN.h	LogLikelihoodFCN.h

	// @(#)root/mathcore:$Id: LogLikelihoodFCN.h 28946 2009-06-11 15:39:14Z mon eta $	// @(#)root/mathcore:$Id: LogLikelihoodFCN.h 30539 2009-10-01 13:13:09Z mon eta $
	// Author: L. Moneta Fri Aug 17 14:29:24 2007	// Author: L. Moneta Fri Aug 17 14:29:24 2007

	/**********************************************************************	/**********************************************************************
	* *	* *
	* Copyright (c) 2007 LCG ROOT Math Team, CERN/PH-SFT *	* Copyright (c) 2007 LCG ROOT Math Team, CERN/PH-SFT *
	* *	* *
	* *	* *
	**********************************************************************/	**********************************************************************/

	// Header file for class LogLikelihoodFCN	// Header file for class LogLikelihoodFCN

	skipping to change at line 64	skipping to change at line 64
	public:	public:

	typedef ::ROOT::Math::BasicFitMethodFunction<FunType> BaseObjFunction;	typedef ::ROOT::Math::BasicFitMethodFunction<FunType> BaseObjFunction;
	typedef typename BaseObjFunction::BaseFunction BaseFunction;	typedef typename BaseObjFunction::BaseFunction BaseFunction;

	typedef ::ROOT::Math::IParamMultiFunction IModelFunction;	typedef ::ROOT::Math::IParamMultiFunction IModelFunction;

	/**	/**
	Constructor from unbin data set and model function (pdf)	Constructor from unbin data set and model function (pdf)
	*/	*/

	LogLikelihoodFCN (const UnBinData & data, IModelFunction & func) :	LogLikelihoodFCN (const UnBinData & data, const IModelFunction & func) :
	BaseObjFunction(func.NPar(), data.Size() ),	BaseObjFunction(func.NPar(), data.Size() ),
	fData(data),	fData(data),
	fFunc(func),	fFunc(func),
	fNEffPoints(0),	fNEffPoints(0),
	fGrad ( std::vector<double> ( func.NPar() ) )	fGrad ( std::vector<double> ( func.NPar() ) )
	{}	{}

	/**	/**
	Destructor (no operations)	Destructor (no operations)
	*/	*/

	skipping to change at line 148	skipping to change at line 148

	// for derivatives	// for derivatives
	virtual double DoDerivative(const double * x, unsigned int icoord ) con st {	virtual double DoDerivative(const double * x, unsigned int icoord ) con st {
	Gradient(x, &fGrad[0]);	Gradient(x, &fGrad[0]);
	return fGrad[icoord];	return fGrad[icoord];
	}	}

	//data member	//data member

	const UnBinData & fData;	const UnBinData & fData;

	mutable IModelFunction & fFunc;	const IModelFunction & fFunc;

	mutable unsigned int fNEffPoints; // number of effective points used in the fit	mutable unsigned int fNEffPoints; // number of effective points used in the fit

	mutable std::vector<double> fGrad; // for derivatives	mutable std::vector<double> fGrad; // for derivatives

	};	};

	// define useful typedef's	// define useful typedef's
	typedef LogLikelihoodFCN<ROOT::Math::IMultiGenFunction> LogLikelihoo dFunction;	typedef LogLikelihoodFCN<ROOT::Math::IMultiGenFunction> LogLikelihoo dFunction;
	typedef LogLikelihoodFCN<ROOT::Math::IMultiGradFunction> LogLikelihoo dGradFunction;	typedef LogLikelihoodFCN<ROOT::Math::IMultiGradFunction> LogLikelihoo dGradFunction;

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

	MCMCInterval.h	MCMCInterval.h

	// @(#)root/roostats:$Id: MCMCInterval.h 26805 2009-06-17 14:31:02Z kbelasc o $	// @(#)root/roostats:$Id: MCMCInterval.h 31276 2009-11-18 15:06:42Z moneta $
	// Authors: Kevin Belasco 17/06/2009	// Authors: Kevin Belasco 17/06/2009
	// Authors: Kyle Cranmer 17/06/2009	// Authors: Kyle Cranmer 17/06/2009
	/*************************************************************************	/*************************************************************************
	* 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 28	skipping to change at line 28

	#ifndef ROOSTATS_ConfInterval	#ifndef ROOSTATS_ConfInterval
	#include "RooStats/ConfInterval.h"	#include "RooStats/ConfInterval.h"
	#endif	#endif
	#ifndef ROO_ARG_SET	#ifndef ROO_ARG_SET
	#include "RooArgSet.h"	#include "RooArgSet.h"
	#endif	#endif
	#ifndef ROO_ARG_LIST	#ifndef ROO_ARG_LIST
	#include "RooArgList.h"	#include "RooArgList.h"
	#endif	#endif

	#ifndef ROO_DATA_HIST	// #ifndef ROO_DATA_HIST
	#include "RooDataHist.h"	// #include "RooDataHist.h"
	#endif	// #endif
	#ifndef ROO_DATA_SET	// #ifndef ROO_DATA_SET
	#include "RooDataSet.h"	// #include "RooDataSet.h"
	#endif	// #endif
	#ifndef ROO_REAL_VAR	// #ifndef ROO_REAL_VAR
	#include "RooRealVar.h"	// #include "RooRealVar.h"
	#endif	// #endif
	#ifndef ROO_KEYS_PDF	// #ifndef ROO_KEYS_PDF
	#include "RooNDKeysPdf.h"	// #include "RooNDKeysPdf.h"
	#endif	// #endif
	#ifndef ROOSTATS_MarkovChain	#ifndef ROOSTATS_MarkovChain
	#include "RooStats/MarkovChain.h"	#include "RooStats/MarkovChain.h"
	#endif	#endif

	#ifndef ROOT_TH1	// #ifndef ROOT_TH1
	#include "TH1.h"	// #include "TH1.h"
	#endif	// #endif
	#ifndef ROO_PRODUCT	// #ifndef ROO_PRODUCT
	#include "RooProduct.h"	// #include "RooProduct.h"
	#endif	// #endif
	#ifndef RooStats_Heavyside	// #ifndef RooStats_Heavyside
	#include "RooStats/Heavyside.h"	// #include "RooStats/Heavyside.h"
	#endif	// #endif
	#ifndef ROO_PRODUCT	// #ifndef ROO_PRODUCT
	#include "RooProduct.h"	// #include "RooProduct.h"
	#endif	// #endif
	#ifndef ROOT_THnSparse	// #ifndef ROOT_THnSparse
	#include "THnSparse.h"	// #include "THnSparse.h"
	#endif	// #endif

		class RooNDKeysPdf;
		class RooProduct;

	namespace RooStats {	namespace RooStats {


		class Heavyside;

	class MCMCInterval : public ConfInterval {	class MCMCInterval : public ConfInterval {

	public:	public:

	MCMCInterval();
	MCMCInterval(const char* name);	// default constructor
	MCMCInterval(const char* name, const char* title);	explicit MCMCInterval(const char* name = 0);
	MCMCInterval(const char* name, const char* title, const RooArgSet& pa
	rameters,	// constructor from parameter of interest and Markov chain object
		MCMCInterval(const char* name, const RooArgSet& parameters,
	MarkovChain& chain);	MarkovChain& chain);

	enum {DEFAULT_NUM_BINS = 50};	enum {DEFAULT_NUM_BINS = 50};


	virtual ~MCMCInterval()	virtual ~MCMCInterval();
	{
	delete[] fAxes;
	delete fHist;
	delete fChain;
	// kbelasco: check here for memory management errors
	delete fDataHist;
	delete fSparseHist;
	delete fKeysPdf;
	delete fProduct;
	delete fHeavyside;
	delete fKeysDataHist;
	delete fCutoffVar;
	}

	// determine whether this point is in the confidence interval	// determine whether this point is in the confidence interval

	virtual Bool_t IsInInterval(const RooArgSet& point);	virtual Bool_t IsInInterval(const RooArgSet& point) const;

	// set the desired confidence level (see GetActualConfidenceLevel())	// set the desired confidence level (see GetActualConfidenceLevel())
	// Note: calling this function triggers the algorithm that determines	// Note: calling this function triggers the algorithm that determines
	// the interval, so call this after initializing all other aspects	// the interval, so call this after initializing all other aspects
	// of this IntervalCalculator	// of this IntervalCalculator
	// Also, calling this function again with a different confidence leve l	// Also, calling this function again with a different confidence leve l
	// retriggers the calculation of the interval	// retriggers the calculation of the interval
	virtual void SetConfidenceLevel(Double_t cl);	virtual void SetConfidenceLevel(Double_t cl);

	// get the desired confidence level (see GetActualConfidenceLevel())	// get the desired confidence level (see GetActualConfidenceLevel())

	skipping to change at line 118	skipping to change at line 112

	// get the cutoff RooNDKeysPdf value for being considered in the	// get the cutoff RooNDKeysPdf value for being considered in the
	// confidence interval	// confidence interval
	virtual Double_t GetKeysPdfCutoff();	virtual Double_t GetKeysPdfCutoff();
	//virtual Double_t GetKeysPdfCutoff() { return fKeysCutoff; }	//virtual Double_t GetKeysPdfCutoff() { return fKeysCutoff; }

	// get the actual value of the confidence level for this interval.	// get the actual value of the confidence level for this interval.
	virtual Double_t GetActualConfidenceLevel();	virtual Double_t GetActualConfidenceLevel();

	// get the sum of all bin weights	// get the sum of all bin weights

	virtual Double_t GetSumOfWeights() const	virtual Double_t GetSumOfWeights() const;
	{ return fDataHist->sum(kFALSE); }

	// whether the specified confidence level is a floor for the actual	// whether the specified confidence level is a floor for the actual
	// confidence level (strict), or a ceiling (not strict)	// confidence level (strict), or a ceiling (not strict)
	virtual void SetHistStrict(Bool_t isHistStrict) { fIsHistStrict = isH istStrict; }	virtual void SetHistStrict(Bool_t isHistStrict) { fIsHistStrict = isH istStrict; }

	// check if parameters are correct. (dummy implementation to start)	// check if parameters are correct. (dummy implementation to start)
	Bool_t CheckParameters(const RooArgSet& point) const;	Bool_t CheckParameters(const RooArgSet& point) const;

	// Set the parameters of interest for this interval	// Set the parameters of interest for this interval
	// and change other internal data members accordingly	// and change other internal data members accordingly

	skipping to change at line 266	skipping to change at line 259
	<< "negative epsilon value" << endl;	<< "negative epsilon value" << endl;
	else	else
	fEpsilon = epsilon;	fEpsilon = epsilon;
	}	}

	private:	private:
	inline Bool_t AcceptableConfLevel(Double_t confLevel);	inline Bool_t AcceptableConfLevel(Double_t confLevel);

	protected:	protected:
	// data members	// data members

	const RooArgSet * fParameters; // parameters of interest for this int erval	RooArgSet fParameters; // parameters of interest for this interval
	MarkovChain* fChain; // the markov chain	MarkovChain* fChain; // the markov chain
	RooDataHist* fDataHist; // the binned Markov Chain data	RooDataHist* fDataHist; // the binned Markov Chain data
	RooNDKeysPdf* fKeysPdf; // the kernel estimation pdf	RooNDKeysPdf* fKeysPdf; // the kernel estimation pdf
	RooProduct* fProduct; // the (keysPdf * heavyside) product	RooProduct* fProduct; // the (keysPdf * heavyside) product
	Heavyside* fHeavyside; // the Heavyside function	Heavyside* fHeavyside; // the Heavyside function
	RooDataHist* fKeysDataHist; // data hist representing product	RooDataHist* fKeysDataHist; // data hist representing product
	TH1* fHist; // the binned Markov Chain data	TH1* fHist; // the binned Markov Chain data
	THnSparse* fSparseHist; // the binned Markov Chain data	THnSparse* fSparseHist; // the binned Markov Chain data
	Double_t fConfidenceLevel; // Requested confidence level (eg. 0.95 fo r 95% CL)	Double_t fConfidenceLevel; // Requested confidence level (eg. 0.95 fo r 95% CL)
	Double_t fHistConfLevel; // the actual conf level determined by hist	Double_t fHistConfLevel; // the actual conf level determined by hist

End of changes. 9 change blocks.
	51 lines changed or deleted	43 lines changed or added

	MCMCIntervalPlot.h	MCMCIntervalPlot.h

	// @(#)root/roostats:$Id: MCMCIntervalPlot.h 29342 2009-06-12 15:45:36Z kbe lasco $	// @(#)root/roostats:$Id: MCMCIntervalPlot.h 31276 2009-11-18 15:06:42Z mon eta $
	// Authors: Kevin Belasco 17/06/2009	// Authors: Kevin Belasco 17/06/2009
	// Authors: Kyle Cranmer 17/06/2009	// Authors: Kyle Cranmer 17/06/2009
	/*************************************************************************	/*************************************************************************
	* Project: RooStats *	* Project: RooStats *
	* Package: RooFit/RooStats *	* Package: RooFit/RooStats *
	*************************************************************************	*************************************************************************
	* 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. *

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

	MarkovChain.h	MarkovChain.h

	// @(#)root/roostats:$Id: MarkovChain.h 26805 2009-06-17 14:31:02Z kbelasco $	// @(#)root/roostats:$Id: MarkovChain.h 31276 2009-11-18 15:06:42Z moneta $
	// Authors: Kevin Belasco 17/06/2009	// Authors: Kevin Belasco 17/06/2009
	// Authors: Kyle Cranmer 17/06/2009	// Authors: Kyle Cranmer 17/06/2009
	/*************************************************************************	/*************************************************************************
	* 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 124	skipping to change at line 124
	{ return (RooRealVar*)fWeight->Clone(); }	{ return (RooRealVar*)fWeight->Clone(); }

	virtual ~MarkovChain()	virtual ~MarkovChain()
	{	{
	delete fParameters;	delete fParameters;
	delete fDataEntry;	delete fDataEntry;
	delete fChain;	delete fChain;
	}	}

	protected:	protected:

	RooArgSet* fParameters;	RooArgSet * fParameters;
	RooArgSet* fDataEntry;	RooArgSet * fDataEntry;
	RooDataSet* fChain;	RooDataSet* fChain;
	RooRealVar* fNLL;	RooRealVar* fNLL;
	RooRealVar* fWeight;	RooRealVar* fWeight;

	ClassDef(MarkovChain,1);	ClassDef(MarkovChain,1);
	};	};
	}	}

	#endif	#endif

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

	Match.h	Match.h

	// @(#)root/base:$Id: Match.h 20877 2007-11-19 11:17:07Z rdm $	// @(#)root/base:$Id: Match.h 30815 2009-10-20 13:49:22Z 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. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOT_Match	#ifndef ROOT_Match
	#define ROOT_Match	#define ROOT_Match

	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////
	// //	// //
	// Declarations for regular expression routines. //	// Declarations for regular expression routines. //
	// //	// //
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////


		#if !defined(__CINT__)
		#include <sys/types.h>
		#endif

	typedef unsigned short Pattern_t;	typedef unsigned short Pattern_t;

	int Makepat(const char, Pattern_t, int);	int Makepat(const char, Pattern_t, int);
	const char* Matchs(const char, size_t len, const Pattern_t,	const char* Matchs(const char, size_t len, const Pattern_t,
	const char**);	const char**);

	#endif	#endif

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

	MatrixFunctions.h	MatrixFunctions.h

	// @(#)root/smatrix:$Id: MatrixFunctions.h 28954 2009-06-12 09:36:34Z monet a $	// @(#)root/smatrix:$Id: MatrixFunctions.h 30749 2009-10-15 16:33:04Z brun $
	// Authors: T. Glebe, L. Moneta 2005	// Authors: T. Glebe, L. Moneta 2005

	#ifndef ROOT_Math_MatrixFunctions	#ifndef ROOT_Math_MatrixFunctions
	#define ROOT_Math_MatrixFunctions	#define ROOT_Math_MatrixFunctions
	// ********************************************************************	// ********************************************************************
	//	//
	// source:	// source:
	//	//
	// type: source code	// type: source code
	//	//

	skipping to change at line 70	skipping to change at line 70
	const unsigned int rpos = i*D2;	const unsigned int rpos = i*D2;
	for(unsigned int j=0; j<D2; ++j) {	for(unsigned int j=0; j<D2; ++j) {
	tmp[i] += rhs.apply(rpos+j) * lhs.apply(j);	tmp[i] += rhs.apply(rpos+j) * lhs.apply(j);
	}	}
	}	}
	return tmp;	return tmp;
	}	}
	#endif	#endif

	// matrix-vector product:	// matrix-vector product:

	// use apply(i) funciton for matrices. Tested (11/05/06) with using (i,j) but	// use apply(i) function for matrices. Tested (11/05/06) with using (i,j) but
	// performances are slightly worse (not clear why)	// performances are slightly worse (not clear why)

	//========================================================================= =====	//========================================================================= =====
	// meta_row_dot	// meta_row_dot
	//========================================================================= =====	//========================================================================= =====
	template <unsigned int I>	template <unsigned int I>
	struct meta_row_dot {	struct meta_row_dot {
	template <class A, class B>	template <class A, class B>
	static inline typename A::value_type f(const A& lhs, const B& rhs,	static inline typename A::value_type f(const A& lhs, const B& rhs,
	const unsigned int offset) {	const unsigned int offset) {

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

	MetropolisHastings.h	MetropolisHastings.h

	// @(#)root/roostats:$Id: MetropolisHastings.h 26805 2009-06-17 14:31:02Z k belasco $	// @(#)root/roostats:$Id: MetropolisHastings.h 31276 2009-11-18 15:06:42Z m oneta $
	// Authors: Kevin Belasco 17/06/2009	// Authors: Kevin Belasco 17/06/2009
	// Authors: Kyle Cranmer 17/06/2009	// Authors: Kyle Cranmer 17/06/2009
	/*************************************************************************	/*************************************************************************
	* 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. *
	*************************************************************************/	*************************************************************************/


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

	Minimizer.h	Minimizer.h

	// @(#)root/mathcore:$Id: Minimizer.h 28946 2009-06-11 15:39:14Z moneta $	// @(#)root/mathcore:$Id: Minimizer.h 31180 2009-11-16 10:54:05Z moneta $
	// Author: L. Moneta Fri Sep 22 15:06:47 2006	// Author: L. Moneta Fri Sep 22 15:06:47 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 Minimizer	// Header file for class Minimizer

	skipping to change at line 92	skipping to change at line 92
	#ifndef DEBUG	#ifndef DEBUG
	fDebug(0),	fDebug(0),
	#else	#else
	fDebug(3),	fDebug(3),
	#endif	#endif
	fStrategy(1),	fStrategy(1),
	fStatus(-1),	fStatus(-1),
	fMaxCalls(0),	fMaxCalls(0),
	fMaxIter(0),	fMaxIter(0),
	fTol(1.E-6),	fTol(1.E-6),

		fPrec(-1),
	fUp(1.)	fUp(1.)
	{}	{}

	/**	/**
	Destructor (no operations)	Destructor (no operations)
	*/	*/
	virtual ~Minimizer () {}	virtual ~Minimizer () {}

	private:	private:
	// usually copying is non trivial, so we make this unaccessible	// usually copying is non trivial, so we make this unaccessible

	skipping to change at line 268	skipping to change at line 269
	errLow = 0; errUp = 0;	errLow = 0; errUp = 0;
	return false;	return false;
	}	}

	/**	/**
	perform a full calculation of the Hessian matrix for error calculatio n	perform a full calculation of the Hessian matrix for error calculatio n
	*/	*/
	virtual bool Hesse() { return false; }	virtual bool Hesse() { return false; }

	/**	/**

	scan function minimum for variable i. Variable and funciton must be s	scan function minimum for variable i. Variable and function must be s
	et before using Scan	et before using Scan
	Return false if an error or if minimizer does not support this funcit	Return false if an error or if minimizer does not support this functi
	onality	onality
	*/	*/
	virtual bool Scan(unsigned int /* i /, unsigned int & / nstep /, doub le /* x /, double /* y */,	virtual bool Scan(unsigned int /* i /, unsigned int & / nstep /, doub le /* x /, double /* y */,
	double /xmin / = 0, double /xmax/ = 0) {	double /xmin / = 0, double /xmax/ = 0) {
	return false;	return false;
	}	}

	/**	/**
	find the contour points (xi,xj) of the function for parameter i and j around the minimum	find the contour points (xi,xj) of the function for parameter i and j around the minimum
	The contour will be find for value of the function = Min + ErrorUp();	The contour will be find for value of the function = Min + ErrorUp();
	*/	*/

	skipping to change at line 291	skipping to change at line 292
	double * /* xi /, double /* xj */) {	double * /* xi /, double /* xj */) {
	return false;	return false;
	}	}

	/// return reference to the objective function	/// return reference to the objective function
	///virtual const ROOT::Math::IGenFunction & Function() const = 0;	///virtual const ROOT::Math::IGenFunction & Function() const = 0;

	/// print the result according to set level (implemented for TMinuit for mantaining Minuit-style printing)	/// print the result according to set level (implemented for TMinuit for mantaining Minuit-style printing)
	virtual void PrintResults() {}	virtual void PrintResults() {}


	// get name of variables (override if minimizer support storing of varia	/// get name of variables (override if minimizer support storing of vari
	ble names)	able names)
	//virtual std::string VariableName(unsigned int ivar) const { return "x_	/// return an empty string if variable is not found
	" + ROOT::Math::Util::ToString(ivar); }	virtual std::string VariableName(unsigned int ) const { return std::stri
		ng();} // return empty string

		/// get index of variable given a variable given a name
		/// return -1 if variable is not found
		virtual int VariableIndex(const std::string &) const { return -1; }

	/ minimizer configuration parameters /	/ minimizer configuration parameters /

	/// set print level	/// set print level
	int PrintLevel() const { return fDebug; }	int PrintLevel() const { return fDebug; }

	/// max number of function calls	/// max number of function calls
	unsigned int MaxFunctionCalls() { return fMaxCalls; }	unsigned int MaxFunctionCalls() { return fMaxCalls; }

	/// max iterations	/// max iterations
	unsigned int MaxIterations() { return fMaxIter; }	unsigned int MaxIterations() { return fMaxIter; }

	/// absolute tolerance	/// absolute tolerance
	double Tolerance() const { return fTol; }	double Tolerance() const { return fTol; }


		/// precision of minimizer in the evaluation of the objective function
		/// ( a value <=0 corresponds to the let the minimizer choose its defaul
		t one)
		double Precision() const { return fPrec; }

	/// strategy	/// strategy
	int Strategy() const { return fStrategy; }	int Strategy() const { return fStrategy; }

	/// status code of minimizer	/// status code of minimizer
	int Status() const { return fStatus; }	int Status() const { return fStatus; }

	/// return the statistical scale used for calculate the error	/// return the statistical scale used for calculate the error
	/// is typically 1 for Chi2 and 0.5 for likelihood minimization	/// is typically 1 for Chi2 and 0.5 for likelihood minimization
	double ErrorDef() const { return fUp; }	double ErrorDef() const { return fUp; }


	skipping to change at line 333	skipping to change at line 343

	///set maximum of function calls	///set maximum of function calls
	void SetMaxFunctionCalls(unsigned int maxfcn) { if (maxfcn > 0) fMaxCall s = maxfcn; }	void SetMaxFunctionCalls(unsigned int maxfcn) { if (maxfcn > 0) fMaxCall s = maxfcn; }

	/// set maximum iterations (one iteration can have many function calls)	/// set maximum iterations (one iteration can have many function calls)
	void SetMaxIterations(unsigned int maxiter) { if (maxiter > 0) fMaxIter = maxiter; }	void SetMaxIterations(unsigned int maxiter) { if (maxiter > 0) fMaxIter = maxiter; }

	/// set the tolerance	/// set the tolerance
	void SetTolerance(double tol) { fTol = tol; }	void SetTolerance(double tol) { fTol = tol; }


		/// set in the minimizer the objective function evaluation precision
		/// ( a value <=0 means the minimizer will choose its optimal value auto
		matically, i.e. default case)
		void SetPrecision(double prec) { fPrec = prec; }

	///set the strategy	///set the strategy
	void SetStrategy(int strategyLevel) { fStrategy = strategyLevel; }	void SetStrategy(int strategyLevel) { fStrategy = strategyLevel; }

	/// set scale for calculating the errors	/// set scale for calculating the errors
	void SetErrorDef(double up) { fUp = up; }	void SetErrorDef(double up) { fUp = up; }

	/// flag to check if minimizer needs to perform accurate error analysis (e.g. run Hesse for Minuit)	/// flag to check if minimizer needs to perform accurate error analysis (e.g. run Hesse for Minuit)
	void SetValidError(bool on) { fValidError = on; }	void SetValidError(bool on) { fValidError = on; }

	protected:	protected:

	//private:	//private:

	// keep protected to be accessible by the derived classes	// keep protected to be accessible by the derived classes

	bool fValidError; // flag to control if errors have been vali dated (Hesse has been run in case of Minuit)	bool fValidError; // flag to control if errors have been vali dated (Hesse has been run in case of Minuit)
	int fDebug; // print level	int fDebug; // print level
	int fStrategy; // minimizer strategy	int fStrategy; // minimizer strategy
	int fStatus; // status of minimizer	int fStatus; // status of minimizer

	unsigned int fMaxCalls; // max number of funciton calls	unsigned int fMaxCalls; // max number of function calls
	unsigned int fMaxIter; // max number or iterations used to find th e minimum	unsigned int fMaxIter; // max number or iterations used to find th e minimum
	double fTol; // tolerance (absolute)	double fTol; // tolerance (absolute)

		double fPrec; // precision
	double fUp; // error scale	double fUp; // error scale

	};	};

	} // end namespace Math	} // end namespace Math

	} // end namespace ROOT	} // end namespace ROOT

	#endif /* ROOT_Math_Minimizer */	#endif /* ROOT_Math_Minimizer */

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

	Minuit2Minimizer.h	Minuit2Minimizer.h

	skipping to change at line 121	skipping to change at line 121
	virtual bool SetLimitedVariable(unsigned int ivar , const std::string & name , double val , double step , double /* lower /, double / upper */);	virtual bool SetLimitedVariable(unsigned int ivar , const std::string & name , double val , double step , double /* lower /, double / upper */);
	/// set fixed variable (override if minimizer supports them )	/// set fixed variable (override if minimizer supports them )
	virtual bool SetFixedVariable(unsigned int /* ivar /, const std::string & / name /, double / val */);	virtual bool SetFixedVariable(unsigned int /* ivar /, const std::string & / name /, double / val */);
	/// set variable	/// set variable
	virtual bool SetVariableValue(unsigned int ivar, double val);	virtual bool SetVariableValue(unsigned int ivar, double val);
	virtual bool SetVariableValues(const double * val);	virtual bool SetVariableValues(const double * val);

	/// get name of variables (override if minimizer support storing of vari able names)	/// get name of variables (override if minimizer support storing of vari able names)
	virtual std::string VariableName(unsigned int ivar) const;	virtual std::string VariableName(unsigned int ivar) const;


	/// method to perform the minimization	/// get index of variable given a variable given a name
		/// return -1 if variable is not found
		virtual int VariableIndex(const std::string & name) const;

		/**
		method to perform the minimization.
		Return false in case the minimization did not converge. In this case
		a
		status code different than zero is set
		(retrieved by the derived method Minimizer::Status() )"

		status = 1 : Covariance was made pos defined
		status = 2 : Hesse is invalid
		status = 3 : Edm is above max
		status = 4 : Reached call limit
		status = 5 : Any other failure
		*/
	virtual bool Minimize();	virtual bool Minimize();

	/// return minimum function value	/// return minimum function value
	virtual double MinValue() const { return fState.Fval(); }	virtual double MinValue() const { return fState.Fval(); }

	/// return expected distance reached from the minimum	/// return expected distance reached from the minimum
	virtual double Edm() const { return fState.Edm(); }	virtual double Edm() const { return fState.Edm(); }

	/// return pointer to X values at the minimum	/// return pointer to X values at the minimum
	virtual const double * X() const {	virtual const double * X() const {

	skipping to change at line 190	skipping to change at line 205
	get global correlation coefficient for the variable i. This is a numb er between zero and one which gives	get global correlation coefficient for the variable i. This is a numb er between zero and one which gives
	the correlation between the i-th variable and that linear combinatio n of all other variables which	the correlation between the i-th variable and that linear combinatio n of all other variables which
	is most strongly correlated with i.	is most strongly correlated with i.
	If the variable is fixed or const the return value is zero	If the variable is fixed or const the return value is zero
	*/	*/
	virtual double GlobalCC(unsigned int i) const;	virtual double GlobalCC(unsigned int i) const;

	/**	/**
	get the minos error for parameter i, return false if Minos failed	get the minos error for parameter i, return false if Minos failed
	A minimizaiton must be performed befre, return false if no minimizati on has been done	A minimizaiton must be performed befre, return false if no minimizati on has been done

		In case of Minos failed the status error is updated as following
		status += 10 * minosStatus where the minos status is:
		status = 1 : maximum number of function calls exceeded when runni
		ng for lower error
		status = 2 : maximum number of function calls exceeded when runni
		ng for upper error
		status = 3 : new minimum found when running for lower error
		status = 4 : new minimum found when running for upper error
		status = 5 : any other failure

	*/	*/
	virtual bool GetMinosError(unsigned int i, double & errLow, double & err Up);	virtual bool GetMinosError(unsigned int i, double & errLow, double & err Up);

	/**	/**
	scan a parameter i around the minimum. A minimization must have been done before,	scan a parameter i around the minimum. A minimization must have been done before,
	return false if it is not the case	return false if it is not the case
	*/	*/
	virtual bool Scan(unsigned int i, unsigned int & nstep, double * x, doub le * y, double xmin = 0, double xmax = 0);	virtual bool Scan(unsigned int i, unsigned int & nstep, double * x, doub le * y, double xmin = 0, double xmax = 0);

	/**	/**
	find the contour points (xi,xj) of the function for parameter i and j around the minimum	find the contour points (xi,xj) of the function for parameter i and j around the minimum
	The contour will be find for value of the function = Min + ErrorUp();	The contour will be find for value of the function = Min + ErrorUp();
	*/	*/
	virtual bool Contour(unsigned int i, unsigned int j, unsigned int & npoi nts, double xi, double xj);	virtual bool Contour(unsigned int i, unsigned int j, unsigned int & npoi nts, double xi, double xj);

	/**	/**
	perform a full calculation of the Hessian matrix for error calculatio n	perform a full calculation of the Hessian matrix for error calculatio n

	If a valid minimum exists the calculation is done on theminimum point otherwise is performed	If a valid minimum exists the calculation is done on the minimum poin t otherwise is performed
	in the current set values of parameters	in the current set values of parameters

		Status code of minimizer is updated according to the following conven
		tion (in case Hesse failed)
		status += 100*hesseStatus where hesse status is:
		status = 1 : hesse failed
		status = 2 : matrix inversion failed
		status = 3 : matrix is not pos defined
	*/	*/
	virtual bool Hesse();	virtual bool Hesse();

	/// return reference to the objective function	/// return reference to the objective function
	///virtual const ROOT::Math::IGenFunction & Function() const;	///virtual const ROOT::Math::IGenFunction & Function() const;

	protected:	protected:

	// protected function for accessing the internal Minuit2 object. Needed for derived classes	// protected function for accessing the internal Minuit2 object. Needed for derived classes


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

	ModelConfig.h	ModelConfig.h

	// @(#)root/roostats:$Id: ModelConfig.h 27519 2009-02-19 13:31:41Z pellicci $	// @(#)root/roostats:$Id: ModelConfig.h 31276 2009-11-18 15:06:42Z moneta $
	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke
	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOSTATS_ModelConfig	#ifndef ROOSTATS_ModelConfig

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

	MultiDimParamFunctionAdapter.h	MultiDimParamFunctionAdapter.h

	// @(#)root/mathmore:$Id: MultiDimParamFunctionAdapter.h 24482 2008-06-23 1 5:33:08Z moneta $	// @(#)root/mathmore:$Id: MultiDimParamFunctionAdapter.h 30749 2009-10-15 1 6:33:04Z brun $
	// Author: L. Moneta Wed Dec 6 11:45:55 2006	// Author: L. Moneta Wed Dec 6 11:45:55 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 MultiDimParamFunctionAdapter	// Header file for class MultiDimParamFunctionAdapter

	skipping to change at line 74	skipping to change at line 74
	/**	/**
	Constructor from a parametric one dim function interface from a non-c onst reference	Constructor from a parametric one dim function interface from a non-c onst reference
	Do not own the function in this case	Do not own the function in this case
	*/	*/
	MultiDimParamFunctionAdapter (IParamFunction & f ) :	MultiDimParamFunctionAdapter (IParamFunction & f ) :
	fOwn(false),	fOwn(false),
	fFunc(&f)	fFunc(&f)
	{ }	{ }

	/**	/**

	Copy constructor. Different behaviour according if funciton is owned or not	Copy constructor. Different behaviour according if function is owned or not
	*/	*/
	MultiDimParamFunctionAdapter (const MultiDimParamFunctionAdapter & rhs) :	MultiDimParamFunctionAdapter (const MultiDimParamFunctionAdapter & rhs) :
	BaseFunc(),	BaseFunc(),
	IParamMultiFunction(),	IParamMultiFunction(),
	fOwn(rhs.fOwn),	fOwn(rhs.fOwn),
	fFunc(0)	fFunc(0)
	{	{
	if (fOwn)	if (fOwn)
	fFunc = dynamic_cast<IParamFunction *>( (rhs.fFunc)->Clone() );	fFunc = dynamic_cast<IParamFunction *>( (rhs.fFunc)->Clone() );
	}	}

	skipping to change at line 183	skipping to change at line 183
	/**	/**
	Constructor from a param one dim function interface from a non const reference	Constructor from a param one dim function interface from a non const reference
	Do not own the function pointer in this case	Do not own the function pointer in this case
	*/	*/
	MultiDimParamGradFunctionAdapter (IParamGradFunction & f) :	MultiDimParamGradFunctionAdapter (IParamGradFunction & f) :
	fOwn(false),	fOwn(false),
	fFunc(&f)	fFunc(&f)
	{ }	{ }

	/**	/**

	Copy constructor. Different behaviour according if funciton is owned or not	Copy constructor. Different behaviour according if function is owned or not
	*/	*/
	MultiDimParamGradFunctionAdapter (const MultiDimParamGradFunctionAdapter & rhs) :	MultiDimParamGradFunctionAdapter (const MultiDimParamGradFunctionAdapter & rhs) :
	BaseFunc(),	BaseFunc(),
	IParamMultiGradFunction(),	IParamMultiGradFunction(),
	fOwn(rhs.fOwn),	fOwn(rhs.fOwn),
	fFunc(rhs.fFunc)	fFunc(rhs.fFunc)
	{	{
	if (fOwn)	if (fOwn)
	fFunc = dynamic_cast<IParamGradFunction *>( (rhs.fFunc)->Clone() ) ;	fFunc = dynamic_cast<IParamGradFunction *>( (rhs.fFunc)->Clone() ) ;
	}	}

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

	NumEventsTestStat.h	NumEventsTestStat.h

	// @(#)root/roostats:$Id: NumEventsTestStat.h 26805 2009-01-13 17:45:57Z cr anmer $	// @(#)root/roostats:$Id: NumEventsTestStat.h 31276 2009-11-18 15:06:42Z mo neta $
	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke
	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOSTATS_NumEventsTestStat	#ifndef ROOSTATS_NumEventsTestStat

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

	OneDimFunctionAdapter.h	OneDimFunctionAdapter.h

	skipping to change at line 254	skipping to change at line 254
	double * p = const_cast<double *>(fParams);	double * p = const_cast<double *>(fParams);
	double pprev = fParams[fIpar]; // keep original value to restore in f X	double pprev = fParams[fIpar]; // keep original value to restore in f X
	p[fIpar] = x;	p[fIpar] = x;
	double y = fFunc( fX, p );	double y = fFunc( fX, p );
	p[fIpar] = pprev;	p[fIpar] = pprev;
	return y;	return y;
	}	}

	private:	private:


	// need to be mutable since ofter operator()(x,p) is not a const method	ParamFuncType fFunc;
	mutable ParamFuncType fFunc;
	const double * fX;	const double * fX;
	const double * fParams;	const double * fParams;
	unsigned int fIpar;	unsigned int fIpar;

	};	};

	} // end namespace Math	} // end namespace Math

	} // end namespace ROOT	} // end namespace ROOT


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

	PdfProposal.h	PdfProposal.h

	// @(#)root/roostats:$Id: PdfProposal.h 26805 2009-06-17 14:31:02Z kbelasco $	// @(#)root/roostats:$Id: PdfProposal.h 31276 2009-11-18 15:06:42Z moneta $
	// Authors: Kevin Belasco 17/06/2009	// Authors: Kevin Belasco 17/06/2009
	// Authors: Kyle Cranmer 17/06/2009	// Authors: Kyle Cranmer 17/06/2009
	/*************************************************************************	/*************************************************************************
	* 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. *
	*************************************************************************/	*************************************************************************/


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

	PointSetInterval.h	PointSetInterval.h

	// @(#)root/roostats:$Id: PointSetInterval.cxx 26317 2009-01-13 15:31:05Z c ranmer $	// @(#)root/roostats:$Id: PointSetInterval.h 31276 2009-11-18 15:06:42Z mon eta $
	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke
	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef RooStats_PointSetInterval	#ifndef RooStats_PointSetInterval

	skipping to change at line 25	skipping to change at line 25
	#include "RooArgSet.h"	#include "RooArgSet.h"
	#endif	#endif
	#ifndef ROO_TREE_DATA	#ifndef ROO_TREE_DATA
	#include "RooAbsData.h"	#include "RooAbsData.h"
	#endif	#endif
	#ifndef RooStats_ConfInterval	#ifndef RooStats_ConfInterval
	#include "RooStats/ConfInterval.h"	#include "RooStats/ConfInterval.h"
	#endif	#endif

	namespace RooStats {	namespace RooStats {


	class PointSetInterval : public ConfInterval {	class PointSetInterval : public ConfInterval {

	private:
	// RooArgSet* fParameters; // parameter of interest
	Double_t fConfidenceLevel; // confidence level
	RooAbsData* fParameterPointsInInterval; // either a histogram (RooDataH
	ist) or a tree (RooDataSet)

	public:	public:

	// constructors,destructors
	PointSetInterval();	// default constructors
	PointSetInterval(const char* name);	explicit PointSetInterval(const char* name = 0);
	PointSetInterval(const char* name, const char* title);
		// constructor from name and data set specifying the interval points
	PointSetInterval(const char* name, RooAbsData&);	PointSetInterval(const char* name, RooAbsData&);

	PointSetInterval(const char* name, const char* title, RooAbsData&);
		// destructor
	virtual ~PointSetInterval();	virtual ~PointSetInterval();


	virtual Bool_t IsInInterval(const RooArgSet&);	// check if parameter is in the interval
		virtual Bool_t IsInInterval(const RooArgSet&) const;

		// set the confidence level for the interval
	virtual void SetConfidenceLevel(Double_t cl) {fConfidenceLevel = cl;}	virtual void SetConfidenceLevel(Double_t cl) {fConfidenceLevel = cl;}


		// return the confidence level for the interval
	virtual Double_t ConfidenceLevel() const {return fConfidenceLevel;}	virtual Double_t ConfidenceLevel() const {return fConfidenceLevel;}

	// Method to return lower limit on a given parameter	// Method to return lower limit on a given parameter
	// Double_t LowerLimit(RooRealVar& param) ; // could provide, but misl eading?	// Double_t LowerLimit(RooRealVar& param) ; // could provide, but misl eading?
	// Double_t UpperLimit(RooRealVar& param) ; // could provide, but misleading?	// Double_t UpperLimit(RooRealVar& param) ; // could provide, but misleading?


	// do we want it to return list of parameters	// return a cloned list with the parameter of interest
	virtual RooArgSet* GetParameters() const;	virtual RooArgSet* GetParameters() const;


	// Accessor for making plots	// return a copy of the data set (points) defining this interval
	RooAbsData* GetParameterPoints() const {return (RooAbsData*)fParameterP ointsInInterval->Clone();}	RooAbsData* GetParameterPoints() const {return (RooAbsData*)fParameterP ointsInInterval->Clone();}


	// check if parameters are correct. (dummy implementation to start)	// return a cloned list with the parameter of interest
	Bool_t CheckParameters(const RooArgSet&) const ;	Bool_t CheckParameters(const RooArgSet&) const ;


	// Method to return lower limit on a given parameter	// return lower limit on a given parameter
	Double_t LowerLimit(RooRealVar& param) ;	Double_t LowerLimit(RooRealVar& param) ;


		// return upper limit on a given parameter
	Double_t UpperLimit(RooRealVar& param) ;	Double_t UpperLimit(RooRealVar& param) ;

	protected:	protected:


	ClassDef(PointSetInterval,1) // Concrete implementation of ConfInterva l for simple 1-D intervals in the form [a,b]	ClassDef(PointSetInterval,1) // Concrete implementation of ConfInterva l for simple 1-D intervals in the form [a,b]


		private:

		// RooArgSet* fParameters; // parameter of interest
		Double_t fConfidenceLevel; // confidence level
		RooAbsData* fParameterPointsInInterval; // either a histogram (RooDataH
		ist) or a tree (RooDataSet)

	};	};
	}	}

	#endif	#endif

End of changes. 14 change blocks.
	16 lines changed or deleted	29 lines changed or added

	PoissonLikelihoodFCN.h	PoissonLikelihoodFCN.h

	// @(#)root/mathcore:$Id: PoissonLikelihoodFCN.h 28946 2009-06-11 15:39:14Z moneta $	// @(#)root/mathcore:$Id: PoissonLikelihoodFCN.h 30539 2009-10-01 13:13:09Z moneta $
	// Author: L. Moneta Fri Aug 17 14:29:24 2007	// Author: L. Moneta Fri Aug 17 14:29:24 2007

	/**********************************************************************	/**********************************************************************
	* *	* *
	* Copyright (c) 2007 LCG ROOT Math Team, CERN/PH-SFT *	* Copyright (c) 2007 LCG ROOT Math Team, CERN/PH-SFT *
	* *	* *
	* *	* *
	**********************************************************************/	**********************************************************************/

	// Header file for class PoissonLikelihoodFCN	// Header file for class PoissonLikelihoodFCN

	skipping to change at line 64	skipping to change at line 64
	public:	public:

	typedef ::ROOT::Math::BasicFitMethodFunction<FunType> BaseObjFunction;	typedef ::ROOT::Math::BasicFitMethodFunction<FunType> BaseObjFunction;
	typedef typename BaseObjFunction::BaseFunction BaseFunction;	typedef typename BaseObjFunction::BaseFunction BaseFunction;

	typedef ::ROOT::Math::IParamMultiFunction IModelFunction;	typedef ::ROOT::Math::IParamMultiFunction IModelFunction;

	/**	/**
	Constructor from unbin data set and model function (pdf)	Constructor from unbin data set and model function (pdf)
	*/	*/

	PoissonLikelihoodFCN (const BinData & data, IModelFunction & func) :	PoissonLikelihoodFCN (const BinData & data, const IModelFunction & func) :
	BaseObjFunction(func.NPar(), data.Size() ),	BaseObjFunction(func.NPar(), data.Size() ),
	fData(data),	fData(data),
	fFunc(func),	fFunc(func),
	fNEffPoints(0),	fNEffPoints(0),
	fGrad ( std::vector<double> ( func.NPar() ) )	fGrad ( std::vector<double> ( func.NPar() ) )
	{ }	{ }

	/**	/**
	Destructor (no operations)	Destructor (no operations)
	*/	*/

	skipping to change at line 139	skipping to change at line 139

	// for derivatives	// for derivatives
	virtual double DoDerivative(const double * x, unsigned int icoord ) con st {	virtual double DoDerivative(const double * x, unsigned int icoord ) con st {
	Gradient(x, &fGrad[0]);	Gradient(x, &fGrad[0]);
	return fGrad[icoord];	return fGrad[icoord];
	}	}

	//data member	//data member

	const BinData & fData;	const BinData & fData;

	mutable IModelFunction & fFunc;	const IModelFunction & fFunc;

	unsigned int fNDim;	unsigned int fNDim;
	unsigned int fNPoints; // size of the data	unsigned int fNPoints; // size of the data
	mutable unsigned int fNEffPoints; // number of effective points used in the fit	mutable unsigned int fNEffPoints; // number of effective points used in the fit
	mutable unsigned int fNCalls;	mutable unsigned int fNCalls;

	mutable std::vector<double> fGrad; // for derivatives	mutable std::vector<double> fGrad; // for derivatives

	};	};


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

	ProfileLikelihoodCalculator.h	ProfileLikelihoodCalculator.h

	// @(#)root/roostats:$Id: ProfileLikelihoodCalculator.h 30512 2009-09-28 17 :24:48Z moneta $	// @(#)root/roostats:$Id: ProfileLikelihoodCalculator.h 31276 2009-11-18 15 :06:42Z moneta $
	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke
	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOSTATS_ProfileLikelihoodCalculator	#ifndef ROOSTATS_ProfileLikelihoodCalculator

	skipping to change at line 28	skipping to change at line 28
	#include "RooStats/LikelihoodInterval.h"	#include "RooStats/LikelihoodInterval.h"

	namespace RooStats {	namespace RooStats {

	class LikelihoodInterval;	class LikelihoodInterval;

	class ProfileLikelihoodCalculator : public CombinedCalculator, public TN amed {	class ProfileLikelihoodCalculator : public CombinedCalculator, public TN amed {

	public:	public:


		// default constructor (needed for I/O)
	ProfileLikelihoodCalculator();	ProfileLikelihoodCalculator();


		/// constructor from data, from a full model pdf describing both para
		meter of interest and nuisance parameters
		/// and from the set specifying the parameter of interest (POI).
		/// There is no need to specify the nuisance parameters since they ar
		e all other parameters of the model.
		/// When using the calculator for performing an hypothesis test one n
		eeds to provide also a snapshot (a copy)
		/// defining the null parameters and their value. There is no need to
		pass the alternate parameters. These
		/// will be obtained by the value maximazing the likelihood function
	ProfileLikelihoodCalculator(RooAbsData& data, RooAbsPdf& pdf, const R ooArgSet& paramsOfInterest,	ProfileLikelihoodCalculator(RooAbsData& data, RooAbsPdf& pdf, const R ooArgSet& paramsOfInterest,
	Double_t size = 0.05, const RooArgSet* nu llParams = 0 );	Double_t size = 0.05, const RooArgSet* nu llParams = 0 );


		/// constructor from data and a model configuration
		/// If the ModelConfig defines a prior pdf for any of the parameters
		those will be included as constrained terms in the
		/// likelihood function
	ProfileLikelihoodCalculator(RooAbsData& data, ModelConfig & model, Do uble_t size = 0.05);	ProfileLikelihoodCalculator(RooAbsData& data, ModelConfig & model, Do uble_t size = 0.05);

	virtual ~ProfileLikelihoodCalculator();	virtual ~ProfileLikelihoodCalculator();


	// main interface, implemented	/// Return a likelihood interval. A global fit to the likelihood is p
		erformed and
		/// the interval is constructed using the the profile likelihood rati
		o function of the POI
	virtual LikelihoodInterval* GetInterval() const ;	virtual LikelihoodInterval* GetInterval() const ;


	// main interface, implemented	/// Return the hypothesis test result obtained from the likelihood ra
		tio of the
		/// maximum likelihood value with the null parameters fixed to their
		values, with respect keeping all parameters
		/// floating (global maximum likelihood value).
	virtual HypoTestResult* GetHypoTest() const;	virtual HypoTestResult* GetHypoTest() const;

	protected:	protected:


		// clear internal fit result
		void DoReset() const;

		// perform a global fit
		void DoGlobalFit() const;

	ClassDef(ProfileLikelihoodCalculator,1) // A concrete implementation of CombinedCalculator that uses the ProfileLikelihood ratio.	ClassDef(ProfileLikelihoodCalculator,1) // A concrete implementation of CombinedCalculator that uses the ProfileLikelihood ratio.


		mutable RooFitResult * fFitResult; // internal result of gloabl fit

	};	};
	}	}
	#endif	#endif

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

	ProfileLikelihoodTestStat.h	ProfileLikelihoodTestStat.h

	// @(#)root/roostats:$Id: ProfileLikelihoodTestStat.h 26805 2009-01-13 17:4 5:57Z cranmer $	// @(#)root/roostats:$Id: ProfileLikelihoodTestStat.h 31276 2009-11-18 15:0 6:42Z moneta $
	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke
	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOSTATS_ProfileLikelihoodTestStat	#ifndef ROOSTATS_ProfileLikelihoodTestStat

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

	ProposalFunction.h	ProposalFunction.h

	// @(#)root/roostats:$Id: ProposalFunction.h 26805 2009-06-17 14:31:02Z kbe lasco $	// @(#)root/roostats:$Id: ProposalFunction.h 31276 2009-11-18 15:06:42Z mon eta $
	// Authors: Kevin Belasco 17/06/2009	// Authors: Kevin Belasco 17/06/2009
	// Authors: Kyle Cranmer 17/06/2009	// Authors: Kyle Cranmer 17/06/2009
	/*************************************************************************	/*************************************************************************
	* 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. *
	*************************************************************************/	*************************************************************************/


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

	ProposalHelper.h	ProposalHelper.h

	// @(#)root/roostats:$Id: ProposalHelper.h 29524 2009-07-22 14:31:02Z kbela sco $	// @(#)root/roostats:$Id: ProposalHelper.h 31276 2009-11-18 15:06:42Z monet a $
	// Authors: Kevin Belasco 7/22/2009	// Authors: Kevin Belasco 7/22/2009
	// Authors: Kyle Cranmer 7/22/2009	// Authors: Kyle Cranmer 7/22/2009
	/*************************************************************************	/*************************************************************************
	* 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. *
	*************************************************************************/	*************************************************************************/


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

	RConfig.h	RConfig.h

	/* @(#)root/base:$Id: RConfig.h 29770 2009-08-12 16:40:27Z rdm $ */	/* @(#)root/base:$Id: RConfig.h 30773 2009-10-16 15:10:47Z rdm $ */

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2002, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2002, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOT_RConfig	#ifndef ROOT_RConfig

	skipping to change at line 551	skipping to change at line 551
	/---- misc --------------------------------------------------------------- ---/	/---- misc --------------------------------------------------------------- ---/

	#ifdef R__GNU	#ifdef R__GNU
	# define SafeDelete(p) { if (p) { delete p; p = 0; } }	# define SafeDelete(p) { if (p) { delete p; p = 0; } }
	#else	#else
	# define SafeDelete(p) { delete p; p = 0; }	# define SafeDelete(p) { delete p; p = 0; }
	#endif	#endif

	#if defined(R__WIN32) \|\| defined(__CINT__)	#if defined(R__WIN32) \|\| defined(__CINT__)
	#define R__LL(longlong) longlong	#define R__LL(longlong) longlong

		#define R__ULL(ulonglong) ulonglong
	#else	#else
	#define R__LL(longlong) _NAME2_(longlong,LL)	#define R__LL(longlong) _NAME2_(longlong,LL)

		#define R__ULL(ulonglong) _NAME2_(ulonglong,ULL)
	#endif	#endif

	#endif	#endif

End of changes. 3 change blocks.
	1 lines changed or deleted	3 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/	#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	i686-slc5-gcc43-opt PYTHONDIR=/afs/cern.ch/sw/lcg/external/Python/2.5.4p2/i
	6-slc5-gcc43-opt --fail-on-missing --enable-cintex --enable-explicitlink --	686-slc5-gcc43-opt --fail-on-missing --enable-cintex --enable-explicitlink
	enable-gdml --enable-genvector --enable-mathmore --enable-minuit2 --enable-	--enable-gdml --enable-genvector --enable-krb5 --enable-mathmore --enable-m
	mysql --enable-oracle --enable-python --enable-qt --enable-qtgsi --enable-r	inuit2 --enable-mysql --enable-oracle --enable-python --enable-qt --enable-
	eflex --enable-roofit --enable-table --enable-unuran --with-castor-incdir=/	qtgsi --enable-reflex --enable-roofit --enable-table --enable-unuran --with
	afs/cern.ch/sw/lcg/external/castor/2.1.7-24/i686-slc5-gcc43-opt/usr/include	-castor-incdir=/afs/cern.ch/sw/lcg/external/castor/2.1.8-10/i686-slc5-gcc43
	/shift --with-castor-libdir=/afs/cern.ch/sw/lcg/external/castor/2.1.7-24/i6	-opt/usr/include/shift --with-castor-libdir=/afs/cern.ch/sw/lcg/external/ca
	86-slc5-gcc43-opt/usr/lib --with-cern-libdir=/afs/cern.ch/sw/lcg/external/c	stor/2.1.8-10/i686-slc5-gcc43-opt/usr/lib --with-cern-libdir=/afs/cern.ch/s
	ernlib/2006a/i686-slc5-gcc43-opt/lib --with-dcap-libdir=/afs/cern.ch/sw/lcg	w/lcg/external/cernlib/2006a/i686-slc5-gcc43-opt/lib --with-dcap-libdir=/af
	/external/dcache_client/1.9.3/i686-slc5-gcc43-opt/dcap/lib --with-dcap-incd	s/cern.ch/sw/lcg/external/dcache_client/1.9.3/i686-slc5-gcc43-opt/dcap/lib
	ir=/afs/cern.ch/sw/lcg/external/dcache_client/1.9.3/i686-slc5-gcc43-opt/dca	--with-dcap-incdir=/afs/cern.ch/sw/lcg/external/dcache_client/1.9.3/i686-sl
	p/include --with-fftw3-incdir=/afs/cern.ch/sw/lcg/external/fftw3/3.1.2/i686	c5-gcc43-opt/dcap/include --with-fftw3-incdir=/afs/cern.ch/sw/lcg/external/
	-slc5-gcc43-opt/include --with-fftw3-libdir=/afs/cern.ch/sw/lcg/external/ff	fftw3/3.1.2/i686-slc5-gcc43-opt/include --with-fftw3-libdir=/afs/cern.ch/sw
	tw3/3.1.2/i686-slc5-gcc43-opt/lib --with-gccxml=/afs/cern.ch/sw/lcg/externa	/lcg/external/fftw3/3.1.2/i686-slc5-gcc43-opt/lib --with-gccxml=/afs/cern.c
	l/gccxml/0.9.0_20090601/i686-slc5-gcc43-opt/bin --with-gfal-libdir=/afs/cer	h/sw/lcg/external/gccxml/0.9.0_20090601/i686-slc5-gcc43-opt/bin --with-gfal
	n.ch/sw/lcg/external/Grid/gfal/1.11.7-1/i686-slc5-gcc43-opt/lib --with-gfal	-libdir=/afs/cern.ch/sw/lcg/external/Grid/gfal/1.11.8-3/i686-slc5-gcc43-opt
	-incdir=/afs/cern.ch/sw/lcg/external/Grid/gfal/1.11.7-1/i686-slc5-gcc43-opt	/lib --with-gfal-incdir=/afs/cern.ch/sw/lcg/external/Grid/gfal/1.11.8-3/i68
	/include --with-globus-incdir=/afs/cern.ch/sw/lcg/external/Grid/globus/4.0.	6-slc5-gcc43-opt/include --with-globus-incdir=/afs/cern.ch/sw/lcg/external/
	3-VDT-1.6.0/i686-slc5-gcc43-opt/globus/include --with-globus-libdir=/afs/ce	Grid/globus/4.0.3-VDT-1.6.0/i686-slc5-gcc43-opt/globus/include --with-globu
	rn.ch/sw/lcg/external/Grid/globus/4.0.3-VDT-1.6.0/i686-slc5-gcc43-opt/globu	s-libdir=/afs/cern.ch/sw/lcg/external/Grid/globus/4.0.3-VDT-1.6.0/i686-slc5
	s/lib --with-gsl-incdir=/afs/cern.ch/sw/lcg/external/GSL/1.10/i686-slc5-gcc	-gcc43-opt/globus/lib --with-gsl-incdir=/afs/cern.ch/sw/lcg/external/GSL/1.
	43-opt/include --with-gsl-libdir=/afs/cern.ch/sw/lcg/external/GSL/1.10/i686	10/i686-slc5-gcc43-opt/include --with-gsl-libdir=/afs/cern.ch/sw/lcg/extern
	-slc5-gcc43-opt/lib --with-mysql-incdir=/afs/cern.ch/sw/lcg/external/mysql/	al/GSL/1.10/i686-slc5-gcc43-opt/lib --with-mysql-incdir=/afs/cern.ch/sw/lcg
	5.0.18/i686-slc5-gcc43-opt/include --with-mysql-libdir=/afs/cern.ch/sw/lcg/	/external/mysql/5.0.18/i686-slc5-gcc43-opt/include --with-mysql-libdir=/afs
	external/mysql/5.0.18/i686-slc5-gcc43-opt/lib --with-oracle-incdir=/afs/cer	/cern.ch/sw/lcg/external/mysql/5.0.18/i686-slc5-gcc43-opt/lib --with-oracle
	n.ch/sw/lcg/external/oracle/10.2.0.4p1-full/i686-slc5-gcc43-opt/include --w	-incdir=/afs/cern.ch/sw/lcg/external/oracle/11.2.0.1.0/i686-slc5-gcc43-opt/
	ith-oracle-libdir=/afs/cern.ch/sw/lcg/external/oracle/10.2.0.4p1-full/i686-	include --with-oracle-libdir=/afs/cern.ch/sw/lcg/external/oracle/11.2.0.1.0
	slc5-gcc43-opt/lib --with-shift-incdir=/afs/cern.ch/sw/lcg/external/castor/	/i686-slc5-gcc43-opt/lib --with-shift-incdir=/afs/cern.ch/sw/lcg/external/c
	2.1.7-24/i686-slc5-gcc43-opt/usr/include/shift --with-shift-libdir=/afs/cer	astor/2.1.8-10/i686-slc5-gcc43-opt/usr/include/shift --with-shift-libdir=/a
	n.ch/sw/lcg/external/castor/2.1.7-24/i686-slc5-gcc43-opt/usr/lib"	fs/cern.ch/sw/lcg/external/castor/2.1.8-10/i686-slc5-gcc43-opt/usr/lib --wi
		th-pythia6-libdir=/afs/cern.ch/user/b/bellenot/scratch0/dist/pythia6/i686-s
		lc5-gcc43-opt --with-pythia8-incdir=/afs/cern.ch/user/b/bellenot/scratch0/d
		ist/pythia8/i686-slc5-gcc43-opt/include --with-pythia8-libdir=/afs/cern.ch/
		user/b/bellenot/scratch0/dist/pythia8/i686-slc5-gcc43-opt/lib --with-gviz-i
		ncdir=/build/bellenot/libraries/i686-slc5-gcc43-opt/graphviz-2.24.0/include
		/graphviz --with-gviz-libdir=/build/bellenot/libraries/i686-slc5-gcc43-opt/
		graphviz-2.24.0/lib"
		#define R__CONFIGUREFEATURES "asimage astiff builtin_afterimage builtin_ft
		gl builtin_freetype builtin_glew builtin_pcre builtin_zlib castor cint5 cin
		tex editline dcache exceptions explicitlink fftw3 gviz gdml genvector gfal
		krb5 ldap mathmore memstat minuit2 mysql opengl oracle pythia6 pythia8 pyth
		on qt qtgsi reflex roofit rfio shadowpw shared ssl table tmva unuran xft xm
		l xrootd thread"

	#endif	#endif

End of changes. 1 change blocks.
	31 lines changed or deleted	44 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.25/02"	#define ROOT_RELEASE "5.25/04"
	#define ROOT_RELEASE_DATE "Sep 29 2009"	#define ROOT_RELEASE_DATE "Nov 23 2009"
	#define ROOT_RELEASE_TIME "06:55:55"	#define ROOT_RELEASE_TIME "22:31:15"
	#define ROOT_SVN_REVISION 30516	#define ROOT_SVN_REVISION 31399
	#define ROOT_SVN_BRANCH "trunk"	#define ROOT_SVN_BRANCH "trunk"

	#define ROOT_VERSION_CODE 334082	#define ROOT_VERSION_CODE 334084
	#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

	RooAbsDataStore.h	RooAbsDataStore.h
	/************************************************************************ *	/************************************************************************ *
	* Project: RooFit *	* Project: RooFit *
	* Package: RooFitCore *	* Package: RooFitCore *

	* File: $Id: RooAbsDataStore.h 30333 2009-09-21 15:39:17Z wouter $	* File: $Id: RooAbsDataStore.h 31258 2009-11-17 22:41:06Z wouter $
	* Authors: *	* Authors: *
	* WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu *	* WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu *
	* DK, David Kirkby, UC Irvine, dkirkby@uci.edu *	* DK, David Kirkby, UC Irvine, dkirkby@uci.edu *
	* *	* *
	* Copyright (c) 2000-2005, Regents of the University of California *	* Copyright (c) 2000-2005, Regents of the University of California *
	* and Stanford University. All rights reserved. *	* and Stanford University. All rights reserved. *
	* *	* *
	* Redistribution and use in source and binary forms, *	* Redistribution and use in source and binary forms, *
	* with or without modification, are permitted according to the terms *	* with or without modification, are permitted according to the terms *
	* listed in LICENSE (http://roofit.sourceforge.net/license.txt) *	* listed in LICENSE (http://roofit.sourceforge.net/license.txt) *
	************************************************************************ */	************************************************************************ */
	#ifndef ROO_ABS_DATA_STORE	#ifndef ROO_ABS_DATA_STORE
	#define ROO_ABS_DATA_STORE	#define ROO_ABS_DATA_STORE

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

		#include "RooAbsData.h"
	#include "TNamed.h"	#include "TNamed.h"
	#include <list>	#include <list>

	class RooAbsArg ;	class RooAbsArg ;
	class RooArgList ;	class RooArgList ;
	class TIterator ;	class TIterator ;
	class TTree ;	class TTree ;

	class RooAbsDataStore : public TNamed, public RooPrintable {	class RooAbsDataStore : public TNamed, public RooPrintable {
	public:	public:

	skipping to change at line 45	skipping to change at line 46
	RooAbsDataStore(const RooAbsDataStore& other, const RooArgSet& vars, cons t char* newname=0) ;	RooAbsDataStore(const RooAbsDataStore& other, const RooArgSet& vars, cons t char* newname=0) ;
	virtual RooAbsDataStore* clone(const RooArgSet& vars, const char* newname =0) const = 0 ;	virtual RooAbsDataStore* clone(const RooArgSet& vars, const char* newname =0) const = 0 ;
	virtual ~RooAbsDataStore() ;	virtual ~RooAbsDataStore() ;

	// Write current row	// Write current row
	virtual Int_t fill() = 0 ;	virtual Int_t fill() = 0 ;

	// Retrieve a row	// Retrieve a row
	virtual const RooArgSet* get(Int_t index) const = 0 ;	virtual const RooArgSet* get(Int_t index) const = 0 ;
	virtual const RooArgSet* get() const { return &_vars ; }	virtual const RooArgSet* get() const { return &_vars ; }

		virtual Double_t weight() const = 0 ;

		virtual Double_t weightError(RooAbsData::ErrorType etype=RooAbsData::Pois
		son) const = 0 ;
		virtual void weightError(Double_t& lo, Double_t& hi, RooAbsData::ErrorTyp
		e etype=RooAbsData::Poisson) const = 0 ;

		virtual Double_t weight(Int_t index) const = 0 ;

		virtual Bool_t isWeighted() const = 0 ;

	// Change observable name	// Change observable name
	virtual Bool_t changeObservableName(const char* from, const char* to) =0 ;	virtual Bool_t changeObservableName(const char* from, const char* to) =0 ;

	// Add one or more columns	// Add one or more columns
	virtual RooAbsArg* addColumn(RooAbsArg& var, Bool_t adjustRange=kTRUE) = 0 ;	virtual RooAbsArg* addColumn(RooAbsArg& var, Bool_t adjustRange=kTRUE) = 0 ;
	virtual RooArgSet* addColumns(const RooArgList& varList) = 0 ;	virtual RooArgSet* addColumns(const RooArgList& varList) = 0 ;

	// Merge column-wise	// Merge column-wise
	virtual RooAbsDataStore* merge(const RooArgSet& allvars, std::list<RooAbs DataStore*> dstoreList) = 0 ;	virtual RooAbsDataStore* merge(const RooArgSet& allvars, std::list<RooAbs DataStore*> dstoreList) = 0 ;

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

	RooCompositeDataStore.h	RooCompositeDataStore.h
	/************************************************************************ *	/************************************************************************ *
	* Project: RooFit *	* Project: RooFit *
	* Package: RooFitCore *	* Package: RooFitCore *

	* File: $Id: RooCompositeDataStore.h 30333 2009-09-21 15:39:17Z wouter $	* File: $Id: RooCompositeDataStore.h 31258 2009-11-17 22:41:06Z wouter $
	* Authors: *	* Authors: *
	* WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu *	* WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu *
	* DK, David Kirkby, UC Irvine, dkirkby@uci.edu *	* DK, David Kirkby, UC Irvine, dkirkby@uci.edu *
	* *	* *
	* Copyright (c) 2000-2005, Regents of the University of California *	* Copyright (c) 2000-2005, Regents of the University of California *
	* and Stanford University. All rights reserved. *	* and Stanford University. All rights reserved. *
	* *	* *
	* Redistribution and use in source and binary forms, *	* Redistribution and use in source and binary forms, *
	* with or without modification, are permitted according to the terms *	* with or without modification, are permitted according to the terms *
	* listed in LICENSE (http://roofit.sourceforge.net/license.txt) *	* listed in LICENSE (http://roofit.sourceforge.net/license.txt) *

	skipping to change at line 51	skipping to change at line 51
	RooCompositeDataStore(const RooCompositeDataStore& other, const char* new name=0) ;	RooCompositeDataStore(const RooCompositeDataStore& other, const char* new name=0) ;
	RooCompositeDataStore(const RooCompositeDataStore& other, const RooArgSet & vars, const char* newname=0) ;	RooCompositeDataStore(const RooCompositeDataStore& other, const RooArgSet & vars, const char* newname=0) ;
	virtual ~RooCompositeDataStore() ;	virtual ~RooCompositeDataStore() ;

	// Write current row	// Write current row
	virtual Int_t fill() ;	virtual Int_t fill() ;

	// Retrieve a row	// Retrieve a row
	using RooAbsDataStore::get ;	using RooAbsDataStore::get ;
	virtual const RooArgSet* get(Int_t index) const ;	virtual const RooArgSet* get(Int_t index) const ;

		virtual Double_t weight() const ;
		virtual Double_t weight(Int_t index) const ;
		virtual Double_t weightError(RooAbsData::ErrorType etype=RooAbsData::Pois
		son) const ;
		virtual void weightError(Double_t& lo, Double_t& hi, RooAbsData::ErrorTyp
		e etype=RooAbsData::Poisson) const ;
		virtual Bool_t isWeighted() const ;

	// Change observable name	// Change observable name
	virtual Bool_t changeObservableName(const char* from, const char* to) ;	virtual Bool_t changeObservableName(const char* from, const char* to) ;

	// Add one or more columns	// Add one or more columns
	virtual RooAbsArg* addColumn(RooAbsArg& var, Bool_t adjustRange=kTRUE) ;	virtual RooAbsArg* addColumn(RooAbsArg& var, Bool_t adjustRange=kTRUE) ;
	virtual RooArgSet* addColumns(const RooArgList& varList) ;	virtual RooArgSet* addColumns(const RooArgList& varList) ;

	// Merge column-wise	// Merge column-wise
	RooAbsDataStore* merge(const RooArgSet& allvars, std::list<RooAbsDataStor e*> dstoreList) ;	RooAbsDataStore* merge(const RooArgSet& allvars, std::list<RooAbsDataStor e*> dstoreList) ;

	skipping to change at line 82	skipping to change at line 87
	virtual const RooAbsArg* cacheOwner() { return 0 ; }	virtual const RooAbsArg* cacheOwner() { return 0 ; }
	virtual void setArgStatus(const RooArgSet& set, Bool_t active) ;	virtual void setArgStatus(const RooArgSet& set, Bool_t active) ;
	virtual void resetCache() ;	virtual void resetCache() ;

	protected:	protected:

	void attachCache(const RooAbsArg* newOwner, const RooArgSet& cachedVars) ;	void attachCache(const RooAbsArg* newOwner, const RooArgSet& cachedVars) ;

	std::map<std::string,RooAbsDataStore*> _dataMap ;	std::map<std::string,RooAbsDataStore*> _dataMap ;
	RooCategory* _indexCat ;	RooCategory* _indexCat ;

		mutable RooAbsDataStore* _curStore ; //! Datastore associated with curren
		t event
		mutable Int_t _curIndex ; //! Index associated with current event

	ClassDef(RooCompositeDataStore,1) // Composite Data Storage class	ClassDef(RooCompositeDataStore,1) // Composite Data Storage class
	};	};

	#endif	#endif

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

	RooEffProd.h	RooEffProd.h

	skipping to change at line 67	skipping to change at line 67
	public:	public:
	CacheElem() : _clone(0), _int(0) {}	CacheElem() : _clone(0), _int(0) {}
	virtual ~CacheElem() { delete _int ; delete _clone ; }	virtual ~CacheElem() { delete _int ; delete _clone ; }
	// Payload	// Payload
	RooArgSet _intObs ;	RooArgSet _intObs ;
	RooEffProd* _clone ;	RooEffProd* _clone ;
	RooAbsReal* _int ;	RooAbsReal* _int ;
	// Cache management functions	// Cache management functions
	virtual RooArgList containedArgs(Action) ;	virtual RooArgList containedArgs(Action) ;
	} ;	} ;

	mutable RooObjCacheManager _cacheMgr ; // The cache manager	mutable RooObjCacheManager _cacheMgr ; //! The cache manager

	// the real stuff...	// the real stuff...
	RooRealProxy _pdf ; // Probability Density function	RooRealProxy _pdf ; // Probability Density function
	RooRealProxy _eff; // Efficiency function	RooRealProxy _eff; // Efficiency function
	mutable const RooArgSet* _nset ; //! Normalization set to be used in eva luation	mutable const RooArgSet* _nset ; //! Normalization set to be used in eva luation

	RooArgSet* _fixedNset ; //! Fixed normalization set overriding default no rmalization set (if provided)	RooArgSet* _fixedNset ; //! Fixed normalization set overriding default no rmalization set (if provided)


	ClassDef(RooEffProd,1) // Product operator p.d.f of (PDF x efficiency) im plementing optimized generator context	ClassDef(RooEffProd,2) // Product operator p.d.f of (PDF x efficiency) im plementing optimized generator context
	};	};

	#endif	#endif

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

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

	* File: $Id: RooNDKeysPdf.h 30333 2009-09-21 15:39:17Z wouter $	* File: $Id: RooNDKeysPdf.h 30854 2009-10-23 15:23:44Z wouter $
	* Authors: *	* Authors: *
	* Max Baak, CERN, mbaak@cern.ch *	* Max Baak, CERN, mbaak@cern.ch *
	* *	* *
	* Copyright (c) 2000-2005, Regents of the University of California *	* Copyright (c) 2000-2005, Regents of the University of California *
	* and Stanford University. All rights reserved. *	* and Stanford University. All rights reserved. *
	* *	* *
	* Redistribution and use in source and binary forms, *	* Redistribution and use in source and binary forms, *
	* with or without modification, are permitted according to the terms *	* with or without modification, are permitted according to the terms *
	* listed in LICENSE (http://roofit.sourceforge.net/license.txt) *	* listed in LICENSE (http://roofit.sourceforge.net/license.txt) *
	************************************************************************ */	************************************************************************ */

	skipping to change at line 114	skipping to change at line 114
	void mirrorDataSet() const;	void mirrorDataSet() const;
	void loadWeightSet() const;	void loadWeightSet() const;
	void calculateShell(BoxInfo* bi) const;	void calculateShell(BoxInfo* bi) const;
	void calculatePreNorm(BoxInfo* bi) const;	void calculatePreNorm(BoxInfo* bi) const;
	void sortDataIndices(BoxInfo* bi=0) const;	void sortDataIndices(BoxInfo* bi=0) const;
	void calculateBandWidth() const;	void calculateBandWidth() const;
	Double_t gauss(vector<Double_t>& x, vector<vector<Double_t> >& weights) c onst;	Double_t gauss(vector<Double_t>& x, vector<vector<Double_t> >& weights) c onst;
	void loopRange(vector<Double_t>& x, map<Int_t,Bool_t>& ibMap) const;	void loopRange(vector<Double_t>& x, map<Int_t,Bool_t>& ibMap) const;
	void boxInfoInit(BoxInfo* bi, const char* rangeName, Int_t code) cons t;	void boxInfoInit(BoxInfo* bi, const char* rangeName, Int_t code) cons t;


	mutable RooDataSet& _data;	RooDataSet& _data;
	mutable TString _options;	mutable TString _options;
	mutable Double_t _widthFactor;	mutable Double_t _widthFactor;
	mutable Double_t _nSigma;	mutable Double_t _nSigma;

	mutable Bool_t _fixedShape;	mutable Bool_t _fixedShape;
	mutable Bool_t _mirror;	mutable Bool_t _mirror;
	mutable Bool_t _debug;	mutable Bool_t _debug;
	mutable Bool_t _verbose;	mutable Bool_t _verbose;

	mutable Double_t _sqrt2pi;	mutable Double_t _sqrt2pi;

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

	RooTreeDataStore.h	RooTreeDataStore.h
	/************************************************************************ *	/************************************************************************ *
	* Project: RooFit *	* Project: RooFit *
	* Package: RooFitCore *	* Package: RooFitCore *

	* File: $Id: RooTreeDataStore.h 30333 2009-09-21 15:39:17Z wouter $	* File: $Id: RooTreeDataStore.h 31258 2009-11-17 22:41:06Z wouter $
	* Authors: *	* Authors: *
	* WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu *	* WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu *
	* DK, David Kirkby, UC Irvine, dkirkby@uci.edu *	* DK, David Kirkby, UC Irvine, dkirkby@uci.edu *
	* *	* *
	* Copyright (c) 2000-2005, Regents of the University of California *	* Copyright (c) 2000-2005, Regents of the University of California *
	* and Stanford University. All rights reserved. *	* and Stanford University. All rights reserved. *
	* *	* *
	* Redistribution and use in source and binary forms, *	* Redistribution and use in source and binary forms, *
	* with or without modification, are permitted according to the terms *	* with or without modification, are permitted according to the terms *
	* listed in LICENSE (http://roofit.sourceforge.net/license.txt) *	* listed in LICENSE (http://roofit.sourceforge.net/license.txt) *

	skipping to change at line 32	skipping to change at line 32
	class RooAbsArg ;	class RooAbsArg ;
	class RooArgList ;	class RooArgList ;
	class TTree ;	class TTree ;
	class RooFormulaVar ;	class RooFormulaVar ;
	class RooArgSet ;	class RooArgSet ;

	class RooTreeDataStore : public RooAbsDataStore {	class RooTreeDataStore : public RooAbsDataStore {
	public:	public:

	RooTreeDataStore() ;	RooTreeDataStore() ;

	RooTreeDataStore(TTree* t, const RooArgSet& vars) ;	RooTreeDataStore(TTree* t, const RooArgSet& vars, const char* wgtVarName= 0) ;

	// Empty ctor	// Empty ctor

	RooTreeDataStore(const char* name, const char* title, const RooArgSet& va rs) ;	RooTreeDataStore(const char* name, const char* title, const RooArgSet& va rs, const char* wgtVarName=0) ;
	virtual RooAbsDataStore* clone(const RooArgSet& vars, const char* newname =0) const { return new RooTreeDataStore(*this,vars,newname) ; }	virtual RooAbsDataStore* clone(const RooArgSet& vars, const char* newname =0) const { return new RooTreeDataStore(*this,vars,newname) ; }

	// Ctors from TTree	// Ctors from TTree

	RooTreeDataStore(const char* name, const char* title, const RooArgSet& va	RooTreeDataStore(const char* name, const char* title, const RooArgSet& va
	rs, TTree& t, const RooFormulaVar& select) ;	rs, TTree& t, const RooFormulaVar& select, const char* wgtVarName=0) ;
	RooTreeDataStore(const char* name, const char* title, const RooArgSet& va	RooTreeDataStore(const char* name, const char* title, const RooArgSet& va
	rs, TTree& t, const char* selExpr=0) ;	rs, TTree& t, const char* selExpr=0, const char* wgtVarName=0) ;

	// Ctors from DataStore	// Ctors from DataStore

	RooTreeDataStore(const char* name, const char* title, const RooArgSet& va	RooTreeDataStore(const char* name, const char* title, const RooArgSet& va
	rs, const RooAbsDataStore& tds, const RooFormulaVar& select) ;	rs, const RooAbsDataStore& tds, const RooFormulaVar& select, const char* wg
	RooTreeDataStore(const char* name, const char* title, const RooArgSet& va	tVarName=0) ;
	rs, const RooAbsDataStore& tds, const char* selExpr=0) ;	RooTreeDataStore(const char* name, const char* title, const RooArgSet& va
		rs, const RooAbsDataStore& tds, const char* selExpr=0, const char* wgtVarNa
		me=0) ;

	RooTreeDataStore(const char name, const char title, RooAbsDataStore& td s,	RooTreeDataStore(const char name, const char title, RooAbsDataStore& td s,
	const RooArgSet& vars, const RooFormulaVar* cutVar, const char* cutRange,	const RooArgSet& vars, const RooFormulaVar* cutVar, const char* cutRange,

	Int_t nStart, Int_t nStop, Bool_t /copyCache/) ;	Int_t nStart, Int_t nStop, Bool_t /copyCache/, const ch ar* wgtVarName=0) ;

	RooTreeDataStore(const RooTreeDataStore& other, const char* newname=0) ;	RooTreeDataStore(const RooTreeDataStore& other, const char* newname=0) ;
	RooTreeDataStore(const RooTreeDataStore& other, const RooArgSet& vars, co nst char* newname=0) ;	RooTreeDataStore(const RooTreeDataStore& other, const RooArgSet& vars, co nst char* newname=0) ;
	virtual ~RooTreeDataStore() ;	virtual ~RooTreeDataStore() ;

	// Write current row	// Write current row
	virtual Int_t fill() ;	virtual Int_t fill() ;

	// Retrieve a row	// Retrieve a row
	using RooAbsDataStore::get ;	using RooAbsDataStore::get ;
	virtual const RooArgSet* get(Int_t index) const ;	virtual const RooArgSet* get(Int_t index) const ;

		virtual Double_t weight() const ;
		virtual Double_t weightError(RooAbsData::ErrorType etype=RooAbsData::Pois
		son) const ;
		virtual void weightError(Double_t& lo, Double_t& hi, RooAbsData::ErrorTyp
		e etype=RooAbsData::Poisson) const ;
		virtual Double_t weight(Int_t index) const ;
		virtual Bool_t isWeighted() const { return (_wgtVar!=0\|\|_extWgtArray!=0)
		; }

	// Change observable name	// Change observable name
	virtual Bool_t changeObservableName(const char* from, const char* to) ;	virtual Bool_t changeObservableName(const char* from, const char* to) ;

	// Add one or more columns	// Add one or more columns
	virtual RooAbsArg* addColumn(RooAbsArg& var, Bool_t adjustRange=kTRUE) ;	virtual RooAbsArg* addColumn(RooAbsArg& var, Bool_t adjustRange=kTRUE) ;
	virtual RooArgSet* addColumns(const RooArgList& varList) ;	virtual RooArgSet* addColumns(const RooArgList& varList) ;

	// Merge column-wise	// Merge column-wise
	RooAbsDataStore* merge(const RooArgSet& allvars, std::list<RooAbsDataStor e*> dstoreList) ;	RooAbsDataStore* merge(const RooArgSet& allvars, std::list<RooAbsDataStor e*> dstoreList) ;

	skipping to change at line 102	skipping to change at line 107
	virtual void cacheArgs(const RooAbsArg* owner, RooArgSet& varSet, const R ooArgSet* nset=0) ;	virtual void cacheArgs(const RooAbsArg* owner, RooArgSet& varSet, const R ooArgSet* nset=0) ;
	virtual const RooAbsArg* cacheOwner() { return _cacheOwner ; }	virtual const RooAbsArg* cacheOwner() { return _cacheOwner ; }
	virtual void setArgStatus(const RooArgSet& set, Bool_t active) ;	virtual void setArgStatus(const RooArgSet& set, Bool_t active) ;
	virtual void resetCache() ;	virtual void resetCache() ;

	void loadValues(const TTree t, const RooFormulaVar select=0, const char * rangeName=0, Int_t nStart=0, Int_t nStop=2000000000) ;	void loadValues(const TTree t, const RooFormulaVar select=0, const char * rangeName=0, Int_t nStart=0, Int_t nStop=2000000000) ;
	void loadValues(const RooAbsDataStore tds, const RooFormulaVar select=0 , const char* rangeName=0, Int_t nStart=0, Int_t nStop=2000000000) ;	void loadValues(const RooAbsDataStore tds, const RooFormulaVar select=0 , const char* rangeName=0, Int_t nStart=0, Int_t nStop=2000000000) ;

	virtual void checkInit() const;	virtual void checkInit() const;


		void setExternalWeightArray(Double_t* arrayWgt, Double_t* arrayWgtErrLo,
		Double_t* arrayWgtErrHi, Double_t* arraySumW2) {
		_extWgtArray = arrayWgt ;
		_extWgtErrLoArray = arrayWgtErrLo ;
		_extWgtErrHiArray = arrayWgtErrHi ;
		_extSumW2Array = arraySumW2 ;
		}

	protected:	protected:


		RooArgSet varsNoWeight(const RooArgSet& allVars, const char* wgtName=0) ;
		RooRealVar* weightVar(const RooArgSet& allVars, const char* wgtName=0) ;

	void initialize();	void initialize();
	void attachCache(const RooAbsArg* newOwner, const RooArgSet& cachedVars) ;	void attachCache(const RooAbsArg* newOwner, const RooArgSet& cachedVars) ;

	// TTree Branch buffer size control	// TTree Branch buffer size control
	void setBranchBufferSize(Int_t size) { _defTreeBufSize = size ; }	void setBranchBufferSize(Int_t size) { _defTreeBufSize = size ; }
	Int_t getBranchBufferSize() const { return _defTreeBufSize ; }	Int_t getBranchBufferSize() const { return _defTreeBufSize ; }

	static Int_t _defTreeBufSize ;	static Int_t _defTreeBufSize ;

	void createTree(const char* name, const char* title) ;	void createTree(const char* name, const char* title) ;
	TTree *_tree ; // TTree holding the data points	TTree *_tree ; // TTree holding the data points
	TTree *_cacheTree ; //! TTree holding the cached function values	TTree *_cacheTree ; //! TTree holding the cached function values
	const RooAbsArg* _cacheOwner ; //! Object owning cache contents	const RooAbsArg* _cacheOwner ; //! Object owning cache contents
	mutable Bool_t _defCtor ;//! Was object constructed with default ctor?	mutable Bool_t _defCtor ;//! Was object constructed with default ctor?


	ClassDef(RooTreeDataStore,1) // TTree-based Data Storage class	RooArgSet _varsww ;
		RooRealVar* _wgtVar ; // Pointer to weight variable (if set)

		Double_t* _extWgtArray ; //! External weight array
		Double_t* _extWgtErrLoArray ; //! External weight array - low error
		Double_t* _extWgtErrHiArray ; //! External weight array - high error
		Double_t* _extSumW2Array ; //! External sum of weights array

		mutable Double_t _curWgt ; // Weight of current event
		mutable Double_t _curWgtErrLo ; // Weight of current event
		mutable Double_t _curWgtErrHi ; // Weight of current event
		mutable Double_t _curWgtErr ; // Weight of current event

		ClassDef(RooTreeDataStore,2) // TTree-based Data Storage class
	};	};

	#endif	#endif

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

	RootFinder.h	RootFinder.h

	// @(#)root/tmva $Id: RootFinder.h 29195 2009-06-24 10:39:49Z brun $	// @(#)root/mathmore:$Id: RootFinder.h 25486 2008-09-22 12:43:03Z moneta $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss	// Authors: L. Moneta, A. Zsenei 08/2005


	/**************************************************************************	/**********************************************************************
	********	* *
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis	* Copyright (c) 2004 ROOT Foundation, CERN/PH-SFT *
	*	* *
	* Package: TMVA	* This library is free software; you can redistribute it and/or *
	*	* modify it under the terms of the GNU General Public License *
	* Class : RootFinder	* as published by the Free Software Foundation; either version 2 *
	*	* of the License, or (at your option) any later version. *
	* Web : http://tmva.sourceforge.net	* *
	*	* This library is distributed in the hope that it will be useful, *
	*	* but WITHOUT ANY WARRANTY; without even the implied warranty of *
	*	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
	* Description:	* General Public License for more details. *
	*	* *
	* Root finding using Brents algorithm	* You should have received a copy of the GNU General Public License *
	*	* along with this library (see file COPYING); if not, write *
	* (translated from CERNLIB function RZERO)	* to the Free Software Foundation, Inc., 59 Temple Place, Suite *
	*	* 330, Boston, MA 02111-1307 USA, or contact the author. *
	*	* *
	*	**********************************************************************/
	* Authors (alphabetical):
	*	// Header file for class RootFinder
	* Andreas Hoecker <Andreas.Hocker@cern.ch> - CERN, Switzerland	//
	*	// Created by: moneta at Sun Nov 14 16:59:55 2004
	* Helge Voss <Helge.Voss@cern.ch> - MPI-K Heidelberg, German	//
	y *	// Last update: Sun Nov 14 16:59:55 2004
	* Kai Voss <Kai.Voss@cern.ch> - U. of Victoria, Canada	//
	*	#ifndef ROOT_Math_RootFinder
	*	#define ROOT_Math_RootFinder
	*
	* Copyright (c) 2005:
	*
	* CERN, Switzerland
	*
	* U. of Victoria, Canada
	*
	* MPI-K Heidelberg, Germany
	*
	*
	*
	* Redistribution and use in source and binary forms, with or without
	*
	* modification, are permitted according to the terms listed in LICENSE
	*
	* (http://tmva.sourceforge.net/LICENSE)
	*
	**************************************************************************
	********/

	#ifndef ROOT_TMVA_RootFinder
	#define ROOT_TMVA_RootFinder

	//////////////////////////////////////////////////////////////////////////
	// //
	// RootFinder //
	// //
	// Root finding using Brents algorithm //
	// (translated from CERNLIB function RZERO) //
	// //
	//////////////////////////////////////////////////////////////////////////


	#ifndef ROOT_TObject	#ifndef ROOT_Math_IFunctionfwd
	#include "TObject.h"	#include "Math/IFunctionfwd.h"
	#endif	#endif


	namespace TMVA {	#ifndef ROOT_Math_IRootFinderMethod
		#include "Math/IRootFinderMethod.h"
	class MsgLogger;	#endif

	class RootFinder : public TObject {

	public:

	RootFinder( Double_t (*rootVal)( Double_t ),
	Double_t rootMin, Double_t rootMax,
	Int_t maxIterations = 100,
	Double_t absTolerance = 0.0 );
	virtual ~RootFinder( void );

	// returns the root of the function
	Double_t Root( Double_t refValue );


	private:	/**
		@defgroup RootFinders One-dimensional Root-Finding algorithms
		@ingroup NumAlgo
		*/

		namespace ROOT {
		namespace Math {

		//_________________________________________________________________________
		____________
		/**
		Class to find the Root of one dimensional functions.
		The class is templated on the type of Root solver algorithms.
		The possible types of Root-finding algorithms are:
		<ul>
		<li>Root Bracketing Algorithms which they do not require function
		derivatives
		<ol>
		<li>Roots::Bisection
		<li>Roots::FalsePos
		<li>Roots::Brent
		</ol>
		<li>Root Finding Algorithms using Derivatives
		<ol>
		<li>Roots::Newton
		<li>Roots::Secant
		<li>Roots::Steffenson
		</ol>
		</ul>

		This class does not cupport copying

		@ingroup RootFinders

		*/

		class RootFinder {

		public:

		enum EType { kBRENT, // Methods
		from MathCore
		kGSL_BISECTION, kGSL_FALSE_POS, kGSL_BRENT, // GSL Nor
		mal
		kGSL_NEWTON, kGSL_SECANT, kGSL_STEFFENSON // GSL Der
		ivatives
		};

		/**
		Construct a Root-Finder algorithm
		*/
		RootFinder(RootFinder::EType type = RootFinder::kBRENT);
		virtual ~RootFinder();

		private:
		// usually copying is non trivial, so we make this unaccessible
		RootFinder(const RootFinder & ) {}
		RootFinder & operator = (const RootFinder & rhs)
		{
		if (this == &rhs) return *this; // time saving self-test
		return *this;
		}

		public:

		int SetMethod(RootFinder::EType type = RootFinder::kBRENT);

		/**
		Provide to the solver the function and the initial search inter
		val [xlow, xup]
		for algorithms not using derivatives (bracketing algorithms)
		The templated function f must be of a type implementing the \a
		operator() method,
		<em> double operator() ( double x ) </em>
		Returns non zero if interval is not valid (i.e. does not contai
		ns a root)
		*/

		int SetFunction( const IGenFunction & f, double xlow, double xup)
		{
		return fSolver->SetFunction( f, xlow, xup);
		}

		/**
		Provide to the solver the function and an initial estimate of t
		he root,
		for algorithms using derivatives.
		The templated function f must be of a type implementing the \a
		operator()
		and the \a Gradient() methods.
		<em> double operator() ( double x ) </em>
		Returns non zero if starting point is not valid
		*/

		int SetFunction( const IGradFunction & f, double xstart) {
		return fSolver->SetFunction( f, xstart);
		}

		template<class Function, class Derivative>
		int Solve(Function f, Derivative d, double start,
		int maxIter = 100, double absTol = 1E-3, double relTol =
		1E-6);

		template<class Function>
		int Solve(Function f, double min, double max,
		int maxIter = 100, double absTol = 1E-3, double relTol =
		1E-6);

		/**
		Compute the roots iterating until the estimate of the Root is
		within the required tolerance returning
		the iteration Status
		*/
		int Solve( int maxIter = 100, double absTol = 1E-3, double relTol
		= 1E-6) {
		return fSolver->Solve( maxIter, absTol, relTol );
		}

		/**
		Return the number of iteration performed to find the Root.
		*/
		int Iterations() const {
		return fSolver->Iterations();
		}

		/**
		Perform a single iteration and return the Status
		*/
		int Iterate() {
		return fSolver->Iterate();
		}

		/**
		Return the current and latest estimate of the Root
		*/
		double Root() const {
		return fSolver->Root();
		}

		/**
		Return the current and latest estimate of the lower value of th
		e Root-finding interval (for bracketing algorithms)
		*/
		/* double XLower() const { */
		/* return fSolver->XLower(); */
		/* } */

		/**
		Return the current and latest estimate of the upper value of th
		e Root-finding interval (for bracketing algorithms)
		*/
		/* double XUpper() const { */
		/* return fSolver->XUpper(); */
		/* } */

		/**
		Get Name of the Root-finding solver algorithm
		*/
		const char * Name() const {
		return fSolver->Name();
		}

		#ifdef LATER
		/**
		Test convertgence Status of current iteration using interval va
		lues (for bracketing algorithms)
		*/
		static int TestInterval( double xlow, double xup, double epsAbs, d
		ouble epsRel) {
		return GSLRootHelper::TestInterval(xlow, xup, epsAbs, epsRel);
		}

		/**
		Test convergence Status of current iteration using last Root es
		timates (for algorithms using function derivatives)
		*/
		static int TestDelta( double r1, double r0, double epsAbs, double
		epsRel) {
		return GSLRootHelper::TestDelta(r1, r0, epsAbs, epsRel);
		}

		/**
		Test function residual
		*/
		static int TestResidual(double f, double epsAbs) {
		return GSLRootHelper::TestResidual(f, epsAbs);
		}
		#endif


	Double_t fRootMin; // minimum root value	protected:
	Double_t fRootMax; // maximum root value
	Int_t fMaxIter; // maximum number of iterations
	Double_t fAbsTol; // absolute tolerance deviation


	// function pointer	private:
	Double_t (*fGetRootVal)( Double_t );


	mutable MsgLogger* fLogger; //! message logger	IRootFinderMethod* fSolver; // type of algorithm to be used
	MsgLogger& Log() const { return *fLogger; }


	ClassDef(RootFinder,0) // Root finding using Brents algorithm	};
	};


	} // namespace TMVA	} // namespace Math
		} // namespace ROOT

		#include "Math/WrappedFunction.h"
		#include "Math/Functor.h"

		template<class Function, class Derivative>
		int ROOT::Math::RootFinder::Solve(Function f, Derivative d, double start,
		int maxIter, double absTol, double relTol
		)
		{
		ROOT::Math::GradFunctor1D wf(f, d);
		if (fSolver) fSolver->SetFunction(wf, start);
		return Solve(maxIter, absTol, relTol);
		}

		template<class Function>
		int ROOT::Math::RootFinder::Solve(Function f, double min, double max,
		int maxIter, double absTol, double relTol
		)
		{
		ROOT::Math::WrappedFunction<Function> wf(f);
		if (fSolver) fSolver->SetFunction(wf, min, max);
		return Solve(maxIter, absTol, relTol);
		}


	#endif	#endif /* ROOT_Math_RootFinder */

End of changes. 11 change blocks.
	92 lines changed or deleted	253 lines changed or added

	SamplingDistPlot.h	SamplingDistPlot.h

	// @(#)root/roostats:$Id: SamplingDistPlot.h 26427 2009-05-20 15:45:36Z pel licci $	// @(#)root/roostats:$Id: SamplingDistPlot.h 31276 2009-11-18 15:06:42Z mon eta $

	/*************************************************************************	/*************************************************************************
	* Project: RooStats *	* Project: RooStats *
	* Package: RooFit/RooStats *	* Package: RooFit/RooStats *
	* Authors: *	* Authors: *
	* Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke *	* Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke *
	*************************************************************************	*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *

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

	SamplingDistribution.h	SamplingDistribution.h

	// @(#)root/roostats:$Id: SamplingDistribution.h 26427 2009-01-13 15:45:36Z cranmer $	// @(#)root/roostats:$Id: SamplingDistribution.h 31276 2009-11-18 15:06:42Z moneta $

	/*************************************************************************	/*************************************************************************
	* Project: RooStats *	* Project: RooStats *
	* Package: RooFit/RooStats *	* Package: RooFit/RooStats *
	* Authors: *	* Authors: *
	* Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke *	* Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke *
	*************************************************************************	*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *

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

	SimpleInterval.h	SimpleInterval.h

	// @(#)root/roostats:$Id: SimpleInterval.h 30512 2009-09-28 17:24:48Z monet a $	// @(#)root/roostats:$Id: SimpleInterval.h 31285 2009-11-18 16:38:36Z monet a $
	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke
	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef RooStats_SimpleInterval	#ifndef RooStats_SimpleInterval
	#define RooStats_SimpleInterval	#define RooStats_SimpleInterval

	#ifndef ROO_ARG_SET	#ifndef ROO_ARG_SET
	#include "RooArgSet.h"	#include "RooArgSet.h"
	#endif	#endif
	#ifndef RooStats_ConfInterval	#ifndef RooStats_ConfInterval
	#include "RooStats/ConfInterval.h"	#include "RooStats/ConfInterval.h"
	#endif	#endif


		class RooRealVar;

	namespace RooStats {	namespace RooStats {
	class SimpleInterval : public ConfInterval {	class SimpleInterval : public ConfInterval {

	protected:
	RooArgSet* fParameters; // parameter of interest
	Double_t fLowerLimit; // lower limit
	Double_t fUpperLimit; // upper limit
	Double_t fConfidenceLevel; // confidence level

	public:	public:

	// constructors,destructors	// default constructors
	SimpleInterval();	explicit SimpleInterval(const char* name = 0);
	SimpleInterval(const char* name);
	SimpleInterval(const char* name, const char* title);	// constructor from name, the Parameter of interest and lower/upper bou
	SimpleInterval(const char* name, RooAbsArg* var, Double_t, Double_t);	nd values
	SimpleInterval(const char* name, const char* title, RooAbsArg* var, Dou	SimpleInterval(const char* name, const RooRealVar & var, Double_t lower
	ble_t, Double_t);	, Double_t upper, Double_t cl);

		// destructor
	virtual ~SimpleInterval();	virtual ~SimpleInterval();


	virtual Bool_t IsInInterval(const RooArgSet&);	// check if parameter is in the interval
	virtual void SetConfidenceLevel(Double_t cl) {fConfidenceLevel = cl;}	virtual Bool_t IsInInterval(const RooArgSet&) const;

		// set the confidence level for the interval. Simple interval is define
		d at construction time so this function
		// has no effect
		virtual void SetConfidenceLevel(Double_t ) {}

		// return the confidence interval
	virtual Double_t ConfidenceLevel() const {return fConfidenceLevel;}	virtual Double_t ConfidenceLevel() const {return fConfidenceLevel;}


	// Method to return lower limit	// return the interval lower limit
	virtual Double_t LowerLimit() {return fLowerLimit;}	virtual Double_t LowerLimit() {return fLowerLimit;}

	// Method to return upper limit	// return the interval upper limit
	virtual Double_t UpperLimit() {return fUpperLimit;}	virtual Double_t UpperLimit() {return fUpperLimit;}


	// do we want it to return list of parameters	// return a cloned list with the parameter of interest
	virtual RooArgSet* GetParameters() const;	virtual RooArgSet* GetParameters() const;


	// check if parameters are correct. (dummy implementation to start)	// check if parameters are correct (i.e. they are the POI of this inter val)
	Bool_t CheckParameters(const RooArgSet&) const ;	Bool_t CheckParameters(const RooArgSet&) const ;

	protected:	protected:


	ClassDef(SimpleInterval,1) // Concrete implementation of ConfInterval for simple 1-D intervals in the form [a,b]	ClassDef(SimpleInterval,1) // Concrete implementation of ConfInterval for simple 1-D intervals in the form [a,b]


		RooArgSet fParameters; // set containing the parameter of interest
		Double_t fLowerLimit; // lower interval limit
		Double_t fUpperLimit; // upper interval limit
		Double_t fConfidenceLevel; // confidence level

	};	};
	}	}

	#endif	#endif

End of changes. 11 change blocks.
	19 lines changed or deleted	31 lines changed or added

	TASImage.h	TASImage.h

	// @(#)root/asimage:$Id: TASImage.h 23604 2008-04-29 14:37:35Z couet $	// @(#)root/asimage:$Id: TASImage.h 30543 2009-10-02 15:30:40Z couet $
	// Author: Fons Rademakers, Reiner Rohlfs 28/11/2001	// Author: Fons Rademakers, Reiner Rohlfs 28/11/2001

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2001, Rene Brun, Fons Rademakers and Reiner Rohlfs *	* Copyright (C) 1995-2001, Rene Brun, Fons Rademakers and Reiner Rohlfs *
	* 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_TASImage	#ifndef ROOT_TASImage
	#define ROOT_TASImage	#define ROOT_TASImage

	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////
	// //	// //
	// TASImage //	// TASImage //
	// //	// //

	// Interface to image processing library using libAfterImage. //	// Interface to image processing library libAfterImage. //
	// It allows for the reading and writing of images in different //
	// formats, several image manipulations (scaling, tiling, merging, //
	// etc.) and displaying in pads. //
	// The size of the image on the screen does not depend on the original //
	// size of the image but on the size of the pad. Therefore it is very //
	// easy to resize the image on the screen by resizing the pad. //
	// //
	// Besides reading an image from a file an image can be defined by a //
	// two dimensional array of values. A palette defines the color of //
	// each value. //
	// //
	// The image can be zoomed by defining a rectangle with the mouse. //
	// The color palette can be modified with a GUI, just select //
	// StartPaletteEditor() from the context menu. //
	// //	// //
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////

	#ifndef ROOT_TImage	#ifndef ROOT_TImage
	#include "TImage.h"	#include "TImage.h"
	#endif	#endif

	struct ASImage;	struct ASImage;
	struct ASVisual;	struct ASVisual;
	class TBrowser;	class TBrowser;

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

	TAdvancedGraphicsDialog.h	TAdvancedGraphicsDialog.h

		// @(#)root/fitpanel:$Id: TAdvancedGraphicsDialog.h 31212 2009-11-16 17:30:
		21Z moneta $
		// Author: David Gonzalez Maline 11/12/2008

		/*************************************************************************
		* Copyright (C) 1995-2006, Rene Brun and Fons Rademakers. *
		* All rights reserved. *
		* *
		* For the licensing terms see $ROOTSYS/LICENSE. *
		* For the list of contributors see $ROOTSYS/README/CREDITS. *
		*************************************************************************/

		#ifndef ROOT__TAdvancedGraphicsDialog__
		#define ROOT__TAdvancedGraphicsDialog__

		//////////////////////////////////////////////////////////////////////////
		// //
		// TAdvancedGraphicsDialog //
		// //
		// Allows to create advanced graphics from the last fit made in the //
		// fitpanel. This includes the scan graphics, the contour and the //
		// confidence levels. //
		//////////////////////////////////////////////////////////////////////////

	#include "TGFrame.h"	#include "TGFrame.h"
	#include "TTreeInput.h"	#include "TTreeInput.h"
	#include "TGButton.h"	#include "TGButton.h"
	#include "TGComboBox.h"	#include "TGComboBox.h"
	#include "TGLabel.h"	#include "TGLabel.h"
	#include "TGTextEntry.h"	#include "TGTextEntry.h"
	#include "TGNumberEntry.h"	#include "TGNumberEntry.h"
	#include "TGTab.h"	#include "TGTab.h"
	#include "TGColorSelect.h"	#include "TGColorSelect.h"


	skipping to change at line 24	skipping to change at line 47
	enum EAdvanceGraphicsDialog {	enum EAdvanceGraphicsDialog {
	kAGD_TMETHOD, kAGD_CONTOURMETHOD, kAGD_SCANMETHOD,	kAGD_TMETHOD, kAGD_CONTOURMETHOD, kAGD_SCANMETHOD,
	kAGD_CONTPAR1, kAGD_CONTPAR2, kAGD_CONTERR,	kAGD_CONTPAR1, kAGD_CONTPAR2, kAGD_CONTERR,
	kAGD_CONTOVER, kAGD_CONTCOLOR,	kAGD_CONTOVER, kAGD_CONTCOLOR,
	kAGD_BDRAW, kAGD_BCLOSE,	kAGD_BDRAW, kAGD_BCLOSE,
	kAGD_SCANPAR, kAGD_SCANMIN, kAGD_SCANMAX,	kAGD_SCANPAR, kAGD_SCANMIN, kAGD_SCANMAX,

	kAGD_PARCOUNTER = 1000	kAGD_PARCOUNTER = 1000
	};	};


	#ifndef __TAdvancedGraphicsDialog__
	#define __TAdvancedGraphicsDialog__

	class TAdvancedGraphicsDialog : public TGTransientFrame {	class TAdvancedGraphicsDialog : public TGTransientFrame {

	private:	private:
	TGVerticalFrame *fMainFrame; // Main Vertical Frame	TGVerticalFrame *fMainFrame; // Main Vertical Frame
	TGTab *fTab; // Tab containing the available method s	TGTab *fTab; // Tab containing the available method s

	TGVerticalFrame *fContourFrame; // Contour Frame	TGVerticalFrame *fContourFrame; // Contour Frame
	TGNumberEntry *fContourPoints; // Number of points for the graph	TGNumberEntry *fContourPoints; // Number of points for the graph
	TGComboBox *fContourPar1; // Parameter 1 for Contour	TGComboBox *fContourPar1; // Parameter 1 for Contour
	TGComboBox *fContourPar2; // Parameter 2 for Contour	TGComboBox *fContourPar2; // Parameter 2 for Contour

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

	TBranchElement.h	TBranchElement.h

	// @(#)root/tree:$Id: TBranchElement.h 25450 2008-09-18 21:13:42Z pcanal $	// @(#)root/tree:$Id: TBranchElement.h 31170 2009-11-13 20:21:56Z pcanal $
	// Author: Rene Brun 14/01/2001	// Author: Rene Brun 14/01/2001

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/


	skipping to change at line 48	skipping to change at line 48

	// Friends	// Friends
	friend class TTreeCloner;	friend class TTreeCloner;

	// Types	// Types
	protected:	protected:
	enum {	enum {
	kBranchFolder = BIT(14),	kBranchFolder = BIT(14),
	kDeleteObject = BIT(16), // We are the owner of fObject.	kDeleteObject = BIT(16), // We are the owner of fObject.
	kCache = BIT(18), // Need to pushd/pop fOnfileObject.	kCache = BIT(18), // Need to pushd/pop fOnfileObject.

	kOwnOnfileObj = BIT(19) // We are the owner of fOnfileObject.	kOwnOnfileObj = BIT(19), // We are the owner of fOnfileObject.
		kAddressSet = BIT(20) // The addressing set have been called for
		this branch
	};	};

	// Data Members	// Data Members
	protected:	protected:
	TString fClassName; // Class name of referenced ob ject	TString fClassName; // Class name of referenced ob ject
	TString fTargetClassName; //! Name of the target in-mem ory class	TString fTargetClassName; //! Name of the target in-mem ory class
	TString fParentName; // Name of parent class	TString fParentName; // Name of parent class
	TString fClonesName; // Name of class in TClonesArr ay (if any)	TString fClonesName; // Name of class in TClonesArr ay (if any)
	TVirtualCollectionProxy *fCollProxy; //! collection interface (if an y)	TVirtualCollectionProxy *fCollProxy; //! collection interface (if an y)
	UInt_t fCheckSum; // CheckSum of class	UInt_t fCheckSum; // CheckSum of class

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

	TBranchSTL.h	TBranchSTL.h

	// @(#)root/tree:$Id: TBranchSTL.h 21867 2008-01-28 08:34:00Z brun $	// @(#)root/tree:$Id: TBranchSTL.h 31252 2009-11-17 20:12:32Z pcanal $
	// author: Lukasz Janyst <ljanyst@cern.ch>	// author: Lukasz Janyst <ljanyst@cern.ch>

	//------------------------------------------------------------------------- -----	//------------------------------------------------------------------------- -----
	// file: TBranchSTL.h	// file: TBranchSTL.h
	//------------------------------------------------------------------------- -----	//------------------------------------------------------------------------- -----

	#ifndef ROOT_TBranchSTL	#ifndef ROOT_TBranchSTL
	#define ROOT_TBranchSTL	#define ROOT_TBranchSTL

	#include "TBranch.h"	#include "TBranch.h"

	skipping to change at line 37	skipping to change at line 37
	Int_t buffsize, Int_t splitlevel );	Int_t buffsize, Int_t splitlevel );
	TBranchSTL( TBranch* parent, const char* name,	TBranchSTL( TBranch* parent, const char* name,
	TVirtualCollectionProxy* collProxy,	TVirtualCollectionProxy* collProxy,
	Int_t buffsize, Int_t splitlevel,	Int_t buffsize, Int_t splitlevel,
	TStreamerInfo* info, Int_t id );	TStreamerInfo* info, Int_t id );
	virtual ~TBranchSTL();	virtual ~TBranchSTL();
	virtual void Browse( TBrowser *b );	virtual void Browse( TBrowser *b );
	virtual Bool_t IsFolder() const;	virtual Bool_t IsFolder() const;
	virtual Int_t Fill();	virtual Int_t Fill();
	virtual void FillLeaves( TBuffer& b );	virtual void FillLeaves( TBuffer& b );

		virtual const char *GetClassName() const { return fClassName.Data( ); }
	virtual Int_t GetEntry( Long64_t entry = 0, Int_t getall = 0 );	virtual Int_t GetEntry( Long64_t entry = 0, Int_t getall = 0 );

	virtual TStreamerInfo* GetInfo();	virtual TStreamerInfo *GetInfo() const;
		virtual void Print(Option_t*) const;
	virtual void ReadLeaves( TBuffer& b );	virtual void ReadLeaves( TBuffer& b );
	virtual void SetAddress( void* addr );	virtual void SetAddress( void* addr );

	ClassDef( TBranchSTL, 1 ) //Branch handling STL collection of pointer s	ClassDef( TBranchSTL, 1 ) //Branch handling STL collection of pointer s

	private:	private:

	#ifndef __CINT__	#ifndef __CINT__
	struct ElementBranchHelper_t	struct ElementBranchHelper_t
	{	{

	skipping to change at line 71	skipping to change at line 73
	BranchMap_t fBranchMap; //! Branch map	BranchMap_t fBranchMap; //! Branch map
	std::vector<ElementBranchHelper_t> fBranchVector; //! Branch vector	std::vector<ElementBranchHelper_t> fBranchVector; //! Branch vector
	#endif // __CINT__	#endif // __CINT__

	TVirtualCollectionProxy* fCollProxy; //! Collection proxy	TVirtualCollectionProxy* fCollProxy; //! Collection proxy
	TBranch* fParent; //! Parent of this branch	TBranch* fParent; //! Parent of this branch
	TClass* fIndArrayCl; //! Class of the ind array	TClass* fIndArrayCl; //! Class of the ind array
	TIndArray fInd; //! Indices	TIndArray fInd; //! Indices
	TString fContName; // Class name of referenced object	TString fContName; // Class name of referenced object
	TString fClassName; // Name of the parent class, if we're the data member	TString fClassName; // Name of the parent class, if we're the data member

	Int_t fClassVersion; // Version number of the cla ss	mutable Int_t fClassVersion; // Version number of the cla ss
	UInt_t fClCheckSum; // Class checksum	UInt_t fClCheckSum; // Class checksum

	TStreamerInfo* fInfo; //! The streamer info	mutable TStreamerInfo *fInfo; //! The streamer info
	char* fObject; //! Pointer to object at addr ess or the	char* fObject; //! Pointer to object at addr ess or the
	Int_t fID; // Element serial number in the streamer info	Int_t fID; // Element serial number in the streamer info
	};	};

	#endif // ROOT_TBranchSTL	#endif // ROOT_TBranchSTL

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

	TCint.h	TCint.h

	// @(#)root/meta:$Id: TCint.h 30100 2009-09-09 18:30:50Z pcanal $	// @(#)root/meta:$Id: TCint.h 30549 2009-10-04 01:40:54Z 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 113	skipping to change at line 113
	void LoadMacro(const char filename, EErrorCode error = 0);	void LoadMacro(const char filename, EErrorCode error = 0);
	Int_t LoadLibraryMap(const char *rootmapfile = 0);	Int_t LoadLibraryMap(const char *rootmapfile = 0);
	Int_t RescanLibraryMap();	Int_t RescanLibraryMap();
	Int_t ReloadAllSharedLibraryMaps();	Int_t ReloadAllSharedLibraryMaps();
	Int_t UnloadAllSharedLibraryMaps();	Int_t UnloadAllSharedLibraryMaps();
	Int_t UnloadLibraryMap(const char *library);	Int_t UnloadLibraryMap(const char *library);
	Long_t ProcessLine(const char line, EErrorCode error = 0);	Long_t ProcessLine(const char line, EErrorCode error = 0);
	Long_t ProcessLineAsynch(const char line, EErrorCode error = 0);	Long_t ProcessLineAsynch(const char line, EErrorCode error = 0);
	Long_t ProcessLineSynch(const char line, EErrorCode error = 0);	Long_t ProcessLineSynch(const char line, EErrorCode error = 0);
	void PrintIntro();	void PrintIntro();

		void SetGetline(char(getlineFunc)(const char* prompt),
		void (histaddFunc)(char line));
	void Reset();	void Reset();
	void ResetAll();	void ResetAll();
	void ResetGlobals();	void ResetGlobals();
	void RewindDictionary();	void RewindDictionary();
	Int_t DeleteGlobal(void *obj);	Int_t DeleteGlobal(void *obj);
	void SaveContext();	void SaveContext();
	void SaveGlobalsContext();	void SaveGlobalsContext();
	void UpdateListOfGlobals();	void UpdateListOfGlobals();
	void UpdateListOfGlobalFunctions();	void UpdateListOfGlobalFunctions();
	void UpdateListOfTypes();	void UpdateListOfTypes();

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

	TClassGenerator.h	TClassGenerator.h

	// @(#)root/base:$Id: TClassGenerator.h 20882 2007-11-19 11:31:26Z rdm $	// @(#)root/base:$Id: TClassGenerator.h 30751 2009-10-15 16:45:32Z pcanal $
	// Author: Philippe Canal 24/06/2003	// Author: Philippe Canal 24/06/2003

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2003, Rene Brun and Fons Rademakers, and al. *	* Copyright (C) 1995-2003, 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 39	skipping to change at line 39

	class TClassGenerator : public TObject {	class TClassGenerator : public TObject {

	protected:	protected:
	TClassGenerator() : TObject() { }	TClassGenerator() : TObject() { }
	virtual ~TClassGenerator() { }	virtual ~TClassGenerator() { }

	public:	public:
	virtual TClass GetClass(const char classname, Bool_t load) = 0;	virtual TClass GetClass(const char classname, Bool_t load) = 0;
	virtual TClass *GetClass(const type_info& typeinfo, Bool_t load) = 0;	virtual TClass *GetClass(const type_info& typeinfo, Bool_t load) = 0;

		virtual TClass GetClass(const char classname, Bool_t load, Bool_t sile
		nt);
		virtual TClass *GetClass(const type_info& typeinfo, Bool_t load, Bool_t
		silent);

	ClassDef(TClassGenerator,1); // interface for TClass generators	ClassDef(TClassGenerator,1); // interface for TClass generators
	};	};

	#endif	#endif

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

	TCreatePrimitives.h	TCreatePrimitives.h

	skipping to change at line 25	skipping to change at line 25
	// //	// //
	// TCreatePrimitives //	// TCreatePrimitives //
	// //	// //
	// Creates new primitives. //	// Creates new primitives. //
	// //	// //
	// The functions in this static class are called by TPad::ExecuteEvent //	// The functions in this static class are called by TPad::ExecuteEvent //
	// to create new primitives in gPad from the TPad toolbar. //	// to create new primitives in gPad from the TPad toolbar. //
	// //	// //
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////


		#ifndef ROOT_Rtypes
		#include "Rtypes.h"
		#endif

	class TCreatePrimitives {	class TCreatePrimitives {

	public:	public:

	TCreatePrimitives();	TCreatePrimitives();
	virtual ~TCreatePrimitives();	virtual ~TCreatePrimitives();
	static void Ellipse(Int_t event, Int_t px, Int_t py,Int_t mode);	static void Ellipse(Int_t event, Int_t px, Int_t py,Int_t mode);
	static void Line(Int_t event, Int_t px, Int_t py, Int_t mode);	static void Line(Int_t event, Int_t px, Int_t py, Int_t mode);
	static void Pad(Int_t event, Int_t px, Int_t py, Int_t);	static void Pad(Int_t event, Int_t px, Int_t py, Int_t);
	static void Pave(Int_t event, Int_t px, Int_t py, Int_t mode);	static void Pave(Int_t event, Int_t px, Int_t py, Int_t mode);

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

	TDCacheFile.h	TDCacheFile.h

	// @(#)root/dcache:$Id: TDCacheFile.h 26186 2008-11-14 09:33:41Z rdm $	// @(#)root/dcache:$Id: TDCacheFile.h 31099 2009-11-11 21:10:36Z rdm $
	// Author: Grzegorz Mazur 20/01/2002	// Author: Grzegorz Mazur 20/01/2002
	// Updated: William Tanenbaum 21/11/2003	// Updated: William Tanenbaum 21/11/2003
	// Updated: Tgiran Mkrtchyan 28/06/2004	// Updated: Tgiran Mkrtchyan 28/06/2004

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *

	skipping to change at line 38	skipping to change at line 38
	#endif	#endif
	#ifndef ROOT_TSystem	#ifndef ROOT_TSystem
	#include "TSystem.h"	#include "TSystem.h"
	#endif	#endif
	#ifndef ROOT_TString	#ifndef ROOT_TString
	#include "TString.h"	#include "TString.h"
	#endif	#endif

	#include <sys/stat.h>	#include <sys/stat.h>


	#define RAHEAD_BUFFER_SIZE 8192	#define RAHEAD_BUFFER_SIZE 131072

	class TDCacheFile : public TFile {	class TDCacheFile : public TFile {

	private:	private:
	Bool_t fStatCached; //! (transient) is file status cached?	Bool_t fStatCached; //! (transient) is file status cached?
	struct stat64 fStatBuffer; //! (transient) Cached file status buffer (f or performance)	struct stat64 fStatBuffer; //! (transient) Cached file status buffer (f or performance)

	TDCacheFile() : fStatCached(kFALSE) { }	TDCacheFile() : fStatCached(kFALSE) { }

	// Interface to basic system I/O routines	// Interface to basic system I/O routines

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

	TDocParser.h	TDocParser.h

	// @(#)root/html:$Id: TDocParser.h 27897 2009-03-20 13:27:04Z axel $	// @(#)root/html:$Id: TDocParser.h 31111 2009-11-12 09:57:56Z 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 46	skipping to change at line 46
	#ifndef ROOT_Riosfwd	#ifndef ROOT_Riosfwd
	#include "Riosfwd.h"	#include "Riosfwd.h"
	#endif	#endif

	class TBaseClass;	class TBaseClass;
	class TClass;	class TClass;
	class TClassDocOutput;	class TClassDocOutput;
	class TDocOutput;	class TDocOutput;
	class THtml;	class THtml;


		class TDocMethodWrapper: public TObject {
		public:
		virtual TMethod* GetMethod() const = 0;
		virtual Int_t GetOverloadIdx() const = 0;
		};

	class TDocParser: public TObject {	class TDocParser: public TObject {
	protected:	protected:
	enum EDocContext {	enum EDocContext {
	kIgnore,	kIgnore,
	kDocFunc,	kDocFunc,
	kDocClass,	kDocClass,
	kNumDocContexts	kNumDocContexts
	};	};

	public:	public:

	skipping to change at line 83	skipping to change at line 89
	kDirective,	kDirective,
	kString,	kString,
	kKeyword,	kKeyword,
	kCPP,	kCPP,
	kVerbatim,	kVerbatim,
	kNumParseContexts,	kNumParseContexts,
	kParseContextMask = BIT(4) - 1	kParseContextMask = BIT(4) - 1
	};	};
	enum EParseContextFlag {	enum EParseContextFlag {
	kCXXComment = BIT(4), // kComment is a C++ comment, or macro/html/lat ex content is surrounded by /* */	kCXXComment = BIT(4), // kComment is a C++ comment, or macro/html/lat ex content is surrounded by /* */

	kParseContextFlagMask = ~(BIT(4) - 1)	kParseContextFlagMask = (UInt_t)(~(BIT(4) - 1))

	};


	class TMethodWrapper: public TObject {
	public:
	virtual const TMethod* GetMethod() const = 0;
	};	};

	protected:	protected:
	THtml* fHtml; // THtml object using us	THtml* fHtml; // THtml object using us
	TDocOutput* fDocOutput; // TDocOutput invoking us	TDocOutput* fDocOutput; // TDocOutput invoking us
	UInt_t fLineNo; // current line number	UInt_t fLineNo; // current line number
	TString fLineRaw; // current line	TString fLineRaw; // current line
	TString fLineStripped; // current line without surrounding spa ces	TString fLineStripped; // current line without surrounding spa ces
	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	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; // number of u ndocumented overloads
	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

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

	TEmulatedCollectionProxy.h	TEmulatedCollectionProxy.h

	// @(#)root/io:$Id: TEmulatedCollectionProxy.h 23122 2008-04-10 14:56:30Z r dm $	// @(#)root/io:$Id: TEmulatedCollectionProxy.h 31136 2009-11-12 21:25:38Z p canal $
	// 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_TEmulatedCollectionProxy	#ifndef ROOT_TEmulatedCollectionProxy

	skipping to change at line 117	skipping to change at line 117
	// Block commit of containees	// Block commit of containees
	virtual void Commit(void* env);	virtual void Commit(void* env);

	// Streamer for I/O handling	// Streamer for I/O handling
	virtual void Streamer(TBuffer &refBuffer);	virtual void Streamer(TBuffer &refBuffer);

	// Streamer I/O overload	// Streamer I/O overload
	virtual void Streamer(TBuffer &buff, void *pObj, int siz) {	virtual void Streamer(TBuffer &buff, void *pObj, int siz) {
	TGenCollectionProxy::Streamer(buff,pObj,siz);	TGenCollectionProxy::Streamer(buff,pObj,siz);
	}	}


		// Check validity of the proxy itself
		Bool_t IsValid() const;
	};	};

	#endif	#endif

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

	TEveArrow.h	TEveArrow.h

	// @(#)root/eve:$Id: TEveArrow.h 25879 2008-10-19 20:49:34Z matevz $	// @(#)root/eve:$Id: TEveArrow.h 31016 2009-11-06 17:39:41Z 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 43	skipping to change at line 43
	protected:	protected:
	Color_t fColor;	Color_t fColor;

	Float_t fTubeR;	Float_t fTubeR;
	Float_t fConeR;	Float_t fConeR;
	Float_t fConeL;	Float_t fConeL;

	TEveVector fOrigin;	TEveVector fOrigin;
	TEveVector fVector;	TEveVector fVector;


		Int_t fDrawQuality; // Number of segments of circles.

	public:	public:
	TEveArrow(Float_t xVec=0, Float_t yVec=0, Float_t zVec=1,	TEveArrow(Float_t xVec=0, Float_t yVec=0, Float_t zVec=1,
	Float_t xOrg=0, Float_t yOrg=0, Float_t zOrg=0);	Float_t xOrg=0, Float_t yOrg=0, Float_t zOrg=0);
	virtual ~TEveArrow() {}	virtual ~TEveArrow() {}

	void SetTubeR(Float_t x) { fTubeR = x; }	void SetTubeR(Float_t x) { fTubeR = x; }
	void SetConeR(Float_t x) { fConeR = x; }	void SetConeR(Float_t x) { fConeR = x; }
	void SetConeL(Float_t x) { fConeL = x; }	void SetConeL(Float_t x) { fConeL = x; }

	Float_t GetTubeR() const { return fTubeR; }	Float_t GetTubeR() const { return fTubeR; }
	Float_t GetConeR() const { return fConeR; }	Float_t GetConeR() const { return fConeR; }
	Float_t GetConeL() const { return fConeL; }	Float_t GetConeL() const { return fConeL; }

	TEveVector GetVector() { return fVector; }	TEveVector GetVector() { return fVector; }
	TEveVector GetOrigin() { return fOrigin; }	TEveVector GetOrigin() { return fOrigin; }


		Int_t GetDrawQuality() const { return fDrawQuality; }
		void SetDrawQuality(Int_t q) { fDrawQuality = q; }

	virtual void ComputeBBox();	virtual void ComputeBBox();
	virtual void Paint(Option_t* option="");	virtual void Paint(Option_t* option="");

	virtual Bool_t CanEditMainColor() const { return kTRUE; }	virtual Bool_t CanEditMainColor() const { return kTRUE; }

	ClassDef(TEveArrow, 0); // Class for gl visualisation of arrow.	ClassDef(TEveArrow, 0); // Class for gl visualisation of arrow.
	};	};

	#endif	#endif

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

	TEveBrowser.h	TEveBrowser.h

	// @(#)root/eve:$Id: TEveBrowser.h 25438 2008-09-17 19:35:20Z matevz $	// @(#)root/eve:$Id: TEveBrowser.h 31343 2009-11-20 16:33:02Z 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 99	skipping to change at line 99

	TGCanvas *fLTCanvas;	TGCanvas *fLTCanvas;
	TGListTree *fListTree;	TGListTree *fListTree;
	TGSplitter *fSplitter;	TGSplitter *fSplitter;
	TEveGedEditor *fEditor;	TEveGedEditor *fEditor;

	TContextMenu *fCtxMenu;	TContextMenu *fCtxMenu;

	Bool_t fSignalsConnected;	Bool_t fSignalsConnected;


		static TString fgEditorClass;

	public:	public:
	TEveGListTreeEditorFrame(const TGWindow* p=0, Int_t width=250, Int_t hei ght=700);	TEveGListTreeEditorFrame(const TGWindow* p=0, Int_t width=250, Int_t hei ght=700);
	virtual ~TEveGListTreeEditorFrame();	virtual ~TEveGListTreeEditorFrame();

	void ConnectSignals();	void ConnectSignals();
	void DisconnectSignals();	void DisconnectSignals();

	void ReconfToHorizontal();	void ReconfToHorizontal();
	void ReconfToVertical();	void ReconfToVertical();

	TGListTree* GetListTree() const { return fListTree; }	TGListTree* GetListTree() const { return fListTree; }
	TEveGedEditor* GetEditor() const { return fEditor; }	TEveGedEditor* GetEditor() const { return fEditor; }

	void ItemBelowMouse(TGListTreeItem *entry, UInt_t mask);	void ItemBelowMouse(TGListTreeItem *entry, UInt_t mask);
	void ItemClicked(TGListTreeItem *entry, Int_t btn, UInt_t mask, Int_t x, Int_t y);	void ItemClicked(TGListTreeItem *entry, Int_t btn, UInt_t mask, Int_t x, Int_t y);
	void ItemDblClicked(TGListTreeItem* item, Int_t btn);	void ItemDblClicked(TGListTreeItem* item, Int_t btn);
	void ItemKeyPress(TGListTreeItem *entry, UInt_t keysym, UInt_t mask);	void ItemKeyPress(TGListTreeItem *entry, UInt_t keysym, UInt_t mask);


		static void SetEditorClass(const char* edclass);

	ClassDef(TEveGListTreeEditorFrame, 0); // Composite GUI frame for parall el display of a TGListTree and TEveGedEditor.	ClassDef(TEveGListTreeEditorFrame, 0); // Composite GUI frame for parall el display of a TGListTree and TEveGedEditor.
	};	};

	// ----------------------------------------------------------------	// ----------------------------------------------------------------

	class TEveBrowser : public TRootBrowser	class TEveBrowser : public TRootBrowser
	{	{
	TEveBrowser(const TEveBrowser&); // Not implemented	TEveBrowser(const TEveBrowser&); // Not implemented
	TEveBrowser& operator=(const TEveBrowser&); // Not implemented	TEveBrowser& operator=(const TEveBrowser&); // Not implemented


	skipping to change at line 149	skipping to change at line 153

	void ReallyDelete();	void ReallyDelete();

	void InitPlugins(Option_t *opt="FI");	void InitPlugins(Option_t *opt="FI");

	TGFileBrowser* MakeFileBrowser();	TGFileBrowser* MakeFileBrowser();
	TGFileBrowser* GetFileBrowser() const { return fFileBrowser; }	TGFileBrowser* GetFileBrowser() const { return fFileBrowser; }

	void EveMenu(Int_t id);	void EveMenu(Int_t id);


		// Some getters missing in TRootBrowser
		TGMenuBar* GetMenuBar() const { return fMenuBar; }
		TGHorizontalFrame* GetTopMenuFrame() const { return fTopMenuFrame; }

	ClassDef(TEveBrowser, 0); // Specialization of TRootBrowser for Eve.	ClassDef(TEveBrowser, 0); // Specialization of TRootBrowser for Eve.
	};	};

	#endif	#endif

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

	TEveCalo.h	TEveCalo.h

	// @(#)root/eve:$Id: TEveCalo.h 30384 2009-09-23 17:54:23Z matevz $	// @(#)root/eve:$Id: TEveCalo.h 31075 2009-11-10 20:03:38Z 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 39	skipping to change at line 39
	public TAttBBox,	public TAttBBox,
	public TEveProjectable	public TEveProjectable
	{	{
	friend class TEveCaloVizEditor;	friend class TEveCaloVizEditor;

	private:	private:
	TEveCaloViz(const TEveCaloViz&); // Not implemented	TEveCaloViz(const TEveCaloViz&); // Not implemented
	TEveCaloViz& operator=(const TEveCaloViz&); // Not implemented	TEveCaloViz& operator=(const TEveCaloViz&); // Not implemented

	protected:	protected:

	TEveCaloData* fData; // event data reference	TEveCaloData* fData; // event data reference
		Bool_t fCellIdCacheOK; // data cell ids cache state

	Double_t fEtaMin;	Double_t fEtaMin;
	Double_t fEtaMax;	Double_t fEtaMax;

	Double_t fPhi;	Double_t fPhi;
	Double_t fPhiOffset; // phi range +/- offset	Double_t fPhiOffset; // phi range +/- offset

	Bool_t fAutoRange; // set eta phi limits on DataChanged()	Bool_t fAutoRange; // set eta phi limits on DataChanged()

	Float_t fBarrelRadius; // barrel raidus in cm	Float_t fBarrelRadius; // barrel raidus in cm

	skipping to change at line 61	skipping to change at line 62

	Float_t fPlotEt; // plot E or Et.	Float_t fPlotEt; // plot E or Et.

	Float_t fMaxTowerH; // bounding box z dimesion	Float_t fMaxTowerH; // bounding box z dimesion
	Bool_t fScaleAbs;	Bool_t fScaleAbs;
	Float_t fMaxValAbs;	Float_t fMaxValAbs;

	Bool_t fValueIsColor; // Interpret signal value as RGBA col or.	Bool_t fValueIsColor; // Interpret signal value as RGBA col or.
	TEveRGBAPalette* fPalette; // Pointer to signal-color palette.	TEveRGBAPalette* fPalette; // Pointer to signal-color palette.


	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 char* n="TEveCaloViz", const cha r* t="");	TEveCaloViz(TEveCaloData* data=0, const char* n="TEveCaloViz", const cha r* t="");

	virtual ~TEveCaloViz();	virtual ~TEveCaloViz();


	TEveCaloData* GetData() const { return fData; }	virtual TEveElement* ForwardSelection();
	virtual void SetData(TEveCaloData* d);	virtual TEveElement* ForwardEdit();
	virtual void DataChanged();
		virtual void Paint(Option_t* option="");


		virtual TClass* ProjectedClass(const TEveProjection* p) const;
	virtual Float_t GetValToHeight() const;	virtual Float_t GetValToHeight() const;

		virtual void CellSelectionChanged() {}

		TEveCaloData* GetData() const { return fData; }
		void SetData(TEveCaloData* d);
		void DataChanged(); Float_t GetMaxVal() const;

		void AssertCellIdCache() const;
		void InvalidateCellIdCache() { fCellIdCacheOK=kFALSE; ResetBBox(); };

	Float_t GetDataSliceThreshold(Int_t slice) const;	Float_t GetDataSliceThreshold(Int_t slice) const;
	void SetDataSliceThreshold(Int_t slice, Float_t val);	void SetDataSliceThreshold(Int_t slice, Float_t val);
	Color_t GetDataSliceColor(Int_t slice) const;	Color_t GetDataSliceColor(Int_t slice) const;
	void SetDataSliceColor(Int_t slice, Color_t col);	void SetDataSliceColor(Int_t slice, Color_t col);

	Float_t GetBarrelRadius() const { return fBarrelRadius; }	Float_t GetBarrelRadius() const { return fBarrelRadius; }
	void SetBarrelRadius(Float_t r) { fBarrelRadius = r; ResetBBox(); }	void SetBarrelRadius(Float_t r) { fBarrelRadius = r; ResetBBox(); }
	Float_t GetEndCapPos () const { return fEndCapPos; }	Float_t GetEndCapPos () const { return fEndCapPos; }
	void SetEndCapPos (Float_t z) { fEndCapPos = z; ResetBBox(); }	void SetEndCapPos (Float_t z) { fEndCapPos = z; ResetBBox(); }

	Bool_t GetPlotEt() const { return fPlotEt; }	Bool_t GetPlotEt() const { return fPlotEt; }

	virtual void SetPlotEt(Bool_t x);	void SetPlotEt(Bool_t x);

	void SetMaxTowerH(Float_t x) { fMaxTowerH = x; }	void SetMaxTowerH(Float_t x) { fMaxTowerH = x; }
	Float_t GetMaxTowerH() const { return fMaxTowerH; }	Float_t GetMaxTowerH() const { return fMaxTowerH; }
	void SetScaleAbs(Bool_t x) { fScaleAbs = x; }	void SetScaleAbs(Bool_t x) { fScaleAbs = x; }
	Bool_t GetScaleAbs() const { return fScaleAbs; }	Bool_t GetScaleAbs() const { return fScaleAbs; }
	void SetMaxValAbs(Float_t x) { fMaxValAbs = x; }	void SetMaxValAbs(Float_t x) { fMaxValAbs = x; }
	Float_t GetMaxValAbs() const { return fMaxValAbs; }	Float_t GetMaxValAbs() const { return fMaxValAbs; }


	Float_t GetMaxVal() const;

	Float_t GetTransitionEta() const;	Float_t GetTransitionEta() const;
	Float_t GetTransitionTheta() const;	Float_t GetTransitionTheta() const;

	TEveRGBAPalette* GetPalette() const { return fPalette; }	TEveRGBAPalette* GetPalette() const { return fPalette; }
	void SetPalette(TEveRGBAPalette* p);	void SetPalette(TEveRGBAPalette* p);


	TEveRGBAPalette* AssertPalette();	TEveRGBAPalette* AssertPalette();

		Bool_t GetValueIsColor() const { return fValueIsColor;}
		void SetValueIsColor(Bool_t x) { fValueIsColor = x;}


	Bool_t GetValueIsColor() const { return fValueIsColor;}	Bool_t GetAutoRange() const { return fAutoRange; }
	void SetValueIsColor(Bool_t x) { fValueIsColor = x;}	void SetAutoRange(Bool_t x) { fAutoRange = x; }

	void SetEta(Float_t l, Float_t u);	void SetEta(Float_t l, Float_t u);
	Float_t GetEta() const { return 0.5f*(fEtaMin+fEtaMax); }	Float_t GetEta() const { return 0.5f*(fEtaMin+fEtaMax); }
	Float_t GetEtaMin() const { return fEtaMin; }	Float_t GetEtaMin() const { return fEtaMin; }
	Float_t GetEtaMax() const { return fEtaMax; }	Float_t GetEtaMax() const { return fEtaMax; }
	Float_t GetEtaRng() const { return fEtaMax-fEtaMin; }	Float_t GetEtaRng() const { return fEtaMax-fEtaMin; }


	virtual void SetPhi(Float_t phi) { SetPhiWithRng(phi, fPhiOffset); }	void SetPhi(Float_t phi) { SetPhiWithRng(phi, fPhiOffset); }
	virtual void SetPhiRng(Float_t rng) { SetPhiWithRng(fPhi, rng); }	void SetPhiRng(Float_t rng) { SetPhiWithRng(fPhi, rng); }
	virtual void SetPhiWithRng(Float_t x, Float_t r);	void SetPhiWithRng(Float_t x, Float_t r);
	Float_t GetPhi() const { return fPhi; }	Float_t GetPhi() const { return fPhi; }
	Float_t GetPhiMin() const { return fPhi-fPhiOffset; }	Float_t GetPhiMin() const { return fPhi-fPhiOffset; }
	Float_t GetPhiMax() const { return fPhi+fPhiOffset; }	Float_t GetPhiMax() const { return fPhi+fPhiOffset; }
	Float_t GetPhiRng() const { return 2.0f*fPhiOffset; }	Float_t GetPhiRng() const { return 2.0f*fPhiOffset; }


	Bool_t GetAutoRange() const { return fAutoRange; }	Bool_t CellInEtaPhiRng (TEveCaloData::CellData_t&) const;
	void SetAutoRange(Bool_t x) { fAutoRange = x; }

	void InvalidateCellIdCache() { fCellIdCacheOK=kFALSE; ResetBBox(); }

	virtual void Paint(Option_t* option="");

	virtual TClass* ProjectedClass() const;

	ClassDef(TEveCaloViz, 0); // Base-class for visualization of calorimeter eventdata.	ClassDef(TEveCaloViz, 0); // Base-class for visualization of calorimeter eventdata.
	};	};

	/************************************************************************** /	/************************************************************************** /
	/************************************************************************** /	/************************************************************************** /

	class TEveCalo3D : public TEveCaloViz	class TEveCalo3D : public TEveCaloViz
	{	{
	friend class TEveCalo3DGL;	friend class TEveCalo3DGL;
	private:	private:
	TEveCalo3D(const TEveCalo3D&); // Not implemented	TEveCalo3D(const TEveCalo3D&); // Not implemented
	TEveCalo3D& operator=(const TEveCalo3D&); // Not implemented	TEveCalo3D& operator=(const TEveCalo3D&); // Not implemented

	protected:	protected:
	TEveCaloData::vCellId_t fCellList;	TEveCaloData::vCellId_t fCellList;

		TEveCaloData::vCellId_t fCellListSelected;

	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 char* n="TEveCalo3D", const char* t= "xx");	TEveCalo3D(TEveCaloData* d=0, const char* n="TEveCalo3D", const char* t= "xx");
	virtual ~TEveCalo3D() {}	virtual ~TEveCalo3D() {}
	virtual void ComputeBBox();	virtual void ComputeBBox();

	virtual Bool_t CanEditMainColor() const { return kTRUE; }	virtual Bool_t CanEditMainColor() const { return kTRUE; }
	virtual Bool_t CanEditMainTransparency() const { return kTRUE; }	virtual Bool_t CanEditMainTransparency() const { return kTRUE; }

	void SetRnrFrame(Bool_t e, Bool_t b) { fRnrEndCapFrame = e; fRnr BarrelFrame = b; }	void SetRnrFrame(Bool_t e, Bool_t b) { fRnrEndCapFrame = e; fRnr BarrelFrame = b; }
	void GetRnrFrame(Bool_t &e, Bool_t &b) const { e = fRnrEndCapFrame; b = fRnrBarrelFrame; }	void GetRnrFrame(Bool_t &e, Bool_t &b) const { e = fRnrEndCapFrame; b = fRnrBarrelFrame; }


	virtual void SetFrameTransparency(UChar_t x) { fFrameTransparency = x; }	void SetFrameTransparency(UChar_t x) { fFrameTransparency = x; }
	UChar_t GetFrameTransparency() const { return fFrameTransparency; }	UChar_t GetFrameTransparency() const { return fFrameTransparency; }

	ClassDef(TEveCalo3D, 0); // Class for 3D visualization of calorimeter ev ent data.	ClassDef(TEveCalo3D, 0); // Class for 3D visualization of calorimeter ev ent data.
	};	};

	/************************************************************************** /	/************************************************************************** /
	/************************************************************************** /	/************************************************************************** /

	class TEveCalo2D : public TEveCaloViz,	class TEveCalo2D : public TEveCaloViz,
	public TEveProjected	public TEveProjected
	{	{
	friend class TEveCalo2DGL;	friend class TEveCalo2DGL;


		typedef std::vector<TEveCaloData::vCellId_t*> vBinCells_t;
		typedef std::vector<TEveCaloData::vCellId_t*>::iterator vBinCells_i;

	private:	private:
	TEveCalo2D(const TEveCalo2D&); // Not implemented	TEveCalo2D(const TEveCalo2D&); // Not implemented
	TEveCalo2D& operator=(const TEveCalo2D&); // Not implemented	TEveCalo2D& operator=(const TEveCalo2D&); // Not implemented

	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<TEveCaloData::vCellId_t*> fCellListsSelected;
		std::vector<Int_t> fBinIdsSelected;

		Float_t fMaxESumBin;
		Float_t fMaxEtSumBin;

	virtual void BuildCellIdCache();	virtual void BuildCellIdCache();


		virtual void SetDepthLocal(Float_t x) { fDepth = x; }

	public:	public:
	TEveCalo2D(const char* n="TEveCalo2D", const char* t="");	TEveCalo2D(const char* n="TEveCalo2D", const char* t="");
	virtual ~TEveCalo2D();	virtual ~TEveCalo2D();

	virtual void SetProjection(TEveProjectionManager* proj, TEveProjectable* model);	virtual void SetProjection(TEveProjectionManager* proj, TEveProjectable* model);
	virtual void UpdateProjection();	virtual void UpdateProjection();

	virtual void SetDepth(Float_t x){fDepth = x;}

	virtual void ComputeBBox();	virtual void ComputeBBox();


		virtual void CellSelectionChanged();

		virtual Float_t GetValToHeight() const;

	ClassDef(TEveCalo2D, 0); // Class for visualization of projected calorim eter event data.	ClassDef(TEveCalo2D, 0); // Class for visualization of projected calorim eter event data.
	};	};
	/************************************************************************** /	/************************************************************************** /
	/************************************************************************** /	/************************************************************************** /

	class TEveCaloLego : public TEveCaloViz	class TEveCaloLego : public TEveCaloViz
	{	{
	friend class TEveCaloLegoGL;	friend class TEveCaloLegoGL;
	friend class TEveCaloLegoOverlay;	friend class TEveCaloLegoOverlay;

	public:	public:
	enum EProjection_e { kAuto, k3D, k2D };	enum EProjection_e { kAuto, k3D, k2D };

	enum E2DMode_e { kValColor, kValSize };	enum E2DMode_e { kValColor, kValSize, kValSizeOutline };
	enum EBoxMode_e { kNone, kFrontBack, kBack};	enum EBoxMode_e { kNone, kFrontBack, kBack};

	private:	private:
	TEveCaloLego(const TEveCaloLego&); // Not implemented	TEveCaloLego(const TEveCaloLego&); // Not implemented
	TEveCaloLego& operator=(const TEveCaloLego&); // Not implemented	TEveCaloLego& operator=(const TEveCaloLego&); // Not implemented

	protected:	protected:
	TEveCaloData::vCellId_t fCellList;	TEveCaloData::vCellId_t fCellList;

	Color_t fFontColor;	Color_t fFontColor;

	skipping to change at line 246	skipping to change at line 263
	Int_t fPixelsPerBin;	Int_t fPixelsPerBin;
	Bool_t fNormalizeRebin;	Bool_t fNormalizeRebin;

	EProjection_e fProjection;	EProjection_e fProjection;
	E2DMode_e f2DMode;	E2DMode_e f2DMode;
	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 fBinStep;	Int_t fBinStep;

	Int_t fDrawNumberCellPixels;	Int_t fDrawNumberCellPixels;
	Int_t fCellPixelFontSize;	Int_t fCellPixelFontSize;

	virtual void BuildCellIdCache();	virtual void BuildCellIdCache();

	public:	public:
	TEveCaloLego(TEveCaloData* data=0, const char* n="TEveCaloLego", const c har* t="");	TEveCaloLego(TEveCaloData* data=0, const char* n="TEveCaloLego", const c har* t="");


	virtual ~TEveCaloLego(){}	virtual ~TEveCaloLego(){}


		virtual void ComputeBBox();
	virtual void SetData(TEveCaloData* d);	virtual void SetData(TEveCaloData* d);

	Color_t GetFontColor() const { return fFontColor; }	Color_t GetFontColor() const { return fFontColor; }
	void SetFontColor(Color_t ci) { fFontColor=ci; }	void SetFontColor(Color_t ci) { fFontColor=ci; }

	Color_t GetGridColor() const { return fGridColor; }	Color_t GetGridColor() const { return fGridColor; }
	void SetGridColor(Color_t ci) { fGridColor=ci; }	void SetGridColor(Color_t ci) { fGridColor=ci; }

	Color_t GetPlaneColor() const { return fPlaneColor; }	Color_t GetPlaneColor() const { return fPlaneColor; }
	void SetPlaneColor(Color_t ci) { fPlaneColor=ci; }	void SetPlaneColor(Color_t ci) { fPlaneColor=ci; }

	skipping to change at line 300	skipping to change at line 316

	void SetBoxMode(EBoxMode_e p) { fBoxMode = p; }	void SetBoxMode(EBoxMode_e p) { fBoxMode = p; }
	EBoxMode_e GetBoxMode() { return fBoxMode; }	EBoxMode_e GetBoxMode() { return fBoxMode; }

	Bool_t GetDrawHPlane() const { return fDrawHPlane; }	Bool_t GetDrawHPlane() const { return fDrawHPlane; }
	void SetDrawHPlane(Bool_t s) { fDrawHPlane = s;}	void SetDrawHPlane(Bool_t s) { fDrawHPlane = s;}

	Float_t GetHPlaneVal() const { return fHPlaneVal; }	Float_t GetHPlaneVal() const { return fHPlaneVal; }
	void SetHPlaneVal(Float_t s) { fHPlaneVal = s;}	void SetHPlaneVal(Float_t s) { fHPlaneVal = s;}


	Int_t GetTowerPicked() const { return fTowerPicked; }
	void SetTowerPicked(Int_t p) { fTowerPicked = p;}

	Int_t GetDrawNumberCellPixels() { return fDrawNumberCellPixels; }	Int_t GetDrawNumberCellPixels() { return fDrawNumberCellPixels; }
	void SetDrawNumberCellPixels(Int_t x) { fDrawNumberCellPixels = x; }	void SetDrawNumberCellPixels(Int_t x) { fDrawNumberCellPixels = x; }
	Int_t GetCellPixelFontSize() { return fCellPixelFontSize; }	Int_t GetCellPixelFontSize() { return fCellPixelFontSize; }
	void SetCellPixelFontSize(Int_t x) { fCellPixelFontSize = x; }	void SetCellPixelFontSize(Int_t x) { fCellPixelFontSize = x; }


	virtual void ComputeBBox();

	ClassDef(TEveCaloLego, 0); // Class for visualization of calorimeter hi stogram data.	ClassDef(TEveCaloLego, 0); // Class for visualization of calorimeter hi stogram data.
	};	};

	#endif	#endif

End of changes. 26 change blocks.
	35 lines changed or deleted	46 lines changed or added

	TEveCalo2DGL.h	TEveCalo2DGL.h

	// @(#)root/eve:$Id: TEveCalo2DGL.h 25245 2008-08-25 21:44:09Z matevz $	// @(#)root/eve:$Id: TEveCalo2DGL.h 30929 2009-10-30 15:18:51Z 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_TEveCalo2DGL	#ifndef ROOT_TEveCalo2DGL
	#define ROOT_TEveCalo2DGL	#define ROOT_TEveCalo2DGL

	#include "TGLObject.h"	#include "TGLObject.h"
	#include "TEveCaloData.h"	#include "TEveCaloData.h"

		#include "TEveCalo.h"

	class TGLViewer;	class TGLViewer;
	class TGLScene;	class TGLScene;

	class TEveCalo2D;	class TEveCalo2D;
	class TEveProjection;	class TEveProjection;

	class TEveCalo2DGL : public TGLObject	class TEveCalo2DGL : public TGLObject
	{	{
	private:	private:
	TEveCalo2DGL(const TEveCalo2DGL&); // Not implemented	TEveCalo2DGL(const TEveCalo2DGL&); // Not implemented
	TEveCalo2DGL& operator=(const TEveCalo2DGL&); // Not implemented	TEveCalo2DGL& operator=(const TEveCalo2DGL&); // Not implemented

	protected:	protected:
	TEveCalo2D *fM; // Model object.	TEveCalo2D *fM; // Model object.

	void MakeRhoZCell(Float_t thetaMin, Float_t thetaMax, Float_t& offs et, Bool_t isBarrel, Bool_t phiPlus, Float_t towerH) const;	void MakeRhoZCell(Float_t thetaMin, Float_t thetaMax, Float_t& offs et, Bool_t isBarrel, Bool_t phiPlus, Float_t towerH) const;


	Float_t MakeRPhiCell(Float_t phiMin, Float_t phiMax, Float_t towerH, F loat_t offset) const;	void MakeRPhiCell(Float_t phiMin, Float_t phiMax, Float_t towerH, F loat_t offset) const;


	void DrawRPhi(TGLRnrCtx & rnrCtx) const;	void DrawRPhi(TGLRnrCtx & rnrCtx, TEveCalo2D::vBinCells_t&) const;
	void DrawRhoZ(TGLRnrCtx & rnrCtx) const;	void DrawRPhiHighlighted(TGLRnrCtx & rnrCtx) const;
		void DrawRhoZ(TGLRnrCtx & rnrCtx, TEveCalo2D::vBinCells_t&) const;
		void DrawRhoZHighlighted(TGLRnrCtx & rnrCtx) const;

		Bool_t IsRPhi() const;

	public:	public:
	TEveCalo2DGL();	TEveCalo2DGL();
	virtual ~TEveCalo2DGL() {}	virtual ~TEveCalo2DGL() {}

	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;
		virtual void DrawHighlight(TGLRnrCtx& rnrCtx, const TGLPhysicalShape* ps
		) const;

	// To support two-level selection	// To support two-level selection
	virtual Bool_t SupportsSecondarySelect() const { return kTRUE; }	virtual Bool_t SupportsSecondarySelect() const { return kTRUE; }

		virtual Bool_t AlwaysSecondarySelect() const { return kTRUE; }
	virtual void ProcessSelection(TGLRnrCtx & rnrCtx, TGLSelectRecord & rec) ;	virtual void ProcessSelection(TGLRnrCtx & rnrCtx, TGLSelectRecord & rec) ;

	ClassDef(TEveCalo2DGL, 0); // GL renderer class for TEveCalo2D.	ClassDef(TEveCalo2DGL, 0); // GL renderer class for TEveCalo2D.
	};	};

	#endif	#endif

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

	TEveCalo3DGL.h	TEveCalo3DGL.h

	// @(#)root/eve:$Id: TEveCalo3DGL.h 26772 2008-12-09 19:57:49Z matevz $	// @(#)root/eve:$Id: TEveCalo3DGL.h 30883 2009-10-27 11:30:59Z 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 32	skipping to change at line 32
	private:	private:
	TEveCalo3DGL(const TEveCalo3DGL&); // Not implemented	TEveCalo3DGL(const TEveCalo3DGL&); // Not implemented
	TEveCalo3DGL& operator=(const TEveCalo3DGL&); // Not implemented	TEveCalo3DGL& operator=(const TEveCalo3DGL&); // Not implemented

	void CrossProduct(const Float_t a[3], const Float_t b[3], const Float _t c[3], Float_t out[3]) const;	void CrossProduct(const Float_t a[3], const Float_t b[3], const Float _t c[3], Float_t out[3]) const;

	void RenderBox(const Float_t pnts[8]) const;	void RenderBox(const Float_t pnts[8]) const;
	void RenderGridEndCap() const;	void RenderGridEndCap() const;
	void RenderGridBarrel() const;	void RenderGridBarrel() const;
	void RenderGrid(TGLRnrCtx & rnrCtx) const;	void RenderGrid(TGLRnrCtx & rnrCtx) const;

	Float_t RenderBarrelCell(const TEveCaloData::CellData_t &cell, Float_t t	Float_t RenderBarrelCell(const TEveCaloData::CellGeom_t &cell, Float_t t
	owerH, Float_t offset) const;	owerH, Float_t offset) const;
	Float_t RenderEndCapCell(const TEveCaloData::CellData_t &cell, Float_t t	Float_t RenderEndCapCell(const TEveCaloData::CellGeom_t &cell, Float_t t
	owerH, Float_t offset) const;	owerH, Float_t offset) const;

	protected:	protected:
	TEveCalo3D *fM; // Model object.	TEveCalo3D *fM; // Model object.


		mutable std::vector<Float_t> fOffset;

	public:	public:
	TEveCalo3DGL();	TEveCalo3DGL();
	virtual ~TEveCalo3DGL() {}	virtual ~TEveCalo3DGL() {}

	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;

		virtual void DrawHighlight(TGLRnrCtx & rnrCtx, const TGLPhysicalShape* ps) const;

	virtual Bool_t ShouldDLCache(const TGLRnrCtx& rnrCtx) const;	virtual Bool_t ShouldDLCache(const TGLRnrCtx& rnrCtx) const;
	virtual Bool_t SupportsSecondarySelect() const { return kTRUE; }	virtual Bool_t SupportsSecondarySelect() const { return kTRUE; }

		virtual Bool_t AlwaysSecondarySelect() const { return kTRUE; }
	virtual void ProcessSelection(TGLRnrCtx & rnrCtx, TGLSelectRecord & re c);	virtual void ProcessSelection(TGLRnrCtx & rnrCtx, TGLSelectRecord & re c);

	ClassDef(TEveCalo3DGL, 0); // GL renderer class for TEveCalo.	ClassDef(TEveCalo3DGL, 0); // GL renderer class for TEveCalo.
	};	};

	#endif	#endif

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

	TEveCaloData.h	TEveCaloData.h

	// @(#)root/eve:$Id: TEveCaloData.h 29302 2009-07-02 08:37:01Z matevz $	// @(#)root/eve:$Id: TEveCaloData.h 31075 2009-11-10 20:03:38Z 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_TEveCaloData	#ifndef ROOT_TEveCaloData
	#define ROOT_TEveCaloData	#define ROOT_TEveCaloData

	#include <vector>	#include <vector>

	#include "Rtypes.h"	#include "TEveElement.h"
	#include "TEveUtil.h"

	class TH2F;	class TH2F;
	class TAxis;	class TAxis;
	class THStack;	class THStack;


	class TEveCaloData: public TEveRefBackPtr	class TEveCaloData: public TEveElement,
		public TNamed
	{	{
	public:	public:
	struct SliceInfo_t	struct SliceInfo_t
	{	{
	TString fName; // Name of the slice, eg. ECAL, HCAL.	TString fName; // Name of the slice, eg. ECAL, HCAL.
	Float_t fThreshold; // Only display towers with higher energy.	Float_t fThreshold; // Only display towers with higher energy.

	Int_t fID; // Unique identification of the slice.
	Color_t fColor; // Color used to draw this longitudinal slice.	Color_t fColor; // Color used to draw this longitudinal slice.

	TH2F *fHist;


	SliceInfo_t(): fName(""), fThreshold(0), fID(-1), fColor(Color_t(4)),	SliceInfo_t(): fName(""), fThreshold(0), fColor(kRed) {}
	fHist(0){}
	SliceInfo_t(TH2F* h): fName(""), fThreshold(0), fID(-1), fColor(Color
	_t(4)), fHist(h) {}

	virtual ~SliceInfo_t() {}	virtual ~SliceInfo_t() {}

	void Setup(const char* name, Float_t threshold, Color_t col)	void Setup(const char* name, Float_t threshold, Color_t col)
	{	{
	fName = name;	fName = name;
	fThreshold = threshold;	fThreshold = threshold;
	fColor = col;	fColor = col;
	};	};


	skipping to change at line 151	skipping to change at line 148
	TAxis* fEtaAxis;	TAxis* fEtaAxis;
	TAxis* fPhiAxis;	TAxis* fPhiAxis;

	Bool_t fWrapTwoPi;	Bool_t fWrapTwoPi;

	Float_t fMaxValEt; // cached	Float_t fMaxValEt; // cached
	Float_t fMaxValE; // cached	Float_t fMaxValE; // cached

	Float_t fEps;	Float_t fEps;


		vCellId_t fCellsSelected;

	public:	public:

	TEveCaloData();	TEveCaloData(const char* n="TEveCalData", const char* t="");
	virtual ~TEveCaloData() {}	virtual ~TEveCaloData() {}


		virtual void SelectElement(Bool_t state);
		virtual void FillImpliedSelectedSet(Set_t& impSelSet);

	virtual void GetCellList(Float_t etaMin, Float_t etaMax,	virtual void GetCellList(Float_t etaMin, Float_t etaMax,
	Float_t phi, Float_t phiRng,	Float_t phi, Float_t phiRng,
	vCellId_t &out) const = 0;	vCellId_t &out) const = 0;


		vCellId_t& GetCellsSelected() { return fCellsSelected; }
		void PrintCellsSelected();

	virtual void Rebin(TAxis ax, TAxis ay, vCellId_t &in, Bool_t et, Re binData_t &out) const = 0;	virtual void Rebin(TAxis ax, TAxis ay, vCellId_t &in, Bool_t et, Re binData_t &out) const = 0;

	virtual void GetCellData(const CellId_t &id, CellData_t& data) const = 0;	virtual void GetCellData(const CellId_t &id, CellData_t& data) const = 0;

	virtual void InvalidateUsersCellIdCache();	virtual void InvalidateUsersCellIdCache();
	virtual void DataChanged();	virtual void DataChanged();

		virtual void CellSelectionChanged();

	Int_t GetNSlices() const { return fSliceInfos.size(); }	Int_t GetNSlices() const { return fSliceInfos.size(); }
	SliceInfo_t& RefSliceInfo(Int_t s) { return fSliceInfos[s]; }	SliceInfo_t& RefSliceInfo(Int_t s) { return fSliceInfos[s]; }
	void SetSliceThreshold(Int_t slice, Float_t threshold);	void SetSliceThreshold(Int_t slice, Float_t threshold);
	Float_t GetSliceThreshold(Int_t slice) const;	Float_t GetSliceThreshold(Int_t slice) const;
	void SetSliceColor(Int_t slice, Color_t col);	void SetSliceColor(Int_t slice, Color_t col);
	Color_t GetSliceColor(Int_t slice) const;	Color_t GetSliceColor(Int_t slice) const;

	virtual void GetEtaLimits(Double_t &min, Double_t &max) const = 0;	virtual void GetEtaLimits(Double_t &min, Double_t &max) const = 0;


	skipping to change at line 282	skipping to change at line 288

	virtual void GetCellData(const TEveCaloData::CellId_t &id, TEveCaloData: :CellData_t& data) const;	virtual void GetCellData(const TEveCaloData::CellId_t &id, TEveCaloData: :CellData_t& data) const;

	virtual void GetEtaLimits(Double_t &min, Double_t &max) const;	virtual void GetEtaLimits(Double_t &min, Double_t &max) const;
	virtual void GetPhiLimits(Double_t &min, Double_t &max) const;	virtual void GetPhiLimits(Double_t &min, Double_t &max) const;

	virtual void DataChanged();	virtual void DataChanged();

	THStack* GetStack() { return fHStack; }	THStack* GetStack() { return fHStack; }


		TH2F* GetHist(Int_t slice) const;

	Int_t AddHistogram(TH2F* hist);	Int_t AddHistogram(TH2F* hist);

	ClassDef(TEveCaloDataHist, 0); // Manages calorimeter TH2F event data.	ClassDef(TEveCaloDataHist, 0); // Manages calorimeter TH2F event data.
	};	};

	#endif	#endif

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

	TEveCaloLegoGL.h	TEveCaloLegoGL.h

	// @(#)root/eve:$Id: TEveCaloLegoGL.h 30384 2009-09-23 17:54:23Z matevz $	// @(#)root/eve:$Id: TEveCaloLegoGL.h 30929 2009-10-30 15:18:51Z matevz $
	// Author: Alja Mrak-Tadel 2007	// Author: Alja Mrak-Tadel 2007

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/


	skipping to change at line 29	skipping to change at line 29
	#include "TEveVSDStructs.h"	#include "TEveVSDStructs.h"
	#include "TEveCalo.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	struct Cell2D_t
	TEveCaloLegoGL& operator=(const TEveCaloLegoGL&); // Not implemented	{
		Int_t fId;
	mutable Float_t fDataMax; // cached	Float_t fSumVal;
		Int_t fMaxSlice;

		Float_t fX0, fX1, fY0, fY1;

		Cell2D_t(Int_t id, Float_t sumVal, Int_t maxSlice)
		{
		fId = id;
		fSumVal = sumVal;
		fMaxSlice = maxSlice;
		}

		void SetGeom(Float_t x0, Float_t x1, Float_t y0, Float_t y1)
		{
		fX0 = x0; fX1 = x1;
		fY0 = y0; fY1 = y1;
		}

		Float_t MinSize() { return TMath::Min(fX1- fX0, fY1 - fY0); }
		Float_t X() { return 0.5*(fX0 + fX1); }
		Float_t Y() { return 0.5*(fY0 + fY1); }
		};


	mutable Color_t fGridColor; // cached	typedef std::vector<Cell2D_t> vCell2D_t;
	mutable Color_t fFontColor; // cached	typedef std::vector<Cell2D_t>::iterator vCell2D_i;


	// axis	typedef std::map<Int_t, UInt_t> SliceDLMap_t;
	mutable TAxis *fEtaAxis;	typedef std::map<Int_t, UInt_t>::iterator SliceDLMap_i;
	mutable TAxis *fPhiAxis;
	mutable TAxis *fZAxis;


		// histogram base
		mutable Float_t fDataMax;
		mutable Color_t fGridColor;
		mutable Color_t fFontColor;

		mutable TAxis *fEtaAxis;
		mutable TAxis *fPhiAxis;
		mutable TAxis *fZAxis;
	mutable TEveVector fXAxisTitlePos;	mutable TEveVector fXAxisTitlePos;
	mutable TEveVector fYAxisTitlePos;	mutable TEveVector fYAxisTitlePos;
	mutable TEveVector fZAxisTitlePos;	mutable TEveVector fZAxisTitlePos;
	mutable TEveVector fBackPlaneXConst[2];	mutable TEveVector fBackPlaneXConst[2];
	mutable TEveVector fBackPlaneYConst[2];	mutable TEveVector fBackPlaneYConst[2];

	mutable TGLAxisPainter fAxisPainter;	mutable TGLAxisPainter fAxisPainter;


		// cached
		TEveCaloLego *fM;
		mutable Bool_t fDLCacheOK;
		mutable vCell2D_t fCells2D;

		mutable TEveCaloData::RebinData_t fRebinData;
		mutable Float_t fMaxValRebin;
		mutable Float_t fValToPixel; // top logaritmic viewvie
		w
		mutable Int_t fCurrentPixelsPerBin;

		mutable SliceDLMap_t fDLMap;
		mutable Bool_t fCells3D;

		TEveCaloLegoGL(const TEveCaloLegoGL&); // Stop default
		TEveCaloLegoGL& operator=(const TEveCaloLegoGL&); // Stop default

	protected:	protected:
	Int_t GetGridStep(TGLRnrCtx &rnrCtx) const;	Int_t GetGridStep(TGLRnrCtx &rnrCtx) const;
	void RebinAxis(TAxis orig, TAxis curr) const;	void RebinAxis(TAxis orig, TAxis curr) const;

	void SetAxis3DTitlePos(TGLRnrCtx &rnrCtx, Float_t x0, Float_t x1, Flo at_t y0, Float_t y1) const;	void SetAxis3DTitlePos(TGLRnrCtx &rnrCtx, Float_t x0, Float_t x1, Flo at_t y0, Float_t y1) const;
	void DrawAxis3D(TGLRnrCtx &rnrCtx) const;	void DrawAxis3D(TGLRnrCtx &rnrCtx) const;
	void DrawAxis2D(TGLRnrCtx &rnrCtx) const;	void DrawAxis2D(TGLRnrCtx &rnrCtx) const;
	void DrawHistBase(TGLRnrCtx &rnrCtx) const;	void DrawHistBase(TGLRnrCtx &rnrCtx) const;


	void DrawCells2D(TGLRnrCtx & rnrCtx) const;	// top view
		void PrepareCell2DData(TEveCaloData::vCellId_t& cellList, vCell2D_t&
		cells2D) const;
		void PrepareCell2DDataRebin(TEveCaloData::RebinData_t& rebinData, vCe
		ll2D_t& cells2D) const;
		void DrawCells2D(TGLRnrCtx & rnrCtx, vCell2D_t& cells2D) const;


		// 3D view
	void DrawCells3D(TGLRnrCtx & rnrCtx) const;	void DrawCells3D(TGLRnrCtx & rnrCtx) const;
	void MakeQuad(Float_t x, Float_t y, Float_t z, Float_t xw, Float_t yw , Float_t zh) const;	void MakeQuad(Float_t x, Float_t y, Float_t z, Float_t xw, Float_t yw , Float_t zh) const;

	void MakeDisplayList() const;	void Make3DDisplayList(TEveCaloData::vCellId_t& cellList, SliceDLMap_
		t& map, Bool_t select) const;
		void Make3DDisplayListRebin(TEveCaloData::RebinData_t& rebinData, Sli
		ceDLMap_t& map, Bool_t select) const;

	void WrapTwoPi(Float_t &min, Float_t &max) const;	void WrapTwoPi(Float_t &min, Float_t &max) const;


	TEveCaloLego *fM; // Model object.
	mutable Bool_t fDLCacheOK;

	typedef std::map<Int_t, UInt_t> SliceDLMap_t;
	typedef std::map<Int_t, UInt_t>::iterator SliceDLMap_i;

	mutable SliceDLMap_t fDLMap;
	mutable TEveCaloData::RebinData_t fRebinData;

	mutable Bool_t fCells3D;
	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 void DrawHighlight(TGLRnrCtx& rnrCtx, const TGLPhysicalShape*
		ps) const;

	virtual Bool_t SupportsSecondarySelect() const { return kTRUE; }	virtual Bool_t SupportsSecondarySelect() const { return kTRUE; }

		virtual Bool_t AlwaysSecondarySelect() 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	inline void TEveCaloLegoGL::WrapTwoPi(Float_t &min, Float_t &max) const
	{	{
	if (fM->GetData()->GetWrapTwoPi())	if (fM->GetData()->GetWrapTwoPi())
	{	{

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

	TEveCaloLegoOverlay.h	TEveCaloLegoOverlay.h

	// @(#)root/eve:$Id: TEveCaloLegoOverlay.h 30384 2009-09-23 17:54:23Z matev z $	// @(#)root/eve:$Id: TEveCaloLegoOverlay.h 31081 2009-11-11 10:51:54Z matev z $
	// Author: Alja Mrak-Tadel 2007	// Author: Alja Mrak-Tadel 2007

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/


	skipping to change at line 42	skipping to change at line 42
	void RenderHeader(TGLRnrCtx& rnrCtx);	void RenderHeader(TGLRnrCtx& rnrCtx);

	TEveCaloLego* fCalo; // model	TEveCaloLego* fCalo; // model

	// 2D scales	// 2D scales
	Bool_t fShowScales;	Bool_t fShowScales;
	Color_t fScaleColor;	Color_t fScaleColor;
	UChar_t fScaleTransparency; //transaprency in %	UChar_t fScaleTransparency; //transaprency in %
	Double_t fScaleCoordX;	Double_t fScaleCoordX;
	Double_t fScaleCoordY;	Double_t fScaleCoordY;

		Double_t fScaleW;
		Double_t fScaleH;
	Double_t fCellX;	Double_t fCellX;
	Double_t fCellY;	Double_t fCellY;

	Color_t fFrameColor;	Color_t fFrameColor;
	UChar_t fFrameLineTransp;	UChar_t fFrameLineTransp;

	UChar_t fFrameBgTransp;;	UChar_t fFrameBgTransp;

	// move of scales	// move of scales
	Int_t fMouseX, fMouseY; //! last mouse position	Int_t fMouseX, fMouseY; //! last mouse position
	Bool_t fInDrag;	Bool_t fInDrag;

	// text top right corner	// text top right corner
	TString fHeaderTxt;	TString fHeaderTxt;
	Bool_t fHeaderSelected;	Bool_t fHeaderSelected;

	// plane ojects	// plane ojects

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

	TEveCompound.h	TEveCompound.h

	// @(#)root/eve:$Id: TEveCompound.h 27157 2009-01-15 14:05:12Z brun $	// @(#)root/eve:$Id: TEveCompound.h 30849 2009-10-23 13:45:23Z 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_TEveCompound	#ifndef ROOT_TEveCompound
	#define ROOT_TEveCompound	#define ROOT_TEveCompound

	#include "TEveElement.h"	#include "TEveElement.h"
	#include "TEveProjectionBases.h"	#include "TEveProjectionBases.h"

	//========================================================================= =====	//========================================================================= =====
	// TEveCompound	// TEveCompound
	//========================================================================= =====	//========================================================================= =====


	class TEveCompound : public TEveElementList,	class TEveCompound : public TEveElementList
	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 char* n="TEveCompound", const char* t="",	TEveCompound(const char* n="TEveCompound", const char* t="",

	skipping to change at line 49	skipping to change at line 48
	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);
	virtual void RemoveElementLocal(TEveElement* el);	virtual void RemoveElementLocal(TEveElement* el);
	virtual void RemoveElementsLocal();	virtual void RemoveElementsLocal();

	virtual void FillImpliedSelectedSet(Set_t& impSelSet);	virtual void FillImpliedSelectedSet(Set_t& impSelSet);


	virtual TClass* ProjectedClass() const;	virtual TClass* ProjectedClass(const TEveProjection* p) const;

	ClassDef(TEveCompound, 0); // Container for managing compounds of TEveEl ements.	ClassDef(TEveCompound, 0); // Container for managing compounds of TEveEl ements.
	};	};

	//========================================================================= =====	//========================================================================= =====
	// TEveCompoundProjected	// TEveCompoundProjected
	//========================================================================= =====	//========================================================================= =====

	class TEveCompoundProjected : public TEveCompound,	class TEveCompoundProjected : public TEveCompound,
	public TEveProjected	public TEveProjected
	{	{
	private:	private:
	TEveCompoundProjected(const TEveCompoundProjected&); // Not i mplemented	TEveCompoundProjected(const TEveCompoundProjected&); // Not i mplemented
	TEveCompoundProjected& operator=(const TEveCompoundProjected&); // Not i mplemented	TEveCompoundProjected& operator=(const TEveCompoundProjected&); // Not i mplemented

	protected:	protected:

		virtual void SetDepthLocal(Float_t /d/) {}

	public:	public:
	TEveCompoundProjected();	TEveCompoundProjected();
	virtual ~TEveCompoundProjected() {}	virtual ~TEveCompoundProjected() {}

	virtual void SetMainColor(Color_t color);	virtual void SetMainColor(Color_t color);


	// Abstract from TEveProjected, we seem not to care.
	virtual void SetDepth(Float_t /d/) {}
	virtual void UpdateProjection() {}	virtual void UpdateProjection() {}

	ClassDef(TEveCompoundProjected, 0); // Projected TEveCompund container.	ClassDef(TEveCompoundProjected, 0); // Projected TEveCompund container.
	};	};

	#endif	#endif

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

	TEveElement.h	TEveElement.h

	// @(#)root/eve:$Id: TEveElement.h 29499 2009-07-16 16:51:38Z matevz $	// @(#)root/eve:$Id: TEveElement.h 31234 2009-11-17 14:57:10Z matevz $
	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOT_TEveElement	#ifndef ROOT_TEveElement
	#define ROOT_TEveElement	#define ROOT_TEveElement

	#include "TEveUtil.h"	#include "TEveUtil.h"

		#include "TEveProjectionBases.h"

	#include "TNamed.h"	#include "TNamed.h"
	#include "TRef.h"	#include "TRef.h"

	class TGListTree;	class TGListTree;
	class TGListTreeItem;	class TGListTreeItem;
	class TGPicture;	class TGPicture;

	class TEveCompound;	class TEveCompound;
	class TEveTrans;	class TEveTrans;

	skipping to change at line 104	skipping to change at line 105
	TEveTrans *fMainTrans; // Pointer to main transformati on matrix.	TEveTrans *fMainTrans; // Pointer to main transformati on matrix.

	sLTI_t fItems; //! Set of list-tree-items.	sLTI_t fItems; //! Set of list-tree-items.

	TRef fSource; // External object that is repr esented by this element.	TRef fSource; // External object that is repr esented by this element.
	void *fUserData; //! Externally assigned and cont rolled user data.	void *fUserData; //! Externally assigned and cont rolled user data.

	virtual void PreDeleteElement();	virtual void PreDeleteElement();
	virtual void RemoveElementsInternal();	virtual void RemoveElementsInternal();


		static const char* ToString(Bool_t b);

	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;
	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 char* GetElementName() const;	virtual const char* GetElementName() const;
	virtual const char* GetElementTitle() const;	virtual const char* GetElementTitle() const;
	virtual void SetElementName (const char* name);	virtual void SetElementName (const char* name);
	virtual void SetElementTitle(const char* title);	virtual void SetElementTitle(const char* title);
	virtual void SetElementNameTitle(const char* name, const char* title);	virtual void SetElementNameTitle(const char* name, const char* title);
	virtual void NameTitleChanged();	virtual void NameTitleChanged();


	skipping to change at line 167	skipping to change at line 170
	List_ci BeginChildren() const { return fChildren.begin(); }	List_ci BeginChildren() const { return fChildren.begin(); }
	List_ci EndChildren() const { return fChildren.end(); }	List_ci EndChildren() const { return fChildren.end(); }
	Int_t NumChildren() const { return fChildren.size(); }	Int_t NumChildren() const { return fChildren.size(); }
	Bool_t HasChildren() const { return !fChildren.empty(); }	Bool_t HasChildren() const { return !fChildren.empty(); }

	Bool_t HasChild(TEveElement* el);	Bool_t HasChild(TEveElement* el);
	TEveElement* FindChild(const TString& name, const TClass* cls=0);	TEveElement* FindChild(const TString& name, const TClass* cls=0);
	TEveElement* FindChild(TPRegexp& regexp, const TClass* cls=0);	TEveElement* FindChild(TPRegexp& regexp, const TClass* cls=0);
	Int_t FindChildren(List_t& matches, const TString& name, const T Class* cls=0);	Int_t FindChildren(List_t& matches, const TString& name, const T Class* cls=0);
	Int_t FindChildren(List_t& matches, TPRegexp& regexp, const TClas s* cls=0);	Int_t FindChildren(List_t& matches, TPRegexp& regexp, const TClas s* cls=0);

	TEveElement* FirstChild() const { return fChildren.front(); }	TEveElement* FirstChild() const;
	TEveElement* LastChild () const { return fChildren.back(); }	TEveElement* LastChild () const;

	void EnableListElements (Bool_t rnr_self=kTRUE, Bool_t rnr_children=kTR UE); // MENU	void EnableListElements (Bool_t rnr_self=kTRUE, Bool_t rnr_children=kTR UE); // MENU
	void DisableListElements(Bool_t rnr_self=kFALSE, Bool_t rnr_children=kFA LSE); // MENU	void DisableListElements(Bool_t rnr_self=kFALSE, Bool_t rnr_children=kFA LSE); // MENU


	Bool_t GetDestroyOnZeroRefCnt() const { return fDestroyOnZeroRefCnt; }	Bool_t GetDestroyOnZeroRefCnt() const;
	void SetDestroyOnZeroRefCnt(Bool_t d) { fDestroyOnZeroRefCnt = d; }	void SetDestroyOnZeroRefCnt(Bool_t d);


	Int_t GetDenyDestroy() const { return fDenyDestroy; }	Int_t GetDenyDestroy() const;
	void IncDenyDestroy() { ++fDenyDestroy; }	void IncDenyDestroy();
	void DecDenyDestroy() { if (--fDenyDestroy <= 0) CheckReferenceC	void DecDenyDestroy();
	ount("TEveElement::DecDenyDestroy "); }
		Int_t GetParentIgnoreCnt() const;
	Int_t GetParentIgnoreCnt() const { return fParentIgnoreCnt; }	void IncParentIgnoreCnt();
	void IncParentIgnoreCnt() { ++fParentIgnoreCnt; }	void DecParentIgnoreCnt();
	void DecParentIgnoreCnt() { if (--fParentIgnoreCnt <= 0) CheckRe
	ferenceCount("TEveElement::DecParentIgnoreCnt "); }

	virtual void PadPaint(Option_t* option);	virtual void PadPaint(Option_t* option);

	virtual TObject* GetObject (const TEveException& eh="TEveElement::G etObject ") const;	virtual TObject* GetObject (const TEveException& eh="TEveElement::G etObject ") const;
	virtual TObject* GetEditorObject(const TEveException& eh="TEveElement::G etEditorObject ") const { return GetObject(eh); }	virtual TObject* GetEditorObject(const TEveException& eh="TEveElement::G etEditorObject ") const { return GetObject(eh); }
	virtual TObject* GetRenderObject(const TEveException& eh="TEveElement::G etRenderObject ") const { return GetObject(eh); }	virtual TObject* GetRenderObject(const TEveException& eh="TEveElement::G etRenderObject ") const { return GetObject(eh); }

	// --------------------------------	// --------------------------------

	virtual void ExpandIntoListTree(TGListTree* ltree, TGListTreeItem* paren t);	virtual void ExpandIntoListTree(TGListTree* ltree, TGListTreeItem* paren t);

	skipping to change at line 302	skipping to change at line 305
	Short_t fImpliedSelected; //!	Short_t fImpliedSelected; //!
	Short_t fImpliedHighlighted; //!	Short_t fImpliedHighlighted; //!

	public:	public:
	typedef void (TEveElement::* Select_foo) (Bool_t);	typedef void (TEveElement::* Select_foo) (Bool_t);
	typedef void (TEveElement::* ImplySelect_foo) ();	typedef void (TEveElement::* ImplySelect_foo) ();

	Bool_t IsPickable() const { return fPickable; }	Bool_t IsPickable() const { return fPickable; }
	void SetPickable(Bool_t p) { fPickable = p; }	void SetPickable(Bool_t p) { fPickable = p; }


	void SelectElement(Bool_t state);	virtual TEveElement* ForwardSelection();
	void IncImpliedSelected();	virtual TEveElement* ForwardEdit();
	void DecImpliedSelected();
		virtual void SelectElement(Bool_t state);
	void HighlightElement(Bool_t state);	virtual void IncImpliedSelected();
	void IncImpliedHighlighted();	virtual void DecImpliedSelected();
	void DecImpliedHighlighted();
		virtual void HighlightElement(Bool_t state);
		virtual void IncImpliedHighlighted();
		virtual void DecImpliedHighlighted();

	virtual void FillImpliedSelectedSet(Set_t& impSelSet);	virtual void FillImpliedSelectedSet(Set_t& impSelSet);

	virtual UChar_t GetSelectedLevel() const;	virtual UChar_t GetSelectedLevel() const;

	// Change-stamping and change bits	// Change-stamping and change bits
	//---------------------------------	//---------------------------------

	enum EChangeBits	enum EChangeBits
	{	{

	skipping to change at line 380	skipping to change at line 386
	protected:	protected:
	TObject* fObject; // External object holding the visual data.	TObject* fObject; // External object holding the visual data.
	Bool_t fOwnObject; // Is object owned / should be deleted on destruct ion.	Bool_t fOwnObject; // Is object owned / should be deleted on destruct ion.

	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;

	virtual TObject* GetObject(const TEveException& eh="TEveElementObjectPtr ::GetObject ") const;	virtual TObject* GetObject(const TEveException& eh="TEveElementObjectPtr ::GetObject ") const;
	virtual void ExportToCINT(char* 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
	/************************************************************************ **/	/************************************************************************ **/

	class TEveElementList : public TEveElement,	class TEveElementList : public TEveElement,

	public TNamed	public TNamed,
		public TEveProjectable
	{	{
	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 char* n="TEveElementList", const char* 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;

	virtual const char* GetElementName() const { return GetName(); }	virtual const char* GetElementName() const { return GetName(); }
	virtual const char* GetElementTitle() const { return GetTitle(); }	virtual const char* GetElementTitle() const { return GetTitle(); }

	virtual void SetElementName (const char* name)	virtual void SetElementName (const char* name)
	{ TNamed::SetName(name); NameTitleChanged(); }	{ TNamed::SetName(name); NameTitleChanged(); }

	virtual void SetElementTitle(const char* title)	virtual void SetElementTitle(const char* title)
	{ TNamed::SetTitle(title); NameTitleChanged(); }	{ TNamed::SetTitle(title); NameTitleChanged(); }

	virtual void SetElementNameTitle(const char* name, const char* 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);


		virtual TClass* ProjectedClass(const TEveProjection* p) const;

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


		/**************************************************************************
		****/
		// TEveElementListProjected
		/**************************************************************************
		****/

		class TEveElementListProjected : public TEveElementList,
		public TEveProjected
		{
		private:
		TEveElementListProjected(const TEveElementListProjected&); //
		Not implemented
		TEveElementListProjected& operator=(const TEveElementListProjected&); //
		Not implemented

		protected:
		virtual void SetDepthLocal(Float_t d);

		public:
		TEveElementListProjected();
		virtual ~TEveElementListProjected() {}

		virtual void UpdateProjection();

		ClassDef(TEveElementListProjected, 0); // Projected TEveElementList.
		};

	#endif	#endif

End of changes. 13 change blocks.
	25 lines changed or deleted	59 lines changed or added

	TEveGedEditor.h	TEveGedEditor.h

	// @(#)root/eve:$Id: TEveGedEditor.h 21310 2007-12-10 19:05:45Z matevz $	// @(#)root/eve:$Id: TEveGedEditor.h 31326 2009-11-19 17:04:40Z matevz $
	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOT_TEveGedEditor	#ifndef ROOT_TEveGedEditor
	#define ROOT_TEveGedEditor	#define ROOT_TEveGedEditor

	#include "TGedEditor.h"	#include "TGedEditor.h"

		#include "TGedFrame.h"

	class TEveElement;	class TEveElement;


		//=========================================================================
		=====
		// TEveGedEditor
		//=========================================================================
		=====

	class TEveGedEditor : public TGedEditor	class TEveGedEditor : public TGedEditor
	{	{
	TEveGedEditor(const TEveGedEditor&); // Not implemented	TEveGedEditor(const TEveGedEditor&); // Not implemented
	TEveGedEditor& operator=(const TEveGedEditor&); // Not implemented	TEveGedEditor& operator=(const TEveGedEditor&); // Not implemented


		public:
		typedef TGedFrame* (NameFrameCreator_t)(TEveGedEditor, const TGWindow*
		parent, const char* tab_name);

	protected:	protected:
	TEveElement *fElement; // Cached eve-element pointer.	TEveElement *fElement; // Cached eve-element pointer.
	TObject *fObject; // Cached tobj pointer.	TObject *fObject; // Cached tobj pointer.


		virtual TGedFrame* CreateNameFrame(const TGWindow* parent, const char* t
		ab_name);

		static Int_t fgMaxExtraEditors;
		static TList *fgExtraEditors;

	public:	public:

	TEveGedEditor(TCanvas* canvas=0, Int_t width=250, Int_t height=400);	TEveGedEditor(TCanvas* canvas=0, UInt_t width=250, UInt_t height=400);
	virtual ~TEveGedEditor() {}	virtual ~TEveGedEditor();

		virtual void CloseWindow();
		virtual void DeleteWindow();

	TEveElement* GetEveElement() const;	TEveElement* GetEveElement() const;

	void DisplayElement(TEveElement* re);	void DisplayElement(TEveElement* re);
	void DisplayObject(TObject* obj);	void DisplayObject(TObject* obj);

	virtual void SetModel(TVirtualPad* pad, TObject* obj, Int_t event);	virtual void SetModel(TVirtualPad* pad, TObject* obj, Int_t event);
	virtual void Update(TGedFrame* gframe=0);	virtual void Update(TGedFrame* gframe=0);


	// virtual Bool_t HandleButton(Event_t *event);	// --- Statics for extra editors. ---

		static void SpawnNewEditor(TObject* obj);
		static void ElementChanged(TEveElement* el);
		static void ElementDeleted(TEveElement* el);

		static void DestroyEditors();

	ClassDef(TEveGedEditor, 0); // Specialization of TGedEditor for proper u pdate propagation to TEveManager.	ClassDef(TEveGedEditor, 0); // Specialization of TGedEditor for proper u pdate propagation to TEveManager.
	};	};


		//=========================================================================
		=====
		// TEveGedNameFrame
		//=========================================================================
		=====

		class TEveGedNameFrame : public TGedFrame
		{
		private:
		TEveGedNameFrame(const TEveGedNameFrame&); // Not implemented
		TEveGedNameFrame& operator=(const TEveGedNameFrame&); // Not implemented

		protected:
		TGTextButton *fNCButton; // Name/Class button.

		public:
		TEveGedNameFrame(const TGWindow *p=0, Int_t width=140, Int_t height=30,
		UInt_t options=kChildFrame \| kHorizontalFrame);
		virtual ~TEveGedNameFrame();

		virtual void SetModel(TObject* obj);

		void SpawnEditorClone();

		ClassDef(TEveGedNameFrame, 0); // Top name-frame used in EVE.
		};

	#endif	#endif

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

	TEveGeoShape.h	TEveGeoShape.h

	// @(#)root/eve:$Id: TEveGeoShape.h 28343 2009-04-23 21:34:31Z matevz $	// @(#)root/eve:$Id: TEveGeoShape.h 30840 2009-10-23 09:03:14Z 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_TEveGeoShape	#ifndef ROOT_TEveGeoShape
	#define ROOT_TEveGeoShape	#define ROOT_TEveGeoShape

	#include "TEveElement.h"	#include "TEveElement.h"
	#include "TEveProjectionBases.h"	#include "TEveProjectionBases.h"

		#include "TAttBBox.h"

	class TGeoShape;	class TGeoShape;
	class TEveGeoShapeExtract;	class TEveGeoShapeExtract;

	class TEveGeoShape : public TEveElement,	class TEveGeoShape : public TEveElement,
	public TNamed,	public TNamed,
	public TEveProjectable	public TEveProjectable
	{	{

		private:
	TEveGeoShape(const TEveGeoShape&); // Not implemented	TEveGeoShape(const TEveGeoShape&); // Not implemented
	TEveGeoShape& operator=(const TEveGeoShape&); // Not implemented	TEveGeoShape& operator=(const TEveGeoShape&); // Not implemented

	protected:	protected:
	Color_t fColor;	Color_t fColor;
	Int_t fNSegments;	Int_t fNSegments;
	TGeoShape* fShape;	TGeoShape* fShape;

	static TGeoManager* fgGeoMangeur;	static TGeoManager* fgGeoMangeur;


	skipping to change at line 61	skipping to change at line 63
	virtual void Paint(Option_t* option="");	virtual void Paint(Option_t* option="");

	void Save(const char* file, const char* name="Extract");	void Save(const char* file, const char* name="Extract");
	void SaveExtract(const char* file, const char* name);	void SaveExtract(const char* file, const char* name);
	void WriteExtract(const char* name);	void WriteExtract(const char* name);

	static TEveGeoShape* ImportShapeExtract(TEveGeoShapeExtract* gse, TEveEl ement* parent=0);	static TEveGeoShape* ImportShapeExtract(TEveGeoShapeExtract* gse, TEveEl ement* parent=0);

	// GeoProjectable	// GeoProjectable
	virtual TBuffer3D* MakeBuffer3D();	virtual TBuffer3D* MakeBuffer3D();

	virtual TClass* ProjectedClass() const;	virtual TClass* ProjectedClass(const TEveProjection* p) const;

	static TGeoManager* GetGeoMangeur();	static TGeoManager* GetGeoMangeur();

	ClassDef(TEveGeoShape, 1); // Wrapper for TGeoShape with absolute positi oning and color attributes allowing display of extracted TGeoShape's (witho ut an active TGeoManager) and simplified geometries (needed for NLT project ions).	ClassDef(TEveGeoShape, 1); // Wrapper for TGeoShape with absolute positi oning and color attributes allowing display of extracted TGeoShape's (witho ut an active TGeoManager) and simplified geometries (needed for NLT project ions).
	};	};


		//-------------------------------------------------------------------------
		-----

		class TEveGeoShapeProjected : public TEveElementList,
		public TEveProjected,
		public TAttBBox
		{
		private:
		TEveGeoShapeProjected(const TEveGeoShapeProjected&); // Not i
		mplemented
		TEveGeoShapeProjected& operator=(const TEveGeoShapeProjected&); // Not i
		mplemented

		protected:
		TBuffer3D* fBuff;

		virtual void SetDepthLocal(Float_t d);

		public:
		TEveGeoShapeProjected();
		virtual ~TEveGeoShapeProjected() {}

		virtual Bool_t CanEditMainTransparency() const { return kTRUE; }

		virtual void SetProjection(TEveProjectionManager* proj, TEveProjectable*
		model);
		virtual void UpdateProjection();

		virtual void ComputeBBox();
		virtual void Paint(Option_t* option = "");

		ClassDef(TEveGeoShapeProjected, 0);
		};

	#endif	#endif

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

	TEveLine.h	TEveLine.h

	// @(#)root/eve:$Id: TEveLine.h 29764 2009-08-12 11:27:40Z matevz $	// @(#)root/eve:$Id: TEveLine.h 30840 2009-10-23 09:03:14Z 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 64	skipping to change at line 64
	void SetSmooth(Bool_t r);	void SetSmooth(Bool_t r);

	void ReduceSegmentLengths(Float_t max);	void ReduceSegmentLengths(Float_t max);

	TEveVector GetLineStart() const;	TEveVector GetLineStart() const;
	TEveVector GetLineEnd() const;	TEveVector GetLineEnd() const;

	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 TEveProjection* p) const;

	static Bool_t GetDefaultSmooth() { return fgDefaultSmooth; }	static Bool_t GetDefaultSmooth() { return fgDefaultSmooth; }
	static void SetDefaultSmooth(Bool_t r) { fgDefaultSmooth = r; }	static void SetDefaultSmooth(Bool_t r) { fgDefaultSmooth = r; }

	ClassDef(TEveLine, 0); // An arbitrary polyline with fixed line and mark er attributes.	ClassDef(TEveLine, 0); // An arbitrary polyline with fixed line and mark er attributes.
	};	};

	//------------------------------------------------------------------------- -----	//------------------------------------------------------------------------- -----
	// TEveLineProjected	// TEveLineProjected
	//------------------------------------------------------------------------- -----	//------------------------------------------------------------------------- -----

	class TEveLineProjected : public TEveLine,	class TEveLineProjected : public TEveLine,
	public TEveProjected	public TEveProjected
	{	{
	private:	private:
	TEveLineProjected(const TEveLineProjected&); // Not implement ed	TEveLineProjected(const TEveLineProjected&); // Not implement ed
	TEveLineProjected& operator=(const TEveLineProjected&); // Not implement ed	TEveLineProjected& operator=(const TEveLineProjected&); // Not implement ed


		protected:
		virtual void SetDepthLocal(Float_t d);

	public:	public:
	TEveLineProjected();	TEveLineProjected();
	virtual ~TEveLineProjected() {}	virtual ~TEveLineProjected() {}

	virtual void SetProjection(TEveProjectionManager* mng, TEveProjectable* model);	virtual void SetProjection(TEveProjectionManager* mng, TEveProjectable* model);

	virtual void SetDepth(Float_t d);
	virtual void UpdateProjection();	virtual void UpdateProjection();

	ClassDef(TEveLineProjected, 0); // Projected replica of a TEveLine.	ClassDef(TEveLineProjected, 0); // Projected replica of a TEveLine.
	};	};

	#endif	#endif

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

	TEveManager.h	TEveManager.h

	// @(#)root/eve:$Id: TEveManager.h 29481 2009-07-16 07:35:38Z brun $	// @(#)root/eve:$Id: TEveManager.h 31256 2009-11-17 21:59:06Z 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 92	skipping to change at line 92

	TMap *fVizDB;	TMap *fVizDB;
	Bool_t fVizDBReplace;	Bool_t fVizDBReplace;
	Bool_t fVizDBUpdate;	Bool_t fVizDBUpdate;

	TMap *fGeometries;	TMap *fGeometries;
	TMap *fGeometryAliases;	TMap *fGeometryAliases;

	TEveBrowser *fBrowser;	TEveBrowser *fBrowser;
	TEveGListTreeEditorFrame *fLTEFrame;	TEveGListTreeEditorFrame *fLTEFrame;

	TEveGedEditor *fEditor;
	TGStatusBar *fStatusBar;

	TFolder *fMacroFolder;	TFolder *fMacroFolder;

	TEveWindowManager *fWindowManager;	TEveWindowManager *fWindowManager;
	TEveViewerList *fViewers;	TEveViewerList *fViewers;
	TEveSceneList *fScenes;	TEveSceneList *fScenes;

	TEveScene *fGlobalScene;	TEveScene *fGlobalScene;
	TEveScene *fEventScene;	TEveScene *fEventScene;
	TEveEventManager *fCurrentEvent;	TEveEventManager *fCurrentEvent;

	skipping to change at line 140	skipping to change at line 138
	TEveSelection* GetSelection() const { return fSelection; }	TEveSelection* GetSelection() const { return fSelection; }
	TEveSelection* GetHighlight() const { return fHighlight; }	TEveSelection* GetHighlight() const { return fHighlight; }

	TEveElementList* GetOrphanage() const { return fOrphanage; }	TEveElementList* GetOrphanage() const { return fOrphanage; }
	Bool_t GetUseOrphanage() const { return fUseOrphanage; }	Bool_t GetUseOrphanage() const { return fUseOrphanage; }
	void SetUseOrphanage(Bool_t o) { fUseOrphanage = o; }	void SetUseOrphanage(Bool_t o) { fUseOrphanage = o; }
	void ClearOrphanage();	void ClearOrphanage();

	TEveBrowser* GetBrowser() const { return fBrowser; }	TEveBrowser* GetBrowser() const { return fBrowser; }
	TEveGListTreeEditorFrame* GetLTEFrame() const { return fLTEFrame; }	TEveGListTreeEditorFrame* GetLTEFrame() const { return fLTEFrame; }

	TEveGedEditor* GetEditor() const { return fEditor; }	TEveGedEditor* GetEditor() const;
	TGStatusBar* GetStatusBar() const { return fStatusBar; }	TGStatusBar* GetStatusBar() const;

	TEveWindowManager* GetWindowManager() const { return fWindowManager; }	TEveWindowManager* GetWindowManager() const { return fWindowManager; }

	TEveSceneList* GetScenes() const { return fScenes; }	TEveSceneList* GetScenes() const { return fScenes; }
	TEveViewerList* GetViewers() const { return fViewers; }	TEveViewerList* GetViewers() const { return fViewers; }

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


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

	TEvePointSet.h	TEvePointSet.h

	// @(#)root/eve:$Id: TEvePointSet.h 30254 2009-09-18 17:24:24Z matevz $	// @(#)root/eve:$Id: TEvePointSet.h 31327 2009-11-19 17:13:58Z 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 95	skipping to change at line 95
	virtual void InitFill(Int_t subIdNum);	virtual void InitFill(Int_t subIdNum);
	virtual void TakeAction(TEvePointSelector*);	virtual void TakeAction(TEvePointSelector*);

	virtual void PointSelected(Int_t id); // SIGNAL	virtual void PointSelected(Int_t id); // SIGNAL

	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 TEveProjection* p) const;

	ClassDef(TEvePointSet, 1); // Set of 3D points with same marker attribut es; optionally each point can be assigned an external TRef or a number of i nteger indices.	ClassDef(TEvePointSet, 1); // Set of 3D points with same marker attribut es; optionally each point can be assigned an external TRef or a number of i nteger indices.
	};	};

	/************************************************************************ **/	/************************************************************************ **/
	// TEvePointSetArray	// TEvePointSetArray
	/************************************************************************ **/	/************************************************************************ **/

	class TEvePointSetArray : public TEveElement,	class TEvePointSetArray : public TEveElement,
	public TNamed,	public TNamed,

	skipping to change at line 173	skipping to change at line 173
	// TEvePointSetProjected	// TEvePointSetProjected
	/************************************************************************ **/	/************************************************************************ **/

	class TEvePointSetProjected : public TEvePointSet,	class TEvePointSetProjected : public TEvePointSet,
	public TEveProjected	public TEveProjected
	{	{
	private:	private:
	TEvePointSetProjected(const TEvePointSetProjected&); // Not i mplemented	TEvePointSetProjected(const TEvePointSetProjected&); // Not i mplemented
	TEvePointSetProjected& operator=(const TEvePointSetProjected&); // Not i mplemented	TEvePointSetProjected& operator=(const TEvePointSetProjected&); // Not i mplemented


		protected:
		virtual void SetDepthLocal(Float_t d);

	public:	public:
	TEvePointSetProjected();	TEvePointSetProjected();
	virtual ~TEvePointSetProjected() {}	virtual ~TEvePointSetProjected() {}

	virtual void SetProjection(TEveProjectionManager* proj, TEveProjectable* model);	virtual void SetProjection(TEveProjectionManager* proj, TEveProjectable* model);

	virtual void SetDepth(Float_t d);
	virtual void UpdateProjection();	virtual void UpdateProjection();


		virtual void PointSelected(Int_t id);

	ClassDef(TEvePointSetProjected, 1); // Projected copy of a TEvePointSet.	ClassDef(TEvePointSetProjected, 1); // Projected copy of a TEvePointSet.
	};	};

	#endif	#endif

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

	TEvePolygonSetProjectedGL.h	TEvePolygonSetProjectedGL.h

	// @(#)root/eve:$Id: TEvePolygonSetProjectedGL.h 28197 2009-04-14 13:59:27Z matevz $	// @(#)root/eve:$Id: TEvePolygonSetProjectedGL.h 30752 2009-10-15 18:55:34Z matevz $
	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/


	skipping to change at line 26	skipping to change at line 26

	class TEvePolygonSetProjectedGL : public TGLObject	class TEvePolygonSetProjectedGL : public TGLObject
	{	{
	public:	public:
	TEvePolygonSetProjectedGL();	TEvePolygonSetProjectedGL();
	virtual ~TEvePolygonSetProjectedGL() {}	virtual ~TEvePolygonSetProjectedGL() {}

	virtual Bool_t SetModel(TObject* obj, const Option_t* opt=0);	virtual Bool_t SetModel(TObject* obj, const Option_t* opt=0);
	virtual void SetBBox();	virtual void SetBBox();
	virtual void Draw(TGLRnrCtx& rnrCtx) const;	virtual void Draw(TGLRnrCtx& rnrCtx) const;

	virtual void DirectDraw(TGLRnrCtx & rnrCtx) const;	virtual void DirectDraw(TGLRnrCtx& rnrCtx) const;

		virtual void DrawHighlight(TGLRnrCtx& rnrCtx, const TGLPhysicalShape*
		pshp) const;

	virtual Bool_t IgnoreSizeForOfInterest() const { return kTRUE; }	virtual Bool_t IgnoreSizeForOfInterest() const { return kTRUE; }


		private:
		void DrawOutline() const;

	ClassDef(TEvePolygonSetProjectedGL,0); // GL-renderer for TEvePolygonSe tProjected class.	ClassDef(TEvePolygonSetProjectedGL,0); // GL-renderer for TEvePolygonSe tProjected class.
	};	};

	#endif	#endif

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

	TEveProjectionBases.h	TEveProjectionBases.h

	// @(#)root/eve:$Id: TEveProjectionBases.h 24004 2008-05-24 20:08:56Z matev z $	// @(#)root/eve:$Id: TEveProjectionBases.h 30840 2009-10-23 09:03:14Z matev z $
	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOT_TEveProjectionBases	#ifndef ROOT_TEveProjectionBases
	#define ROOT_TEveProjectionBases	#define ROOT_TEveProjectionBases

	#include "TEveUtil.h"	#include "TEveUtil.h"


	#include <list>

	class TBuffer3D;	class TBuffer3D;

	class TEveElement;	class TEveElement;


		class TEveProjection;
	class TEveProjected;	class TEveProjected;
	class TEveProjectionManager;	class TEveProjectionManager;

	////////////////////////////////////////////////////////////////	////////////////////////////////////////////////////////////////
	// //	// //
	// TEveProjectable //	// TEveProjectable //
	// //	// //
	// Abstract base class for non-linear projectable objects. //	// Abstract base class for non-linear projectable objects. //
	// //	// //
	////////////////////////////////////////////////////////////////	////////////////////////////////////////////////////////////////

	skipping to change at line 50	skipping to change at line 49
	protected:	protected:
	typedef std::list<TEveProjected*> ProjList_t;	typedef std::list<TEveProjected*> ProjList_t;
	typedef std::list<TEveProjected*>::iterator ProjList_i;	typedef std::list<TEveProjected*>::iterator ProjList_i;

	ProjList_t fProjectedList; // references to projected instances.	ProjList_t fProjectedList; // references to projected instances.

	public:	public:
	TEveProjectable();	TEveProjectable();
	virtual ~TEveProjectable();	virtual ~TEveProjectable();


	virtual TClass* ProjectedClass() const = 0;	virtual TClass* ProjectedClass(const TEveProjection* p) const = 0;

	virtual Bool_t HasProjecteds() const { return ! fProjectedList.empty(); }	virtual Bool_t HasProjecteds() const { return ! fProjectedList.empty(); }

	virtual void AddProjected(TEveProjected* p) { fProjectedList.push_bac k(p); }	virtual void AddProjected(TEveProjected* p) { fProjectedList.push_bac k(p); }
	virtual void RemoveProjected(TEveProjected* p) { fProjectedList.remove(p ); }	virtual void RemoveProjected(TEveProjected* p) { fProjectedList.remove(p ); }

	virtual void AddProjectedsToSet(std::set<TEveElement*>& set);	virtual void AddProjectedsToSet(std::set<TEveElement*>& set);

	virtual void PropagateVizParams(TEveElement* el=0);	virtual void PropagateVizParams(TEveElement* el=0);
	virtual void PropagateRenderState(Bool_t rnr_self, Bool_t rnr_children);	virtual void PropagateRenderState(Bool_t rnr_self, Bool_t rnr_children);

	skipping to change at line 85	skipping to change at line 84
	{	{
	private:	private:
	TEveProjected(const TEveProjected&); // Not implemented	TEveProjected(const TEveProjected&); // Not implemented
	TEveProjected& operator=(const TEveProjected&); // Not implemented	TEveProjected& operator=(const TEveProjected&); // Not implemented

	protected:	protected:
	TEveProjectionManager *fManager; // manager	TEveProjectionManager *fManager; // manager
	TEveProjectable *fProjectable; // link to original object	TEveProjectable *fProjectable; // link to original object
	Float_t fDepth; // z coordinate	Float_t fDepth; // z coordinate


		void SetDepthCommon(Float_t d, TEveElement* el, Float_t* bbox);
		virtual void SetDepthLocal(Float_t d) = 0;

	public:	public:
	TEveProjected();	TEveProjected();
	virtual ~TEveProjected();	virtual ~TEveProjected();

	TEveProjectable* GetProjectable() const { return fProjectable; }	TEveProjectable* GetProjectable() const { return fProjectable; }

	virtual void SetProjection(TEveProjectionManager* mng, TEveProjectable* model);	virtual void SetProjection(TEveProjectionManager* mng, TEveProjectable* model);
	virtual void UnRefProjectable(TEveProjectable* assumed_parent);	virtual void UnRefProjectable(TEveProjectable* assumed_parent);


	virtual void SetDepth(Float_t d) = 0;

	virtual void UpdateProjection() = 0;	virtual void UpdateProjection() = 0;


	void SetDepthCommon(Float_t d, TEveElement* el, Float_t* bbox);	virtual void SetDepth(Float_t d);

	ClassDef(TEveProjected, 0); // Abstract base class for classes that hold results of a non-linear projection transformation.	ClassDef(TEveProjected, 0); // Abstract base class for classes that hold results of a non-linear projection transformation.
	};	};

	#endif	#endif

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

	TEveProjections.h	TEveProjections.h

	// @(#)root/eve:$Id: TEveProjections.h 26367 2008-11-21 18:08:30Z matevz $	// @(#)root/eve:$Id: TEveProjections.h 30840 2009-10-23 09:03:14Z matevz $
	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOT_TEveProjections	#ifndef ROOT_TEveProjections
	#define ROOT_TEveProjections	#define ROOT_TEveProjections

	#include "TEveVSDStructs.h"	#include "TEveVSDStructs.h"

	#include <vector>	#include <vector>


	////////////////////////////////////////////////////////////////	//=========================================================================
	// //	=====
	// TEveProjection //	// TEveProjection
	// //	//=========================================================================
	////////////////////////////////////////////////////////////////	=====

	class TEveProjection	class TEveProjection
	{	{
	public:	public:

	enum EPType_e { kPT_Unknown, kPT_RPhi, kPT_RhoZ, kPT_End };// type	enum EPType_e { kPT_Unknown, kPT_RPhi, kPT_RhoZ, kPT_3D, kPT_End }; //
	enum EPProc_e { kPP_Plane, kPP_Distort, kPP_Full }; // procedur	projection type
	e	enum EPProc_e { kPP_Plane, kPP_Distort, kPP_Full }; //
	enum EGeoMode_e { kGM_Unknown, kGM_Polygons, kGM_Segments }; // reconstr	projection procedure
	uction of geometry	enum EGeoMode_e { kGM_Unknown, kGM_Polygons, kGM_Segments }; //
		strategy for geometry projections

	struct PreScaleEntry_t	struct PreScaleEntry_t
	{	{
	Float_t fMin, fMax;	Float_t fMin, fMax;
	Float_t fOffset;	Float_t fOffset;
	Float_t fScale;	Float_t fScale;

	PreScaleEntry_t() :	PreScaleEntry_t() :
	fMin(0), fMax(0), fOffset(0), fScale(1) {}	fMin(0), fMax(0), fOffset(0), fScale(1) {}
	PreScaleEntry_t(Float_t min, Float_t max, Float_t off, Float_t scale) :	PreScaleEntry_t(Float_t min, Float_t max, Float_t off, Float_t scale) :

	skipping to change at line 60	skipping to change at line 58

	protected:	protected:
	EPType_e fType; // type	EPType_e fType; // type
	EGeoMode_e fGeoMode; // strategy of polygon projection (w hat to try first)	EGeoMode_e fGeoMode; // strategy of polygon projection (w hat to try first)
	TString fName; // name	TString fName; // name

	TEveVector fCenter; // center of distortion	TEveVector fCenter; // center of distortion
	TEveVector fZeroPosVal; // projected origin (0, 0, 0)	TEveVector fZeroPosVal; // projected origin (0, 0, 0)

	Bool_t fUsePreScale; // use pre-scaling	Bool_t fUsePreScale; // use pre-scaling

	vPreScale_t fPreScales[2]; // scaling before the distortion	vPreScale_t fPreScales[3]; // scaling before the distortion

	Float_t fDistortion; // distortion	Float_t fDistortion; // distortion
	Float_t fFixR; // radius from which scaling remains constant	Float_t fFixR; // radius from which scaling remains constant
	Float_t fFixZ; // z-coordinate from which scaling r emains constant	Float_t fFixZ; // z-coordinate from which scaling r emains constant
	Float_t fPastFixRFac; // relative scaling factor beyond fF ixR as 10^x	Float_t fPastFixRFac; // relative scaling factor beyond fF ixR as 10^x
	Float_t fPastFixZFac; // relative scaling factor beyond fF ixZ as 10^x	Float_t fPastFixZFac; // relative scaling factor beyond fF ixZ as 10^x
	Float_t fScaleR; // scale factor to keep projected ra dius at fFixR fixed	Float_t fScaleR; // scale factor to keep projected ra dius at fFixR fixed
	Float_t fScaleZ; // scale factor to keep projected z- coordinate at fFixZ fixed	Float_t fScaleZ; // scale factor to keep projected z- coordinate at fFixZ fixed
	Float_t fPastFixRScale; // relative scaling beyond fFixR	Float_t fPastFixRScale; // relative scaling beyond fFixR
	Float_t fPastFixZScale; // relative scaling beyond fFixZ	Float_t fPastFixZScale; // relative scaling beyond fFixZ
	Float_t fMaxTrackStep; // maximum distance between two poin ts on a track	Float_t fMaxTrackStep; // maximum distance between two poin ts on a track

	TEveVector fLowLimit; // convergence of point +infinity	TEveVector fLowLimit; // convergence of point +infinity
	TEveVector fUpLimit; // convergence of point -infinity	TEveVector fUpLimit; // convergence of point -infinity


		void PreScaleVariable(Int_t dim, Float_t& v);

	public:	public:
	TEveProjection();	TEveProjection();
	virtual ~TEveProjection() {}	virtual ~TEveProjection() {}


	virtual void ProjectPoint(Float_t&, Float_t&, Float_t&, EPProc_e	virtual Bool_t Is2D() const = 0;
	p = kPP_Full ) = 0;	virtual Bool_t Is3D() const = 0;
	virtual void ProjectPointFv(Float_t* v) { ProjectPoint(v[0], v[1]
	, v[2]); }	virtual void ProjectPoint(Float_t& x, Float_t& y, Float_t& z, Flo
	virtual void ProjectVector(TEveVector& v);	at_t d, EPProc_e p = kPP_Full) = 0;
		virtual void ProjectPointfv(Float_t* v, Float_t d);
		virtual void ProjectPointdv(Double_t* v, Float_t d);
		virtual void ProjectVector(TEveVector& v, Float_t d);


	const char* GetName() { return fName.Data(); }	const Char_t* GetName() const { return fName.Data(); }
	void SetName(const char* txt) { fName = txt; }	void SetName(const Char_t* txt) { fName = txt; }


	virtual void SetCenter(TEveVector& v) { fCenter = v; UpdateLimit(	virtual void SetCenter(TEveVector& v) { fCenter = v; UpdateLimi
	); }	t(); }
	virtual Float_t* GetProjectedCenter() { return fCenter.Arr(); }	virtual Float_t* GetProjectedCenter() { return fCenter.Arr(); }


	void SetType(EPType_e t) { fType = t; }	void SetType(EPType_e t) { fType = t; }
	EPType_e GetType() { return fType; }	EPType_e GetType() const { return fType; }


	void SetGeoMode(EGeoMode_e m) { fGeoMode = m; }	void SetGeoMode(EGeoMode_e m) { fGeoMode = m; }
	EGeoMode_e GetGeoMode() { return fGeoMode; }	EGeoMode_e GetGeoMode() const { return fGeoMode; }

	virtual void UpdateLimit();	virtual void UpdateLimit();

	Bool_t GetUsePreScale() const { return fUsePreScale; }	Bool_t GetUsePreScale() const { return fUsePreScale; }
	void SetUsePreScale(Bool_t x) { fUsePreScale = x; }	void SetUsePreScale(Bool_t x) { fUsePreScale = x; }

	void PreScalePoint(Float_t& x, Float_t& y);	void PreScalePoint(Float_t& x, Float_t& y);

		void PreScalePoint(Float_t& x, Float_t& y, Float_t& z);
	void AddPreScaleEntry(Int_t coord, Float_t max_val, Float_t scale);	void AddPreScaleEntry(Int_t coord, Float_t max_val, Float_t scale);
	void ChangePreScaleEntry(Int_t coord, Int_t entry, Float_t new_scale );	void ChangePreScaleEntry(Int_t coord, Int_t entry, Float_t new_scale );
	void ClearPreScales();	void ClearPreScales();

	void SetDistortion(Float_t d);	void SetDistortion(Float_t d);
	Float_t GetDistortion() const { return fDistortion; }	Float_t GetDistortion() const { return fDistortion; }
	Float_t GetFixR() const { return fFixR; }	Float_t GetFixR() const { return fFixR; }
	Float_t GetFixZ() const { return fFixZ; }	Float_t GetFixZ() const { return fFixZ; }
	void SetFixR(Float_t x);	void SetFixR(Float_t x);
	void SetFixZ(Float_t x);	void SetFixZ(Float_t x);

	skipping to change at line 132	skipping to change at line 137
	// utils to draw axis	// utils to draw axis
	virtual Float_t GetValForScreenPos(Int_t ax, Float_t value);	virtual Float_t GetValForScreenPos(Int_t ax, Float_t value);
	virtual Float_t GetScreenVal(Int_t ax, Float_t value);	virtual Float_t GetScreenVal(Int_t ax, Float_t value);
	Float_t GetLimit(Int_t i, Bool_t pos) { return pos ? fUpLimi t[i] : fLowLimit[i]; }	Float_t GetLimit(Int_t i, Bool_t pos) { return pos ? fUpLimi t[i] : fLowLimit[i]; }

	static Float_t fgEps; // resolution of projected points	static Float_t fgEps; // resolution of projected points

	ClassDef(TEveProjection, 0); // Base for specific classes that implement non-linear projections.	ClassDef(TEveProjection, 0); // Base for specific classes that implement non-linear projections.
	};	};


	////////////////////////////////////////////////////////////////	//=========================================================================
	// //	=====
	// TEveRhoZProjection //	// TEveRhoZProjection
	// //	//=========================================================================
	////////////////////////////////////////////////////////////////	=====

	class TEveRhoZProjection: public TEveProjection	class TEveRhoZProjection: public TEveProjection
	{	{
	private:	private:
	TEveVector fProjectedCenter; // projected center of distortion.	TEveVector fProjectedCenter; // projected center of distortion.

	public:	public:
	TEveRhoZProjection();	TEveRhoZProjection();
	virtual ~TEveRhoZProjection() {}	virtual ~TEveRhoZProjection() {}


	virtual void ProjectPoint(Float_t& x, Float_t& y, Float_t& z, EPP	virtual Bool_t Is2D() const { return kTRUE; }
	roc_e proc = kPP_Full);	virtual Bool_t Is3D() const { return kFALSE; }

		virtual void ProjectPoint(Float_t& x, Float_t& y, Float_t& z, Flo
		at_t d, EPProc_e proc = kPP_Full);

	virtual void SetCenter(TEveVector& center);	virtual void SetCenter(TEveVector& center);
	virtual Float_t* GetProjectedCenter() { return fProjectedCenter.Arr() ; }	virtual Float_t* GetProjectedCenter() { return fProjectedCenter.Arr() ; }

	virtual void UpdateLimit();	virtual void UpdateLimit();

	virtual Bool_t AcceptSegment(TEveVector& v1, TEveVector& v2, Float_ t tolerance);	virtual Bool_t AcceptSegment(TEveVector& v1, TEveVector& v2, Float_ t tolerance);
	virtual void SetDirectionalVector(Int_t screenAxis, TEveVector& v ec);	virtual void SetDirectionalVector(Int_t screenAxis, TEveVector& v ec);

	ClassDef(TEveRhoZProjection, 0); // Rho/Z non-linear projection.	ClassDef(TEveRhoZProjection, 0); // Rho/Z non-linear projection.
	};	};


	////////////////////////////////////////////////////////////////	//=========================================================================
	// //	=====
	// TEveRPhiProjection //	// TEveRPhiProjection
	// //	//=========================================================================
	////////////////////////////////////////////////////////////////	=====

	class TEveRPhiProjection : public TEveProjection	class TEveRPhiProjection : public TEveProjection
	{	{
	public:	public:
	TEveRPhiProjection();	TEveRPhiProjection();
	virtual ~TEveRPhiProjection() {}	virtual ~TEveRPhiProjection() {}


	virtual void ProjectPoint(Float_t& x, Float_t& y, Float_t& z, EPProc_e p	virtual Bool_t Is2D() const { return kTRUE; }
	roc = kPP_Full);	virtual Bool_t Is3D() const { return kFALSE; }

		virtual void ProjectPoint(Float_t& x, Float_t& y, Float_t& z, Float_t
		d, EPProc_e proc = kPP_Full);

	ClassDef(TEveRPhiProjection, 0); // XY non-linear projection.	ClassDef(TEveRPhiProjection, 0); // XY non-linear projection.
	};	};


		//=========================================================================
		=====
		// TEve3DProjection
		//=========================================================================
		=====

		class TEve3DProjection : public TEveProjection
		{
		public:
		TEve3DProjection();
		virtual ~TEve3DProjection() {}

		virtual Bool_t Is2D() const { return kFALSE; }
		virtual Bool_t Is3D() const { return kTRUE; }

		virtual void ProjectPoint(Float_t& x, Float_t& y, Float_t& z, Float_t
		d, EPProc_e proc = kPP_Full);

		ClassDef(TEve3DProjection, 0); // 3D scaling "projection"
		};

	#endif	#endif

End of changes. 16 change blocks.
	40 lines changed or deleted	74 lines changed or added

	TEveTrackProjected.h	TEveTrackProjected.h

	// @(#)root/eve:$Id: TEveTrackProjected.h 25422 2008-09-16 20:50:49Z matevz $	// @(#)root/eve:$Id: TEveTrackProjected.h 30840 2009-10-23 09:03:14Z 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 38	skipping to change at line 38

	Int_t GetBreakPointIdx(Int_t start);	Int_t GetBreakPointIdx(Int_t start);
	void GetBreakPoint(Int_t N, Bool_t back, Float_t& x, Float_t& y, Float_ t& z);	void GetBreakPoint(Int_t N, Bool_t back, Float_t& x, Float_t& y, Float_ t& z);

	TEveVector* fOrigPnts; // original track points	TEveVector* fOrigPnts; // original track points

	protected:	protected:
	std::vector<Int_t> fBreakPoints; // indices of track break-points	std::vector<Int_t> fBreakPoints; // indices of track break-points
	TEveProjection *fProjection; // projection	TEveProjection *fProjection; // projection


		virtual void SetDepthLocal(Float_t d);

	public:	public:
	TEveTrackProjected();	TEveTrackProjected();
	virtual ~TEveTrackProjected() {}	virtual ~TEveTrackProjected() {}

	virtual void SetProjection(TEveProjectionManager* mng, TEveProjectable* model);	virtual void SetProjection(TEveProjectionManager* mng, TEveProjectable* model);


	virtual void SetDepth(Float_t d);

	virtual void UpdateProjection();	virtual void UpdateProjection();
	virtual void MakeTrack(Bool_t recurse=kTRUE);	virtual void MakeTrack(Bool_t recurse=kTRUE);

	void PrintLineSegments();	void PrintLineSegments();

	virtual void SecSelected(TEveTrack*); // marked as signal in TEveTrack	virtual void SecSelected(TEveTrack*); // marked as signal in TEveTrack

	ClassDef(TEveTrackProjected, 1); // Projected copy of a TEveTrack.	ClassDef(TEveTrackProjected, 1); // Projected copy of a TEveTrack.
	};	};


	skipping to change at line 67	skipping to change at line 67
	// TEveTrackListProjected	// TEveTrackListProjected
	/************************************************************************ **/	/************************************************************************ **/

	class TEveTrackListProjected : public TEveTrackList,	class TEveTrackListProjected : public TEveTrackList,
	public TEveProjected	public TEveProjected
	{	{
	private:	private:
	TEveTrackListProjected(const TEveTrackListProjected&); // Not implemented	TEveTrackListProjected(const TEveTrackListProjected&); // Not implemented
	TEveTrackListProjected& operator=(const TEveTrackListProjected&); // Not implemented	TEveTrackListProjected& operator=(const TEveTrackListProjected&); // Not implemented


		protected:
		virtual void SetDepthLocal(Float_t d);

	public:	public:
	TEveTrackListProjected();	TEveTrackListProjected();
	virtual ~TEveTrackListProjected() {}	virtual ~TEveTrackListProjected() {}

	virtual void SetProjection(TEveProjectionManager* proj, TEveProjectable* model);	virtual void SetProjection(TEveProjectionManager* proj, TEveProjectable* model);

	virtual void SetDepth(Float_t d);
	virtual void UpdateProjection() {}	virtual void UpdateProjection() {}


		virtual void SetDepth(Float_t d);
	virtual void SetDepth(Float_t d, TEveElement* el);	virtual void SetDepth(Float_t d, TEveElement* el);

	ClassDef(TEveTrackListProjected, 1); // Specialization of TEveTrackList for holding TEveTrackProjected objects.	ClassDef(TEveTrackListProjected, 1); // Specialization of TEveTrackList for holding TEveTrackProjected objects.
	};	};

	#endif	#endif

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

	TEveVSD.h	TEveVSD.h

	// @(#)root/eve:$Id: TEveVSD.h 27157 2009-01-15 14:05:12Z brun $	// @(#)root/eve:$Id: TEveVSD.h 31363 2009-11-21 11:31: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 25	skipping to change at line 25
	#include "TEveUtil.h"	#include "TEveUtil.h"
	#include "TEveVSDStructs.h"	#include "TEveVSDStructs.h"
	#include "TTree.h"	#include "TTree.h"

	class TEveVSD : public TObject	class TEveVSD : public TObject
	{	{
	TEveVSD(const TEveVSD&); // Not implemented	TEveVSD(const TEveVSD&); // Not implemented
	TEveVSD& operator=(const TEveVSD&); // Not implemented	TEveVSD& operator=(const TEveVSD&); // Not implemented

	protected:	protected:

	Int_t fBuffSize;	TFile *fFile; //!
		TDirectory *fDirectory; //!


	TFile* fFile; //!	Int_t fBuffSize; //!
	TDirectory* fDirectory; //!	Int_t fVerbose; //!

	public:	public:
	TTree* fTreeK; //! Kinematics.	TTree* fTreeK; //! Kinematics.
	TTree* fTreeH; //! Hits.	TTree* fTreeH; //! Hits.
	TTree* fTreeC; //! Clusters.	TTree* fTreeC; //! Clusters.
	TTree* fTreeR; //! Reconstructed tracks.	TTree* fTreeR; //! Reconstructed tracks.
	TTree* fTreeKK; //! Kinks.	TTree* fTreeKK; //! Kinks.
	TTree* fTreeV0; //! VO's.	TTree* fTreeV0; //! VO's.
	TTree* fTreeCC; //! Cascades.	TTree* fTreeCC; //! Cascades.
	TTree* fTreeGI; //! Sim-Rec cross references.	TTree* fTreeGI; //! Sim-Rec cross references.

	skipping to change at line 51	skipping to change at line 52
	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 char* name="TEveVSD", const char* title="");	TEveVSD(const char* name="TEveVSD", const char* title="");

		virtual ~TEveVSD();

	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 WriteTrees();	virtual void WriteTrees();

	virtual void LoadTrees();


	virtual void LoadVSD(const char* vsd_file_name,	virtual void LoadTrees();
	const char* dir_name="Event0");	virtual void SetBranchAddresses();

	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. 7 change blocks.
	9 lines changed or deleted	8 lines changed or added

	TEventIter.h	TEventIter.h

	// @(#)root/proofplayer:$Id: TEventIter.h 29126 2009-06-22 09:05:46Z brun $	// @(#)root/proofplayer:$Id: TEventIter.h 30859 2009-10-24 14:53:07Z ganis $
	// Author: Maarten Ballintijn 07/01/02	// Author: Maarten Ballintijn 07/01/02
	// Modified: Long Tran-Thanh 04/09/07 (Addition of TEventIterUnit)	// Modified: Long Tran-Thanh 04/09/07 (Addition of TEventIterUnit)

	/*************************************************************************	/*************************************************************************
	* 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 79	skipping to change at line 79
	TEntryList *fEntryList; //! entry list for processing	TEntryList *fEntryList; //! entry list for processing
	Long64_t fEntryListPos; //! current position in the entrylist	Long64_t fEntryListPos; //! current position in the entrylist

	Int_t LoadDir(); // Load the directory pointed to by fElem	Int_t LoadDir(); // Load the directory pointed to by fElem

	public:	public:
	TEventIter();	TEventIter();
	TEventIter(TDSet dset, TSelector sel, Long64_t first, Long64_t num);	TEventIter(TDSet dset, TSelector sel, Long64_t first, Long64_t num);
	virtual ~TEventIter();	virtual ~TEventIter();


		virtual Long64_t GetCacheSize() = 0;
		virtual Int_t GetLearnEntries() = 0;
	virtual Long64_t GetNextEvent() = 0;	virtual Long64_t GetNextEvent() = 0;
	virtual void StopProcess(Bool_t abort);	virtual void StopProcess(Bool_t abort);

	static TEventIter Create(TDSet dset, TSelector *sel, Long64_t first, L ong64_t num);	static TEventIter Create(TDSet dset, TSelector *sel, Long64_t first, L ong64_t num);

	ClassDef(TEventIter,0) // Event iterator used by TProofPlayer's	ClassDef(TEventIter,0) // Event iterator used by TProofPlayer's
	};	};

	//------------------------------------------------------------------------	//------------------------------------------------------------------------


	skipping to change at line 100	skipping to change at line 102

	private:	private:
	Long64_t fNum;	Long64_t fNum;
	Long64_t fCurrent;	Long64_t fCurrent;

	public:	public:
	TEventIterUnit();	TEventIterUnit();
	TEventIterUnit(TDSet dset, TSelector sel, Long64_t num);	TEventIterUnit(TDSet dset, TSelector sel, Long64_t num);
	~TEventIterUnit() { }	~TEventIterUnit() { }


		Long64_t GetCacheSize() {return -1;}
		Int_t GetLearnEntries() {return -1;}
	Long64_t GetNextEvent();	Long64_t GetNextEvent();

	ClassDef(TEventIterUnit,0) // Event iterator for objects	ClassDef(TEventIterUnit,0) // Event iterator for objects
	};	};

	//------------------------------------------------------------------------	//------------------------------------------------------------------------

	class TEventIterObj : public TEventIter {	class TEventIterObj : public TEventIter {

	private:	private:
	TString fClassName; // class name of objects to iterate over	TString fClassName; // class name of objects to iterate over
	TList *fKeys; // list of keys	TList *fKeys; // list of keys
	TIter *fNextKey; // next key in directory	TIter *fNextKey; // next key in directory
	TObject *fObj; // object found	TObject *fObj; // object found

	public:	public:
	TEventIterObj();	TEventIterObj();
	TEventIterObj(TDSet dset, TSelector sel, Long64_t first, Long64_t num) ;	TEventIterObj(TDSet dset, TSelector sel, Long64_t first, Long64_t num) ;
	~TEventIterObj();	~TEventIterObj();


		Long64_t GetCacheSize() {return -1;}
		Int_t GetLearnEntries() {return -1;}
	Long64_t GetNextEvent();	Long64_t GetNextEvent();

	ClassDef(TEventIterObj,0) // Event iterator for objects	ClassDef(TEventIterObj,0) // Event iterator for objects
	};	};

	//------------------------------------------------------------------------	//------------------------------------------------------------------------
	class TEventIterTree : public TEventIter {	class TEventIterTree : public TEventIter {

	private:	private:
	TString fTreeName; // name of the tree object to iterate over	TString fTreeName; // name of the tree object to iterate over
	TTree *fTree; // tree we are iterating over	TTree *fTree; // tree we are iterating over
	TTreeCache *fTreeCache; // instance of the tree cache for the tree	TTreeCache *fTreeCache; // instance of the tree cache for the tree

		Bool_t fTreeCacheIsLearning; // Whether cache is in learning phase
	Bool_t fUseTreeCache; // Control usage of the tree cache	Bool_t fUseTreeCache; // Control usage of the tree cache
	Long64_t fCacheSize; // Cache size	Long64_t fCacheSize; // Cache size

		Bool_t fUseParallelUnzip; // Control usage of parallel unzip
	TList *fFileTrees; // Files && Trees currently open	TList *fFileTrees; // Files && Trees currently open

	// Auxilliary class to keep track open files and loaded trees	// Auxilliary class to keep track open files and loaded trees
	class TFileTree : public TNamed {	class TFileTree : public TNamed {
	public:	public:
	Bool_t fUsed;	Bool_t fUsed;
	Bool_t fIsLocal;	Bool_t fIsLocal;
	TFile *fFile;	TFile *fFile;
	TList *fTrees;	TList *fTrees;
	TFileTree(const char name, TFile f, Bool_t islocal);	TFileTree(const char name, TFile f, Bool_t islocal);
	virtual ~TFileTree();	virtual ~TFileTree();
	};	};

	TTree* Load(TDSetElement *elem, Bool_t &localfile);	TTree* Load(TDSetElement *elem, Bool_t &localfile);
	TTree* GetTrees(TDSetElement *elem);	TTree* GetTrees(TDSetElement *elem);
	public:	public:
	TEventIterTree();	TEventIterTree();
	TEventIterTree(TDSet dset, TSelector sel, Long64_t first, Long64_t num );	TEventIterTree(TDSet dset, TSelector sel, Long64_t first, Long64_t num );
	~TEventIterTree();	~TEventIterTree();


		Long64_t GetCacheSize();
		Int_t GetLearnEntries();
	Long64_t GetNextEvent();	Long64_t GetNextEvent();

	ClassDef(TEventIterTree,0) // Event iterator for Trees	ClassDef(TEventIterTree,0) // Event iterator for Trees
	};	};

	#endif	#endif

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

	TFileCacheRead.h	TFileCacheRead.h

	// @(#)root/io:$Id: TFileCacheRead.h 29877 2009-08-24 09:14:46Z brun $	// @(#)root/io:$Id: TFileCacheRead.h 31077 2009-11-11 08:51:57Z brun $
	// Author: Rene Brun 19/05/2006	// Author: Rene Brun 19/05/2006

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/


	skipping to change at line 28	skipping to change at line 28
	// //	// //
	// TFile cache when reading //	// TFile cache when reading //
	// //	// //
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////

	#ifndef ROOT_TObject	#ifndef ROOT_TObject
	#include "TObject.h"	#include "TObject.h"
	#endif	#endif

	class TFile;	class TFile;

		class TBranch;

	class TFileCacheRead : public TObject {	class TFileCacheRead : public TObject {

	protected:	protected:
	Int_t fBufferSizeMin; //Original size of fBuffer	Int_t fBufferSizeMin; //Original size of fBuffer
	Int_t fBufferSize; //Allocated size of fBuffer (at a given t ime)	Int_t fBufferSize; //Allocated size of fBuffer (at a given t ime)
	Int_t fBufferLen; //Current buffer length (<= fBufferSize)	Int_t fBufferLen; //Current buffer length (<= fBufferSize)

	Bool_t fAsyncReading;	Bool_t fAsyncReading;


	skipping to change at line 63	skipping to change at line 64
	Bool_t fIsTransferred; //True when fBuffer contains something v alid	Bool_t fIsTransferred; //True when fBuffer contains something v alid

	private:	private:
	TFileCacheRead(const TFileCacheRead &); //cannot be copied	TFileCacheRead(const TFileCacheRead &); //cannot be copied
	TFileCacheRead& operator=(const TFileCacheRead &);	TFileCacheRead& operator=(const TFileCacheRead &);

	public:	public:
	TFileCacheRead();	TFileCacheRead();
	TFileCacheRead(TFile *file, Int_t buffersize);	TFileCacheRead(TFile *file, Int_t buffersize);
	virtual ~TFileCacheRead();	virtual ~TFileCacheRead();

		virtual void AddBranch(TBranch * /b/, Bool_t /subbranches/ =
		kFALSE) {}
		virtual void AddBranch(const char * /branch/, Bool_t /*subbranc
		hes*/ = kFALSE) {}
	virtual Int_t GetBufferSize() const { return fBufferSize; };	virtual Int_t GetBufferSize() const { return fBufferSize; };
	virtual Bool_t IsAsyncReading() const { return fAsyncReading; };	virtual Bool_t IsAsyncReading() const { return fAsyncReading; };

		virtual Bool_t IsLearning() const {return kFALSE;}
	virtual void Prefetch(Long64_t pos, Int_t len);	virtual void Prefetch(Long64_t pos, Int_t len);
	virtual void Print(Option_t *option="") const;	virtual void Print(Option_t *option="") const;
	virtual Int_t ReadBufferExt(char *buf, Long64_t pos, Int_t len, In t_t &loc);	virtual Int_t ReadBufferExt(char *buf, Long64_t pos, Int_t len, In t_t &loc);
	virtual Int_t ReadBuffer(char *buf, Long64_t pos, Int_t len);	virtual Int_t ReadBuffer(char *buf, Long64_t pos, Int_t len);
	virtual void SetFile(TFile *file);	virtual void SetFile(TFile *file);

		virtual void SetSkipZip(Bool_t /skip/ = kTRUE) {} // This funct ion is only used by TTreeCacheUnzip (ignore it)
	virtual void Sort();	virtual void Sort();

	ClassDef(TFileCacheRead,1) //TFile cache when reading	ClassDef(TFileCacheRead,1) //TFile cache when reading
	};	};

	#endif	#endif

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

	TFitEditor.h	TFitEditor.h

	// @(#)root/fitpanel:$Id: TFitEditor.h 30461 2009-09-25 16:01:13Z moneta $	// @(#)root/fitpanel:$Id: TFitEditor.h 31212 2009-11-16 17:30:21Z 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 35	skipping to change at line 35
	#endif	#endif
	#ifndef ROOT_TGButton	#ifndef ROOT_TGButton
	#include "TGButton.h"	#include "TGButton.h"
	#endif	#endif

	#include "Foption.h"	#include "Foption.h"
	#include "Math/MinimizerOptions.h"	#include "Math/MinimizerOptions.h"
	#include "Fit/DataRange.h"	#include "Fit/DataRange.h"

	#include <vector>	#include <vector>

		#include <map>
		#include <utility>

	//--- Object types	//--- Object types
	enum EObjectType {	enum EObjectType {
	kObjectHisto,	kObjectHisto,
	kObjectGraph,	kObjectGraph,
	kObjectGraph2D,	kObjectGraph2D,
	kObjectHStack,	kObjectHStack,
	kObjectTree,	kObjectTree,
	kObjectMultiGraph	kObjectMultiGraph
	};	};

	skipping to change at line 67	skipping to change at line 69
	class TAxis;	class TAxis;
	class TF1;	class TF1;

	class TFitEditor : public TGMainFrame {	class TFitEditor : public TGMainFrame {

	protected:	protected:
	TGTab *fTab; // tab widget holding the editor	TGTab *fTab; // tab widget holding the editor
	TGCompositeFrame *fTabContainer; // main tab container	TGCompositeFrame *fTabContainer; // main tab container
	TGCompositeFrame *fGeneral; // general tab	TGCompositeFrame *fGeneral; // general tab
	TGCompositeFrame *fMinimization; // minimization tab	TGCompositeFrame *fMinimization; // minimization tab

		TGTextButton *fUpdateButton; // updates data from gROOT and g Directory
	TGTextButton *fFitButton; // performs fitting	TGTextButton *fFitButton; // performs fitting
	TGTextButton *fResetButton; // resets fit parameters	TGTextButton *fResetButton; // resets fit parameters
	TGTextButton *fCloseButton; // close the fit panel	TGTextButton *fCloseButton; // close the fit panel
	TGLabel *fSelLabel; // contains selected fit functio n	TGLabel *fSelLabel; // contains selected fit functio n
	TGComboBox *fDataSet; // contains list of data set to be fitted	TGComboBox *fDataSet; // contains list of data set to be fitted
	TGComboBox *fTypeFit; // contains the types of functio ns to be selected	TGComboBox *fTypeFit; // contains the types of functio ns to be selected
	TGComboBox *fFuncList; // contains function list	TGComboBox *fFuncList; // contains function list
	TGTextEntry *fEnteredFunc; // contains user function file n ame	TGTextEntry *fEnteredFunc; // contains user function file n ame
	TGTextButton *fUserButton; // opens a dialog for user-defin ed fit method	TGTextButton *fUserButton; // opens a dialog for user-defin ed fit method
	TGRadioButton *fNone; // set no operation mode	TGRadioButton *fNone; // set no operation mode

	skipping to change at line 128	skipping to change at line 131
	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)


	std::vector<TF1*> fPrevFit; // Previous succesful fits.	std::multimap<TObject, TF1> fPrevFit; // Previous succesful fits.
		std::vector<TF1*> fSystemFuncs; // functions managed by the fitp
		anel

	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 *fLibGSL; // set GSL as minimization libra ry	TGRadioButton *fLibGSL; // set GSL as minimization libra ry
	TGRadioButton *fLibGenetics; // set Genetic/GALib as minimiza tion library	TGRadioButton *fLibGenetics; // set Genetic/GALib as minimiza tion library
	TGComboBox *fMinMethodList; // set the minimization method	TGComboBox *fMinMethodList; // set the minimization method
	TGNumberEntryField *fErrorScale; // contains error scale set for minimization	TGNumberEntryField *fErrorScale; // contains error scale set for minimization
	TGNumberEntryField *fTolerance; // contains tolerance set for mi nimization	TGNumberEntryField *fTolerance; // contains tolerance set for mi nimization
	TGNumberEntryField *fIterations; // contains maximum number of it erations	TGNumberEntryField *fIterations; // contains maximum number of it erations

	TGStatusBar *fStatusBar; // statusbar widget	TGStatusBar *fStatusBar; // statusbar widget

	static TFitEditor *fgFitDialog; // singleton fit panel	static TFitEditor *fgFitDialog; // singleton fit panel


	TGComboBox* BuildDataSetList(TGFrame *parent, Int_t id);	protected:
		void GetFunctionsFromSystem();
		void ProcessTreeInput(TObject* objSelected, Int_t selected,
		TString variables, TString cuts);
		TF1* FindFunction();
		void FillDataSetList();
	TGComboBox* BuildMethodList(TGFrame *parent, Int_t id);	TGComboBox* BuildMethodList(TGFrame *parent, Int_t id);
	void GetRanges(ROOT::Fit::DataRange&);	void GetRanges(ROOT::Fit::DataRange&);
	TF1* GetFitFunction();	TF1* GetFitFunction();
	TList* GetFitObjectListOfFunctions();	TList* GetFitObjectListOfFunctions();
	void DrawSelection(bool restore = false);	void DrawSelection(bool restore = false);
	Int_t CheckFunctionString(const char* str);	Int_t CheckFunctionString(const char* str);
	void CreateFunctionGroup();	void CreateFunctionGroup();
	void CreateGeneralTab();	void CreateGeneralTab();
	void CreateMinimizationTab();	void CreateMinimizationTab();
	void MakeTitle(TGCompositeFrame parent, const char title);	void MakeTitle(TGCompositeFrame parent, const char title);

	skipping to change at line 170	skipping to change at line 179
	private:	private:
	TFitEditor(const TFitEditor&); // not implemented	TFitEditor(const TFitEditor&); // not implemented
	TFitEditor& operator=(const TFitEditor&); // not implemented	TFitEditor& operator=(const TFitEditor&); // not implemented

	void RetrieveOptions(Foption_t&, TString&, ROOT::Math::MinimizerOptions& , Int_t);	void RetrieveOptions(Foption_t&, TString&, ROOT::Math::MinimizerOptions& , Int_t);

	public:	public:
	TFitEditor(TVirtualPad* pad, TObject *obj);	TFitEditor(TVirtualPad* pad, TObject *obj);
	virtual ~TFitEditor();	virtual ~TFitEditor();


	// static TFitEditor *&GetFP();	TList* GetListOfFittingFunctions(TObject* obj = 0);
	static TFitEditor GetInstance(TVirtualPad pad, TObject *obj);
		static TFitEditor GetInstance(TVirtualPad pad = 0, TObject *obj = 0);
	virtual Option_t *GetDrawOption() const;	virtual Option_t *GetDrawOption() const;
	virtual void Hide();	virtual void Hide();
	virtual void Show(TVirtualPad* pad, TObject *obj);	virtual void Show(TVirtualPad* pad, TObject *obj);

	void ShowObjectName(TObject* obj);	void ShowObjectName(TObject* obj);
	Bool_t SetObjectType(TObject* obj);	Bool_t SetObjectType(TObject* obj);
	virtual void Terminate();	virtual void Terminate();
	void UpdateGUI();	void UpdateGUI();

	virtual void CloseWindow();	virtual void CloseWindow();

	skipping to change at line 202	skipping to change at line 212

	// slot methods 'General' tab	// slot methods 'General' tab
	void FillFunctionList(Int_t selected = -1);	void FillFunctionList(Int_t selected = -1);
	void FillMinMethodList(Int_t selected = -1);	void FillMinMethodList(Int_t selected = -1);
	virtual void DoAddition(Bool_t on);	virtual void DoAddition(Bool_t on);
	virtual void DoAdvancedOptions();	virtual void DoAdvancedOptions();
	virtual void DoAllWeights1();	virtual void DoAllWeights1();
	virtual void DoClose();	virtual void DoClose();
	virtual void DoEmptyBinsAllWeights1();	virtual void DoEmptyBinsAllWeights1();
	virtual void DoEnteredFunction();	virtual void DoEnteredFunction();

		virtual void DoUpdate();
	virtual void DoFit();	virtual void DoFit();
	virtual void DoMaxIterations();	virtual void DoMaxIterations();
	virtual void DoDataSet(Int_t sel);	virtual void DoDataSet(Int_t sel);
	virtual void DoFunction(Int_t sel);	virtual void DoFunction(Int_t sel);
	virtual void DoLinearFit();	virtual void DoLinearFit();
	virtual void DoNoChi2();	virtual void DoNoChi2();
	virtual void DoNoSelection();	virtual void DoNoSelection();
	virtual void DoNoStoreDrawing();	virtual void DoNoStoreDrawing();
	virtual void DoReset();	virtual void DoReset();
	virtual void DoSetParameters();	virtual void DoSetParameters();

	skipping to change at line 228	skipping to change at line 239
	virtual void DoUseFuncRange();	virtual void DoUseFuncRange();

	// slot methods 'Minimization' tab	// slot methods 'Minimization' tab
	virtual void DoLibrary(Bool_t on);	virtual void DoLibrary(Bool_t on);
	virtual void DoMinMethod(Int_t );	virtual void DoMinMethod(Int_t );
	virtual void DoPrintOpt(Bool_t on);	virtual void DoPrintOpt(Bool_t on);

	public:	public:
	typedef std::vector<FuncParamData_t > FuncParams_t;	typedef std::vector<FuncParamData_t > FuncParams_t;


		friend class FitEditorUnitTesting;
	ClassDef(TFitEditor,0) //Fit Panel interface	ClassDef(TFitEditor,0) //Fit Panel interface
	};	};

	#endif	#endif

End of changes. 9 change blocks.
	6 lines changed or deleted	19 lines changed or added

	TGHtmlUri.h	TGHtmlUri.h

	// $Id$	// @(#)root/guihtml:$Id: TObject.h 20877 2007-11-19 11:17:07Z rdm $
	// Author: Valeriy Onuchin 03/05/2007	// Author: Valeriy Onuchin 03/05/2007

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2001, Rene Brun, Fons Rademakers and Reiner Rohlfs *	* Copyright (C) 1995-2001, Rene Brun, Fons Rademakers and Reiner Rohlfs *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/


	skipping to change at line 37	skipping to change at line 37

	You should have received a copy of the GNU Library General Public	You should have received a copy of the GNU Library General Public
	License along with this library; if not, write to the Free	License along with this library; if not, write to the Free
	Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

	**************************************************************************/	**************************************************************************/

	#ifndef ROOT_TGHtmlUri	#ifndef ROOT_TGHtmlUri
	#define ROOT_TGHtmlUri	#define ROOT_TGHtmlUri


		#ifndef ROOT_TObject
		#include "TObject.h"
		#endif

	#define URI_SCHEME_MASK (1<<0)	#define URI_SCHEME_MASK (1<<0)
	#define URI_AUTH_MASK (1<<1)	#define URI_AUTH_MASK (1<<1)
	#define URI_PATH_MASK (1<<2)	#define URI_PATH_MASK (1<<2)
	#define URI_QUERY_MASK (1<<3)	#define URI_QUERY_MASK (1<<3)
	#define URI_FRAGMENT_MASK (1<<4)	#define URI_FRAGMENT_MASK (1<<4)

	#define URI_FULL_MASK (URI_SCHEME_MASK \| URI_AUTH_MASK \| \	#define URI_FULL_MASK (URI_SCHEME_MASK \| URI_AUTH_MASK \| \
	URI_PATH_MASK \| URI_QUERY_MASK \| \	URI_PATH_MASK \| URI_QUERY_MASK \| \
	URI_FRAGMENT_MASK)	URI_FRAGMENT_MASK)


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

	TGLAnnotation.h	TGLAnnotation.h

	// @(#)root/gl:$Id: TGLAnnotation.h 27560 2009-02-20 21:41:28Z matevz $	// @(#)root/gl:$Id: TGLAnnotation.h 30994 2009-11-05 17:20:24Z matevz $
	// Author: Matevz and Alja Tadel 20/02/2009	// Author: Matevz and Alja Tadel 20/02/2009

	/*************************************************************************	/*************************************************************************
	* 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 33	skipping to change at line 33
	class TGMainFrame;	class TGMainFrame;

	class TGLAnnotation : public TGLOverlayElement	class TGLAnnotation : public TGLOverlayElement
	{	{
	private:	private:
	TGLAnnotation(const TGLAnnotation&); // Not implemented	TGLAnnotation(const TGLAnnotation&); // Not implemented
	TGLAnnotation& operator=(const TGLAnnotation&); // Not implemented	TGLAnnotation& operator=(const TGLAnnotation&); // Not implemented

	void MakeEditor();	void MakeEditor();


	protected:
	TGMainFrame *fMainFrame;
	TGTextEdit *fTextEdit;

	TGLViewer *fParent;

	TString fText; // annotation text
	Float_t fLabelFontSize; // relative font size
	TGLFont fLabelFont; // font used to render labels
	TGLFont fMenuFont; // font used to render menu buttons

	Pixel_t fBackColor; // background color
	Pixel_t fBackHighColor; // background active color
	Pixel_t fTextColor; // text color
	Pixel_t fTextHighColor; // text active color
	Float_t fAlpha; // label transparency

	Float_t fPosX; // x position [0, 1]	Float_t fPosX; // x position [0, 1]
	Float_t fPosY; // y position [0, 1]	Float_t fPosY; // y position [0, 1]

	Int_t fMouseX, fMouseY; //! last mouse position	Int_t fMouseX, fMouseY; //! last mouse position
	Bool_t fInDrag; //!	Bool_t fInDrag; //!

		Float_t fDrawW, fDrawH; //! width/height of drawn annotation
		Float_t fDrawY; //! y-position of annotation box

	TGLVector3 fPointer; // picked location in 3D space	TGLVector3 fPointer; // picked location in 3D space
	Bool_t fActive; // active item identifier	Bool_t fActive; // active item identifier


		TGMainFrame *fMainFrame; // editors
		TGTextEdit *fTextEdit; // editors

		static Color_t fgBackColor;
		static Color_t fgTextColor;

		protected:
		TGLViewer *fParent;

		TString fText; // annotation text
		Float_t fTextSize; // relative font size
		TGLFont fFont; // font used to render labels
		TGLFont fMenuFont; // font used to render menu buttons
		TGLFont::ETextAlignH_e fTextAlign;

		Color_t fBackColor; // background color
		Color_t fTextColor; // text color
		Char_t fTransparency; // transparency of background

		Bool_t fDrawRefLine; // draw 3D refrence line
		Bool_t fUseColorSet; // use color set from rnrCtx

	public:	public:

		TGLAnnotation(TGLViewerBase parent, const char text, Float_t posx, Flo at_t posy);
	TGLAnnotation(TGLViewerBase parent, const char text, Float_t posx, Flo at_t posy, TGLVector3 ref);	TGLAnnotation(TGLViewerBase parent, const char text, Float_t posx, Flo at_t posy, TGLVector3 ref);
	virtual ~TGLAnnotation();	virtual ~TGLAnnotation();


		void SetTransparency(Char_t x) { fTransparency = x;}
		Char_t GetTransparency() const { return fTransparency;}
		void SetUseColorSet(Bool_t x) { fUseColorSet = x; }
		Bool_t GetUseColorSet() const { return fUseColorSet;}
		void SetBackColor(Color_t x) { fBackColor = x;}
		Color_t GetBackColor() const { return fBackColor;}
		void SetTextColor(Color_t x) { fTextColor = x; }
		Color_t GetTextColor() const { return fTextColor;}
		void SetTextSize(Float_t x) { fTextSize = x; }
		Float_t GetTextSize() const { return fTextSize;}
		TGLFont::ETextAlignH_e GetTextAlign() const { return fTextAlign; }
		void SetTextAlign(TGLFont::ETextAlignH_e a) { fTextAlign = a; }

	virtual Bool_t MouseEnter(TGLOvlSelectRecord& selRec);	virtual Bool_t MouseEnter(TGLOvlSelectRecord& selRec);
	virtual Bool_t Handle(TGLRnrCtx& rnrCtx, TGLOvlSelectRecord& selRec,	virtual Bool_t Handle(TGLRnrCtx& rnrCtx, TGLOvlSelectRecord& selRec,
	Event_t* event);	Event_t* event);
	virtual void MouseLeave();	virtual void MouseLeave();

	void CloseEditor();	void CloseEditor();

	void UpdateText();	void UpdateText();

	virtual void Render(TGLRnrCtx& rnrCtx);	virtual void Render(TGLRnrCtx& rnrCtx);

End of changes. 6 change blocks.
	18 lines changed or deleted	39 lines changed or added

	TGLEmbeddedViewer.h	TGLEmbeddedViewer.h

	// @(#)root/gl:$Id: TGLEmbeddedViewer.h 26849 2008-12-11 21:39:15Z matevz $	// @(#)root/gl:$Id: TGLEmbeddedViewer.h 31330 2009-11-19 17:34:19Z matevz $
	// Author: Bertrand Bellenot 23/01/2008	// Author: Bertrand Bellenot 23/01/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 25	skipping to change at line 25
	#ifndef ROOT_TGFrame	#ifndef ROOT_TGFrame
	#include "TGFrame.h"	#include "TGFrame.h"
	#endif	#endif

	#ifndef ROOT_TGLViewer	#ifndef ROOT_TGLViewer
	#include "TGLViewer.h"	#include "TGLViewer.h"
	#endif	#endif

	class TGLRenderArea;	class TGLRenderArea;
	class TGLEventHandler;	class TGLEventHandler;

		class TGedEditor;

	class TGLEmbeddedViewer : public TGLViewer	class TGLEmbeddedViewer : public TGLViewer
	{	{
	private:	private:
	// GUI components	// GUI components
	TGCompositeFrame *fFrame;	TGCompositeFrame *fFrame;
	Int_t fBorder;	Int_t fBorder;


		void Init(const TGWindow *parent);
	void CreateFrames();	void CreateFrames();

	TGLEmbeddedViewer(const TGLEmbeddedViewer&); // Not implemented	TGLEmbeddedViewer(const TGLEmbeddedViewer&); // Not implemented
	TGLEmbeddedViewer& operator=(const TGLEmbeddedViewer&); // Not implement ed	TGLEmbeddedViewer& operator=(const TGLEmbeddedViewer&); // Not implement ed

	public:	public:
	TGLEmbeddedViewer(const TGWindow parent, TVirtualPad pad=0, Int_t bord er=2);	TGLEmbeddedViewer(const TGWindow parent, TVirtualPad pad=0, Int_t bord er=2);

		TGLEmbeddedViewer(const TGWindow parent, TVirtualPad pad, TGedEditor * ged, Int_t border=2);
	~TGLEmbeddedViewer();	~TGLEmbeddedViewer();

	virtual void CreateGLWidget();	virtual void CreateGLWidget();
	virtual void DestroyGLWidget();	virtual void DestroyGLWidget();

	virtual const char *GetName() const { return "GLViewer"; }	virtual const char *GetName() const { return "GLViewer"; }

	TGCompositeFrame* GetFrame() const { return fFrame; }	TGCompositeFrame* GetFrame() const { return fFrame; }

	TGLOrthoCamera *GetOrthoXOYCamera() { return &fOrthoXOYCamera; }	TGLOrthoCamera *GetOrthoXOYCamera() { return &fOrthoXOYCamera; }

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

	TGLEventHandler.h	TGLEventHandler.h

	// @(#)root/gl:$Id: TGLEventHandler.h 30425 2009-09-24 19:45:11Z matevz $	// @(#)root/gl:$Id: TGLEventHandler.h 31301 2009-11-18 22:45:34Z matevz $
	// Author: Bertrand Bellenot 29/01/2008	// Author: Bertrand Bellenot 29/01/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 38	skipping to change at line 38
	class TGToolTip;	class TGToolTip;

	class TGLViewer;	class TGLViewer;
	class TGLPhysicalShape;	class TGLPhysicalShape;

	class TGLEventHandler : public TGEventHandler	class TGLEventHandler : public TGEventHandler
	{	{
	protected:	protected:
	TGLViewer *fGLViewer;	TGLViewer *fGLViewer;
	TTimer *fMouseTimer; // mouse delay timer	TTimer *fMouseTimer; // mouse delay timer

		TPoint fButtonPushPos;
	TPoint fLastPos;	TPoint fLastPos;
	TPoint fLastMouseOverPos;	TPoint fLastMouseOverPos;
	TGLPhysicalShape *fLastMouseOverShape;	TGLPhysicalShape *fLastMouseOverShape;
	TGToolTip *fTooltip; // tooltip for highlight	TGToolTip *fTooltip; // tooltip for highlight
	TPoint fLastGlobalPos;	TPoint fLastGlobalPos;
	TPoint fTooltipPos;	TPoint fTooltipPos;
	UInt_t fActiveButtonID;	UInt_t fActiveButtonID;
	UInt_t fLastEventState;	UInt_t fLastEventState;

		Bool_t fIgnoreButtonUp;
	Bool_t fInPointerGrab;	Bool_t fInPointerGrab;
	Bool_t fMouseTimerRunning;	Bool_t fMouseTimerRunning;
	Bool_t fTooltipShown;	Bool_t fTooltipShown;
	Int_t fTooltipPixelTolerance;	Int_t fTooltipPixelTolerance;

		Int_t fSecSelType; // secondary selection type

	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 GrabMouse();
		virtual void UnGrabMouse();

	public:	public:
	TGLEventHandler(TGWindow w, TObject obj);	TGLEventHandler(TGWindow w, TObject obj);
	virtual ~TGLEventHandler();	virtual ~TGLEventHandler();

	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 Bool_t HandleEvent(Event_t *event);	virtual Bool_t HandleEvent(Event_t *event);
	virtual Bool_t HandleExpose(Event_t * event);	virtual Bool_t HandleExpose(Event_t * event);
	virtual Bool_t HandleFocusChange(Event_t *event);	virtual Bool_t HandleFocusChange(Event_t *event);
	virtual Bool_t HandleCrossing(Event_t *event);	virtual Bool_t HandleCrossing(Event_t *event);
	virtual Bool_t HandleButton(Event_t * event);	virtual Bool_t HandleButton(Event_t * event);

	skipping to change at line 82	skipping to change at line 88

	virtual void TriggerTooltip(const char* text);	virtual void TriggerTooltip(const char* text);
	virtual void RemoveTooltip();	virtual void RemoveTooltip();

	void SetMouseOverSelectDelay(Int_t ms);	void SetMouseOverSelectDelay(Int_t ms);
	void SetMouseOverTooltipDelay(Int_t ms);	void SetMouseOverTooltipDelay(Int_t ms);

	Int_t GetTooltipPixelTolerance() const { return fTooltipPixelTolerance; }	Int_t GetTooltipPixelTolerance() const { return fTooltipPixelTolerance; }
	void SetTooltipPixelTolerance(Int_t t) { fTooltipPixelTolerance = t; }	void SetTooltipPixelTolerance(Int_t t) { fTooltipPixelTolerance = t; }


		Int_t GetSecSelType() const { return fSecSelType; }
		void SetSecSelType(Int_t t) { fSecSelType = t; }

	ClassDef(TGLEventHandler, 0); // Base-class and default implementation o f event-handler for TGLViewer.	ClassDef(TGLEventHandler, 0); // Base-class and default implementation o f event-handler for TGLViewer.
	};	};

	#endif	#endif

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

	TGLLogicalShape.h	TGLLogicalShape.h

	// @(#)root/gl:$Id: TGLLogicalShape.h 26250 2008-11-17 20:56:44Z matevz $	// @(#)root/gl:$Id: TGLLogicalShape.h 30811 2009-10-19 13:22:46Z 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 48	skipping to change at line 48
	public:	public:
	enum ELODAxes { kLODAxesNone = 0, // LOD will be set to high or pixel.	enum ELODAxes { kLODAxesNone = 0, // LOD will be set to high or pixel.
	kLODAxesX = 1 << 0,	kLODAxesX = 1 << 0,
	kLODAxesY = 1 << 1,	kLODAxesY = 1 << 1,
	kLODAxesZ = 1 << 2,	kLODAxesZ = 1 << 2,
	kLODAxesAll = kLODAxesX \| kLODAxesY \| kLODAxesZ	kLODAxesAll = kLODAxesX \| kLODAxesY \| kLODAxesZ
	};	};

	protected:	protected:
	mutable UInt_t fRef; //! physical instance ref cou nting	mutable UInt_t fRef; //! physical instance ref cou nting

	mutable TGLPhysicalShape * fFirstPhysical; //! first replica	mutable TGLPhysicalShape *fFirstPhysical; //! first replica

	TObject *fExternalObj; //! Also plays the role of ID.	TObject *fExternalObj; //! Also plays the role of ID.
	TGLBoundingBox fBoundingBox; //! Shape's bounding box.	TGLBoundingBox fBoundingBox; //! Shape's bounding box.
	mutable TGLScene *fScene; //! scene where object is stored (can b e zero!)	mutable TGLScene *fScene; //! scene where object is stored (can b e zero!)
	mutable UInt_t fDLBase; //! display-list id base	mutable UInt_t fDLBase; //! display-list id base
	mutable Int_t fDLSize; //! display-list size for different LOD s	mutable Int_t fDLSize; //! display-list size for different LOD s
	mutable UShort_t fDLValid; //! display-list validity bit-field	mutable UShort_t fDLValid; //! display-list validity bit-field
	mutable Bool_t fDLCache; //! use display list caching	mutable Bool_t fDLCache; //! use display list caching
	mutable Bool_t fRefStrong; //! Strong ref (delete on 0 ref); not i n scene	mutable Bool_t fRefStrong; //! Strong ref (delete on 0 ref); not i n scene
	mutable Bool_t fOwnExtObj; //! External object is a fake	mutable Bool_t fOwnExtObj; //! External object is a fake

	skipping to change at line 76	skipping to change at line 76
	virtual ~TGLLogicalShape();	virtual ~TGLLogicalShape();

	// Physical shape reference-counting, replica management	// Physical shape reference-counting, replica management
	UInt_t Ref() const { return fRef; }	UInt_t Ref() const { return fRef; }
	void AddRef(TGLPhysicalShape* phys) const;	void AddRef(TGLPhysicalShape* phys) const;
	void SubRef(TGLPhysicalShape* phys) const;	void SubRef(TGLPhysicalShape* phys) const;
	void StrongRef(Bool_t strong) const { fRefStrong = strong; }	void StrongRef(Bool_t strong) const { fRefStrong = strong; }
	void DestroyPhysicals();	void DestroyPhysicals();
	UInt_t UnrefFirstPhysical();	UInt_t UnrefFirstPhysical();


	const TGLPhysicalShape * GetFirstPhysical() const { return fFirstPhysica l; }	const TGLPhysicalShape* GetFirstPhysical() const { return fFirstPhysical ; }


	TObject * ID() const { return fExternalObj; }	TObject* ID() const { return fExternalObj; }
	TObject * GetExternal() const { return fExternalObj; }	TObject* GetExternal() const { return fExternalObj; }
	TGLScene * GetScene() const { return fScene; }	TGLScene* GetScene() const { return fScene; }

	const TGLBoundingBox & BoundingBox() const { return fBoundingBox; }	const TGLBoundingBox& BoundingBox() const { return fBoundingBox; }
	virtual void UpdateBoundingBox() {}	virtual void UpdateBoundingBox() {}
	void UpdateBoundingBoxesOfPhysicals();	void UpdateBoundingBoxesOfPhysicals();

	// Display List Caching	// Display List Caching
	Bool_t SetDLCache(Bool_t cached);	Bool_t SetDLCache(Bool_t cached);
	virtual Bool_t ShouldDLCache(const TGLRnrCtx & rnrCtx) const;	virtual Bool_t ShouldDLCache(const TGLRnrCtx & rnrCtx) const;
	virtual UInt_t DLOffset(Short_t /lod/) const { return 0; }	virtual UInt_t DLOffset(Short_t /lod/) const { return 0; }
	virtual void DLCacheClear();	virtual void DLCacheClear();
	virtual void DLCacheDrop();	virtual void DLCacheDrop();
	virtual void DLCachePurge();	virtual void DLCachePurge();

	virtual ELODAxes SupportedLODAxes() const { return kLODAxesNone; }	virtual ELODAxes SupportedLODAxes() const { return kLODAxesNone; }
	virtual Short_t QuantizeShapeLOD(Short_t shapeLOD, Short_t combiLOD) co nst;	virtual Short_t QuantizeShapeLOD(Short_t shapeLOD, Short_t combiLOD) co nst;

	virtual void Draw(TGLRnrCtx & rnrCtx) const;	virtual void Draw(TGLRnrCtx& rnrCtx) const;
	virtual void DirectDraw(TGLRnrCtx & rnrCtx) const = 0; // Actual dra	virtual void DirectDraw(TGLRnrCtx& rnrCtx) const = 0; // Actual draw
	w method (non DL cached)	method (non DL cached)

		virtual void DrawHighlight(TGLRnrCtx& rnrCtx, const TGLPhysicalShape
		* pshp) const;

	virtual Bool_t IgnoreSizeForOfInterest() const { return kFALSE; }	virtual Bool_t IgnoreSizeForOfInterest() const { return kFALSE; }

	// Override in sub-classes that do direct object rendering (e.g. TGLObje ct).	// Override in sub-classes that do direct object rendering (e.g. TGLObje ct).
	virtual Bool_t KeepDuringSmartRefresh() const { return kFALSE; }	virtual Bool_t KeepDuringSmartRefresh() const { return kFALSE; }
	// Override in sub-classes that support secondary selection (e.g. TPoint Set3DGL).	// Override in sub-classes that support secondary selection (e.g. TPoint Set3DGL).
	virtual Bool_t SupportsSecondarySelect() const { return kFALSE; }	virtual Bool_t SupportsSecondarySelect() const { return kFALSE; }

	virtual void ProcessSelection(TGLRnrCtx & rnrCtx, TGLSelectRecord & re	virtual Bool_t AlwaysSecondarySelect() const { return kFALSE; }
	c);	virtual void ProcessSelection(TGLRnrCtx& rnrCtx, TGLSelectRecord& rec)
		;

	void InvokeContextMenu(TContextMenu & menu, UInt_t x, UInt_t y) const;	void InvokeContextMenu(TContextMenu & menu, UInt_t x, UInt_t y) const;

	ClassDef(TGLLogicalShape,0) // a logical (non-placed, local frame) drawa ble object	ClassDef(TGLLogicalShape,0) // a logical (non-placed, local frame) drawa ble object
	};	};

	#endif // ROOT_TGLLogicalShape	#endif // ROOT_TGLLogicalShape

End of changes. 6 change blocks.
	15 lines changed or deleted	19 lines changed or added

	TGLManip.h	TGLManip.h

	// @(#)root/gl:$Id: TGLManip.h 26394 2008-11-23 14:35:25Z matevz $	// @(#)root/gl:$Id: TGLManip.h 30815 2009-10-20 13:49:22Z rdm $
	// Author: Richard Maunder 16/09/2005	// Author: Richard Maunder 16/09/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 24	skipping to change at line 24

	#ifndef ROOT_TVirtualGL	#ifndef ROOT_TVirtualGL
	#include "TVirtualGL.h"	#include "TVirtualGL.h"
	#endif	#endif
	#ifndef ROOT_TPoint	#ifndef ROOT_TPoint
	#include "TPoint.h"	#include "TPoint.h"
	#endif	#endif
	#ifndef ROOT_GuiTypes	#ifndef ROOT_GuiTypes
	#include "GuiTypes.h"	#include "GuiTypes.h"
	#endif	#endif

	#ifndef ROOT_Rtypes	#ifndef ROOT_TGLUtil
	#include "Rtypes.h"	#include "TGLUtil.h"
	#endif	#endif

	class TGLPhysicalShape;	class TGLPhysicalShape;
	class TGLVertex3;	class TGLVertex3;
	class TGLVector3;	class TGLVector3;
	class TGLCamera;	class TGLCamera;
	class TGLRect;	class TGLRect;
	class TGLBoundingBox;	class TGLBoundingBox;

	class TGLManip : public TVirtualGLManip	class TGLManip : public TVirtualGLManip

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

	TGLRotateManip.h	TGLRotateManip.h

	// @(#)root/gl:$Id: TGLRotateManip.h 26394 2008-11-23 14:35:25Z matevz $	// @(#)root/gl:$Id: TGLRotateManip.h 30815 2009-10-20 13:49:22Z rdm $
	// Author: Richard Maunder 04/10/2005	// Author: Richard Maunder 04/10/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. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOT_TGLRotateManip	#ifndef ROOT_TGLRotateManip
	#define ROOT_TGLRotateManip	#define ROOT_TGLRotateManip

	#ifndef ROOT_TGLManip	#ifndef ROOT_TGLManip
	#include "TGLManip.h"	#include "TGLManip.h"
	#endif	#endif

	#ifndef ROOT_TGLUtil
	#include "TGLUtil.h"
	#endif

	class TGLRotateManip : public TGLManip	class TGLRotateManip : public TGLManip
	{	{
	private:	private:
	// Active ring interaction - set on mouse down	// Active ring interaction - set on mouse down
	// Shallow ring interaction	// Shallow ring interaction
	// Where the ring plane forms a shallow angle to the eye direction -	// Where the ring plane forms a shallow angle to the eye direction -
	// a different interaction is required in these cases - see HandleMotion ()	// a different interaction is required in these cases - see HandleMotion ()
	Bool_t fShallowRing; //! does active ring form shallow angle to eye?	Bool_t fShallowRing; //! does active ring form shallow angle to eye?
	Bool_t fShallowFront; //! front or back of the active shallow ring?	Bool_t fShallowFront; //! front or back of the active shallow ring?

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

	TGLSAViewer.h	TGLSAViewer.h

	// @(#)root/gl:$Id: TGLSAViewer.h 26849 2008-12-11 21:39:15Z matevz $	// @(#)root/gl:$Id: TGLSAViewer.h 31299 2009-11-18 21:06:28Z matevz $
	// Author: Richard Maunder / Timur Pocheptsov	// Author: Richard Maunder / Timur Pocheptsov

	/*************************************************************************	/*************************************************************************
	* 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_TGLSAViewer	#ifndef ROOT_TGLSAViewer
	#define ROOT_TGLSAViewer	#define ROOT_TGLSAViewer


	#ifndef ROOT_TGLViewer
	#include "TGLViewer.h"	#include "TGLViewer.h"

	#endif

	#ifndef ROOT_TString
	#include "TString.h"	#include "TString.h"

	#endif


		class TGLSAFrame;
	class TGWindow;	class TGWindow;
	class TGFrame;	class TGFrame;
	class TGCompositeFrame;	class TGCompositeFrame;
	class TGPopupMenu;	class TGPopupMenu;

		class TGButton;

	class TGedEditor;	class TGedEditor;

	class TGLPShapeObj;
	class TGLEventHandler;	class TGLEventHandler;
	class TGMenuBar;	class TGMenuBar;

	//_________________________________________________________________________ _____	//_________________________________________________________________________ _____
	//	//
	// TGLSAViewer	// TGLSAViewer
	//	//
	// The top-level standalone GL viewer.	// The top-level standalone GL viewer.

	class TGLSAViewer : public TGLViewer	class TGLSAViewer : public TGLViewer

	skipping to change at line 54	skipping to change at line 50
	kGLPerspYOZ, kGLPerspXOZ, kGLPerspXOY,	kGLPerspYOZ, kGLPerspXOZ, kGLPerspXOY,
	kGLXOY, kGLXOZ, kGLZOY,	kGLXOY, kGLXOZ, kGLZOY,
	kGLXnOY, kGLXnOZ, kGLZnOY,	kGLXnOY, kGLXnOZ, kGLZnOY,
	kGLOrthoRotate, kGLOrthoDolly,	kGLOrthoRotate, kGLOrthoDolly,
	kGLSaveEPS, kGLSavePDF, kGLSavePNG, kGLSaveGIF, kGLSaveAnimGIF,	kGLSaveEPS, kGLSavePDF, kGLSavePNG, kGLSaveGIF, kGLSaveAnimGIF,
	kGLSaveJPG, kGLSaveAS, kGLCloseViewer, kGLQuitROOT,	kGLSaveJPG, kGLSaveAS, kGLCloseViewer, kGLQuitROOT,
	kGLEditObject };	kGLEditObject };

	private:	private:
	// GUI components	// GUI components

	TGCompositeFrame *fFrame;	TGLSAFrame *fFrame;
	TGPopupMenu *fFileMenu;	TGPopupMenu *fFileMenu;
	TGPopupMenu *fFileSaveMenu;	TGPopupMenu *fFileSaveMenu;
	TGPopupMenu *fCameraMenu;	TGPopupMenu *fCameraMenu;
	TGPopupMenu *fHelpMenu;	TGPopupMenu *fHelpMenu;

	// Ged	// Ged
	TGCompositeFrame *fLeftVerticalFrame;	TGCompositeFrame *fLeftVerticalFrame;

	TGedEditor *fGedEditor;
	TGLPShapeObj *fPShapeWrap;

	TGCompositeFrame *fRightVerticalFrame;	TGCompositeFrame *fRightVerticalFrame;

	TString fDirName;	TString fDirName;
	Int_t fTypeIdx;	Int_t fTypeIdx;
	Bool_t fOverwrite;	Bool_t fOverwrite;
	TGMenuBar *fMenuBar;	TGMenuBar *fMenuBar;

		TGButton *fMenuBut;
		Bool_t fHideMenuBar;
	Bool_t fDeleteMenuBar;	Bool_t fDeleteMenuBar;

	// Initial window positioning	// Initial window positioning
	static const Int_t fgInitX;	static const Int_t fgInitX;
	static const Int_t fgInitY;	static const Int_t fgInitY;
	static const Int_t fgInitW;	static const Int_t fgInitW;
	static const Int_t fgInitH;	static const Int_t fgInitH;

	static const char *fgHelpText1;	static const char *fgHelpText1;
	static const char *fgHelpText2;	static const char *fgHelpText2;

	void CreateMenus();	void CreateMenus();
	void CreateFrames();	void CreateFrames();

	// non-copyable class	// non-copyable class
	TGLSAViewer(const TGLSAViewer &);	TGLSAViewer(const TGLSAViewer &);
	TGLSAViewer & operator = (const TGLSAViewer &);	TGLSAViewer & operator = (const TGLSAViewer &);

	public:	public:
	TGLSAViewer(TVirtualPad *pad);	TGLSAViewer(TVirtualPad *pad);

	TGLSAViewer(const TGWindow parent, TVirtualPad pad, TGedEditor *ged = 0);	TGLSAViewer(const TGWindow parent, TVirtualPad pad, TGedEditor *ged=0) ;
	~TGLSAViewer();	~TGLSAViewer();

	virtual void CreateGLWidget();	virtual void CreateGLWidget();
	virtual void DestroyGLWidget();	virtual void DestroyGLWidget();

	virtual const char* GetName() const { return "GLViewer"; }	virtual const char* GetName() const { return "GLViewer"; }


	virtual void SelectionChanged(); // SIGNAL	virtual void SelectionChanged();
	virtual void OverlayDragFinished(); // SIGNAL

	virtual void RefreshPadEditor(TObject* changed=0);

	void Show();	void Show();
	void Close();	void Close();
	void DeleteMenuBar();	void DeleteMenuBar();

		void DisableCloseMenuEntries();
		void EnableMenuBarHiding();

		void HandleMenuBarHiding(Event_t* ev);

	// GUI events - editors, frame etc	// GUI events - editors, frame etc
	Bool_t ProcessFrameMessage(Long_t msg, Long_t parm1, Long_t);	Bool_t ProcessFrameMessage(Long_t msg, Long_t parm1, Long_t);


	TGCompositeFrame* GetFrame() const { return fFrame; }	TGCompositeFrame* GetFrame() const;
	TGCompositeFrame* GetLeftVerticalFrame() const { return fLeftVerticalFra me; }	TGCompositeFrame* GetLeftVerticalFrame() const { return fLeftVerticalFra me; }

	TGedEditor* GetGedEditor() const { return fGedEditor; }

	void ToggleEditObject();	void ToggleEditObject();
	void ToggleOrthoRotate();	void ToggleOrthoRotate();
	void ToggleOrthoDolly();	void ToggleOrthoDolly();

	ClassDef(TGLSAViewer, 0); // Standalone GL viewer.	ClassDef(TGLSAViewer, 0); // Standalone GL viewer.
	};	};

	#endif	#endif

End of changes. 15 change blocks.
	17 lines changed or deleted	13 lines changed or added

	TGLScaleManip.h	TGLScaleManip.h

	// @(#)root/gl:$Id: TGLScaleManip.h 20882 2007-11-19 11:31:26Z rdm $	// @(#)root/gl:$Id: TGLScaleManip.h 30815 2009-10-20 13:49:22Z rdm $
	// Author: Richard Maunder 16/09/2005	// Author: Richard Maunder 16/09/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. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOT_TGLScaleManip	#ifndef ROOT_TGLScaleManip
	#define ROOT_TGLScaleManip	#define ROOT_TGLScaleManip

	#ifndef ROOT_TGLManip	#ifndef ROOT_TGLManip
	#include "TGLManip.h"	#include "TGLManip.h"
	#endif	#endif

	#ifndef ROOT_TGLUtil
	#include "TGLUtil.h"
	#endif

	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////
	// //	// //
	// TGLScaleManip //	// TGLScaleManip //
	// //	// //
	// Scale manipulator - attaches to physical shape and draws local axes //	// Scale manipulator - attaches to physical shape and draws local axes //
	// widgets with box heads. User can mouse over (turns yellow) and L //	// widgets with box heads. User can mouse over (turns yellow) and L //
	// click/drag to scale along this axis. //	// click/drag to scale along this axis. //
	// Widgets use standard 3D package axes colours: X red, Y green, Z blue.//	// Widgets use standard 3D package axes colours: X red, Y green, Z blue.//
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////

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

	TGLSelectRecord.h	TGLSelectRecord.h

	// @(#)root/gl:$Id: TGLSelectRecord.h 20882 2007-11-19 11:31:26Z rdm $	// @(#)root/gl:$Id: TGLSelectRecord.h 30886 2009-10-27 13:37:11Z 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_TGLSelectRecord	#ifndef ROOT_TGLSelectRecord
	#define ROOT_TGLSelectRecord	#define ROOT_TGLSelectRecord

	skipping to change at line 72	skipping to change at line 72

	ClassDef(TGLSelectRecordBase, 0) // Base class for GL selection records.	ClassDef(TGLSelectRecordBase, 0) // Base class for GL selection records.
	};	};

	/************************************************************************** /	/************************************************************************** /
	// TGLSelectRecord	// TGLSelectRecord
	/************************************************************************** /	/************************************************************************** /

	class TGLSelectRecord : public TGLSelectRecordBase	class TGLSelectRecord : public TGLSelectRecordBase
	{	{

		public:
		enum ESecSelResult { kNone, kEnteringSelection, kLeavingSelection, kModi
		fyingInternalSelection };

	protected:	protected:
	// Secondary data (scene dependent) - use	// Secondary data (scene dependent) - use
	// TGLSceneBase::ResolveSelectRecord to fill.	// TGLSceneBase::ResolveSelectRecord to fill.
	Bool_t fTransparent;	Bool_t fTransparent;
	TGLSceneInfo *fSceneInfo; // SceneInfo	TGLSceneInfo *fSceneInfo; // SceneInfo
	TGLPhysicalShape *fPhysShape; // PhysicalShape, if applicable	TGLPhysicalShape *fPhysShape; // PhysicalShape, if applicable
	TObject *fObject; // Master TObject, if applicable	TObject *fObject; // Master TObject, if applicable
	void *fSpecific; // Scene specific, if applicable	void *fSpecific; // Scene specific, if applicable

		Bool_t fMultiple; // Mutliple selection, requested by event
		handler

		ESecSelResult fSecSelRes; // Result of ProcessSelection;

	public:	public:
	TGLSelectRecord();	TGLSelectRecord();
	TGLSelectRecord(UInt_t* data);	TGLSelectRecord(UInt_t* data);
	TGLSelectRecord(const TGLSelectRecord& rec);	TGLSelectRecord(const TGLSelectRecord& rec);
	virtual ~TGLSelectRecord();	virtual ~TGLSelectRecord();

	TGLSelectRecord& operator=(const TGLSelectRecord& rec);	TGLSelectRecord& operator=(const TGLSelectRecord& rec);

	virtual void Set(UInt_t* data);	virtual void Set(UInt_t* data);
	virtual void Reset();	virtual void Reset();

	Bool_t GetTransparent() const { return fTransparent; }	Bool_t GetTransparent() const { return fTransparent; }
	TGLSceneInfo * GetSceneInfo() const { return fSceneInfo; }	TGLSceneInfo * GetSceneInfo() const { return fSceneInfo; }
	TGLPhysicalShape * GetPhysShape() const { return fPhysShape; }	TGLPhysicalShape * GetPhysShape() const { return fPhysShape; }
	TObject * GetObject() const { return fObject; }	TObject * GetObject() const { return fObject; }
	void * GetSpecific() const { return fSpecific; }	void * GetSpecific() const { return fSpecific; }

		Bool_t GetMultiple() const { return fMultiple; }

		ESecSelResult GetSecSelResult() const { return fSecSelRes; }

	void SetTransparent(Bool_t t) { fTransparent = t; }	void SetTransparent(Bool_t t) { fTransparent = t; }
	void SetSceneInfo (TGLSceneInfo* si) { fSceneInfo = si; }	void SetSceneInfo (TGLSceneInfo* si) { fSceneInfo = si; }
	void SetPhysShape (TGLPhysicalShape* pshp) { fPhysShape = pshp; }	void SetPhysShape (TGLPhysicalShape* pshp) { fPhysShape = pshp; }
	void SetObject (TObject* obj) { fObject = obj; }	void SetObject (TObject* obj) { fObject = obj; }
	void SetSpecific (void* spec) { fSpecific = spec; }	void SetSpecific (void* spec) { fSpecific = spec; }

		void SetMultiple (Bool_t multi) { fMultiple = multi; }

		void SetSecSelResult(ESecSelResult r) { fSecSelRes = r; }

	void Print();	void Print();

	static Bool_t AreSameSelectionWise(const TGLSelectRecord& r1,	static Bool_t AreSameSelectionWise(const TGLSelectRecord& r1,
	const TGLSelectRecord& r2);	const TGLSelectRecord& r2);

	ClassDef(TGLSelectRecord, 0) // Standard GL selection record.	ClassDef(TGLSelectRecord, 0) // Standard GL selection record.
	};	};

	/************************************************************************** /	/************************************************************************** /

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

	TGLUtil.h	TGLUtil.h

	// @(#)root/gl:$Id: TGLUtil.h 29755 2009-08-11 17:38:16Z matevz $	// @(#)root/gl:$Id: TGLUtil.h 30815 2009-10-20 13:49:22Z rdm $
	// Author: Richard Maunder 25/05/2005	// Author: Richard Maunder 25/05/2005

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOT_TGLUtil	#ifndef ROOT_TGLUtil
	#define ROOT_TGLUtil	#define ROOT_TGLUtil


		#ifndef ROOT_Rtypes
	#include "Rtypes.h"	#include "Rtypes.h"

		#endif
		#ifndef ROOT_TError
	#include "TError.h"	#include "TError.h"

		#endif

	class TString;	class TString;
	class TGLBoundingBox;	class TGLBoundingBox;
	class TGLCamera;	class TGLCamera;

	class TAttMarker;	class TAttMarker;
	class TAttLine;	class TAttLine;

	class GLUtesselator;	class GLUtesselator;


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

	TGLViewer.h	TGLViewer.h

	// @(#)root/gl:$Id: TGLViewer.h 30384 2009-09-23 17:54:23Z matevz $	// @(#)root/gl:$Id: TGLViewer.h 31299 2009-11-18 21:06:28Z 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 47	skipping to change at line 47
	class TGLViewerEditor;	class TGLViewerEditor;
	class TGLWidget;	class TGLWidget;
	class TGLLightSet;	class TGLLightSet;
	class TGLClipSet;	class TGLClipSet;
	class TGLManipSet;	class TGLManipSet;
	class TGLCameraOverlay;	class TGLCameraOverlay;
	class TGLContextIdentity;	class TGLContextIdentity;
	class TTimer;	class TTimer;

	class TContextMenu;	class TContextMenu;

		class TGedEditor;
		class TGLPShapeObj;

	class TGLViewer : public TVirtualViewer3D,	class TGLViewer : public TVirtualViewer3D,
	public TGLViewerBase,	public TGLViewerBase,
	public TQObject	public TQObject

	{	{
	friend class TGLOutput;	friend class TGLOutput;
	friend class TGLEventHandler;	friend class TGLEventHandler;
	public:	public:

	enum ECameraType { kCameraPerspXOZ, kCameraPerspYOZ, kCameraPerspXOY,	enum ECameraType { kCameraPerspXOZ, kCameraPerspYOZ, kCameraPerspXOY,
	kCameraOrthoXOY, kCameraOrthoXOZ, kCameraOrthoZOY,	kCameraOrthoXOY, kCameraOrthoXOZ, kCameraOrthoZOY,
	kCameraOrthoXnOY, kCameraOrthoXnOZ, kCameraOrthoZnOY };	kCameraOrthoXnOY, kCameraOrthoXnOZ, kCameraOrthoZnOY };


		enum ESecSelType { kOnRequest, kOnKeyMod1 };

	private:	private:
	TGLViewer(const TGLViewer &); // Not implemented	TGLViewer(const TGLViewer &); // Not implemented
	TGLViewer & operator=(const TGLViewer &); // Not implemented	TGLViewer & operator=(const TGLViewer &); // Not implemented

	void InitSecondaryObjects();	void InitSecondaryObjects();

	protected:	protected:
	// External handles	// External handles
	TVirtualPad *fPad; //! external pad - remove replace with sign al	TVirtualPad *fPad; //! external pad - remove replace with sign al


	skipping to change at line 102	skipping to change at line 106
	// Selected physical	// Selected physical
	TGLSelectRecord fCurrentSelRec; //! select record in use as selected	TGLSelectRecord fCurrentSelRec; //! select record in use as selected
	TGLSelectRecord fSelRec; //! select record from last select (should go to context)	TGLSelectRecord fSelRec; //! select record from last select (should go to context)
	TGLSelectRecord fSecSelRec; //! select record from last secondary select (should go to context)	TGLSelectRecord fSecSelRec; //! select record from last secondary select (should go to context)
	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

		TGedEditor *fGedEditor; //! GED editor
		TGLPShapeObj *fPShapeWrap;

	// Mouse ineraction	// Mouse ineraction
	public:	public:
	enum EPushAction { kPushStd,	enum EPushAction { kPushStd,
	kPushCamCenter, kPushAnnotate };	kPushCamCenter, kPushAnnotate };
	enum EDragAction { kDragNone,	enum EDragAction { kDragNone,
	kDragCameraRotate, kDragCameraTruck, kDragCameraDol ly,	kDragCameraRotate, kDragCameraTruck, kDragCameraDol ly,
	kDragOverlay };	kDragOverlay };
	protected:	protected:
	EPushAction fPushAction;	EPushAction fPushAction;

	skipping to change at line 170	skipping to change at line 176

	protected:	protected:
	TGLWidget *fGLWidget;	TGLWidget *fGLWidget;
	Int_t fGLDevice; //!for embedded gl viewer	Int_t fGLDevice; //!for embedded gl viewer
	TGLContextIdentity *fGLCtxId; //!for embedded gl viewer	TGLContextIdentity *fGLCtxId; //!for embedded gl viewer

	// Updata/camera-reset behaviour	// Updata/camera-reset behaviour
	Bool_t fIgnoreSizesOnUpdate; // ignore sizes of bounding- boxes on update	Bool_t fIgnoreSizesOnUpdate; // ignore sizes of bounding- boxes on update
	Bool_t fResetCamerasOnUpdate; // reposition camera on each update	Bool_t fResetCamerasOnUpdate; // reposition camera on each update
	Bool_t fResetCamerasOnNextUpdate; // reposition camera on next update	Bool_t fResetCamerasOnNextUpdate; // reposition camera on next update

	Bool_t fResetCameraOnDoubleClick; // reposition camera on doub le-click

	public:	public:
	TGLViewer(TVirtualPad* pad, Int_t x, Int_t y, Int_t width, Int_t height) ;	TGLViewer(TVirtualPad* pad, Int_t x, Int_t y, Int_t width, Int_t height) ;
	TGLViewer(TVirtualPad* pad);	TGLViewer(TVirtualPad* pad);
	virtual ~TGLViewer();	virtual ~TGLViewer();

	void ResetInitGL();	void ResetInitGL();

	// TVirtualViewer3D interface ... mostly a facade	// TVirtualViewer3D interface ... mostly a facade


	skipping to change at line 203	skipping to change at line 208
	virtual Int_t AddObject(const TBuffer3D&, Bool_t* = 0) { return TBuffer 3D::kNone; }	virtual Int_t AddObject(const TBuffer3D&, Bool_t* = 0) { return TBuffer 3D::kNone; }
	virtual Int_t AddObject(UInt_t, const TBuffer3D&, Bool_t* = 0) { return TBuffer3D::kNone; }	virtual Int_t AddObject(UInt_t, const TBuffer3D&, Bool_t* = 0) { return TBuffer3D::kNone; }
	virtual Bool_t OpenComposite(const TBuffer3D&, Bool_t* = 0) { return kFA LSE; }	virtual Bool_t OpenComposite(const TBuffer3D&, Bool_t* = 0) { return kFA LSE; }
	virtual void CloseComposite() {}	virtual void CloseComposite() {}
	virtual void AddCompositeOp(UInt_t) {}	virtual void AddCompositeOp(UInt_t) {}

	virtual void PrintObjects();	virtual void PrintObjects();
	virtual void ResetCameras() { SetupCameras(kTRUE); }	virtual void ResetCameras() { SetupCameras(kTRUE); }
	virtual void ResetCamerasAfterNextUpdate() { fResetCamerasOnNextUpdate = kTRUE; }	virtual void ResetCamerasAfterNextUpdate() { fResetCamerasOnNextUpdate = kTRUE; }


	virtual void RefreshPadEditor(TObject* = 0) {}

	TGLWidget* GetGLWidget() { return fGLWidget; }	TGLWidget* GetGLWidget() { return fGLWidget; }

	virtual void CreateGLWidget() {}	virtual void CreateGLWidget() {}
	virtual void DestroyGLWidget() {}	virtual void DestroyGLWidget() {}

	Int_t GetDev() const { return fGLDevice; }	Int_t GetDev() const { return fGLDevice; }
	Bool_t GetSmartRefresh() const { return fSmartRefresh; }	Bool_t GetSmartRefresh() const { return fSmartRefresh; }
	void SetSmartRefresh(Bool_t smart_ref) { fSmartRefresh = smart_ref; }	void SetSmartRefresh(Bool_t smart_ref) { fSmartRefresh = smart_ref; }

	TGLColorSet& RefDarkColorSet() { return fDarkColorSet; }	TGLColorSet& RefDarkColorSet() { return fDarkColorSet; }

	skipping to change at line 284	skipping to change at line 287

	// Request methods post cross thread request via TROOT::ProcessLineFast( ).	// Request methods post cross thread request via TROOT::ProcessLineFast( ).
	void RequestDraw(Short_t LOD = TGLRnrCtx::kLODMed); // Cross thread draw request	void RequestDraw(Short_t LOD = TGLRnrCtx::kLODMed); // Cross thread draw request
	virtual void PreRender();	virtual void PreRender();
	virtual void PostRender();	virtual void PostRender();
	void DoDraw();	void DoDraw();

	void DrawGuides();	void DrawGuides();
	void DrawDebugInfo();	void DrawDebugInfo();


	Bool_t RequestSelect(Int_t x, Int_t y, Bool_t trySecSel=kFALSE); // Cros	Bool_t RequestSelect(Int_t x, Int_t y); // Cross thread select
	s thread select request	request
	Bool_t DoSelect(Int_t x, Int_t y, Bool_t trySecSel=kFALSE); // Wind	Bool_t DoSelect(Int_t x, Int_t y); // First level selecton
	ow coords origin top left	(shapes/objects).
		Bool_t RequestSecondarySelect(Int_t x, Int_t y); // Cross thread seconda
		ry select request
		Bool_t DoSecondarySelect(Int_t x, Int_t y); // Second level selecto
		n (inner structure).
	void ApplySelection();	void ApplySelection();

	Bool_t RequestOverlaySelect(Int_t x, Int_t y); // Cross thread select re quest	Bool_t RequestOverlaySelect(Int_t x, Int_t y); // Cross thread select re quest
	Bool_t DoOverlaySelect(Int_t x, Int_t y); // Window coords origin t op left	Bool_t DoOverlaySelect(Int_t x, Int_t y); // Window coords origin t op left

	// Saving of screen image	// Saving of screen image
	Bool_t SavePicture();	Bool_t SavePicture();
	Bool_t SavePicture(const TString &fileName);	Bool_t SavePicture(const TString &fileName);
	Bool_t SavePictureUsingBB (const TString &fileName);	Bool_t SavePictureUsingBB (const TString &fileName);
	Bool_t SavePictureUsingFBO(const TString &fileName, Int_t w, Int_t h, Fl oat_t pixel_object_scale=0);	Bool_t SavePictureUsingFBO(const TString &fileName, Int_t w, Int_t h, Fl oat_t pixel_object_scale=0);

	skipping to change at line 313	skipping to change at line 318
	void SetFader(Float_t x) { fFader = x; }	void SetFader(Float_t x) { fFader = x; }
	void AutoFade(Float_t fade, Float_t time=1, Int_t steps=10);	void AutoFade(Float_t fade, Float_t time=1, Int_t steps=10);

	// Update/camera-reset	// Update/camera-reset
	void UpdateScene();	void UpdateScene();
	Bool_t GetIgnoreSizesOnUpdate() const { return fIgnoreSizesOnUpda te; }	Bool_t GetIgnoreSizesOnUpdate() const { return fIgnoreSizesOnUpda te; }
	void SetIgnoreSizesOnUpdate(Bool_t v) { fIgnoreSizesOnUpdate = v; }	void SetIgnoreSizesOnUpdate(Bool_t v) { fIgnoreSizesOnUpdate = v; }
	void ResetCurrentCamera();	void ResetCurrentCamera();
	Bool_t GetResetCamerasOnUpdate() const { return fResetCamerasOnUpd ate; }	Bool_t GetResetCamerasOnUpdate() const { return fResetCamerasOnUpd ate; }
	void SetResetCamerasOnUpdate(Bool_t v) { fResetCamerasOnUpdate = v ; }	void SetResetCamerasOnUpdate(Bool_t v) { fResetCamerasOnUpdate = v ; }

	Bool_t GetResetCameraOnDoubleClick() const { return fResetCameraOnDoub
	leClick; }
	void SetResetCameraOnDoubleClick(Bool_t v) { fResetCameraOnDoubleClick
	= v; }

	virtual void PostSceneBuildSetup(Bool_t resetCameras);	virtual void PostSceneBuildSetup(Bool_t resetCameras);


	virtual void SelectionChanged(); // SIGNAL
	virtual void OverlayDragFinished(); // SIGNAL
	virtual void MouseIdle(TGLPhysicalShape,UInt_t,UInt_t); // SIGNAL*	virtual void MouseIdle(TGLPhysicalShape,UInt_t,UInt_t); // SIGNAL*
	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 ReClicked(TObject obj, UInt_t button, UInt_t state); //SI
		GNAL*
		virtual void UnClicked(TObject obj, UInt_t button, UInt_t state); //SI
		GNAL*
	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);


		TGedEditor* GetGedEditor() const { return fGedEditor; }
		virtual void SetGedEditor(TGedEditor* ed) { fGedEditor = ed; }

		virtual void SelectionChanged();
		virtual void OverlayDragFinished();
		virtual void RefreshPadEditor(TObject* obj=0);

	virtual void RemoveOverlayElement(TGLOverlayElement* el);	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.
	};	};


End of changes. 11 change blocks.
	14 lines changed or deleted	26 lines changed or added

	TGLViewerEditor.h	TGLViewerEditor.h

	skipping to change at line 40	skipping to change at line 40
	private:	private:
	//Pointers to manipulate with tabs	//Pointers to manipulate with tabs
	TGCompositeFrame *fGuidesFrame;	TGCompositeFrame *fGuidesFrame;
	TGCompositeFrame *fClipFrame;	TGCompositeFrame *fClipFrame;

	TGLLightSetSubEditor *fLightSet;	TGLLightSetSubEditor *fLightSet;

	TGColorSelect *fClearColor;	TGColorSelect *fClearColor;
	TGCheckButton *fIgnoreSizesOnUpdate;	TGCheckButton *fIgnoreSizesOnUpdate;
	TGCheckButton *fResetCamerasOnUpdate;	TGCheckButton *fResetCamerasOnUpdate;

	TGCheckButton *fResetCameraOnDoubleClick;
	TGTextButton *fUpdateScene;	TGTextButton *fUpdateScene;
	TGTextButton *fCameraHome;	TGTextButton *fCameraHome;

	TGNumberEntry *fMaxSceneDrawTimeHQ;	TGNumberEntry *fMaxSceneDrawTimeHQ;
	TGNumberEntry *fMaxSceneDrawTimeLQ;	TGNumberEntry *fMaxSceneDrawTimeLQ;

	TGNumberEntry *fPointSizeScale;	TGNumberEntry *fPointSizeScale;
	TGNumberEntry *fLineWidthScale;	TGNumberEntry *fLineWidthScale;
	TGCheckButton *fPointSmooth;	TGCheckButton *fPointSmooth;
	TGCheckButton *fLineSmooth;	TGCheckButton *fLineSmooth;

	skipping to change at line 111	skipping to change at line 110
	~TGLViewerEditor();	~TGLViewerEditor();

	virtual void ViewerRedraw();	virtual void ViewerRedraw();

	virtual void SetModel(TObject* obj);	virtual void SetModel(TObject* obj);

	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 DoUpdateScene();	void DoUpdateScene();
	void DoCameraHome();	void DoCameraHome();
	void UpdateMaxDrawTimes();	void UpdateMaxDrawTimes();
	void UpdatePointLineStuff();	void UpdatePointLineStuff();
	void DoCameraCenterExt();	void DoCameraCenterExt();
	void DoCaptureCenter();	void DoCaptureCenter();
	void DoAnnotation();	void DoAnnotation();
	void DoDrawCameraCenter();	void DoDrawCameraCenter();
	void UpdateCameraCenter();	void UpdateCameraCenter();
	//Axis manipulation	//Axis manipulation

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

	TGSpeedo.h	TGSpeedo.h

	skipping to change at line 90	skipping to change at line 90
	const char lbl1 = "", const char lbl2 = "",	const char lbl1 = "", const char lbl2 = "",
	const char dsp1 = "", const char dsp2 = "", int id = -1);	const char dsp1 = "", const char dsp2 = "", int id = -1);
	virtual ~TGSpeedo();	virtual ~TGSpeedo();

	virtual TGDimension GetDefaultSize() const;	virtual TGDimension GetDefaultSize() const;
	virtual Bool_t HandleButton(Event_t *event);	virtual Bool_t HandleButton(Event_t *event);

	const TGPicture *GetPicture() const { return fBase; }	const TGPicture *GetPicture() const { return fBase; }
	TImage *GetImage() const { return fImage; }	TImage *GetImage() const { return fImage; }
	Float_t GetPeakVal() const { return fPeakVal; }	Float_t GetPeakVal() const { return fPeakVal; }

		Float_t GetScaleMin() const { return fScaleMin; }
		Float_t GetScaleMax() const { return fScaleMax; }
	Bool_t IsThresholdActive() { return fThresholdActive; }	Bool_t IsThresholdActive() { return fThresholdActive; }

	void Build();	void Build();
	void Glow(EGlowColor col = kGreen);	void Glow(EGlowColor col = kGreen);
	void StepScale(Float_t step);	void StepScale(Float_t step);
	void SetScaleValue(Float_t val);	void SetScaleValue(Float_t val);
	void SetScaleValue(Float_t val, Int_t damping);	void SetScaleValue(Float_t val, Int_t damping);
	void SetOdoValue(Int_t val);	void SetOdoValue(Int_t val);
	void SetDisplayText(const char text1, const char text2 = "");	void SetDisplayText(const char text1, const char text2 = "");
	void SetLabelText(const char text1, const char text2 = "");	void SetLabelText(const char text1, const char text2 = "");

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

	TGenCollectionProxy.h	TGenCollectionProxy.h

	// @(#)root/io:$Id: TGenCollectionProxy.h 29225 2009-06-25 15:17:04Z brun $	// @(#)root/io:$Id: TGenCollectionProxy.h 31136 2009-11-12 21:25:38Z 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 80	skipping to change at line 80
	TClassRef fType; // TClass reference of Value_type in col lection	TClassRef fType; // TClass reference of Value_type in col lection
	EDataType fKind; // kind of ROOT-fundamental type	EDataType fKind; // kind of ROOT-fundamental type
	size_t fSize; // fSize of the contained object	size_t fSize; // fSize of the contained object

	// Copy constructor	// Copy constructor
	Value(const Value& inside);	Value(const Value& inside);
	// Initializing constructor	// Initializing constructor
	Value(const std::string& info);	Value(const std::string& info);
	// Delete individual item from STL container	// Delete individual item from STL container
	void DeleteItem(void* ptr);	void DeleteItem(void* ptr);


		Bool_t IsValid();
	};	};

	/**@class StreamHelper	/**@class StreamHelper
	*	*
	* Helper class to facilitate I/O	* Helper class to facilitate I/O
	*	*
	* @author M.Frank	* @author M.Frank
	* @version 1.0	* @version 1.0
	* @date 10/10/2004	* @date 10/10/2004
	*/	*/

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

	TGenericClassInfo.h	TGenericClassInfo.h

	// @(#)root/base:$Id: TGenericClassInfo.h 25450 2008-09-18 21:13:42Z pcanal $	// @(#)root/base:$Id: TGenericClassInfo.h 30815 2009-10-20 13:49:22Z rdm $
	// 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. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOT_TGenericClassInfo	#ifndef ROOT_TGenericClassInfo
	#define ROOT_TGenericClassInfo	#define ROOT_TGenericClassInfo

	#include <vector>	#include <vector>

		//#ifndef ROOT_TSchemaHelper
	#include "TSchemaHelper.h"	#include "TSchemaHelper.h"

		//#endif
		//#ifndef ROOT_Rtypes
		//#inlcude "Rtypes.h"
		//#endif

	// Forward declarations	// Forward declarations
	class TVirtualIsAProxy;	class TVirtualIsAProxy;

		//class TClass;
		//class TClassStreamer;
		//class TVirtualCollectionProxy;
		//class TCollectionProxyInfo;

	namespace ROOT {	namespace ROOT {

	class TCollectionProxyInfo;	class TCollectionProxyInfo;

	class TGenericClassInfo {	class TGenericClassInfo {
	// This class in not inlined because it is used is non time critical	// This class in not inlined because it is used is non time critical
	// section (the dictionaries) and inline would lead to too much	// section (the dictionaries) and inline would lead to too much
	// repetition of the code (once per class!).	// repetition of the code (once per class!).


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

	TGraph.h	TGraph.h

	// @(#)root/hist:$Id: TGraph.h 30458 2009-09-25 15:30:16Z moneta $	// @(#)root/hist:$Id: TGraph.h 31207 2009-11-16 16:52:00Z moneta $
	// Author: Rene Brun, Olivier Couet 12/12/94	// Author: Rene Brun, Olivier Couet 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 75	skipping to change at line 75

	virtual Double_t **Allocate(Int_t newsize);	virtual Double_t **Allocate(Int_t newsize);
	Double_t **AllocateArrays(Int_t Narrays, Int_t arraySize);	Double_t **AllocateArrays(Int_t Narrays, Int_t arraySize);
	virtual Bool_t CopyPoints(Double_t **newarrays, Int_t ibegin, Int_t iend, Int_t obegin);	virtual Bool_t CopyPoints(Double_t **newarrays, Int_t ibegin, Int_t iend, Int_t obegin);
	virtual void CopyAndRelease(Double_t **newarrays, Int_t ibegin, In t_t iend, Int_t obegin);	virtual void CopyAndRelease(Double_t **newarrays, Int_t ibegin, In t_t iend, Int_t obegin);
	Bool_t CtorAllocate();	Bool_t CtorAllocate();
	Double_t **ExpandAndCopy(Int_t size, Int_t iend);	Double_t **ExpandAndCopy(Int_t size, Int_t iend);
	virtual void FillZero(Int_t begin, Int_t end, Bool_t from_ctor = k TRUE);	virtual void FillZero(Int_t begin, Int_t end, Bool_t from_ctor = k TRUE);
	Double_t **ShrinkAndCopy(Int_t size, Int_t iend);	Double_t **ShrinkAndCopy(Int_t size, Int_t iend);


	virtual Int_t DoFit(TF1 f1,Option_t option,Option_t *goption, Axi
	s_t xmin, Axis_t xmax);

	public:	public:
	// TGraph status bits	// TGraph status bits
	enum {	enum {
	kClipFrame = BIT(10), // clip to the frame boundary	kClipFrame = BIT(10), // clip to the frame boundary
	kNotEditable = BIT(18) // bit set if graph is non editable	kNotEditable = BIT(18) // bit set if graph is non editable
	};	};

	TGraph();	TGraph();
	TGraph(Int_t n);	TGraph(Int_t n);
	TGraph(Int_t n, const Int_t x, const Int_t y);	TGraph(Int_t n, const Int_t x, const Int_t y);

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

	TGraph2D.h	TGraph2D.h

	skipping to change at line 76	skipping to change at line 76
	TVirtualHistPainter *fPainter; //!pointer to histogram painter	TVirtualHistPainter *fPainter; //!pointer to histogram painter

	void Build(Int_t n);	void Build(Int_t n);

	private:	private:

	Bool_t fUserHisto; // True when SetHistogram has been called	Bool_t fUserHisto; // True when SetHistogram has been called

	protected:	protected:


	virtual Int_t DoFit(TF2 f2,Option_t option,Option_t *goption);

	public:	public:

	TGraph2D();	TGraph2D();
	TGraph2D(Int_t n);	TGraph2D(Int_t n);
	TGraph2D(Int_t n, Int_t x, Int_t y, Int_t *z);	TGraph2D(Int_t n, Int_t x, Int_t y, Int_t *z);
	TGraph2D(Int_t n, Float_t x, Float_t y, Float_t *z);	TGraph2D(Int_t n, Float_t x, Float_t y, Float_t *z);
	TGraph2D(Int_t n, Double_t x, Double_t y, Double_t *z);	TGraph2D(Int_t n, Double_t x, Double_t y, Double_t *z);
	TGraph2D(TH2 *h2);	TGraph2D(TH2 *h2);
	TGraph2D(const char name, const char title, Int_t n, Double_t x, Doub le_t y, Double_t *z);	TGraph2D(const char name, const char title, Int_t n, Double_t x, Doub le_t y, Double_t *z);
	TGraph2D(const char filename, const char format="%lg %lg %lg", Option_ t *option="");	TGraph2D(const char filename, const char format="%lg %lg %lg", Option_ t *option="");

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

	THnSparse.h	THnSparse.h

	// @(#)root/hist:$Id: THnSparse.h 30458 2009-09-25 15:30:16Z moneta $	// @(#)root/hist:$Id: THnSparse.h 31207 2009-11-16 16:52:00Z 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 54	skipping to change at line 54
	#endif	#endif
	#ifndef ROOT_TArrayS	#ifndef ROOT_TArrayS
	#include "TArrayS.h"	#include "TArrayS.h"
	#endif	#endif
	#ifndef ROOT_TArrayC	#ifndef ROOT_TArrayC
	#include "TArrayC.h"	#include "TArrayC.h"
	#endif	#endif

	class TAxis;	class TAxis;
	class TCollection;	class TCollection;

		class TFitResultPtr;
	class TH1;	class TH1;
	class TH1D;	class TH1D;
	class TH2D;	class TH2D;
	class TH3D;	class TH3D;
	class TF1;	class TF1;

	class THnSparseArrayChunk: public TObject {	class THnSparseArrayChunk: public TObject {
	private:	private:

	THnSparseArrayChunk(const THnSparseArrayChunk&); // Not implemented	THnSparseArrayChunk(const THnSparseArrayChunk&); // Not implemented

	skipping to change at line 168	skipping to change at line 169
	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, Bool_t keepTargetAxis) const;	const TObjArray* axes, Bool_t keepTargetAxis) const;
	TObject* ProjectionAny(Int_t ndim, const Int_t* dim,	TObject* ProjectionAny(Int_t ndim, const Int_t* dim,
	Bool_t wantSparse, Option_t* option = "") const;	Bool_t wantSparse, Option_t* option = "") const;

	public:	public:
	virtual ~THnSparse();	virtual ~THnSparse();

	static THnSparse* CreateSparse(const char* name, const char* title,	static THnSparse* CreateSparse(const char* name, const char* title,

	const TH1* axes, Int_t ChunkSize = 1024 * 16);	const TH1* h1, Int_t ChunkSize = 1024 * 1 6);

	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];
	fTsumwx[d] += w * xd;	fTsumwx[d] += w * xd;
	fTsumwx2[d] += w * xd * xd;	fTsumwx2[d] += w * xd * xd;
	}	}
	}	}
	return Fill(GetBin(x), w);	return Fill(GetBin(x), w);
	}	}
	Long_t Fill(const char* name[], Double_t w = 1.) {	Long_t Fill(const char* name[], Double_t w = 1.) {
	return Fill(GetBin(name), w);	return Fill(GetBin(name), w);
	}	}


		TFitResultPtr Fit(TF1 f1 ,Option_t option = "", Option_t *goption = ""
		);
		TList* GetListOfFunctions() { return 0; }

	Double_t GetEntries() const { return fEntries; }	Double_t GetEntries() const { return fEntries; }
	Double_t GetWeightSum() const { return fTsumw; }	Double_t GetWeightSum() const { return fTsumw; }
	Long64_t GetNbins() const { return fFilledBins; }	Long64_t GetNbins() const { return fFilledBins; }
	Int_t GetNdimensions() const { return fNdimensions; }	Int_t GetNdimensions() const { return fNdimensions; }
	Bool_t GetCalculateErrors() const { return fTsumw2 >= 0.; }	Bool_t GetCalculateErrors() const { return fTsumw2 >= 0.; }
	void CalculateErrors(Bool_t calc = kTRUE) {	void CalculateErrors(Bool_t calc = kTRUE) {
	// Calculate errors (or not if "calc" == kFALSE)	// Calculate errors (or not if "calc" == kFALSE)
	if (calc) Sumw2();	if (calc) Sumw2();
	else fTsumw2 = -1.;	else fTsumw2 = -1.;
	}	}

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

	TImage.h	TImage.h

	// @(#)root/graf:$Id: TImage.h 23087 2008-04-09 14:10:56Z rdm $	// @(#)root/graf:$Id: TImage.h 30544 2009-10-02 15:33:12Z couet $
	// Author: Fons Rademakers, Reiner Rohlfs 15/10/2001	// Author: Fons Rademakers, Reiner Rohlfs 15/10/2001

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 2001-2001, Rene Brun, Fons Rademakers and Reiner Rohlfs *	* Copyright (C) 2001-2001, Rene Brun, Fons Rademakers and Reiner Rohlfs *
	* 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_TImage	#ifndef ROOT_TImage
	#define ROOT_TImage	#define ROOT_TImage

	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////
	// //	// //
	// TImage //	// TImage //
	// //	// //
	// Abstract interface to image processing library. //	// Abstract interface to image processing library. //

	// It allows for the reading and writing of images in different //
	// formats, several image manipulations (scaling, tiling, merging, //
	// etc.) and displaying in pads. //
	// //	// //
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////

	#ifndef ROOT_TNamed	#ifndef ROOT_TNamed
	#include "TNamed.h"	#include "TNamed.h"
	#endif	#endif

	#ifndef ROOT_TAttImage	#ifndef ROOT_TAttImage
	#include "TAttImage.h"	#include "TAttImage.h"
	#endif	#endif

	skipping to change at line 139	skipping to change at line 136
	virtual TObject Clone(const char ) const { return 0; }	virtual TObject Clone(const char ) const { return 0; }

	// Input / output	// Input / output
	virtual void ReadImage(const char * /file/, EImageFileTypes /type/ = TImage::kUnknown) {}	virtual void ReadImage(const char * /file/, EImageFileTypes /type/ = TImage::kUnknown) {}
	virtual void WriteImage(const char * /file/, EImageFileTypes /type/ = TImage::kUnknown) {}	virtual void WriteImage(const char * /file/, EImageFileTypes /type/ = TImage::kUnknown) {}
	virtual void SetImage(const Double_t * /imageData/, UInt_t /width/, UInt_t /height/, TImagePalette * /palette/ = 0) {}	virtual void SetImage(const Double_t * /imageData/, UInt_t /width/, UInt_t /height/, TImagePalette * /palette/ = 0) {}
	virtual void SetImage(const TArrayD & /imageData/, UInt_t /width/, T ImagePalette * /palette/ = 0) {}	virtual void SetImage(const TArrayD & /imageData/, UInt_t /width/, T ImagePalette * /palette/ = 0) {}
	virtual void SetImage(const TVectorD & /imageData/, UInt_t /width/, TImagePalette * /palette/ = 0) {}	virtual void SetImage(const TVectorD & /imageData/, UInt_t /width/, TImagePalette * /palette/ = 0) {}
	virtual void SetImage(Pixmap_t /pxm/, Pixmap_t /mask/ = 0) {}	virtual void SetImage(Pixmap_t /pxm/, Pixmap_t /mask/ = 0) {}


	// Pad conversions	// Create an image from the given pad. (See TASImage::FromPad)
	virtual void FromPad(TVirtualPad * /pad/, Int_t /x/ = 0, Int_t /y/ = 0, UInt_t /w/ = 0, UInt_t /h/ = 0) {}	virtual void FromPad(TVirtualPad * /pad/, Int_t /x/ = 0, Int_t /y/ = 0, UInt_t /w/ = 0, UInt_t /h/ = 0) {}


	// Transformations	// Restore the image original size. (See TASImage::UnZoom)
	virtual void UnZoom() {}	virtual void UnZoom() {}


		// Zoom the image. (See TASImage::Zoom)
	virtual void Zoom(UInt_t /offX/, UInt_t /offY/, UInt_t /width/, UI nt_t /height/) {}	virtual void Zoom(UInt_t /offX/, UInt_t /offY/, UInt_t /width/, UI nt_t /height/) {}


		// Flip the image by a multiple of 90 degrees. (See TASImage::Flip)
	virtual void Flip(Int_t /flip/ = 180) {}	virtual void Flip(Int_t /flip/ = 180) {}


		// Converts image to Gray. (See TASImage::Gray)
	virtual void Gray(Bool_t /on/ = kTRUE) {}	virtual void Gray(Bool_t /on/ = kTRUE) {}
	virtual Bool_t IsGray() const { return kFALSE; }	virtual Bool_t IsGray() const { return kFALSE; }


		// Mirror the image. (See TASImage::Mirror)
	virtual void Mirror(Bool_t /vert/ = kTRUE) {}	virtual void Mirror(Bool_t /vert/ = kTRUE) {}


		// Scale the image. (See TASImage::Scale)
	virtual void Scale(UInt_t /width/, UInt_t /height/) {}	virtual void Scale(UInt_t /width/, UInt_t /height/) {}


		// Slice the image. (See TASImage::Slice)
	virtual void Slice(UInt_t /xStart/, UInt_t /xEnd/, UInt_t /yStart/ , UInt_t /yEnd/,	virtual void Slice(UInt_t /xStart/, UInt_t /xEnd/, UInt_t /yStart/ , UInt_t /yEnd/,
	UInt_t /toWidth/, UInt_t /toHeight/) {}	UInt_t /toWidth/, UInt_t /toHeight/) {}


		// Tile the image. (See TASImage::Tile)
	virtual void Tile(UInt_t /width/, UInt_t /height/) {}	virtual void Tile(UInt_t /width/, UInt_t /height/) {}


		// Crop the image. (See TASImage::Crop)
	virtual void Crop(Int_t /x/ = 0, Int_t /y/ = 0, UInt_t /width/ = 0 , UInt_t /height/ = 0) {}	virtual void Crop(Int_t /x/ = 0, Int_t /y/ = 0, UInt_t /width/ = 0 , UInt_t /height/ = 0) {}


		// Enlarge image. (See TASImage::Pad)
	virtual void Pad(const char * /color/ = "#FFFFFFFF", UInt_t /left/ = 0,	virtual void Pad(const char * /color/ = "#FFFFFFFF", UInt_t /left/ = 0,
	UInt_t /right/ = 0, UInt_t /top/ = 0, UInt_t /botto m/ = 0) {}	UInt_t /right/ = 0, UInt_t /top/ = 0, UInt_t /botto m/ = 0) {}


		// Gaussian blurr. (See TASImage::Blur)
	virtual void Blur(Double_t /horizontal/ = 3, Double_t /vertical/ = 3 ) { }	virtual void Blur(Double_t /horizontal/ = 3, Double_t /vertical/ = 3 ) { }


		// Reduces colordepth of an image. (See TASImage::Vectorize)
	virtual Double_t Vectorize(UInt_t /max_colors/ = 256, UInt_t /dither / = 4, Int_t /opaque_threshold*/ = 0) { return 0; }	virtual Double_t Vectorize(UInt_t /max_colors/ = 256, UInt_t /dither / = 4, Int_t /opaque_threshold*/ = 0) { return 0; }


		// (See TASImage::HSV)
	virtual void HSV(UInt_t /hue/ = 0, UInt_t /radius/ = 360, Int_t /H / = 0, Int_t /S/ = 0, Int_t /V/ = 0,	virtual void HSV(UInt_t /hue/ = 0, UInt_t /radius/ = 360, Int_t /H / = 0, Int_t /S/ = 0, Int_t /V/ = 0,
	Int_t /x/ = 0, Int_t /y/ = 0, UInt_t /width/ = 0, UInt_t /height/ = 0) {}	Int_t /x/ = 0, Int_t /y/ = 0, UInt_t /width/ = 0, UInt_t /height/ = 0) {}


		// Render multipoint gradient inside a rectangle. (See TASImage::Gradien
		t)
	virtual void Gradient(UInt_t /angle/ = 0, const char * /colors/ = "# FFFFFF #000000", const char * /offsets/ = 0,	virtual void Gradient(UInt_t /angle/ = 0, const char * /colors/ = "# FFFFFF #000000", const char * /offsets/ = 0,
	Int_t /x/ = 0, Int_t /y/ = 0, UInt_t /width/ = 0, UInt_t /height/ = 0) {}	Int_t /x/ = 0, Int_t /y/ = 0, UInt_t /width/ = 0, UInt_t /height/ = 0) {}


		// Merge two images. (See TASImage::Merge)
	virtual void Merge(const TImage * /im/, const char * /op/ = "alphabl end", Int_t /x/ = 0, Int_t /y/ = 0) {}	virtual void Merge(const TImage * /im/, const char * /op/ = "alphabl end", Int_t /x/ = 0, Int_t /y/ = 0) {}


		// Append image. (See TASImage::Append)
	virtual void Append(const TImage * /im/, const char * /option/ = "+" , const char * /color/ = "#00000000") {}	virtual void Append(const TImage * /im/, const char * /option/ = "+" , const char * /color/ = "#00000000") {}


		// Bevel effect. (See TASImage::Bevel)
	virtual void Bevel(Int_t /x/ = 0, Int_t /y/ = 0, UInt_t /width/ = 0, UInt_t /height/ = 0,	virtual void Bevel(Int_t /x/ = 0, Int_t /y/ = 0, UInt_t /width/ = 0, UInt_t /height/ = 0,
	const char * /hi/ = "#ffdddddd", const char * /lo / = "#ff555555",	const char * /hi/ = "#ffdddddd", const char * /lo / = "#ff555555",
	UShort_t /thick/ = 1, Bool_t /pressed/ = kFALSE) {}	UShort_t /thick/ = 1, Bool_t /pressed/ = kFALSE) {}

	virtual void DrawText(Int_t /x/ = 0, Int_t /y/ = 0, const char * /*t
	ext/ = "", Int_t /size*/ = 12,
	const char * /color/ = 0, const char * /font/
	= "fixed",
	EText3DType /type/ = TImage::kPlain, const char
	* /fore_file/ = 0, Float_t /angle/ = 0) { }
	virtual void DrawText(TText * /text/, Int_t /x/ = 0, Int_t /y/ = 0
	) { }


	// vector graphics
	virtual void BeginPaint(Bool_t /fast/ = kTRUE) {}	virtual void BeginPaint(Bool_t /fast/ = kTRUE) {}
	virtual void EndPaint() {}	virtual void EndPaint() {}
	virtual void DrawLine(UInt_t /x1/, UInt_t /y1/, UInt_t /x2/, UInt_ t /y2/,	virtual void DrawLine(UInt_t /x1/, UInt_t /y1/, UInt_t /x2/, UInt_ t /y2/,
	const char * /col/ = "#000000", UInt_t /thick/ = 1) {}	const char * /col/ = "#000000", UInt_t /thick/ = 1) {}
	virtual void DrawDashLine(UInt_t /x1/, UInt_t /y1/, UInt_t /x2/, U Int_t /y2/, UInt_t /nDash/,	virtual void DrawDashLine(UInt_t /x1/, UInt_t /y1/, UInt_t /x2/, U Int_t /y2/, UInt_t /nDash/,
	const char * /pDash/, const char * /col/ = "#000000", UInt_t /thick/ = 1) {}	const char * /pDash/, const char * /col/ = "#000000", UInt_t /thick/ = 1) {}
	virtual void DrawBox(Int_t /x1/, Int_t /y1/, Int_t /x2/, Int_t /y 2/,	virtual void DrawBox(Int_t /x1/, Int_t /y1/, Int_t /x2/, Int_t /y 2/,
	const char * /col/ = "#000000", UInt_t /thick/ = 1, Int_t /mode/ = 0) {}	const char * /col/ = "#000000", UInt_t /thick/ = 1, Int_t /mode/ = 0) {}
	virtual void DrawRectangle(UInt_t /x/, UInt_t /y/, UInt_t /w/, UIn t_t /h/,	virtual void DrawRectangle(UInt_t /x/, UInt_t /y/, UInt_t /w/, UIn t_t /h/,
	const char * /col/ = "#000000", UInt_t /th ick/ = 1) {}	const char * /col/ = "#000000", UInt_t /th ick/ = 1) {}
	virtual void FillRectangle(const char * /col/ = 0, Int_t /x/ = 0, In t_t /y/ = 0,	virtual void FillRectangle(const char * /col/ = 0, Int_t /x/ = 0, In t_t /y/ = 0,
	UInt_t /width/ = 0, UInt_t /height/ = 0) {}	UInt_t /width/ = 0, UInt_t /height/ = 0) {}
	virtual void DrawPolyLine(UInt_t /nn/, TPoint * /xy/, const char * / col/ = "#000000",	virtual void DrawPolyLine(UInt_t /nn/, TPoint * /xy/, const char * / col/ = "#000000",
	UInt_t /thick/ = 1, TImage::ECoordMode /mod e/ = kCoordModeOrigin) {}	UInt_t /thick/ = 1, TImage::ECoordMode /mod e/ = kCoordModeOrigin) {}
	virtual void PutPixel(Int_t /x/, Int_t /y/, const char * /col/ = " #000000") {}	virtual void PutPixel(Int_t /x/, Int_t /y/, const char * /col/ = " #000000") {}
	virtual void PolyPoint(UInt_t /npt/, TPoint * /ppt/, const char * /* col*/ = "#000000",	virtual void PolyPoint(UInt_t /npt/, TPoint * /ppt/, const char * /* col*/ = "#000000",
	TImage::ECoordMode /mode/ = kCoordModeOrigin) { }	TImage::ECoordMode /mode/ = kCoordModeOrigin) { }
	virtual void DrawSegments(UInt_t /nseg/, Segment_t * /seg/, const ch ar * /col/ = "#000000", UInt_t /thick/ = 1) {}	virtual void DrawSegments(UInt_t /nseg/, Segment_t * /seg/, const ch ar * /col/ = "#000000", UInt_t /thick/ = 1) {}

		virtual void DrawText(Int_t /x/ = 0, Int_t /y/ = 0, const char * /*t
		ext/ = "", Int_t /size*/ = 12,
		const char * /color/ = 0, const char * /font/
		= "fixed",
		EText3DType /type/ = TImage::kPlain, const char
		* /fore_file/ = 0, Float_t /angle/ = 0) { }
		virtual void DrawText(TText * /text/, Int_t /x/ = 0, Int_t /y/ = 0
		) { }
	virtual void FillPolygon(UInt_t /npt/, TPoint * /ppt/, const char * /col/ = "#000000",	virtual void FillPolygon(UInt_t /npt/, TPoint * /ppt/, const char * /col/ = "#000000",
	const char * /stipple/ = 0, UInt_t /w/ = 16, UInt_t /h/ = 16) {}	const char * /stipple/ = 0, UInt_t /w/ = 16, UInt_t /h/ = 16) {}
	virtual void FillPolygon(UInt_t /npt/, TPoint * /ppt/, TImage * /ti le/) {}	virtual void FillPolygon(UInt_t /npt/, TPoint * /ppt/, TImage * /ti le/) {}
	virtual void CropPolygon(UInt_t /npt/, TPoint * /ppt/) {}	virtual void CropPolygon(UInt_t /npt/, TPoint * /ppt/) {}
	virtual void DrawFillArea(UInt_t /npt/, TPoint * /ppt/, const char * /col/ = "#000000",	virtual void DrawFillArea(UInt_t /npt/, TPoint * /ppt/, const char * /col/ = "#000000",
	const char * /stipple/ = 0, UInt_t /w/ = 16, UInt_t /h/ = 16) {}	const char * /stipple/ = 0, UInt_t /w/ = 16, UInt_t /h/ = 16) {}
	virtual void DrawFillArea(UInt_t /npt/, TPoint * /ppt/, TImage * /t ile/) {}	virtual void DrawFillArea(UInt_t /npt/, TPoint * /ppt/, TImage * /t ile/) {}
	virtual void FillSpans(UInt_t /npt/, TPoint * /ppt/, UInt_t * /widt hs/, const char * /col/ = "#000000",	virtual void FillSpans(UInt_t /npt/, TPoint * /ppt/, UInt_t * /widt hs/, const char * /col/ = "#000000",
	const char * /stipple/ = 0, UInt_t /w/ = 16, U Int_t /h/ = 16) {}	const char * /stipple/ = 0, UInt_t /w/ = 16, U Int_t /h/ = 16) {}
	virtual void FillSpans(UInt_t /npt/, TPoint * /ppt/, UInt_t * /widt hs/, TImage * /tile/) {}	virtual void FillSpans(UInt_t /npt/, TPoint * /ppt/, UInt_t * /widt hs/, TImage * /tile/) {}

	skipping to change at line 215	skipping to change at line 243
	virtual void FloodFill(Int_t /x/, Int_t /y/, const char * /col/, c onst char * /min_col/, const char * /max_col/ = 0) {}	virtual void FloodFill(Int_t /x/, Int_t /y/, const char * /col/, c onst char * /min_col/, const char * /max_col/ = 0) {}
	virtual void DrawCubeBezier(Int_t /x1/, Int_t /y1/, Int_t /x2/, In t_t /y2/, Int_t /x3/, Int_t /y3/, const char * /col/ = "#000000", U Int_t /thick/ = 1) {}	virtual void DrawCubeBezier(Int_t /x1/, Int_t /y1/, Int_t /x2/, In t_t /y2/, Int_t /x3/, Int_t /y3/, const char * /col/ = "#000000", U Int_t /thick/ = 1) {}
	virtual void DrawStraightEllips(Int_t /x/, Int_t /y/, Int_t /rx/, Int_t /ry/, const char * /col/ = "#000000", Int_t /thick/ = 1) {}	virtual void DrawStraightEllips(Int_t /x/, Int_t /y/, Int_t /rx/, Int_t /ry/, const char * /col/ = "#000000", Int_t /thick/ = 1) {}
	virtual void DrawCircle(Int_t /x/, Int_t /y/, Int_t /r/, const cha r * /col/ = "#000000", Int_t /thick/ = 1) {}	virtual void DrawCircle(Int_t /x/, Int_t /y/, Int_t /r/, const cha r * /col/ = "#000000", Int_t /thick/ = 1) {}
	virtual void DrawEllips(Int_t /x/, Int_t /y/, Int_t /rx/, Int_t /* ry/, Int_t /angle/, const char /col/ = "#000000", Int_t /thick/ = 1) {}	virtual void DrawEllips(Int_t /x/, Int_t /y/, Int_t /rx/, Int_t /* ry/, Int_t /angle/, const char /col/ = "#000000", Int_t /thick/ = 1) {}
	virtual void DrawEllips2(Int_t /x/, Int_t /y/, Int_t /rx/, Int_t / ry/, Int_t /angle/, const char * /col/ = "#000000", Int_t /thick/ = 1) {}	virtual void DrawEllips2(Int_t /x/, Int_t /y/, Int_t /rx/, Int_t / ry/, Int_t /angle/, const char * /col/ = "#000000", Int_t /thick/ = 1) {}

	virtual void SetEditable(Bool_t /on/ = kTRUE) {}	virtual void SetEditable(Bool_t /on/ = kTRUE) {}
	virtual Bool_t IsEditable() const { return kFALSE; }	virtual Bool_t IsEditable() const { return kFALSE; }


	// Utilities
	virtual UInt_t GetWidth() const { return 0; }	virtual UInt_t GetWidth() const { return 0; }
	virtual UInt_t GetHeight() const { return 0; }	virtual UInt_t GetHeight() const { return 0; }
	virtual Bool_t IsValid() const { return kTRUE; }	virtual Bool_t IsValid() const { return kTRUE; }
	virtual TImage *GetScaledImage() const { return 0; }	virtual TImage *GetScaledImage() const { return 0; }

	virtual TArrayL GetPixels(Int_t /x/= 0, Int_t /y/= 0, UInt_t /w/ = 0, UInt_t /h*/ = 0) { return 0; }	virtual TArrayL GetPixels(Int_t /x/= 0, Int_t /y/= 0, UInt_t /w/ = 0, UInt_t /h*/ = 0) { return 0; }
	virtual TArrayD GetArray(UInt_t /w/ = 0, UInt_t /h/ = 0, TImagePal ette = gWebImagePalette) { return 0; }	virtual TArrayD GetArray(UInt_t /w/ = 0, UInt_t /h/ = 0, TImagePal ette = gWebImagePalette) { return 0; }
	virtual Pixmap_t GetPixmap() { return 0; }	virtual Pixmap_t GetPixmap() { return 0; }
	virtual Pixmap_t GetMask() { return 0; }	virtual Pixmap_t GetMask() { return 0; }
	virtual UInt_t *GetArgbArray() { return 0; }	virtual UInt_t *GetArgbArray() { return 0; }

End of changes. 24 change blocks.
	16 lines changed or deleted	44 lines changed or added

	TIndArray.h	TIndArray.h

	// @(#)root/tree:$Id: TIndArray.h 21861 2008-01-26 09:47:41Z brun $	// @(#)root/tree:$Id: TIndArray.h 30815 2009-10-20 13:49:22Z rdm $
	// Author: Lukasz Janyst <ljanyst@cern.ch> 23/01/2008	// Author: Lukasz Janyst <ljanyst@cern.ch> 23/01/2008

	//------------------------------------------------------------------------- -----	//------------------------------------------------------------------------- -----
	// file: TIndArray.h	// file: TIndArray.h
	//------------------------------------------------------------------------- -----	//------------------------------------------------------------------------- -----

	#ifndef ROOT_TIndArray	#ifndef ROOT_TIndArray
	#define ROOT_TIndArray	#define ROOT_TIndArray


		#ifndef ROOT_Rtypes
		#include "Rtypes.h"
		#endif

	class TIndArray	class TIndArray
	{	{
	public:	public:
	TIndArray():	TIndArray():
	fElems( 0 ), fCapacity( 0 ), fArr( 0 ) {};	fElems( 0 ), fCapacity( 0 ), fArr( 0 ) {};

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

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

	TMatrixDBasefwd.h	TMatrixDBasefwd.h

	// @(#)root/matrix:$Id: TMatrixDBasefwd.h 20882 2007-11-19 11:31:26Z rdm $	// @(#)root/matrix:$Id: TMatrixDBasefwd.h 30815 2009-10-20 13:49:22Z rdm $
	/*************************************************************************	/*************************************************************************
	* 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_TMatrixDBasefwd	#ifndef ROOT_TMatrixDBasefwd
	#define ROOT_TMatrixDBasefwd	#define ROOT_TMatrixDBasefwd

	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////
	// //	// //
	// TMatrixDBase //	// TMatrixDBase //
	// //	// //
	// Forward declaration of TMatrixTBase<Double_t> //	// Forward declaration of TMatrixTBase<Double_t> //
	// //	// //
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////


		#ifndef ROOT_Rtypes
		#include "Rtypes.h"
		#endif

	template<class Element> class TMatrixTBase;	template<class Element> class TMatrixTBase;
	typedef TMatrixTBase<Double_t> TMatrixDBase;	typedef TMatrixTBase<Double_t> TMatrixDBase;

	#endif	#endif

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

	TMatrixDSparsefwd.h	TMatrixDSparsefwd.h

	skipping to change at line 20	skipping to change at line 20
	#define ROOT_TMatrixDSparsefwd	#define ROOT_TMatrixDSparsefwd

	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////
	// //	// //
	// TMatrixDSparse //	// TMatrixDSparse //
	// //	// //
	// Forward declaration of TMatrixTSparse<Double_t> //	// Forward declaration of TMatrixTSparse<Double_t> //
	// //	// //
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////


		#ifndef ROOT_Rtypes
		#include "Rtypes.h"
		#endif

	template<class Element> class TMatrixTSparse;	template<class Element> class TMatrixTSparse;
	typedef TMatrixTSparse<Double_t> TMatrixDSparse;	typedef TMatrixTSparse<Double_t> TMatrixDSparse;

	#endif	#endif

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

	TMatrixDSymfwd.h	TMatrixDSymfwd.h

	skipping to change at line 20	skipping to change at line 20
	#define ROOT_TMatrixDSymfwd	#define ROOT_TMatrixDSymfwd

	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////
	// //	// //
	// TMatrixDSym //	// TMatrixDSym //
	// //	// //
	// Forward declaration of TMatrixTSym<Double_t> //	// Forward declaration of TMatrixTSym<Double_t> //
	// //	// //
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////


		#ifndef ROOT_Rtypes
		#include "Rtypes.h"
		#endif

	template<class Element> class TMatrixTSym;	template<class Element> class TMatrixTSym;
	typedef TMatrixTSym<Double_t> TMatrixDSym;	typedef TMatrixTSym<Double_t> TMatrixDSym;

	#endif	#endif

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

	TMatrixFBasefwd.h	TMatrixFBasefwd.h

	// @(#)root/matrix:$Id: TMatrixFBasefwd.h 20882 2007-11-19 11:31:26Z rdm $	// @(#)root/matrix:$Id: TMatrixFBasefwd.h 30815 2009-10-20 13:49:22Z rdm $
	/*************************************************************************	/*************************************************************************
	* 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_TMatrixFBasefwd	#ifndef ROOT_TMatrixFBasefwd
	#define ROOT_TMatrixFBasefwd	#define ROOT_TMatrixFBasefwd

	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////
	// //	// //
	// TMatrixFBase //	// TMatrixFBase //
	// //	// //
	// Forward declaration of TMatrixTBase<Float_t> //	// Forward declaration of TMatrixTBase<Float_t> //
	// //	// //
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////


		#ifndef ROOT_Rtypes
		#include "Rtypes.h"
		#endif

	template<class Element> class TMatrixTBase;	template<class Element> class TMatrixTBase;
	typedef TMatrixTBase<Float_t> TMatrixFBase;	typedef TMatrixTBase<Float_t> TMatrixFBase;

	#endif	#endif

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

	TMatrixFSparsefwd.h	TMatrixFSparsefwd.h

	skipping to change at line 20	skipping to change at line 20
	#define ROOT_TMatrixFSparsefwd	#define ROOT_TMatrixFSparsefwd

	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////
	// //	// //
	// TMatrixFSparse //	// TMatrixFSparse //
	// //	// //
	// Forward declaration of TMatrixTSparse<Float_t> //	// Forward declaration of TMatrixTSparse<Float_t> //
	// //	// //
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////


		#ifndef ROOT_Rtypes
		#include "Rtypes.h"
		#endif

	template<class Element> class TMatrixTSparse;	template<class Element> class TMatrixTSparse;
	typedef TMatrixTSparse<Float_t> TMatrixFSparse;	typedef TMatrixTSparse<Float_t> TMatrixFSparse;

	#endif	#endif

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

	TMatrixFSymfwd.h	TMatrixFSymfwd.h

	skipping to change at line 20	skipping to change at line 20
	#define ROOT_TMatrixFSymfwd	#define ROOT_TMatrixFSymfwd

	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////
	// //	// //
	// TMatrixFSym //	// TMatrixFSym //
	// //	// //
	// Forward declaration of TMatrixTSym<Float_t> //	// Forward declaration of TMatrixTSym<Float_t> //
	// //	// //
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////


		#ifndef ROOT_Rtypes
		#include "Rtypes.h"
		#endif

	template<class Element> class TMatrixTSym;	template<class Element> class TMatrixTSym;
	typedef TMatrixTSym<Float_t> TMatrixFSym;	typedef TMatrixTSym<Float_t> TMatrixFSym;

	#endif	#endif

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

	TMatrixFfwd.h	TMatrixFfwd.h

	skipping to change at line 20	skipping to change at line 20
	#define ROOT_TMatrixFfwd	#define ROOT_TMatrixFfwd

	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////
	// //	// //
	// TMatrixF //	// TMatrixF //
	// //	// //
	// Forward declaration of TMatrixT<Float_t> //	// Forward declaration of TMatrixT<Float_t> //
	// //	// //
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////


		#ifndef ROOT_Rtypes
		#include "Rtypes.h"
		#endif

	template<class Element> class TMatrixT;	template<class Element> class TMatrixT;
	typedef TMatrixT<Float_t> TMatrixF;	typedef TMatrixT<Float_t> TMatrixF;

	#endif	#endif

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

	TMemStat.h	TMemStat.h

	// @(#)root/memstat:$Name$:$Id: TMemStat.h 29410 2009-07-09 12:10:09Z brun $	// @(#)root/memstat:$Name$:$Id: TMemStat.h 30815 2009-10-20 13:49:22Z rdm $
	// Author: D.Bertini and M.Ivanov 18/06/2007 -- Anar Manafov (A.Manafov@g si.de) 28/04/2008	// Author: D.Bertini and M.Ivanov 18/06/2007 -- Anar Manafov (A.Manafov@g si.de) 28/04/2008

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOT_TMEMSTAT
	#define ROOT_TMEMSTAT	#ifndef ROOT_TMemStat
		#define ROOT_TMemStat

	// STD	// STD
	#include <memory>	#include <memory>
	#include <vector>	#include <vector>
	#include <set>	#include <set>
	// ROOT	// ROOT

		#ifndef ROOT_TString
	#include "TString.h"	#include "TString.h"

		#endif
		#ifndef ROOT_TObjArray
	#include "TObjArray.h"	#include "TObjArray.h"

		#endif
		#ifndef ROOT_TFile
	#include "TFile.h"	#include "TFile.h"

		#endif
		#ifndef ROOT_TObjString
	#include "TObjString.h"	#include "TObjString.h"

		#endif

	class TArrayI;	class TArrayI;
	class TBits;	class TBits;
	class TTree;	class TTree;
	class TMemStatManager;	class TMemStatManager;
	class TGraph;	class TGraph;
	class TMemStatCodeInfo;	class TMemStatCodeInfo;
	class TMemStatInfoStamp;	class TMemStatInfoStamp;

	typedef std::vector<UInt_t> UIntVector_t;	typedef std::vector<UInt_t> UIntVector_t;

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

	TMemStatDepend.h	TMemStatDepend.h

	// @(#)root/memstat:$Name$:$Id: TMemStatDepend.h 24658 2008-07-04 09:06:58Z anar $	// @(#)root/memstat:$Name$:$Id: TMemStatDepend.h 30815 2009-10-20 13:49:22Z rdm $
	// Author: M.Ivanov 18/06/2007 -- Anar Manafov (A.Manafov@gsi.de) 28/04/2 008	// Author: M.Ivanov 18/06/2007 -- Anar Manafov (A.Manafov@gsi.de) 28/04/2 008

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOT_TMEMSTATDEPEND
	#define ROOT_TMEMSTATDEPEND	#ifndef ROOT_TMemStatDepend
		#define ROOT_TMemStatDepend

		#if !defined(__CINT__)
		#include <sys/types.h>
		#endif
		#ifndef ROOT_Rtypes
		#include "Rtypes.h"
		#endif

	//	//
	// TMemStatDepend	// TMemStatDepend
	// Non standard C++ functions	// Non standard C++ functions
	// Needed for memory statistic	// Needed for memory statistic

	#define _INIT_TOP_STECK extern void *g_global_stack_end;	#define _INIT_TOP_STECK extern void *g_global_stack_end;
	#define _GET_TO_STECK g_global_stack_end = __builtin_frame_address(1);	#define _GET_TO_STECK g_global_stack_end = __builtin_frame_address(1);

	class TString;	class TString;

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

	TMemStatDrawDlg.h	TMemStatDrawDlg.h

	// @(#)root/memstat:$Name$:$Id: TMemStatDrawDlg.h 24371 2008-06-19 12:48:36 Z anar $	// @(#)root/memstat:$Name$:$Id: TMemStatDrawDlg.h 30815 2009-10-20 13:49:22 Z rdm $
	// Author: Anar Manafov (A.Manafov@gsi.de) 31/05/2008	// Author: Anar Manafov (A.Manafov@gsi.de) 31/05/2008

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef _ROOT_TMEMSTATDRAWDLG_H
	#define _ROOT_TMEMSTATDRAWDLG_H	#ifndef ROOT_TMemStatDrawDlg
		#define ROOT_TMemStatDrawDlg

	// STD	// STD
	#include <vector>	#include <vector>
	#include <string>	#include <string>
	// ROOT	// ROOT

		#ifndef ROOT_RQ_OBJECT
	#include "RQ_OBJECT.h"	#include "RQ_OBJECT.h"

		#endif
		#ifndef ROOT_TGFrame
	#include "TGFrame.h"	#include "TGFrame.h"

		#endif

	class TMemStat;	class TMemStat;
	class TGComboBox;	class TGComboBox;
	class TGNumberEntry;	class TGNumberEntry;
	class TRootEmbeddedCanvas;	class TRootEmbeddedCanvas;

	typedef std::vector<std::string> StringVector_t;	typedef std::vector<std::string> StringVector_t;

	class TMemStatDrawDlg	class TMemStatDrawDlg
	{	{

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

	TMemStatHelpers.h	TMemStatHelpers.h

	// @(#)root/memstat:$Name$:$Id: TMemStatHelpers.h 24366 2008-06-19 09:50:29 Z anar $	// @(#)root/memstat:$Name$:$Id: TMemStatHelpers.h 30815 2009-10-20 13:49:22 Z rdm $
	// Author: Anar Manafov (A.Manafov@gsi.de) 09/05/2008	// Author: Anar Manafov (A.Manafov@gsi.de) 09/05/2008

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOT_HELPERS_
	#define ROOT_HELPERS_	#ifndef ROOT_TMemStatHelpers
		#define ROOT_TMemStatHelpers

	// ROOT	// ROOT

		#ifndef ROOT_TString
	#include "TString.h"	#include "TString.h"

		#endif
		#ifndef ROOT_TObjString
	#include "TObjString.h"	#include "TObjString.h"

		#endif
		#ifndef ROOT_TCollection
	#include "TCollection.h"	#include "TCollection.h"

		#endif
	// STD	// STD
	#include <string>	#include <string>
	#include <functional>	#include <functional>
	#include <algorithm>	#include <algorithm>
	#include <cctype>	#include <cctype>

	class TObject;	class TObject;

	namespace Memstat	namespace Memstat
	{	{

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

	TMemStatInfo.h	TMemStatInfo.h

	// @(#)root/memstat:$Name$:$Id: TMemStatInfo.h 24658 2008-07-04 09:06:58Z a nar $	// @(#)root/memstat:$Name$:$Id: TMemStatInfo.h 30815 2009-10-20 13:49:22Z r dm $
	// Author: D.Bertini and M.Ivanov 18/06/2007 -- Anar Manafov (A.Manafov@g si.de) 28/04/2008	// Author: D.Bertini and M.Ivanov 18/06/2007 -- Anar Manafov (A.Manafov@g si.de) 28/04/2008

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOT_TMEMSTATINFO
	#define ROOT_TMEMSTATINFO	#ifndef ROOT_TMemStatInfo
		#define ROOT_TMemStatInfo

	//*********************************************************************** *//	//*********************************************************************** *//
	//	//
	//	//
	// Memory statistic information	// Memory statistic information
	// TMemStatInfoStamp	// TMemStatInfoStamp
	// TMemStatCodeInfo	// TMemStatCodeInfo
	// TMemStatStackInfo	// TMemStatStackInfo
	//*********************************************************************** *//	//*********************************************************************** *//

	// STD	// STD
	#include <iosfwd>	#include <iosfwd>
	#include <iomanip>	#include <iomanip>
	#include <sstream>	#include <sstream>
	//ROOT	//ROOT

		#ifndef ROOT_TROOT
	#include "TROOT.h"	#include "TROOT.h"

	#include "TObject.h"	#endif
	// Memstat	// Memstat

		#ifndef ROOT_TMemStatHelpers
	#include "TMemStatHelpers.h"	#include "TMemStatHelpers.h"

		#endif

	class TMemStatStackInfo;	class TMemStatStackInfo;
	class TMemStatManager;	class TMemStatManager;

	const int fields_length[] = {18, 15, 19, 12, 8};	const int fields_length[] = {18, 15, 19, 12, 8};

	class TMemStatInfoStamp: public TObject	class TMemStatInfoStamp: public TObject
	{	{
	public:	public:
	enum EStampType { kCode, kStack };	enum EStampType { kCode, kStack };

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

	TMemStatManager.h	TMemStatManager.h

	// @(#)root/memstat:$Name$:$Id: TMemStatManager.h 24658 2008-07-04 09:06:58 Z anar $	// @(#)root/memstat:$Name$:$Id: TMemStatManager.h 30815 2009-10-20 13:49:22 Z rdm $
	// Author: D.Bertini and M.Ivanov 18/06/2007 -- Anar Manafov (A.Manafov@g si.de) 28/04/2008	// Author: D.Bertini and M.Ivanov 18/06/2007 -- Anar Manafov (A.Manafov@g si.de) 28/04/2008

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOT_TMEMSTATMANAGER
	#define ROOT_TMEMSTATMANAGER	#ifndef ROOT_TMemStatManager
		#define ROOT_TMemStatManager

	//*********************************************************************** *//	//*********************************************************************** *//
	//	//
	// TMemStatManager	// TMemStatManager
	// Memory statistic manager class	// Memory statistic manager class
	//	//
	//*********************************************************************** *//	//*********************************************************************** *//
	// STD	// STD
	#include <map>	#include <map>
	#include <vector>	#include <vector>
	#include <memory>	#include <memory>
	#include <cstdlib>	#include <cstdlib>
	// ROOT	// ROOT

		#ifndef ROOT_TObject
	#include "TObject.h"	#include "TObject.h"

		#endif
		#ifndef ROOT_TTimeStamp
	#include "TTimeStamp.h"	#include "TTimeStamp.h"

		#endif
	// Memstat	// Memstat

		#ifndef ROOT_TMemStatDepend
	#include "TMemStatDepend.h"	#include "TMemStatDepend.h"

		#endif
		#ifndef ROOT_TmemStatInfo
	#include "TMemStatInfo.h"	#include "TMemStatInfo.h"

		#endif

	class TTree;	class TTree;
	class TMemStatStackInfo;	class TMemStatStackInfo;

	typedef std::vector<Int_t> IntVector_t;	typedef std::vector<Int_t> IntVector_t;
	typedef std::auto_ptr<TFile> TFilePtr_t;	typedef std::auto_ptr<TFile> TFilePtr_t;

	class TMemStatManager: public TObject	class TMemStatManager: public TObject
	{	{
	struct TMemInfo_t {	struct TMemInfo_t {

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

	TMemStatResource.h	TMemStatResource.h

	// @(#)root/memstat:$Name$:$Id: TMemStatResource.h 24354 2008-06-18 16:10:1 8Z anar $	// @(#)root/memstat:$Name$:$Id: TMemStatResource.h 30815 2009-10-20 13:49:2 2Z rdm $
	// Author: Anar Manafov (A.Manafov@gsi.de) 30/05/2008	// Author: Anar Manafov (A.Manafov@gsi.de) 30/05/2008

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOT_MEMSTAT_RESOURCE_
	#define ROOT_MEMSTAT_RESOURCE_	#ifndef ROOT_TMemStatResource
		#define ROOT_TMemStatResource

	// radio buttons of SortStat IDs	// radio buttons of SortStat IDs
	#define rbtnTotalAllocCount 30	#define rbtnTotalAllocCount 30
	#define rbtnTotalAllocSize 31	#define rbtnTotalAllocSize 31
	#define rbtnAllocCount 32	#define rbtnAllocCount 32
	#define rbtnAllocSize 33	#define rbtnAllocSize 33

	// radio buttons of SortStamp IDs	// radio buttons of SortStamp IDs
	#define rbtnCurrent 40	#define rbtnCurrent 40
	#define rbtnMaxSize 41	#define rbtnMaxSize 41

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

	TMemStatViewerGUI.h	TMemStatViewerGUI.h

	// @(#)root/memstat:$Name$:$Id: TMemStatViewerGUI.h 24658 2008-07-04 09:06: 58Z anar $	// @(#)root/memstat:$Name$:$Id: TMemStatViewerGUI.h 30815 2009-10-20 13:49: 22Z rdm $
	// Author: M.Ivanov -- Anar Manafov (A.Manafov@gsi.de) 28/04/2008	// Author: M.Ivanov -- Anar Manafov (A.Manafov@gsi.de) 28/04/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. *
	*************************************************************************/	*************************************************************************/

	/////////////////////////////////////////////////////////////////////////// ////	/////////////////////////////////////////////////////////////////////////// ////
	// //	// //
	// GUI for the AliTPCCalibViewer //	// GUI for the AliTPCCalibViewer //
	// used for the calibration monitor //	// used for the calibration monitor //
	// //	// //
	/////////////////////////////////////////////////////////////////////////// ////	/////////////////////////////////////////////////////////////////////////// ////

	#ifndef ALITPCCALIBVIEWERGUI
	#define ALITPCCALIBVIEWERGUI	#ifndef ROOT_TMemStatViewerGUI
		#define ROOT_TMemStatViewerGUI

	// STD	// STD
	#include <string>	#include <string>
	#include <memory>	#include <memory>
	// ROOT	// ROOT

		#ifndef ROOT_TGFrame
	#include "TGFrame.h"	#include "TGFrame.h"

		#endif


		class TMemStat;
	class TGTextView;	class TGTextView;
	class TGNumberEntry;	class TGNumberEntry;
	class TGComboBox;	class TGComboBox;

	class TMemStatViewerGUI : public TGCompositeFrame	class TMemStatViewerGUI : public TGCompositeFrame
	{	{
	protected:	protected:
	TMemStat *fViewer; // CalibViewer object used for drawing	TMemStat *fViewer; // CalibViewer object used for drawing
	TGTextView *fText; // text widget	TGTextView *fText; // text widget
	TGNumberEntry *fNmbStackDeep; // number entry box for spe cifying the stack deepness	TGNumberEntry *fNmbStackDeep; // number entry box for spe cifying the stack deepness

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

	TMinuitMinimizer.h	TMinuitMinimizer.h

	// @(#)root/minuit:$Id: TMinuitMinimizer.h 28946 2009-06-11 15:39:14Z monet a $	// @(#)root/minuit:$Id: TMinuitMinimizer.h 31181 2009-11-16 11:00:58Z monet a $
	// Author: L. Moneta Wed Oct 25 16:28:55 2006	// Author: L. Moneta Wed Oct 25 16:28:55 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 TMinuitMinimizer	// Header file for class TMinuitMinimizer

	skipping to change at line 176	skipping to change at line 176
	find the contour points (xi,xj) of the function for parameter i and j around the minimum	find the contour points (xi,xj) of the function for parameter i and j around the minimum
	The contour will be find for value of the function = Min + ErrorUp();	The contour will be find for value of the function = Min + ErrorUp();
	*/	*/
	virtual bool Contour(unsigned int i, unsigned int j, unsigned int & npoi nts, double xi, double xj);	virtual bool Contour(unsigned int i, unsigned int j, unsigned int & npoi nts, double xi, double xj);

	virtual void PrintResults();	virtual void PrintResults();

	/// return reference to the objective function	/// return reference to the objective function
	///virtual const ROOT::Math::IGenFunction & Function() const;	///virtual const ROOT::Math::IGenFunction & Function() const;


		/// get name of variables (override if minimizer support storing of vari
		able names)
		virtual std::string VariableName(unsigned int ivar) const;

		/// get index of variable given a variable given a name
		/// return always -1 . (It is Not implemented)
		virtual int VariableIndex(const std::string & name) const;

	protected:	protected:

	/// implementation of FCN for Minuit	/// implementation of FCN for Minuit
	static void Fcn( int &, double * , double & f, double * , int);	static void Fcn( int &, double * , double & f, double * , int);
	/// implementation of FCN for Minuit when user provided gradient is used	/// implementation of FCN for Minuit when user provided gradient is used
	static void FcnGrad( int &, double * g, double & f, double * , int);	static void FcnGrad( int &, double * g, double & f, double * , int);

	/// reset	/// reset
	void DoClear();	void DoClear();


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

	TPacketizer.h	TPacketizer.h

	skipping to change at line 93	skipping to change at line 93
	void ValidateFiles(TDSet dset, TList slaves);	void ValidateFiles(TDSet dset, TList slaves);

	public:	public:
	TPacketizer(TDSet dset, TList slaves, Long64_t first, Long64_t num,	TPacketizer(TDSet dset, TList slaves, Long64_t first, Long64_t num,
	TList input, TProofProgressStatus st);	TList input, TProofProgressStatus st);
	virtual ~TPacketizer();	virtual ~TPacketizer();

	TDSetElement GetNextPacket(TSlave sl, TMessage *r);	TDSetElement GetNextPacket(TSlave sl, TMessage *r);
	Long64_t GetEntriesProcessed(TSlave *sl) const;	Long64_t GetEntriesProcessed(TSlave *sl) const;


		Float_t GetCurrentRate(Bool_t &all);
		Int_t GetActiveWorkers();

	ClassDef(TPacketizer,0) //Generate work packets for parallel processing	ClassDef(TPacketizer,0) //Generate work packets for parallel processing
	};	};

	#endif	#endif

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

	TPacketizerUnit.h	TPacketizerUnit.h

	// @(#)root/proofplayer:$Id: TPacketizerUnit.h 25896 2008-10-20 17:01:31Z g anis $	// @(#)root/proofplayer:$Id: TPacketizerUnit.h 30870 2009-10-26 15:16:00Z g anis $
	// Author: Long Tran-Thanh 22/07/07	// Author: Long Tran-Thanh 22/07/07

	/*************************************************************************	/*************************************************************************
	* 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 30	skipping to change at line 30
	// number of times an operation cycle has to be repeated by the worker //	// number of times an operation cycle has to be repeated by the worker //
	// node, e.g. the number of Monte carlo events to be generated. //	// node, e.g. the number of Monte carlo events to be generated. //
	// Packets sizes are generated taking into account the performance of //	// Packets sizes are generated taking into account the performance of //
	// worker nodes, based on the time needed to process previous packets. //	// worker nodes, based on the time needed to process previous packets. //
	// //	// //
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////

	#ifndef ROOT_TVirtualPacketizer	#ifndef ROOT_TVirtualPacketizer
	#include "TVirtualPacketizer.h"	#include "TVirtualPacketizer.h"
	#endif	#endif

		#ifndef ROOT_TMap
		#include "TMap.h"
		#endif

	class TMessage;	class TMessage;
	class TTimer;	class TTimer;
	class TTree;	class TTree;

	class TMap;
	class TProofStats;	class TProofStats;
	class TStopwatch;	class TStopwatch;

	class TPacketizerUnit : public TVirtualPacketizer {	class TPacketizerUnit : public TVirtualPacketizer {

	public: // public because of Sun CC bug	public: // public because of Sun CC bug
	class TSlaveStat;	class TSlaveStat;

	private:	private:
	TList *fPackets; // all processed packets	TList *fPackets; // all processed packets

	skipping to change at line 72	skipping to change at line 74
	void operator=(const TPacketizerUnit&); // error on accidental usage	void operator=(const TPacketizerUnit&); // error on accidental usage

	public:	public:
	TPacketizerUnit(TList slaves, Long64_t num, TList input, TProofProgres sStatus *st = 0);	TPacketizerUnit(TList slaves, Long64_t num, TList input, TProofProgres sStatus *st = 0);
	virtual ~TPacketizerUnit();	virtual ~TPacketizerUnit();

	TDSetElement GetNextPacket(TSlave sl, TMessage *r);	TDSetElement GetNextPacket(TSlave sl, TMessage *r);

	Double_t GetCurrentTime();	Double_t GetCurrentTime();


		Float_t GetCurrentRate(Bool_t &all);
		Int_t GetActiveWorkers() { return fSlaveStats->GetSize(); }

	ClassDef(TPacketizerUnit,0) //Generate work packets for parallel proces sing	ClassDef(TPacketizerUnit,0) //Generate work packets for parallel proces sing
	};	};

	#endif	#endif

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

	TPieEditor.h	TPieEditor.h

	skipping to change at line 34	skipping to change at line 34
	#endif	#endif

	class TPie;	class TPie;
	class TGButtonGroup;	class TGButtonGroup;
	class TGTextEntry;	class TGTextEntry;
	class TGCheckButton;	class TGCheckButton;
	class TGRadioButton;	class TGRadioButton;
	class TGNumberEntry;	class TGNumberEntry;
	class TGColorSelect;	class TGColorSelect;
	class TGFontTypeComboBox;	class TGFontTypeComboBox;

	class TGComboox;	class TGCombox;

	class TPieEditor : public TGedFrame {	class TPieEditor : public TGedFrame {

	protected:	protected:
	char fDrawShape; // Shape of the Graph (simple, smooth , bar)	char fDrawShape; // Shape of the Graph (simple, smooth , bar)
	TGTextEntry *fTitle; // Contains the title of the graph	TGTextEntry *fTitle; // Contains the title of the graph
	Int_t fTitlePrec; // font precision level	Int_t fTitlePrec; // font precision level
	TPie *fPie; // Pie object	TPie *fPie; // Pie object
	TGButtonGroup *fgr; // Group the Radiobuttons:	TGButtonGroup *fgr; // Group the Radiobuttons:
	TGRadioButton *fLblDirH; // Draw slice's labels horizontal	TGRadioButton *fLblDirH; // Draw slice's labels horizontal

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

	TProof.h	TProof.h

	// @(#)root/proof:$Id: TProof.h 30174 2009-09-15 14:24:56Z ganis $	// @(#)root/proof:$Id: TProof.h 30995 2009-11-05 17:41:03Z 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 120	skipping to change at line 120
	// 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	// 20 -> 21: Add support for session queuing
	// 21 -> 22: Add support for switching from sync to async while running ('C trl-Z' functionality)	// 21 -> 22: Add support for switching from sync to async while running ('C trl-Z' functionality)
	// 22 -> 23: New dataset features (default tree name; classification per fi leserver)	// 22 -> 23: New dataset features (default tree name; classification per fi leserver)
	// 23 -> 24: Merging optimization	// 23 -> 24: Merging optimization
	// 24 -> 25: Handling of 'data' dir; group information	// 24 -> 25: Handling of 'data' dir; group information

		// 25 -> 26: Use new TProofProgressInfo class

	// PROOF magic constants	// PROOF magic constants

	const Int_t kPROOF_Protocol = 25; // protocol versi on number	const Int_t kPROOF_Protocol = 26; // 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_DataDir = "data"; // dir for produc ed data, under WorkDir	const char* const kPROOF_DataDir = "data"; // dir for produc ed data, under WorkDir
	const char* const kPROOF_CacheLockFile = "proof-cache-lock-"; // cache lock file	const char* const kPROOF_CacheLockFile = "proof-cache-lock-"; // cache lock file

	skipping to change at line 160	skipping to change at line 161
	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);


		// Structure for the progress information
		class TProofProgressInfo : public TObject {
		public:
		Long64_t fTotal; // Total number of events to process
		Long64_t fProcessed; // Number of events processed
		Long64_t fBytesRead; // Number of bytes read
		Float_t fInitTime; // Time for initialization
		Float_t fProcTime; // Time for processing
		Float_t fEvtRateI; // Instantaneous event rate
		Float_t fMBRateI; // Instantaneous byte read rate
		Int_t fActWorkers; // Numebr of workers still active
		Int_t fTotSessions; // Numebr of PROOF sessions running currently on
		the clusters
		Float_t fEffSessions; // Number of effective sessions running on the m
		achines allocated to this session
		TProofProgressInfo(Long64_t tot = 0, Long64_t proc = 0, Long64_t bytes =
		0,
		Float_t initt = -1., Float_t proct = -1.,
		Float_t evts = -1., Float_t mbs = -1.,
		Int_t actw = 0, Int_t tsess = 0, Float_t esess = 0.)
		:
		fTotal(tot), fProcessed(proc), fBytesRead(bytes),
		fInitTime(initt), fProcTime(proct), fEvtRateI(evts),
		fMBRateI(mbs),
		fActWorkers(actw), fTotSessions(tsess), fEffSessions(
		esess) { }
		virtual ~TProofProgressInfo() { }
		ClassDef(TProofProgressInfo, 1); // Progress information
		};

	// PROOF Interrupt signal handler	// PROOF Interrupt signal handler
	class TProofInterruptHandler : public TSignalHandler {	class TProofInterruptHandler : public TSignalHandler {
	private:	private:
	TProof *fProof;	TProof *fProof;

	TProofInterruptHandler(const TProofInterruptHandler&); // Not implemente d	TProofInterruptHandler(const TProofInterruptHandler&); // Not implemente d
	TProofInterruptHandler& operator=(const TProofInterruptHandler&); // Not implemented	TProofInterruptHandler& operator=(const TProofInterruptHandler&); // Not implemented
	public:	public:
	TProofInterruptHandler(TProof *p)	TProofInterruptHandler(TProof *p)
	: TSignalHandler(kSigInterrupt, kFALSE), fProof(p) { }	: TSignalHandler(kSigInterrupt, kFALSE), fProof(p) { }

	skipping to change at line 196	skipping to change at line 221

	// Slaves info class	// Slaves info class
	class TSlaveInfo : public TObject {	class TSlaveInfo : public TObject {
	public:	public:
	enum ESlaveStatus { kActive, kNotActive, kBad };	enum ESlaveStatus { kActive, kNotActive, kBad };

	TString fOrdinal; //slave ordinal	TString fOrdinal; //slave ordinal
	TString fHostName; //hostname this slave is running on	TString fHostName; //hostname this slave is running on
	TString fMsd; //mass storage domain slave is in	TString fMsd; //mass storage domain slave is in
	Int_t fPerfIndex; //relative performance of this slave	Int_t fPerfIndex; //relative performance of this slave

		SysInfo_t fSysInfo; //Infomation about its hardware
	ESlaveStatus fStatus; //slave status	ESlaveStatus fStatus; //slave status

	TSlaveInfo(const char ordinal = "", const char host = "", Int_t perfid x = 0,	TSlaveInfo(const char ordinal = "", const char host = "", Int_t perfid x = 0,
	const char *msd = "") :	const char *msd = "") :
	fOrdinal(ordinal), fHostName(host), fMsd(msd),	fOrdinal(ordinal), fHostName(host), fMsd(msd),

	fPerfIndex(perfidx), fStatus(kNotActive) { }	fPerfIndex(perfidx), fSysInfo(), fStatus(kNotActive) { }

	const char *GetMsd() const { return fMsd; }	const char *GetMsd() const { return fMsd; }
	const char *GetName() const { return fHostName; }	const char *GetName() const { return fHostName; }
	const char *GetOrdinal() const { return fOrdinal; }	const char *GetOrdinal() const { return fOrdinal; }

		SysInfo_t GetSysInfo() const { return fSysInfo; }
	void SetStatus(ESlaveStatus stat) { fStatus = stat; }	void SetStatus(ESlaveStatus stat) { fStatus = stat; }

		void SetSysInfo(SysInfo_t si);

	Int_t Compare(const TObject *obj) const;	Int_t Compare(const TObject *obj) const;
	Bool_t IsSortable() const { return kTRUE; }	Bool_t IsSortable() const { return kTRUE; }
	void Print(Option_t *option="") const;	void Print(Option_t *option="") const;


	ClassDef(TSlaveInfo,2) //basic info on slave	ClassDef(TSlaveInfo,3) //basic info on slave
	};	};

	// Small auxilliary class for merging progress notification	// Small auxilliary class for merging progress notification
	class TProofMergePrg {	class TProofMergePrg {
	private:	private:
	TString fExp;	TString fExp;
	Int_t fIdx;	Int_t fIdx;
	Int_t fNWrks;	Int_t fNWrks;
	static char fgCr[4];	static char fgCr[4];
	public:	public:

	TProofMergePrg() : fIdx(-1), fNWrks(-1) { }	TProofMergePrg() : fExp(), fIdx(-1), fNWrks(-1) { }

	const char *Export() { fExp.Form("%c (%d workers still sending) ", fg Cr[fIdx], fNWrks);	const char *Export() { fExp.Form("%c (%d workers still sending) ", fg Cr[fIdx], fNWrks);
	return fExp.Data(); }	return fExp.Data(); }
	void DecreaseNWrks() { fNWrks--; }	void DecreaseNWrks() { fNWrks--; }
	void IncreaseIdx() { fIdx++; if (fIdx == 4) fIdx = 0; }	void IncreaseIdx() { fIdx++; if (fIdx == 4) fIdx = 0; }
	void Reset(Int_t n = -1) { fIdx = -1; SetNWrks(n); }	void Reset(Int_t n = -1) { fIdx = -1; SetNWrks(n); }
	void SetNWrks(Int_t n) { fNWrks = n; }	void SetNWrks(Int_t n) { fNWrks = n; }
	};	};

	class TProof : public TNamed, public TQObject {	class TProof : public TNamed, public TQObject {

	skipping to change at line 262	skipping to change at line 290
	friend class TXSocketHandler; // to access fCurrentMonitor and CollectInput From	friend class TXSocketHandler; // to access fCurrentMonitor and CollectInput From
	friend class TXProofMgr; // to access EUrgent	friend class TXProofMgr; // to access EUrgent
	friend class TXProofServ; // to access EUrgent	friend class TXProofServ; // to access EUrgent

	public:	public:
	// PROOF status bits	// PROOF status bits
	enum EStatusBits {	enum EStatusBits {
	kUsingSessionGui = BIT(14),	kUsingSessionGui = BIT(14),
	kNewInputData = BIT(15),	kNewInputData = BIT(15),
	kIsClient = BIT(16),	kIsClient = BIT(16),

	kIsMaster = BIT(17)	kIsMaster = BIT(17),
		kIsTopMaster = BIT(18)
	};	};
	enum EQueryMode {	enum EQueryMode {
	kSync = 0,	kSync = 0,
	kAsync = 1	kAsync = 1
	};	};
	enum EUploadOpt {	enum EUploadOpt {
	kAppend = 0x1,	kAppend = 0x1,
	kOverwriteDataSet = 0x2,	kOverwriteDataSet = 0x2,
	kNoOverwriteDataSet = 0x4,	kNoOverwriteDataSet = 0x4,
	kOverwriteAllFiles = 0x8,	kOverwriteAllFiles = 0x8,

	skipping to change at line 747	skipping to change at line 776
	const char *GetWorkDir() const { return fWorkDir; }	const char *GetWorkDir() const { return fWorkDir; }
	const char *GetSessionTag() const { return GetName(); }	const char *GetSessionTag() const { return GetName(); }
	const char *GetImage() const { return fImage; }	const char *GetImage() const { return fImage; }
	const char *GetUrl() { return fUrl.GetUrl(); }	const char *GetUrl() { return fUrl.GetUrl(); }
	Int_t GetPort() const { return fUrl.GetPort(); }	Int_t GetPort() const { return fUrl.GetPort(); }
	Int_t GetRemoteProtocol() const { return fProtocol; }	Int_t GetRemoteProtocol() const { return fProtocol; }
	Int_t GetClientProtocol() const { return kPROOF_Protocol; }	Int_t GetClientProtocol() const { return kPROOF_Protocol; }
	Int_t GetStatus() const { return fStatus; }	Int_t GetStatus() const { return fStatus; }
	Int_t GetLogLevel() const { return fLogLevel; }	Int_t GetLogLevel() const { return fLogLevel; }
	Int_t GetParallel() const;	Int_t GetParallel() const;

		Int_t GetSeqNum() const { return fSeqNum; }
	Int_t GetSessionID() const { return fSessionID; }	Int_t GetSessionID() const { return fSessionID; }
	TList *GetListOfSlaveInfos();	TList *GetListOfSlaveInfos();
	Bool_t UseDynamicStartup() const { return fDynamicStartup; }	Bool_t UseDynamicStartup() const { return fDynamicStartup; }

	EQueryMode GetQueryMode(Option_t *mode = 0) const;	EQueryMode GetQueryMode(Option_t *mode = 0) const;
	void SetQueryMode(EQueryMode mode);	void SetQueryMode(EQueryMode mode);

	void SetRealTimeLog(Bool_t on = kTRUE);	void SetRealTimeLog(Bool_t on = kTRUE);

	Long64_t GetBytesRead() const { return fBytesRead; }	Long64_t GetBytesRead() const { return fBytesRead; }

	skipping to change at line 817	skipping to change at line 847

	Bool_t IsDataReady(Long64_t &totalbytes, Long64_t &bytesready);	Bool_t IsDataReady(Long64_t &totalbytes, Long64_t &bytesready);

	void SetActive(Bool_t /active/ = kTRUE) { }	void SetActive(Bool_t /active/ = kTRUE) { }

	void LogMessage(const char msg, Bool_t all); //SIGNAL*	void LogMessage(const char msg, Bool_t all); //SIGNAL*
	void Progress(Long64_t total, Long64_t processed); //SIGNAL	void Progress(Long64_t total, Long64_t processed); //SIGNAL
	void Progress(Long64_t total, Long64_t processed, Long64_t bytesr ead,	void Progress(Long64_t total, Long64_t processed, Long64_t bytesr ead,
	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(Long64_t total, Long64_t processed, Long64_t bytesr
		ead,
		Float_t initTime, Float_t procTime,
		Float_t evtrti, Float_t mbrti,
		Int_t actw, Int_t tses, Float_t eses); // SIGNAL
	void Feedback(TList objs); //SIGNAL*	void Feedback(TList objs); //SIGNAL*
	void QueryResultReady(const char ref); //SIGNAL*	void QueryResultReady(const char ref); //SIGNAL*
	void CloseProgressDialog(); //SIGNAL	void CloseProgressDialog(); //SIGNAL
	void ResetProgressDialog(const char *sel, Int_t sz,	void ResetProgressDialog(const char *sel, Int_t sz,
	Long64_t fst, Long64_t ent); //SIGNAL	Long64_t fst, Long64_t ent); //SIGNAL
	void StartupMessage(const char *msg, Bool_t status, Int_t done,	void StartupMessage(const char *msg, Bool_t status, Int_t done,
	Int_t total); //SIGNAL	Int_t total); //SIGNAL
	void DataSetStatus(const char *msg, Bool_t status,	void DataSetStatus(const char *msg, Bool_t status,
	Int_t done, Int_t total); //SIGNAL	Int_t done, Int_t total); //SIGNAL


End of changes. 13 change blocks.
	6 lines changed or deleted	47 lines changed or added

	TProofMgr.h	TProofMgr.h

	// @(#)root/proof:$Id: TProofMgr.h 30171 2009-09-15 13:43:12Z ganis $	// @(#)root/proof:$Id: TProofMgr.h 30791 2009-10-19 07:07:32Z 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 67	skipping to change at line 67
	Int_t fRemoteProtocol; // Protocol number run by the daemon ser ver	Int_t fRemoteProtocol; // Protocol number run by the daemon ser ver
	EServType fServType; // Type of server: old-proofd, XrdProofd	EServType fServType; // Type of server: old-proofd, XrdProofd
	TList *fSessions; // PROOF session managed by this server	TList *fSessions; // PROOF session managed by this server
	TUrl fUrl; // Server URL	TUrl fUrl; // Server URL

	TSignalHandler *fIntHandler; // Interrupt signal handler (ctrl-c)	TSignalHandler *fIntHandler; // Interrupt signal handler (ctrl-c)

	static TList fgListOfManagers; // Sub-list of TROOT::ListOfProofs for managers	static TList fgListOfManagers; // Sub-list of TROOT::ListOfProofs for managers

	TProofMgr() : fRemoteProtocol(-1),	TProofMgr() : fRemoteProtocol(-1),

	fServType(kXProofd), fSessions(0), fUrl() { }	fServType(kXProofd), fSessions(0), fUrl(), fIntHand ler(0) { }

	public:	public:
	TProofMgr(const char url, Int_t loglevel = -1, const char alias = "");	TProofMgr(const char url, Int_t loglevel = -1, const char alias = "");
	virtual ~TProofMgr();	virtual ~TProofMgr();

	virtual Bool_t IsLite() const { return (fServType == kProofLite); }	virtual Bool_t IsLite() const { return (fServType == kProofLite); }
	virtual Bool_t IsProofd() const { return (fServType == kProofd); }	virtual Bool_t IsProofd() const { return (fServType == kProofd); }
	virtual Bool_t IsValid() const { return kTRUE; }	virtual Bool_t IsValid() const { return kTRUE; }
	virtual void SetInvalid() { }	virtual void SetInvalid() { }


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

	TProofPlayer.h	TProofPlayer.h

	// @(#)root/proofplayer:$Id: TProofPlayer.h 30174 2009-09-15 14:24:56Z gani s $	// @(#)root/proofplayer:$Id: TProofPlayer.h 30900 2009-10-28 14:10:02Z 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 41	skipping to change at line 41

	#ifndef ROOT_TVirtualProofPlayer	#ifndef ROOT_TVirtualProofPlayer
	#include "TVirtualProofPlayer.h"	#include "TVirtualProofPlayer.h"
	#endif	#endif
	#ifndef ROOT_TArrayL64	#ifndef ROOT_TArrayL64
	#include "TArrayL64.h"	#include "TArrayL64.h"
	#endif	#endif
	#ifndef ROOT_TArrayF	#ifndef ROOT_TArrayF
	#include "TArrayF.h"	#include "TArrayF.h"
	#endif	#endif

		#ifndef ROOT_TArrayI
		#include "TArrayI.h"
		#endif
	#ifndef ROOT_TList	#ifndef ROOT_TList
	#include "TList.h"	#include "TList.h"
	#endif	#endif
	#ifndef ROOT_TSystem	#ifndef ROOT_TSystem
	#include "TSystem.h"	#include "TSystem.h"
	#endif	#endif
	#ifndef ROOT_TQueryResult	#ifndef ROOT_TQueryResult
	#include "TQueryResult.h"	#include "TQueryResult.h"
	#endif	#endif
	#ifndef ROOT_TProofProgressStatus	#ifndef ROOT_TProofProgressStatus
	#include "TProofProgressStatus.h"	#include "TProofProgressStatus.h"
	#endif	#endif
	#ifndef ROOT_TError	#ifndef ROOT_TError
	#include "TError.h"	#include "TError.h"
	#endif	#endif

	class TSelector;	class TSelector;

	class TProof;
	class TSocket;	class TSocket;
	class TVirtualPacketizer;	class TVirtualPacketizer;
	class TSlave;	class TSlave;
	class TEventIter;	class TEventIter;
	class TProofStats;	class TProofStats;
	class TMutex;	class TMutex;
	class TStatus;	class TStatus;
	class TTimer;	class TTimer;
	class THashList;	class THashList;


	skipping to change at line 170	skipping to change at line 172
	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 bytesrea d,	void Progress(Long64_t total, Long64_t processed, Long64_t bytesrea d,
	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, Long64_ t bytesread,	void Progress(TSlave *, Long64_t total, Long64_t processed, Long64_ t bytesread,
	Float_t initTime, Float_t procTime,	Float_t initTime, Float_t procTime,
	Float_t evtrti, Float_t mbrti)	Float_t evtrti, Float_t mbrti)
	{ Progress(total, processed, bytesread, initTime, procTime,	{ Progress(total, processed, bytesread, initTime, procTime,
	evtrti, mbrti); } // SIGNAL	evtrti, mbrti); } // SIGNAL

		void Progress(TProofProgressInfo pi); // SIGNAL*
		void Progress(TSlave , TProofProgressInfo pi) { Progress(pi); } /
		/ SIGNAL
	void Feedback(TList objs); // SIGNAL*	void Feedback(TList objs); // SIGNAL*

	TDrawFeedback CreateDrawFeedback(TProof p);	TDrawFeedback CreateDrawFeedback(TProof p);
	void SetDrawFeedbackOption(TDrawFeedback f, Option_t opt);	void SetDrawFeedbackOption(TDrawFeedback f, Option_t opt);
	void DeleteDrawFeedback(TDrawFeedback *f);	void DeleteDrawFeedback(TDrawFeedback *f);

	TDSetElement GetNextPacket(TSlave slave, TMessage *r);	TDSetElement GetNextPacket(TSlave slave, TMessage *r);

	Int_t ReinitSelector(TQueryResult *qr);	Int_t ReinitSelector(TQueryResult *qr);


	skipping to change at line 196	skipping to change at line 200

	EExitStatus GetExitStatus() const { return fExitStatus; }	EExitStatus GetExitStatus() const { return fExitStatus; }
	Long64_t GetEventsProcessed() const { return fProgressStatus->GetEntr ies(); }	Long64_t GetEventsProcessed() const { return fProgressStatus->GetEntr ies(); }
	void AddEventsProcessed(Long64_t ev) { fProgressStatus->IncEntrie s(ev); }	void AddEventsProcessed(Long64_t ev) { fProgressStatus->IncEntrie s(ev); }

	void SetDispatchTimer(Bool_t on = kTRUE);	void SetDispatchTimer(Bool_t on = kTRUE);
	void SetStopTimer(Bool_t on = kTRUE,	void SetStopTimer(Bool_t on = kTRUE,
	Bool_t abort = kFALSE, Int_t timeout = 0);	Bool_t abort = kFALSE, Int_t timeout = 0);

	virtual void SetInitTime() { }	virtual void SetInitTime() { }

		Long64_t GetCacheSize();
		Int_t GetLearnEntries();

	void SetProcessing(Bool_t on = kTRUE);	void SetProcessing(Bool_t on = kTRUE);
	TProofProgressStatus *GetProgressStatus() const { return fProgressStatu s; }	TProofProgressStatus *GetProgressStatus() const { return fProgressStatu s; }

	ClassDef(TProofPlayer,0) // Basic PROOF player	ClassDef(TProofPlayer,0) // Basic PROOF player
	};	};

	//------------------------------------------------------------------------	//------------------------------------------------------------------------

	class TProofPlayerLocal : public TProofPlayer {	class TProofPlayerLocal : public TProofPlayer {


	skipping to change at line 296	skipping to change at line 303
	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,
	Float_t initTime, Float_t procTime,	Float_t initTime, Float_t procTime,
	Float_t evtrti, Float_t mbrti)	Float_t evtrti, Float_t mbrti)
	{ Progress(total, processed, bytesread, initTime, pro cTime,	{ Progress(total, processed, bytesread, initTime, pro cTime,
	evtrti, mbrti); } // SIGNAL	evtrti, mbrti); } // SIGNAL

		void Progress(TProofProgressInfo pi); // SIGNAL*
		void Progress(TSlave , TProofProgressInfo pi) { Progress(pi)
		; } // SIGNAL
	void Feedback(TList objs); // SIGNAL*	void Feedback(TList objs); // SIGNAL*
	TDSetElement GetNextPacket(TSlave slave, TMessage *r);	TDSetElement GetNextPacket(TSlave slave, TMessage *r);
	TVirtualPacketizer *GetPacketizer() const { return fPacketizer; }	TVirtualPacketizer *GetPacketizer() const { return fPacketizer; }

	Bool_t IsClient() const;	Bool_t IsClient() const;

	void SetInitTime();	void SetInitTime();

	ClassDef(TProofPlayerRemote,0) // PROOF player running on master server	ClassDef(TProofPlayerRemote,0) // PROOF player running on master server
	};	};

	skipping to change at line 341	skipping to change at line 350
	class TProofPlayerSuperMaster : public TProofPlayerRemote {	class TProofPlayerSuperMaster : public TProofPlayerRemote {

	private:	private:
	TArrayL64 fSlaveProgress;	TArrayL64 fSlaveProgress;
	TArrayL64 fSlaveTotals;	TArrayL64 fSlaveTotals;
	TArrayL64 fSlaveBytesRead;	TArrayL64 fSlaveBytesRead;
	TArrayF fSlaveInitTime;	TArrayF fSlaveInitTime;
	TArrayF fSlaveProcTime;	TArrayF fSlaveProcTime;
	TArrayF fSlaveEvtRti;	TArrayF fSlaveEvtRti;
	TArrayF fSlaveMBRti;	TArrayF fSlaveMBRti;

		TArrayI fSlaveActW;
		TArrayI fSlaveTotS;
		TArrayF fSlaveEffS;
	TList fSlaves;	TList fSlaves;
	Bool_t fReturnFeedback;	Bool_t fReturnFeedback;

	protected:	protected:
	Bool_t HandleTimer(TTimer *timer);	Bool_t HandleTimer(TTimer *timer);
	void SetupFeedback();	void SetupFeedback();

	public:	public:
	TProofPlayerSuperMaster(TProof *proof = 0) :	TProofPlayerSuperMaster(TProof *proof = 0) :
	TProofPlayerRemote(proof), fReturnFeedback(kFALSE) { }	TProofPlayerRemote(proof), fReturnFeedback(kFALSE) { }

	skipping to change at line 363	skipping to change at line 375
	Long64_t Process(TDSet set, const char selector,	Long64_t Process(TDSet set, const char selector,
	Option_t *option = "", Long64_t nentries = -1,	Option_t *option = "", Long64_t nentries = -1,
	Long64_t firstentry = 0);	Long64_t firstentry = 0);
	void Progress(Long64_t total, Long64_t processed)	void Progress(Long64_t total, Long64_t processed)
	{ TProofPlayerRemote::Progress(total, processed); }	{ TProofPlayerRemote::Progress(total, processed); }
	void Progress(Long64_t total, Long64_t processed, Long64_t bytesread,	void Progress(Long64_t total, Long64_t processed, Long64_t bytesread,
	Float_t initTime, Float_t procTime,	Float_t initTime, Float_t procTime,
	Float_t evtrti, Float_t mbrti)	Float_t evtrti, Float_t mbrti)
	{ TProofPlayerRemote::Progress(total, processed, bytesr ead,	{ TProofPlayerRemote::Progress(total, processed, bytesr ead,
	initTime, procTime, evtr ti, mbrti); }	initTime, procTime, evtr ti, mbrti); }

		void Progress(TProofProgressInfo *pi) { TProofPlayerRemote::Progress(pi ); }
	void Progress(TSlave *sl, Long64_t total, Long64_t processed);	void Progress(TSlave *sl, Long64_t total, Long64_t processed);
	void Progress(TSlave *sl, Long64_t total, Long64_t processed, Long64_t bytesread,	void Progress(TSlave *sl, Long64_t total, Long64_t processed, Long64_t bytesread,
	Float_t initTime, Float_t procTime,	Float_t initTime, Float_t procTime,
	Float_t evtrti, Float_t mbrti);	Float_t evtrti, Float_t mbrti);

		void Progress(TSlave sl, TProofProgressInfo pi);

	ClassDef(TProofPlayerSuperMaster,0) // PROOF player running on super ma ster	ClassDef(TProofPlayerSuperMaster,0) // PROOF player running on super ma ster
	};	};

	#endif	#endif

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

	TProofProgressDialog.h	TProofProgressDialog.h

	// @(#)root/sessionviewer:$Id: TProofProgressDialog.h 28370 2009-04-28 06:4 3:41Z ganis $	// @(#)root/sessionviewer:$Id: TProofProgressDialog.h 30862 2009-10-25 08:2 6:46Z ganis $
	// Author: Fons Rademakers 21/03/03	// Author: Fons Rademakers 21/03/03

	/*************************************************************************	/*************************************************************************
	* 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 42	skipping to change at line 42
	class TGTextButton;	class TGTextButton;
	class TGCheckButton;	class TGCheckButton;
	class TGLabel;	class TGLabel;
	class TGTextBuffer;	class TGTextBuffer;
	class TGTextEntry;	class TGTextEntry;
	class TProof;	class TProof;
	class TProofProgressLog;	class TProofProgressLog;
	class TProofProgressMemoryPlot;	class TProofProgressMemoryPlot;
	class TNtuple;	class TNtuple;
	class TGraph;	class TGraph;

		class TGSpeedo;

	class TProofProgressDialog {	class TProofProgressDialog {

	friend class TProofProgressLog;	friend class TProofProgressLog;
	friend class TProofProgressMemoryPlot;	friend class TProofProgressMemoryPlot;

	private:	private:
	enum EQueryStatus { kRunning = 0, kDone, kStopped, kAborted, kIncomplete };	enum EQueryStatus { kRunning = 0, kDone, kStopped, kAborted, kIncomplete };

	TGTransientFrame *fDialog; // transient frame, main dialog window	TGTransientFrame *fDialog; // transient frame, main dialog window

	skipping to change at line 66	skipping to change at line 67
	TGTextButton *fAsyn;	TGTextButton *fAsyn;
	TGTextButton *fLog;	TGTextButton *fLog;
	TGTextButton *fRatePlot;	TGTextButton *fRatePlot;
	TGTextButton *fMemPlot;	TGTextButton *fMemPlot;
	TGCheckButton *fKeepToggle;	TGCheckButton *fKeepToggle;
	TGCheckButton *fLogQueryToggle;	TGCheckButton *fLogQueryToggle;
	TGTextBuffer *fTextQuery;	TGTextBuffer *fTextQuery;
	TGTextEntry *fEntry;	TGTextEntry *fEntry;
	TGLabel *fTitleLab;	TGLabel *fTitleLab;
	TGLabel *fFilesEvents;	TGLabel *fFilesEvents;

		TGLabel *fTimeLab;
	TGLabel *fProcessed;	TGLabel *fProcessed;

		TGLabel *fEstim;
	TGLabel *fTotal;	TGLabel *fTotal;
	TGLabel *fRate;	TGLabel *fRate;
	TGLabel *fInit;	TGLabel *fInit;
	TGLabel *fSelector;	TGLabel *fSelector;

	TProofProgressLog *fLogWindow; // transient frame for logs	TGSpeedo *fSpeedo; // speedometer
		TGCheckButton *fSmoothSpeedo; // use smooth speedometer update
		TProofProgressLog *fLogWindow; // transient frame for logs
	TProofProgressMemoryPlot *fMemWindow; // transient frame for memory plo ts	TProofProgressMemoryPlot *fMemWindow; // transient frame for memory plo ts
	TProof *fProof;	TProof *fProof;
	TTime fStartTime;	TTime fStartTime;
	TTime fEndTime;	TTime fEndTime;
	Long64_t fPrevProcessed;	Long64_t fPrevProcessed;
	Long64_t fPrevTotal;	Long64_t fPrevTotal;
	Long64_t fFirst;	Long64_t fFirst;
	Long64_t fEntries;	Long64_t fEntries;
	Int_t fFiles;	Int_t fFiles;
	EQueryStatus fStatus;	EQueryStatus fStatus;
	Bool_t fKeep;	Bool_t fKeep;
	Bool_t fLogQuery;	Bool_t fLogQuery;
	TNtuple *fRatePoints;	TNtuple *fRatePoints;
	TGraph *fRateGraph;	TGraph *fRateGraph;

		TGraph *fMBRtGraph;
		TGraph *fActWGraph;
		TGraph *fTotSGraph;
		TGraph *fEffSGraph;
		Float_t fInitTime;
	Float_t fProcTime;	Float_t fProcTime;
	Double_t fAvgRate;	Double_t fAvgRate;
	Double_t fAvgMBRate;	Double_t fAvgMBRate;
	Int_t fSVNRev;	Int_t fSVNRev;

		Int_t fRightInfo;

	TString fSessionUrl;	TString fSessionUrl;


		Float_t AdjustBytes(Float_t mbs, TString &sf);

	static Bool_t fgKeepDefault;	static Bool_t fgKeepDefault;
	static Bool_t fgLogQueryDefault;	static Bool_t fgLogQueryDefault;
	static TString fgTextQueryDefault;	static TString fgTextQueryDefault;

	public:	public:
	TProofProgressDialog(TProof proof, const char selector,	TProofProgressDialog(TProof proof, const char selector,
	Int_t files, Long64_t first, Long64_t entries);	Int_t files, Long64_t first, Long64_t entries);
	virtual ~TProofProgressDialog();	virtual ~TProofProgressDialog();

	void ResetProgressDialog(const char *sel, Int_t sz, Long64_t fst, Long64 _t ent);	void ResetProgressDialog(const char *sel, Int_t sz, Long64_t fst, Long64 _t ent);
	void Progress(Long64_t total, Long64_t processed);	void Progress(Long64_t total, Long64_t processed);
	void Progress(Long64_t total, Long64_t processed, Long64_t bytesread,	void Progress(Long64_t total, Long64_t processed, Long64_t bytesread,
	Float_t initTime, Float_t procTime,	Float_t initTime, Float_t procTime,

	Float_t evtrti, Float_t mbrti);	Float_t evtrti, Float_t mbrti) {
		Progress(total, processed, bytesread, initTime, procTime,
		evtrti, mbrti, -1, -1, -1.); }
		void Progress(Long64_t total, Long64_t processed, Long64_t bytesread,
		Float_t initTime, Float_t procTime,
		Float_t evtrti, Float_t mbrti, Int_t actw, Int_t tses, Flo
		at_t eses);
	void DisableAsyn();	void DisableAsyn();
	void IndicateStop(Bool_t aborted);	void IndicateStop(Bool_t aborted);
	void LogMessage(const char *msg, Bool_t all);	void LogMessage(const char *msg, Bool_t all);

	void CloseWindow();	void CloseWindow();
	void DoClose();	void DoClose();
	void DoLog();	void DoLog();
	void DoKeep(Bool_t on);	void DoKeep(Bool_t on);
	void DoSetLogQuery(Bool_t on);	void DoSetLogQuery(Bool_t on);
	void DoStop();	void DoStop();
	void DoAbort();	void DoAbort();
	void DoAsyn();	void DoAsyn();
	void DoPlotRateGraph();	void DoPlotRateGraph();
	void DoMemoryPlot();	void DoMemoryPlot();

		void ToggleOdometerInfos();
		void ToggleThreshold();

	ClassDef(TProofProgressDialog,0) //PROOF progress dialog	ClassDef(TProofProgressDialog,0) //PROOF progress dialog
	};	};

	#endif	#endif

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

	TProofProgressLog.h	TProofProgressLog.h

	// @(#)root/sessionviewer:$Id: TProofProgressLog.h 28813 2009-06-04 15:10:4 9Z rdm $	// @(#)root/sessionviewer:$Id: TProofProgressLog.h 30815 2009-10-20 13:49:2 2Z rdm $
	/*************************************************************************	/*************************************************************************
	* 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_TProofProgressLog	#ifndef ROOT_TProofProgressLog
	#define ROOT_TProofProgressLog	#define ROOT_TProofProgressLog

	skipping to change at line 39	skipping to change at line 39

	class TGTextView;	class TGTextView;
	class TGTextButton;	class TGTextButton;
	class TProofProgressDialog;	class TProofProgressDialog;
	class TProofLog;	class TProofLog;
	class TGTextEntry;	class TGTextEntry;
	class TGNumberEntry;	class TGNumberEntry;
	class TGListBox;	class TGListBox;
	class TGSplitButton;	class TGSplitButton;
	class TGVerticalFrame;	class TGVerticalFrame;

		class TGCheckButton;

	class TProofProgressLog : public TGTransientFrame {	class TProofProgressLog : public TGTransientFrame {

	private:	private:
	enum ETextType { kRaw = 0, kStd = 1, kGrep = 2 };	enum ETextType { kRaw = 0, kStd = 1, kGrep = 2 };

	TString fSessionUrl;	TString fSessionUrl;
	Int_t fSessionIdx;	Int_t fSessionIdx;

	TGTextView *fText; // text widget	TGTextView *fText; // text widget

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

	TProofProgressStatus.h	TProofProgressStatus.h

	// @(#)root/proof:$Id: TProofProgressStatus.h 25827 2008-10-15 14:02:59Z ga nis $	// @(#)root/proof:$Id: TProofProgressStatus.h 30859 2009-10-24 14:53:07Z ga nis $
	// Author: Jan Iwaszkiewicz 08/08/08	// Author: Jan Iwaszkiewicz 08/08/08

	/*************************************************************************	/*************************************************************************
	* 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 29	skipping to change at line 29
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////
	// //	// //
	// TProofProgressStatus //	// TProofProgressStatus //
	// //	// //
	// Small class including processing statistics //	// Small class including processing statistics //
	// //	// //
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////

	class TProofProgressStatus : public TObject {	class TProofProgressStatus : public TObject {
	private:	private:

		Long64_t fLastEntries; // Last chunck
	Long64_t fEntries;	Long64_t fEntries;
	Long64_t fBytesRead;	Long64_t fBytesRead;

		Long64_t fReadCalls;
		Double_t fLearnTime; // the time spent in learning phase
		Double_t fLastProcTime; // the wallclock time of the last addition
	Double_t fProcTime; // the wallclock time	Double_t fProcTime; // the wallclock time
	Double_t fCPUTime;	Double_t fCPUTime;

		Double_t fLastUpdate; // Timestamp of last change
	public:	public:
	TProofProgressStatus(Long64_t fEntries = 0, Long64_t fBytesRead = 0,	TProofProgressStatus(Long64_t fEntries = 0, Long64_t fBytesRead = 0,

		Long64_t fReadCalls = 0,
	Double_t fProcTime = 0, Double_t fCPUTime = 0);	Double_t fProcTime = 0, Double_t fCPUTime = 0);
	void Reset() { fEntries = 0,	void Reset() { fEntries = 0,

	fBytesRead = 0, fProcTime = 0, fCPUTime = 0; }	fBytesRead = 0, fProcTime = 0, fCPUTime = 0; SetLastU pdate();}

	Long64_t GetEntries() const { return fEntries; }	Long64_t GetEntries() const { return fEntries; }
	Long64_t GetBytesRead() const { return fBytesRead; }	Long64_t GetBytesRead() const { return fBytesRead; }

		Long64_t GetReadCalls() const { return fReadCalls; }
		Double_t GetLearnTime() const { return fLearnTime; }
	Double_t GetProcTime() const { return fProcTime; }	Double_t GetProcTime() const { return fProcTime; }
	Double_t GetCPUTime() const { return fCPUTime; }	Double_t GetCPUTime() const { return fCPUTime; }

	Double_t GetRate() const { return fProcTime?fEntries/fProcTime:0; }	Double_t GetLastUpdate() const { return fLastUpdate; }
	void SetEntries(Long64_t entries) { fEntries = entries; }	Double_t GetRate() const { return ((fProcTime > 0) ? fEntries/fProcTime
	void IncEntries(Long64_t entries = 1) { fEntries += entries; }	: 0); }
	void IncBytesRead(Long64_t bytesRead) { fBytesRead += bytesRead; }	Double_t GetCurrentRate() const;
	void SetBytesRead(Long64_t bytesRead) { fBytesRead = bytesRead; }	void SetLastEntries(Long64_t entries) { fLastEntries = entries;}
		void SetEntries(Long64_t entries) { fEntries = entries; SetLastUpdat
		e();}
		void IncEntries(Long64_t entries = 1) { fLastEntries = entries; fEnt
		ries += entries; SetLastUpdate();}
		void IncBytesRead(Long64_t bytesRead) { fBytesRead += bytesRead; Set
		LastUpdate();}
		void SetBytesRead(Long64_t bytesRead) { fBytesRead = bytesRead; SetL
		astUpdate();}
		void IncReadCalls(Long64_t readCalls) { fReadCalls += readCalls; Set
		LastUpdate();}
		void SetReadCalls(Long64_t readCalls) { fReadCalls = readCalls; SetL
		astUpdate();}
		void SetLearnTime(Double_t learnTime) { fLearnTime = learnTime; }
		void SetLastProcTime(Double_t procTime) { fLastProcTime = procTime;
		}
	void SetProcTime(Double_t procTime) { fProcTime = procTime; }	void SetProcTime(Double_t procTime) { fProcTime = procTime; }

	void IncProcTime(Double_t procTime) { fProcTime += procTime; }	void IncProcTime(Double_t procTime) { fLastProcTime = procTime; fPro cTime += procTime; }
	void SetCPUTime(Double_t procTime) { fCPUTime = procTime; }	void SetCPUTime(Double_t procTime) { fCPUTime = procTime; }
	void IncCPUTime(Double_t procTime) { fCPUTime += procTime; }	void IncCPUTime(Double_t procTime) { fCPUTime += procTime; }

		void SetLastUpdate(Double_t updtTime = 0);
	void Print(Option_t* option = "") const;	void Print(Option_t* option = "") const;

	TProofProgressStatus operator-(TProofProgressStatus &st);	TProofProgressStatus operator-(TProofProgressStatus &st);
	TProofProgressStatus &operator+=(const TProofProgressStatus &st);	TProofProgressStatus &operator+=(const TProofProgressStatus &st);
	TProofProgressStatus &operator-=(const TProofProgressStatus &st);	TProofProgressStatus &operator-=(const TProofProgressStatus &st);


	ClassDef(TProofProgressStatus,1) // Proof progress status class	ClassDef(TProofProgressStatus,2) // Proof progress status class
	};	};

	#endif	#endif

End of changes. 11 change blocks.
	9 lines changed or deleted	33 lines changed or added

	TQuaternion.h	TQuaternion.h

	// @(#)root/physics:$Id: TQuaternion.h 21469 2007-12-18 18:12:02Z brun $	// @(#)root/physics:$Id: TQuaternion.h 30815 2009-10-20 13:49:22Z rdm $
	// Author: Eric Anciant 28/06/2005	// Author: Eric Anciant 28/06/2005

	#ifndef ROOT_TQuaternion	#ifndef ROOT_TQuaternion
	#define ROOT_TQuaternion	#define ROOT_TQuaternion


		#ifndef ROOT_TVector3
	#include "TVector3.h"	#include "TVector3.h"

		#endif
		#ifndef ROOT_TMath
		#include "TMath.h"
		#endif

	class TQuaternion : public TObject {	class TQuaternion : public TObject {

	public:	public:

	TQuaternion(Double_t real = 0, Double_t X = 0, Double_t Y = 0, Double_t Z = 0);	TQuaternion(Double_t real = 0, Double_t X = 0, Double_t Y = 0, Double_t Z = 0);
	TQuaternion(const TVector3 & vector, Double_t real = 0);	TQuaternion(const TVector3 & vector, Double_t real = 0);
	TQuaternion(const Double_t *);	TQuaternion(const Double_t *);
	TQuaternion(const Float_t *);	TQuaternion(const Float_t *);
	// Constructors from an array : 0 to 2 = vector part, 3 = real part	// Constructors from an array : 0 to 2 = vector part, 3 = real part

	skipping to change at line 261	skipping to change at line 266
	return TQuaternion(fVectorPart+quaternion.fVectorPart, fRealPart+quatern ion.fRealPart);	return TQuaternion(fVectorPart+quaternion.fVectorPart, fRealPart+quatern ion.fRealPart);
	}	}

	inline TQuaternion TQuaternion::operator-(const TQuaternion &quaternion) co nst {	inline TQuaternion TQuaternion::operator-(const TQuaternion &quaternion) co nst {

	return TQuaternion(fVectorPart-quaternion.fVectorPart, fRealPart-quatern ion.fRealPart);	return TQuaternion(fVectorPart-quaternion.fVectorPart, fRealPart-quatern ion.fRealPart);
	}	}

	// ---------------- general	// ---------------- general
	inline Double_t TQuaternion::Norm() const {	inline Double_t TQuaternion::Norm() const {

	return sqrt(Norm2());	return TMath::Sqrt(Norm2());
	}	}

	inline Double_t TQuaternion::Norm2() const {	inline Double_t TQuaternion::Norm2() const {
	return fRealPart*fRealPart + fVectorPart.Mag2();	return fRealPart*fRealPart + fVectorPart.Mag2();
	}	}

	inline TQuaternion& TQuaternion::Normalize() {	inline TQuaternion& TQuaternion::Normalize() {

	(*this) /= Norm();	(*this) /= Norm();
	return (*this);	return (*this);

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

	TSchemaHelper.h	TSchemaHelper.h

	// @(#)root/core:$Id: TSchemaHelper.h 25862 2008-10-17 18:11:46Z brun $	// @(#)root/core:$Id: TSchemaHelper.h 30815 2009-10-20 13:49:22Z rdm $
	// author: Lukasz Janyst <ljanyst@cern.ch>	// author: Lukasz Janyst <ljanyst@cern.ch>

	#ifndef ROOT_TSchemaHelper	#ifndef ROOT_TSchemaHelper
	#define ROOT_TSchemaHelper	#define ROOT_TSchemaHelper

	#include <string>	#include <string>

		#ifndef ROOT_Rtypes
		#include "Rtypes.h"
		#endif

	namespace ROOT	namespace ROOT
	{	{
	struct TSchemaHelper	struct TSchemaHelper
	{	{
	TSchemaHelper(): fTarget(), fSourceClass(),	TSchemaHelper(): fTarget(), fSourceClass(),
	fSource(), fCode(), fVersion(), fChecksum(),	fSource(), fCode(), fVersion(), fChecksum(),
	fInclude(), fEmbed(kTRUE), fFunctionPtr( 0 ) {}	fInclude(), fEmbed(kTRUE), fFunctionPtr( 0 ) {}
	std::string fTarget;	std::string fTarget;
	std::string fSourceClass;	std::string fSourceClass;

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

	TSelectorScalar.h	TSelectorScalar.h

	// @(#)root/tree:$Id: TSelectorScalar.h 20882 2007-11-19 11:31:26Z rdm $	// @(#)root/tree:$Id: TSelectorScalar.h 30749 2009-10-15 16:33:04Z brun $
	// Author: Maarten Ballintijn 13/02/2005	// Author: Maarten Ballintijn 13/02/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. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOT_TSelectorScalar	#ifndef ROOT_TSelectorScalar
	#define ROOT_TSelectorScalar	#define ROOT_TSelectorScalar

	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////
	// //	// //
	// TSelectorScalar //	// TSelectorScalar //
	// //	// //
	// Named scalar type, based on Long64_t, streamable, storable and //	// Named scalar type, based on Long64_t, streamable, storable and //
	// mergable. Ideally to be used in tree selectors in the PROOF //	// mergable. Ideally to be used in tree selectors in the PROOF //

	// environment due to its merge fucntionality which allows a single //	// environment due to its merge functionality which allows a single //
	// merged value to be returned to the user. //	// merged value to be returned to the user. //
	// //	// //
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////

	#ifndef ROOT_TParameter	#ifndef ROOT_TParameter
	#include "TParameter.h"	#include "TParameter.h"
	#endif	#endif

	#ifndef ROOT_Rtypes	#ifndef ROOT_Rtypes
	#include "Rtypes.h"	#include "Rtypes.h"

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

	TStreamerInfo.h	TStreamerInfo.h

	// @(#)root/io:$Id: TStreamerInfo.h 28024 2009-04-01 15:01:27Z pcanal $	// @(#)root/io:$Id: TStreamerInfo.h 30905 2009-10-28 16:51:47Z 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 174	skipping to change at line 174
	// kTNamed : TNamed , special case	// kTNamed : TNamed , special case

	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 CallShowMembers(void* obj, TMemberInspector &insp, c har *parent) const;
	void Clear(Option_t *);	void Clear(Option_t *);
	Bool_t CompareContent(TClass cl,TVirtualStreamerInfo info , Bool_t warn, Bool_t complete);	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;}

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

	TTreeCache.h	TTreeCache.h

	// @(#)root/tree:$Id: TTreeCache.h 30208 2009-09-16 17:30:17Z brun $	// @(#)root/tree:$Id: TTreeCache.h 31077 2009-11-11 08:51:57Z brun $
	// Author: Rene Brun 04/06/2006	// Author: Rene Brun 04/06/2006

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/


	skipping to change at line 38	skipping to change at line 38
	#endif	#endif

	class TTree;	class TTree;
	class TBranch;	class TBranch;

	class TTreeCache : public TFileCacheRead {	class TTreeCache : public TFileCacheRead {

	protected:	protected:
	Long64_t fEntryMin; //! first entry in the cache	Long64_t fEntryMin; //! first entry in the cache
	Long64_t fEntryMax; //! last entry in the cache	Long64_t fEntryMax; //! last entry in the cache

		Long64_t fEntryCurrent;//! current lowest entry number in the cac he
	Long64_t fEntryNext; //! next entry number where cache must be filled	Long64_t fEntryNext; //! next entry number where cache must be filled
	Long64_t fZipBytes; //! Total compressed size of branches in c ache	Long64_t fZipBytes; //! Total compressed size of branches in c ache
	Int_t fNbranches; //! Number of branches in the cache	Int_t fNbranches; //! Number of branches in the cache
	Int_t fNReadOk; //Number of blocks read and found in the c ache	Int_t fNReadOk; //Number of blocks read and found in the c ache
	Int_t fNReadMiss; //Number of blocks read and not found in t he chache	Int_t fNReadMiss; //Number of blocks read and not found in t he chache
	Int_t fNReadPref; //Number of blocks that were prefetched	Int_t fNReadPref; //Number of blocks that were prefetched
	TObjArray *fBranches; //! List of branches to be stored in the c ache	TObjArray *fBranches; //! List of branches to be stored in the c ache
	TList *fBrNames; //! list of branch names in the cache	TList *fBrNames; //! list of branch names in the cache
	TTree *fOwner; //! pointer to the owner Tree/chain	TTree *fOwner; //! pointer to the owner Tree/chain
	TTree *fTree; //! pointer to the current Tree	TTree *fTree; //! pointer to the current Tree

	skipping to change at line 69	skipping to change at line 70
	virtual ~TTreeCache();	virtual ~TTreeCache();
	virtual void AddBranch(TBranch *b, Bool_t subbranches = kFALSE);	virtual void AddBranch(TBranch *b, Bool_t subbranches = kFALSE);
	virtual void AddBranch(const char *branch, Bool_t subbranches = k FALSE);	virtual void AddBranch(const char *branch, Bool_t subbranches = k FALSE);
	Double_t GetEfficiency();	Double_t GetEfficiency();
	Double_t GetEfficiencyRel();	Double_t GetEfficiencyRel();
	static Int_t GetLearnEntries();	static Int_t GetLearnEntries();
	virtual Bool_t GetSkipZip() { return kFALSE; } // This function is only used by TTreeCacheUnzip (ignore it)	virtual Bool_t GetSkipZip() { return kFALSE; } // This function is only used by TTreeCacheUnzip (ignore it)
	virtual Bool_t FillBuffer();	virtual Bool_t FillBuffer();
	TTree *GetOwner() const;	TTree *GetOwner() const;
	TTree *GetTree() const;	TTree *GetTree() const;

	Bool_t IsLearning() const {return fIsLearning;}	virtual Bool_t IsLearning() const {return fIsLearning;}
	virtual Int_t ReadBuffer(char *buf, Long64_t pos, Int_t len);	virtual Int_t ReadBuffer(char *buf, Long64_t pos, Int_t len);
	virtual void ResetCache();	virtual void ResetCache();
	virtual void SetEntryRange(Long64_t emin, Long64_t emax);	virtual void SetEntryRange(Long64_t emin, Long64_t emax);
	static void SetLearnEntries(Int_t n = 10);	static void SetLearnEntries(Int_t n = 10);

	virtual void SetSkipZip(Bool_t skip = kTRUE) { (void)skip; return ; } // This function is only used by TTreeCacheUnzip (ignore it)
	void StartLearningPhase();	void StartLearningPhase();
	virtual void StopLearningPhase();	virtual void StopLearningPhase();
	virtual void UpdateBranches(TTree *tree, Bool_t owner = kFALSE);	virtual void UpdateBranches(TTree *tree, Bool_t owner = kFALSE);

	ClassDef(TTreeCache,2) //Specialization of TFileCacheRead for a TTree	ClassDef(TTreeCache,2) //Specialization of TFileCacheRead for a TTree
	};	};

	#endif	#endif

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

	TVector3.h	TVector3.h

	// @(#)root/physics:$Id: TVector3.h 23440 2008-04-23 10:55:14Z brun $	// @(#)root/physics:$Id: TVector3.h 30815 2009-10-20 13:49:22Z rdm $
	// Author: Pasha Murat, Peter Malzacher 12/02/99	// Author: Pasha Murat, Peter Malzacher 12/02/99

	/*************************************************************************	/*************************************************************************
	* 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_TVector3	#ifndef ROOT_TVector3
	#define ROOT_TVector3	#define ROOT_TVector3


		#ifndef ROOT_TError
	#include "TError.h"	#include "TError.h"

		#endif
		#ifndef ROOT_TVector2
	#include "TVector2.h"	#include "TVector2.h"

		#endif
		#ifndef ROOT_TMatrix
	#include "TMatrix.h"	#include "TMatrix.h"

		#endif

	class TRotation;	class TRotation;

	class TVector3 : public TObject {	class TVector3 : public TObject {

	public:	public:

	TVector3(Double_t x = 0.0, Double_t y = 0.0, Double_t z = 0.0);	TVector3(Double_t x = 0.0, Double_t y = 0.0, Double_t z = 0.0);
	// The constructor.	// The constructor.


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

	TVectorDfwd.h	TVectorDfwd.h

	skipping to change at line 20	skipping to change at line 20
	#define ROOT_TVectorDfwd	#define ROOT_TVectorDfwd

	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////
	// //	// //
	// TVectorD //	// TVectorD //
	// //	// //
	// Forward declaration of TVectorT<Double_t> //	// Forward declaration of TVectorT<Double_t> //
	// //	// //
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////


		#ifndef ROOT_Rtypes
		#include "Rtypes.h"
		#endif

	template<class Element> class TVectorT;	template<class Element> class TVectorT;
	typedef TVectorT<Double_t> TVectorD;	typedef TVectorT<Double_t> TVectorD;

	#endif	#endif

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

	TVectorFfwd.h	TVectorFfwd.h

	skipping to change at line 20	skipping to change at line 20
	#define ROOT_TVectorFfwd	#define ROOT_TVectorFfwd

	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////
	// //	// //
	// TVectorF //	// TVectorF //
	// //	// //
	// Forward declaration of TVectorT<Float_t> //	// Forward declaration of TVectorT<Float_t> //
	// //	// //
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////


		#ifndef ROOT_Rtypes
		#include "Rtypes.h"
		#endif

	template<class Element> class TVectorT;	template<class Element> class TVectorT;
	typedef TVectorT<Float_t> TVectorF;	typedef TVectorT<Float_t> TVectorF;

	#endif	#endif

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

	TVectorfwd.h	TVectorfwd.h

	skipping to change at line 20	skipping to change at line 20
	#define ROOT_TVectorfwd	#define ROOT_TVectorfwd

	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////
	// //	// //
	// TVector //	// TVector //
	// //	// //
	// Forward declaration of TVectorT<Float_t> //	// Forward declaration of TVectorT<Float_t> //
	// //	// //
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////


		#ifndef ROOT_Rtypes
		#include "Rtypes.h"
		#endif

	template<class Element> class TVectorT;	template<class Element> class TVectorT;
	typedef TVectorT<Float_t> TVector;	typedef TVectorT<Float_t> TVector;

	#endif	#endif

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

	TVirtualObject.h	TVirtualObject.h

	// @(#)root/io:$Id: TVirtualObject.h 25450 2008-09-18 21:13:42Z pcanal $	// @(#)root/io:$Id: TVirtualObject.h 30902 2009-10-28 15:13:43Z pcanal $
	// Author: Philippe Canal July, 2008	// Author: Philippe Canal July, 2008

	/*************************************************************************	/*************************************************************************
	* 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 24	skipping to change at line 24

	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////
	// //	// //
	// TVirtualObject //	// TVirtualObject //
	// //	// //
	// Wrapper around an object and giving indirect access to its content //	// Wrapper around an object and giving indirect access to its content //
	// even if the object is not of a class in the Cint/Reflex dictionary. //	// even if the object is not of a class in the Cint/Reflex dictionary. //
	// //	// //
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////


		#ifndef ROOT_TClassRef
	#include "TClassRef.h"	#include "TClassRef.h"

		#endif

	class TVirtualObject {	class TVirtualObject {

		private:

		TVirtualObject(const TVirtualObject&); // not implemented
		TVirtualObject &operator=(const TVirtualObject&); // not implemented

	public:	public:
	TClassRef fClass;	TClassRef fClass;
	void *fObject;	void *fObject;


	TVirtualObject( TClass *cl ) : fClass(cl), fObject( cl ? cl->New() : 0 )	TVirtualObject(TClass *cl) : fClass(cl), fObject(cl ? cl->New() : 0) { }
	{};	~TVirtualObject() { if (fClass) fClass->Destructor(fObject); }
	~TVirtualObject() { if (fClass) fClass->Destructor( fObject ); }


	TClass *GetClass() { return fClass; }	TClass *GetClass() const { return fClass; }
	void *GetObject() { return fObject; }	void *GetObject() const { return fObject; }

	};	};

	#endif // ROOT_TVirtualObject	#endif // ROOT_TVirtualObject

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

	TVirtualPacketizer.h	TVirtualPacketizer.h

	// @(#)root/proofplayer:$Id: TVirtualPacketizer.h 25896 2008-10-20 17:01:31 Z ganis $	// @(#)root/proofplayer:$Id: TVirtualPacketizer.h 30899 2009-10-28 12:22:17 Z ganis $
	// Author: Maarten Ballintijn 9/7/2002	// Author: Maarten Ballintijn 9/7/2002

	/*************************************************************************	/*************************************************************************
	* 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 51	skipping to change at line 51
	#endif	#endif
	#ifndef ROOT_TProofProgressStatus	#ifndef ROOT_TProofProgressStatus
	#include "TProofProgressStatus.h"	#include "TProofProgressStatus.h"
	#endif	#endif

	class TDSet;	class TDSet;
	class TDSetElement;	class TDSetElement;
	class TSlave;	class TSlave;
	class TMessage;	class TMessage;
	class TNtupleD;	class TNtupleD;

		class TProofProgressInfo;

	class TVirtualPacketizer : public TObject {	class TVirtualPacketizer : public TObject {

	friend class TPacketizer;	friend class TPacketizer;
	friend class TPacketizerAdaptive;	friend class TPacketizerAdaptive;
	friend class TPacketizerProgressive;	friend class TPacketizerProgressive;
	friend class TPacketizerUnit;	friend class TPacketizerUnit;

	public: // public because of Sun CC bug	public: // public because of Sun CC bug
	class TVirtualSlaveStat;	class TVirtualSlaveStat;

	skipping to change at line 106	skipping to change at line 107
	Bool_t fStop; // Termination of Process() requested?	Bool_t fStop; // Termination of Process() requested?

	TVirtualPacketizer(TList input, TProofProgressStatus st = 0);	TVirtualPacketizer(TList input, TProofProgressStatus st = 0);
	Long64_t GetEntries(Bool_t tree, TDSetElement *e); // Num of entries or objects	Long64_t GetEntries(Bool_t tree, TDSetElement *e); // Num of entries or objects

	public:	public:
	enum EStatusBits { kIsInitializing = BIT(16), kIsDone = BIT(17) };	enum EStatusBits { kIsInitializing = BIT(16), kIsDone = BIT(17) };
	virtual ~TVirtualPacketizer();	virtual ~TVirtualPacketizer();

	Bool_t IsValid() const { return fValid; }	Bool_t IsValid() const { return fValid; }

	Long64_t GetEntriesProcessed() const { return (fProgressS	Long64_t GetEntriesProcessed() const { return (fProgressS
	tatus? fProgressStatus->GetEntries():0); }	tatus? fProgressStatus->GetEntries() : 0); }
	virtual Int_t GetEstEntriesProcessed(Float_t, Long64_t &ent, L	virtual Int_t GetEstEntriesProcessed(Float_t, Long64_t &ent, L
	ong64_t &bytes)	ong64_t &bytes, Long64_t &calls)
	{ ent = GetEntriesProcessed(); bytes = GetBytesR	{ ent = GetEntriesProcessed(); bytes = GetBytesR
	ead(); return 0; }	ead(); calls = GetReadCalls(); return 0; }
		virtual Float_t GetCurrentRate(Bool_t &all) { all = kTRUE; retur
		n (fProgressStatus? fProgressStatus->GetCurrentRate() : 0.); }
	Long64_t GetTotalEntries() const { return fTotalEntries; }	Long64_t GetTotalEntries() const { return fTotalEntries; }
	virtual TDSetElement GetNextPacket(TSlave sl, TMessage *r);	virtual TDSetElement GetNextPacket(TSlave sl, TMessage *r);
	virtual void SetInitTime();	virtual void SetInitTime();
	virtual void StopProcess(Bool_t abort);	virtual void StopProcess(Bool_t abort);
	TList *GetFailedPackets() { return fFailedPackets; }	TList *GetFailedPackets() { return fFailedPackets; }
	void SetFailedPackets(TList *list) { fFailedPackets = list; }	void SetFailedPackets(TList *list) { fFailedPackets = list; }

	Long64_t GetBytesRead() const { return (fProgressStatus? fProgressS tatus->GetBytesRead() : 0); }	Long64_t GetBytesRead() const { return (fProgressStatus? fProgressS tatus->GetBytesRead() : 0); }

		Long64_t GetReadCalls() const { return (fProgressStatus? fProgressS tatus->GetReadCalls() : 0); }
	Double_t GetCumProcTime() const { return fProgressStatus->GetProcTi me(); }	Double_t GetCumProcTime() const { return fProgressStatus->GetProcTi me(); }
	Float_t GetInitTime() const { return fInitTime; }	Float_t GetInitTime() const { return fInitTime; }
	Float_t GetProcTime() const { return fProcTime; }	Float_t GetProcTime() const { return fProcTime; }
	virtual void MarkBad(TSlave * /s/, TProofProgressStatus * /status/, TList ** /missingFiles/) { return; }	virtual void MarkBad(TSlave * /s/, TProofProgressStatus * /status/, TList ** /missingFiles/) { return; }
	virtual Int_t AddProcessed(TSlave * /sl/, TProofProgressStatus * /st /,	virtual Int_t AddProcessed(TSlave * /sl/, TProofProgressStatus * /st /,
	Double_t /lat/, TList ** /missingFiles/) { return 0 ; }	Double_t /lat/, TList ** /missingFiles/) { return 0 ; }
	TProofProgressStatus *GetStatus() { return fProgressStatus; }	TProofProgressStatus *GetStatus() { return fProgressStatus; }
	void SetProgressStatus(TProofProgressStatus *st) { fProgressSta tus = st; }	void SetProgressStatus(TProofProgressStatus *st) { fProgressSta tus = st; }


		virtual Int_t GetActiveWorkers() { return -1; }

	ClassDef(TVirtualPacketizer,0) //Generate work packets for parallel pro cessing	ClassDef(TVirtualPacketizer,0) //Generate work packets for parallel pro cessing
	};	};

	//------------------------------------------------------------------------- -----	//------------------------------------------------------------------------- -----

	class TVirtualPacketizer::TVirtualSlaveStat : public TObject {	class TVirtualPacketizer::TVirtualSlaveStat : public TObject {

	friend class TPacketizerAdaptive;	friend class TPacketizerAdaptive;
	friend class TPacketizer;	friend class TPacketizer;

	protected:	protected:

	TSlave *fSlave; // corresponding TSlave record	TString fWrkFQDN; // Worker FQDN
		TSlave *fSlave; // corresponding TSlave record
	TProofProgressStatus *fStatus; // status as of the last finished packet	TProofProgressStatus *fStatus; // status as of the last finished packet

	public:	public:

	const char *GetName() const { return fSlave->GetName(); }	const char *GetName() const { return fWrkFQDN.Data(); }
		const char *GetOrdinal() const { return fSlave->GetOrdinal(); }
	Long64_t GetEntriesProcessed() const { return fStatus?fStatus->GetEnt ries():-1; }	Long64_t GetEntriesProcessed() const { return fStatus?fStatus->GetEnt ries():-1; }
	Double_t GetProcTime() const { return fStatus?fStatus->GetProcTime(): -1; }	Double_t GetProcTime() const { return fStatus?fStatus->GetProcTime(): -1; }
	Float_t GetAvgRate() { return fStatus->GetRate(); }	Float_t GetAvgRate() { return fStatus->GetRate(); }
	TProofProgressStatus *GetProgressStatus() { return fStatus; }	TProofProgressStatus *GetProgressStatus() { return fStatus; }
	virtual TProofProgressStatus AddProcessed(TProofProgressStatus st) = 0 ;	virtual TProofProgressStatus AddProcessed(TProofProgressStatus st) = 0 ;
	};	};

	#endif	#endif

End of changes. 7 change blocks.
	9 lines changed or deleted	18 lines changed or added

	TVirtualTableInterface.h	TVirtualTableInterface.h

	skipping to change at line 14	skipping to change at line 14
	* 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_TVirtualTableInterface	#ifndef ROOT_TVirtualTableInterface
	#define ROOT_TVirtualTableInterface	#define ROOT_TVirtualTableInterface


		#ifndef ROOT_Rtypes
		#include "Rtypes.h"
		#endif

	class TVirtualTableInterface {	class TVirtualTableInterface {

	public:	public:
	TVirtualTableInterface() {;}	TVirtualTableInterface() {;}
	virtual ~TVirtualTableInterface() {;}	virtual ~TVirtualTableInterface() {;}

	virtual Double_t GetValue(UInt_t row, UInt_t column) = 0;	virtual Double_t GetValue(UInt_t row, UInt_t column) = 0;
	virtual const char *GetValueAsString(UInt_t row, UInt_t column) = 0;	virtual const char *GetValueAsString(UInt_t row, UInt_t column) = 0;
	virtual const char *GetRowHeader(UInt_t row) = 0;	virtual const char *GetRowHeader(UInt_t row) = 0;
	virtual const char *GetColumnHeader(UInt_t column) = 0;	virtual const char *GetColumnHeader(UInt_t column) = 0;

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

	TXHandler.h	TXHandler.h

	// @(#)root/proofx:$Id: TXHandler.h 20882 2007-11-19 11:31:26Z rdm $	// @(#)root/proofx:$Id: TXHandler.h 30815 2009-10-20 13:49:22Z rdm $
	/*************************************************************************	/*************************************************************************
	* 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. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOT_TXHandler	#ifndef ROOT_TXHandler
	#define ROOT_TXHandler	#define ROOT_TXHandler

	skipping to change at line 23	skipping to change at line 23
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////
	// //	// //
	// TXHandler //	// TXHandler //
	// //	// //
	// Handler of asynchronous events for xproofd sockets. //	// Handler of asynchronous events for xproofd sockets. //
	// Classes which need this should inherit from it and overload the //	// Classes which need this should inherit from it and overload the //
	// relevant methods. //	// relevant methods. //
	// //	// //
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////


		#ifndef ROOT_Rtypes
		#include "Rtypes.h"
		#endif

	class TXHandler {	class TXHandler {

	public:	public:
	TXHandler() { }	TXHandler() { }
	virtual ~TXHandler() { }	virtual ~TXHandler() { }

	virtual Bool_t HandleInput(const void *in = 0);	virtual Bool_t HandleInput(const void *in = 0);
	virtual Bool_t HandleError(const void *in = 0);	virtual Bool_t HandleError(const void *in = 0);

	ClassDef(TXHandler, 0) //Template class for handling of async events	ClassDef(TXHandler, 0) //Template class for handling of async events

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

	TXNetFile.h	TXNetFile.h

	// @(#)root/netx:$Id: TXNetFile.h 24662 2008-07-04 10:54:58Z rdm $	// @(#)root/netx:$Id: TXNetFile.h 30949 2009-11-02 16:37:58Z ganis $
	/*************************************************************************	/*************************************************************************
	* 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_TXNetFile	#ifndef ROOT_TXNetFile
	#define ROOT_TXNetFile	#define ROOT_TXNetFile

	skipping to change at line 86	skipping to change at line 86
	XrdSysRecMutex *fInitMtx; // Protects fInitDone, serializes the	XrdSysRecMutex *fInitMtx; // Protects fInitDone, serializes the
	// attempts to Init() for this object on ly	// attempts to Init() for this object on ly

	// Methods	// Methods
	TXNetFile(const TXNetFile&); // Not implemented	TXNetFile(const TXNetFile&); // Not implemented
	TXNetFile& operator=(const TXNetFile&); // Not implemented	TXNetFile& operator=(const TXNetFile&); // Not implemented
	void CreateXClient(const char url, Option_t option, Int_t netopt,	void CreateXClient(const char url, Option_t option, Int_t netopt,
	Bool_t parallelopen);	Bool_t parallelopen);

	Int_t ParseOptions(const char *opts, Int_t &cachesz, Int_t &readaheads z,	Int_t ParseOptions(const char *opts, Int_t &cachesz, Int_t &readaheads z,

	Int_t &rmpolicy, Int_t &mxredir);	Int_t &rmpolicy, Int_t &mxredir, Int_t &rastrategy,
		Int_t &readtrimblksz);

	// Synchronizes the cache size in XrdClient	// Synchronizes the cache size in XrdClient
	// XrdClient cannot have a cache size smaller than the one in TFile	// XrdClient cannot have a cache size smaller than the one in TFile
	void SynchronizeCacheSize();	void SynchronizeCacheSize();

	void Init(Bool_t create);	void Init(Bool_t create);
	Bool_t Open(Option_t *option, Bool_t parallelopen);	Bool_t Open(Option_t *option, Bool_t parallelopen);
	Int_t SysStat(Int_t fd, Long_t id, Long64_t size, Long_t *flags,	Int_t SysStat(Int_t fd, Long_t id, Long64_t size, Long_t *flags,
	Long_t *modtime);	Long_t *modtime);
	Int_t SysOpen(const char *pathname, Int_t flags, UInt_t mode);	Int_t SysOpen(const char *pathname, Int_t flags, UInt_t mode);
	Int_t SysClose(Int_t fd);	Int_t SysClose(Int_t fd);

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

	TestStatSampler.h	TestStatSampler.h

	// @(#)root/roostats:$Id: TestStatSampler.h 26805 2009-01-13 17:45:57Z cran mer $	// @(#)root/roostats:$Id: TestStatSampler.h 31276 2009-11-18 15:06:42Z mone ta $
	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke
	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOSTATS_TestStatSampler	#ifndef ROOSTATS_TestStatSampler

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

	TestStatistic.h	TestStatistic.h

	// @(#)root/roostats:$Id: TestStatistic.h 26805 2009-02-19 10:00:00 pellicc i $	// @(#)root/roostats:$Id: TestStatistic.h 31276 2009-11-18 15:06:42Z moneta $
	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke
	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOSTATS_TestStatistic	#ifndef ROOSTATS_TestStatistic

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

	ToyMCSampler.h	ToyMCSampler.h

	// @(#)root/roostats:$Id: ToyMCSampler.h 26805 2009-01-13 17:45:57Z cranmer $	// @(#)root/roostats:$Id: ToyMCSampler.h 31276 2009-11-18 15:06:42Z moneta $
	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke
	// Additions and modifications by Mario Pelliccioni	// Additions and modifications by Mario Pelliccioni
	/*************************************************************************	/*************************************************************************
	* 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. *
	*************************************************************************/	*************************************************************************/


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

	TypeBuilder.h	TypeBuilder.h

	// @(#)root/reflex:$Id: TypeBuilder.h 29288 2009-07-01 13:03:35Z axel $	// @(#)root/reflex:$Id: TypeBuilder.h 30749 2009-10-15 16:33:04Z brun $
	// 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 834	skipping to change at line 834
	* @return reference to Type	* @return reference to Type
	*/	*/
	template <typename T>	template <typename T>
	const Type&	const Type&
	GetType() {	GetType() {
	static Type t = TypeDistiller<T>::Get();	static Type t = TypeDistiller<T>::Get();
	return t;	return t;
	}	}

	/**	/**

	* @struct FuntionDistiller TypeBuilder.h Reflex/Builder/TypeBuilder.h	* @struct FunctionDistiller TypeBuilder.h Reflex/Builder/TypeBuilder.h
	* @author Pere Mato	* @author Pere Mato
	* @date 29/07/2004	* @date 29/07/2004
	* @ingroup RefBld	* @ingroup RefBld
	*/	*/
	template <typename S> class FunctionDistiller;	template <typename S> class FunctionDistiller;

	// This define is necessary for all Sun Forte compilers with version < 5.5 (SunWSpro8)	// This define is necessary for all Sun Forte compilers with version < 5.5 (SunWSpro8)
	#if ((defined(__SUNPRO_CC)) && (__SUNPRO_CC < 0x550))	#if ((defined(__SUNPRO_CC)) && (__SUNPRO_CC < 0x550))
	# define __R_TN__ typename	# define __R_TN__ typename
	#else	#else

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

	UniformProposal.h	UniformProposal.h

	// @(#)root/roostats:$Id: UniformProposal.h 26805 2009-06-17 14:31:02Z kbel asco $	// @(#)root/roostats:$Id: UniformProposal.h 31276 2009-11-18 15:06:42Z mone ta $
	// Authors: Kevin Belasco 17/06/2009	// Authors: Kevin Belasco 17/06/2009
	// Authors: Kyle Cranmer 17/06/2009	// Authors: Kyle Cranmer 17/06/2009
	/*************************************************************************	/*************************************************************************
	* 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. *
	*************************************************************************/	*************************************************************************/


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

	UpperLimitMCSModule.h	UpperLimitMCSModule.h

	// @(#)root/roostats:$Id: CombinedCalculator.h 30450 2009-09-25 13:30:32Z m oneta $	// @(#)root/roostats:$Id: UpperLimitMCSModule.h 31276 2009-11-18 15:06:42Z moneta $
	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke, N ils Ruthmann	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke, N ils Ruthmann
	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef UPPER_LIMIT_MCS_MODULE	#ifndef UPPER_LIMIT_MCS_MODULE

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

	WidgetMessageTypes.h	WidgetMessageTypes.h

	/* @(#)root/gui:$Id: WidgetMessageTypes.h 23115 2008-04-10 13:35:37Z rdm $ */	/* @(#)root/gui:$Id: WidgetMessageTypes.h 30815 2009-10-20 13:49:22Z rdm $ */

	/*************************************************************************	/*************************************************************************
	* 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_WidgetMessageTypes	#ifndef ROOT_WidgetMessageTypes

	skipping to change at line 28	skipping to change at line 28
	// System predefined widget message types. Message types are constants //	// System predefined widget message types. Message types are constants //
	// that indicate which widget sent the message and by which widget //	// that indicate which widget sent the message and by which widget //
	// function (sub-message). Make sure your own message types don't clash //	// function (sub-message). Make sure your own message types don't clash //
	// whith the ones defined in this file. ROOT reserves all message ids //	// whith the ones defined in this file. ROOT reserves all message ids //
	// between 0 - 1000. User defined messages should be in the range //	// between 0 - 1000. User defined messages should be in the range //
	// 1001 - 10000. Sub-messages must always be in the range 1-255. //	// 1001 - 10000. Sub-messages must always be in the range 1-255. //
	// To use MK_MSG() just cast your message id's to an EWidgetMessageType.//	// To use MK_MSG() just cast your message id's to an EWidgetMessageType.//
	// //	// //
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////


		#ifndef ROOT_Rtypes
		#include "Rtypes.h"
		#endif

	enum EWidgetMessageTypes {	enum EWidgetMessageTypes {
	kC_COMMAND = 1,	kC_COMMAND = 1,
	kCM_MENU = 1,	kCM_MENU = 1,
	kCM_MENUSELECT = 2,	kCM_MENUSELECT = 2,
	kCM_BUTTON = 3,	kCM_BUTTON = 3,
	kCM_CHECKBUTTON = 4,	kCM_CHECKBUTTON = 4,
	kCM_RADIOBUTTON = 5,	kCM_RADIOBUTTON = 5,
	kCM_LISTBOX = 6,	kCM_LISTBOX = 6,
	kCM_COMBOBOX = 7,	kCM_COMBOBOX = 7,
	kCM_TAB = 8,	kCM_TAB = 8,

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

	WrappedMultiTF1.h	WrappedMultiTF1.h

	// @(#)root/mathmore:$Id: WrappedMultiTF1.h 28964 2009-06-12 16:08:04Z mone ta $	// @(#)root/mathmore:$Id: WrappedMultiTF1.h 31207 2009-11-16 16:52:00Z 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 37	skipping to change at line 37

	/**	/**
	Class to Wrap a ROOT Function class (like TF1) in a IParamMultiFunction interface	Class to Wrap a ROOT Function class (like TF1) in a IParamMultiFunction interface
	of multi-dimensions to be used in the ROOT::Math numerical algorithm	of multi-dimensions to be used in the ROOT::Math numerical algorithm
	The parameter are stored in this wrapper class, so the TF1 parameter val ues are not used for evaluating the function.	The parameter are stored in this wrapper class, so the TF1 parameter val ues are not used for evaluating the function.
	This allows for the copy of the wrapper function without the need to cop y the TF1.	This allows for the copy of the wrapper function without the need to cop y the TF1.
	This wrapper class does not own the TF1 pointer, so it assumes it exists during the wrapper lifetime.	This wrapper class does not own the TF1 pointer, so it assumes it exists during the wrapper lifetime.

	@ingroup CppFunctions	@ingroup CppFunctions
	*/	*/

	class WrappedMultiTF1 : public ROOT::Math::IParamMultiFunction {	class WrappedMultiTF1 : public ROOT::Math::IParamMultiGradFunction {

	public:	public:


	typedef ROOT::Math::IParamMultiFunction BaseParamFunc;	typedef ROOT::Math::IParamMultiGradFunction BaseParamFunc;
	typedef ROOT::Math::IParamMultiFunction::BaseFunc BaseFunc;	typedef ROOT::Math::IParamMultiFunction::BaseFunc BaseFunc;

	/**	/**
	constructor from a function pointer to a TF1	constructor from a function pointer to a TF1
	If dim = 0 dimension is taken from TF1::GetNdim().	If dim = 0 dimension is taken from TF1::GetNdim().
	IN case of multi-dimensional function created using directly TF1 obje ct the dimension	IN case of multi-dimensional function created using directly TF1 obje ct the dimension
	returned by TF1::GetNdim is always 1. The user must then pass the cor rect value of dim	returned by TF1::GetNdim is always 1. The user must then pass the cor rect value of dim
	*/	*/
	WrappedMultiTF1 (TF1 & f, unsigned int dim = 0 );	WrappedMultiTF1 (TF1 & f, unsigned int dim = 0 );


	skipping to change at line 103	skipping to change at line 103
	/// return number of parameters	/// return number of parameters
	unsigned int NPar() const {	unsigned int NPar() const {
	return fParams.size();	return fParams.size();
	}	}

	/// return parameter name (from TF1)	/// return parameter name (from TF1)
	std::string ParameterName(unsigned int i) const {	std::string ParameterName(unsigned int i) const {
	return std::string(fFunc->GetParName(i));	return std::string(fFunc->GetParName(i));
	}	}


		/// evaluate the derivative of the function with respect to the paramete
		rs
		void ParameterGradient(const double * x, const double * par, double * g
		rad ) const;

		/// precision value used for calculating the derivative step-size
		/// h = eps * \|x\|. The default is 0.001, give a smaller in case function
		changes rapidly
		static void SetDerivPrecision(double eps);

		/// get precision value used for calculating the derivative step-size
		static double GetDerivPrecision();

	private:	private:

	/// evaluate function passing coordinates x and vector of parameters	/// evaluate function passing coordinates x and vector of parameters
	double DoEvalPar (const double * x, const double * p ) const {	double DoEvalPar (const double * x, const double * p ) const {
	if (fFunc->GetMethodCall() ) fFunc->InitArgs(x,p); // needed for in terpreted functions	if (fFunc->GetMethodCall() ) fFunc->InitArgs(x,p); // needed for in terpreted functions
	return fFunc->EvalPar(x,p);	return fFunc->EvalPar(x,p);
	}	}


		/// evaluate the partial derivative with respect to the parameter
		double DoParameterDerivative(const double * x, const double * p, unsigne
		d int ipar) const;

		bool fLinear; // flag for linear functions
		bool fPolynomial; // flag for polynomial functions
	TF1 * fFunc; // pointer to ROOT function	TF1 * fFunc; // pointer to ROOT function
	unsigned int fDim; // cached value of dimension	unsigned int fDim; // cached value of dimension
	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 h ~ eps \|p\|
	};	};

	} // end namespace Fit	} // end namespace Fit

	} // end namespace ROOT	} // end namespace ROOT

	#endif /* ROOT_Fit_WrappedMultiTF1 */	#endif /* ROOT_Fit_WrappedMultiTF1 */

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

	compiledata.h	compiledata.h
	/* This is file is automatically generated */	/* This is file is automatically generated */
	#define BUILD_ARCH "linux"	#define BUILD_ARCH "linux"

	#define BUILD_NODE "Linux lxbuild147.cern.ch 2.6.18-128.7.1.el5 #1 SMP Mon Aug 24 16:57:26 CEST 2009 i686 i686 i386 GNU/Linux"	#define BUILD_NODE "Linux lxbuild147.cern.ch 2.6.18-164.6.1.el5 #1 SMP Wed Nov 4 09:08:07 CET 2009 i686 i686 i386 GNU/Linux"
	#define COMPILER "/afs/cern.ch/sw/lcg/contrib/gcc/4.3/i686-slc5-gcc34-opt/b in/g++"	#define COMPILER "/afs/cern.ch/sw/lcg/contrib/gcc/4.3/i686-slc5-gcc34-opt/b in/g++"
	#define COMPILERVERS "gcc432"	#define COMPILERVERS "gcc432"
	#define MAKESHAREDLIB "cd $BuildDir ; g++ -c $Opt -pipe -m32 -Wall -W -Wov erloaded-virtual -fPIC -pthread $IncludePath $SourceFiles ; g++ $ObjectFil es -shared -Wl,-soname,$LibName.so -m32 -O2 $LinkedLibs -o $SharedLib"	#define MAKESHAREDLIB "cd $BuildDir ; g++ -c $Opt -pipe -m32 -Wall -W -Wov erloaded-virtual -fPIC -pthread $IncludePath $SourceFiles ; g++ $ObjectFil es -shared -Wl,-soname,$LibName.so -m32 -O2 $LinkedLibs -o $SharedLib"
	#define MAKEEXE "cd $BuildDir ; g++ -c -pipe -m32 -Wall -W -Woverloaded-vi rtual -fPIC -pthread $IncludePath $SourceFiles; g++ $ObjectFiles -m32 -O2 -o $ExeName $LinkedLibs -lm -ldl -pthread -rdynamic"	#define MAKEEXE "cd $BuildDir ; g++ -c -pipe -m32 -Wall -W -Woverloaded-vi rtual -fPIC -pthread $IncludePath $SourceFiles; g++ $ObjectFiles -m32 -O2 -o $ExeName $LinkedLibs -lm -ldl -pthread -rdynamic"
	#define CXXOPT "-O2"	#define CXXOPT "-O2"
	#define CXXDEBUG "-g"	#define CXXDEBUG "-g"
	#define ROOTBUILD ""	#define ROOTBUILD ""
	#define LINKEDLIBS "-L$ROOTSYS/lib -lCore -lCint -lMathCore -lRint "	#define LINKEDLIBS "-L$ROOTSYS/lib -lCore -lCint -lMathCore -lRint "
	#define INCLUDEPATH "-I$ROOTSYS/include"	#define INCLUDEPATH "-I$ROOTSYS/include"
	#define OBJEXT "o"	#define OBJEXT "o"

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

	mmprivate.h	mmprivate.h

	/* @(#)root/clib:$Id: mmprivate.h 20882 2007-11-19 11:31:26Z rdm $ */	/* @(#)root/clib:$Id: mmprivate.h 31251 2009-11-17 20:00:28Z rdm $ */

	/*************************************************************************	/*************************************************************************
	* 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. *
	*************************************************************************/	*************************************************************************/

	/* Declarations for `mmalloc' and friends.	/* Declarations for `mmalloc' and friends.

	skipping to change at line 143	skipping to change at line 143
	} info;	} info;
	} busy;	} busy;
	/* Heap information for a free block (that may be the first of	/* Heap information for a free block (that may be the first of
	a free cluster). */	a free cluster). */
	struct	struct
	{	{
	size_t size; /* Size (in blocks) of a free cluster. */	size_t size; /* Size (in blocks) of a free cluster. */
	size_t next; /* Index of next free cluster. */	size_t next; /* Index of next free cluster. */
	size_t prev; /* Index of previous free cluster. */	size_t prev; /* Index of previous free cluster. */
	} free;	} free;

	} malloc_info;	} mmalloc_info;

	/* List of blocks allocated with `mmemalign' (or `mvalloc'). */	/* List of blocks allocated with `mmemalign' (or `mvalloc'). */

	struct alignlist	struct alignlist
	{	{
	struct alignlist *next;	struct alignlist *next;
	PTR aligned; /* The address that mmemaligned returned. * /	PTR aligned; /* The address that mmemaligned returned. * /
	PTR exact; /* The address that malloc returned. */	PTR exact; /* The address that malloc returned. */
	};	};


	skipping to change at line 269	skipping to change at line 269
	size_t heapindex;	size_t heapindex;

	/* Limit of valid info table indices. */	/* Limit of valid info table indices. */

	size_t heaplimit;	size_t heaplimit;

	/* Block information table.	/* Block information table.
	Allocated with malign/__mmalloc_free (not mmalloc/mfree). */	Allocated with malign/__mmalloc_free (not mmalloc/mfree). */
	/* Table indexed by block number giving per-block information. */	/* Table indexed by block number giving per-block information. */


	malloc_info *heapinfo;	mmalloc_info *heapinfo;

	/* Instrumentation. */	/* Instrumentation. */

	struct mstats heapstats;	struct mstats heapstats;

	/* Free list headers for each fragment size. */	/* Free list headers for each fragment size. */
	/* Free lists for each fragment size. */	/* Free lists for each fragment size. */

	struct mmlist fraghead[BLOCKLOG];	struct mmlist fraghead[BLOCKLOG];


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

	rsaaux.h	rsaaux.h

	/* @(#)root/auth:$Id: rsaaux.h 20882 2007-11-19 11:31:26Z rdm $ */	/* @(#)root/auth:$Id: rsaaux.h 30749 2009-10-15 16:33:04Z brun $ */
	/* Author: Martin Nicolay 22/11/1988 */	/* Author: Martin Nicolay 22/11/1988 */

	/************************************************************************ **	/************************************************************************ **
	Copyright (C) 2006 Martin Nicolay <m.nicolay@osm-gmbh.de>	Copyright (C) 2006 Martin Nicolay <m.nicolay@osm-gmbh.de>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Lesser General Public	modify it under the terms of the GNU Lesser General Public
	License as published by the Free Software Foundation; either	License as published by the Free Software Foundation; either
	version 2.1 of the License, or (at your option) any later	version 2.1 of the License, or (at your option) any later
	version.	version.

	skipping to change at line 30	skipping to change at line 30
	Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,	Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
	MA 02110-1301 USA	MA 02110-1301 USA
	************************************************************************* */	************************************************************************* */

	/************************************************************************ ***	/************************************************************************ ***
	* *	* *
	* Simple RSA public key code. *	* Simple RSA public key code. *
	* Adaptation in library for ROOT by G. Ganis, July 2003 *	* Adaptation in library for ROOT by G. Ganis, July 2003 *
	* (gerardo.ganis@cern.ch) *	* (gerardo.ganis@cern.ch) *
	* *	* *

	* Header used by internal rsa funtions *	* Header used by internal rsa functions *
	* *	* *
	************************************************************************* **/	************************************************************************* **/

	#ifndef _RSAAUX_H	#ifndef _RSAAUX_H
	#define _RSAAUX_H	#define _RSAAUX_H

	#ifndef _RSADEF_H	#ifndef _RSADEF_H
	#include "rsadef.h"	#include "rsadef.h"
	#endif	#endif


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

	rsafun.h	rsafun.h

	/* @(#)root/auth:$Id: rsafun.h 20882 2007-11-19 11:31:26Z rdm $ */	/* @(#)root/auth:$Id: rsafun.h 30749 2009-10-15 16:33:04Z brun $ */
	/* Author: Martin Nicolay 22/11/1988 */	/* Author: Martin Nicolay 22/11/1988 */

	/************************************************************************ **	/************************************************************************ **
	Copyright (C) 2006 Martin Nicolay <m.nicolay@osm-gmbh.de>	Copyright (C) 2006 Martin Nicolay <m.nicolay@osm-gmbh.de>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Lesser General Public	modify it under the terms of the GNU Lesser General Public
	License as published by the Free Software Foundation; either	License as published by the Free Software Foundation; either
	version 2.1 of the License, or (at your option) any later	version 2.1 of the License, or (at your option) any later
	version.	version.

	skipping to change at line 30	skipping to change at line 30
	Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,	Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
	MA 02110-1301 USA	MA 02110-1301 USA
	************************************************************************* */	************************************************************************* */

	/************************************************************************ ***	/************************************************************************ ***
	* *	* *
	* Simple RSA public key code. *	* Simple RSA public key code. *
	* Adaptation in library for ROOT by G. Ganis, July 2003 *	* Adaptation in library for ROOT by G. Ganis, July 2003 *
	* (gerardo.ganis@cern.ch) *	* (gerardo.ganis@cern.ch) *
	* *	* *

	* Header used by internal rsa funtions *	* Header used by internal rsa functions *
	* *	* *
	************************************************************************* **/	************************************************************************* **/

	#include <stdio.h>	#include <stdio.h>

	#ifndef ROOT_rsafun	#ifndef ROOT_rsafun
	#define ROOT_rsafun	#define ROOT_rsafun

	#ifndef _RSADEF_H	#ifndef _RSADEF_H
	#include "rsadef.h"	#include "rsadef.h"

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

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

	AdaptiveIntegratorMultiDim.h	AdaptiveIntegratorMultiDim.h

	// @(#)root/mathcore:$Id: AdaptiveIntegratorMultiDim.h 22518 2008-03-07 15: 40:22Z moneta $	// @(#)root/mathcore:$Id: AdaptiveIntegratorMultiDim.h 30749 2009-10-15 16: 33:04Z brun $
	// Author: M. Slawinska 08/2007	// Author: M. Slawinska 08/2007

	/**********************************************************************	/**********************************************************************
	* *	* *
	* Copyright (c) 2007 , LCG ROOT MathLib Team *	* Copyright (c) 2007 , LCG ROOT MathLib Team *
	* *	* *
	* *	* *
	**********************************************************************/	**********************************************************************/

	// Header source file for class AdaptiveIntegratorMultiDim	// Header source file for class AdaptiveIntegratorMultiDim

	skipping to change at line 70	skipping to change at line 70
	virtual ~AdaptiveIntegratorMultiDim() {}	virtual ~AdaptiveIntegratorMultiDim() {}

	/**	/**
	evaluate the integral with the previously given function between xmin [] and xmax[]	evaluate the integral with the previously given function between xmin [] and xmax[]
	*/	*/
	double Integral(const double* xmin, const double * xmax);	double Integral(const double* xmin, const double * xmax);

	/// evaluate the integral passing a new function	/// evaluate the integral passing a new function
	double Integral(const IMultiGenFunction &f, const double* xmin, const do uble * xmax);	double Integral(const IMultiGenFunction &f, const double* xmin, const do uble * xmax);


	/// set the integration function (must implement multi-dim funciton inte rface: IBaseFunctionMultiDim)	/// set the integration function (must implement multi-dim function inte rface: IBaseFunctionMultiDim)
	void SetFunction(const IMultiGenFunction &f);	void SetFunction(const IMultiGenFunction &f);

	/// return result of integration	/// return result of integration
	double Result() const { return fResult; }	double Result() const { return fResult; }

	/// return integration error	/// return integration error
	double Error() const { return fError; }	double Error() const { return fError; }

	/// return relative error	/// return relative error
	double RelError() const { return fRelError; }	double RelError() const { return fRelError; }

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

	CholeskyDecomp.h	CholeskyDecomp.h

	// @(#)root/smatrix:$Id: CholeskyDecomp.h 28954 2009-06-12 09:36:34Z moneta $	// @(#)root/smatrix:$Id: CholeskyDecomp.h 30561 2009-10-05 14:23:15Z moneta $
	// Author: M. Schiller 2009	// Author: M. Schiller 2009

	#ifndef ROOT_Math_CholeskyDecomp	#ifndef ROOT_Math_CholeskyDecomp
	#define ROOT_Math_CholeskyDecomp	#define ROOT_Math_CholeskyDecomp

	/** @file	/** @file
	* header file containing the templated implementation of matrix inversion	* header file containing the templated implementation of matrix inversion
	* routines for use with ROOT's SMatrix classes (symmetric positive	* routines for use with ROOT's SMatrix classes (symmetric positive
	* definite case)	* definite case)
	*	*

	skipping to change at line 96	skipping to change at line 96
	};	};
	public:	public:
	/// perform a Cholesky decomposition	/// perform a Cholesky decomposition
	/** perfrom a Cholesky decomposition of a symmetric positive	/** perfrom a Cholesky decomposition of a symmetric positive
	* definite matrix m	* definite matrix m
	*	*
	* this is the constructor to uses with an SMatrix (and objects	* this is the constructor to uses with an SMatrix (and objects
	* that behave like an SMatrix in terms of using	* that behave like an SMatrix in terms of using
	* operator()(int i, int j) for access to elements)	* operator()(int i, int j) for access to elements)
	*/	*/

	template<class M> CholeskyDecomp(const M& m)	template<class M> CholeskyDecomp(const M& m) :
		fL( ), fOk(false)
	{	{
	using CholeskyDecompHelpers::_decomposer;	using CholeskyDecompHelpers::_decomposer;
	fOk = _decomposer<F, N, M>()(fL, m);	fOk = _decomposer<F, N, M>()(fL, m);
	}	}

	/// perform a Cholesky decomposition	/// perform a Cholesky decomposition
	/** perfrom a Cholesky decomposition of a symmetric positive	/** perfrom a Cholesky decomposition of a symmetric positive
	* definite matrix m	* definite matrix m
	*	*
	* this is the constructor to use in special applications where	* this is the constructor to use in special applications where
	* plain arrays are used	* plain arrays are used
	*	*
	* NOTE: the matrix is given in packed representation, matrix	* NOTE: the matrix is given in packed representation, matrix
	* element m(i,j) (j <= i) is supposed to be in array element	* element m(i,j) (j <= i) is supposed to be in array element
	* (i * (i + 1)) / 2 + j	* (i * (i + 1)) / 2 + j
	*/	*/

	template<typename G> CholeskyDecomp(G* m)	template<typename G> CholeskyDecomp(G* m) :
		fL(), fOk(false)
	{	{
	using CholeskyDecompHelpers::_decomposer;	using CholeskyDecompHelpers::_decomposer;
	fOk = _decomposer<F, N, PackedArrayAdapter<G> >()(	fOk = _decomposer<F, N, PackedArrayAdapter<G> >()(
	fL, PackedArrayAdapter<G>(m));	fL, PackedArrayAdapter<G>(m));
	}	}

	/// returns true if decomposition was successful	/// returns true if decomposition was successful
	/** @returns true if decomposition was successful */	/** @returns true if decomposition was successful */
	bool ok() const { return fOk; }	bool ok() const { return fOk; }
	/// returns true if decomposition was successful	/// returns true if decomposition was successful

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

	FeldmanCousins.h	FeldmanCousins.h

	// @(#)root/roostats:$Id: FeldmanCousins.h 26805 2009-01-13 17:45:57Z cranm er $	// @(#)root/roostats:$Id: FeldmanCousins.h 31276 2009-11-18 15:06:42Z monet a $
	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke
	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOSTATS_FeldmanCousins	#ifndef ROOSTATS_FeldmanCousins

	skipping to change at line 55	skipping to change at line 55
	virtual ConfInterval* GetInterval() const;	virtual ConfInterval* GetInterval() const;

	// Get the size of the test (eg. rate of Type I error)	// Get the size of the test (eg. rate of Type I error)
	virtual Double_t Size() const {return fSize;}	virtual Double_t Size() const {return fSize;}
	// Get the Confidence level for the test	// Get the Confidence level for the test
	virtual Double_t ConfidenceLevel() const {return 1.-fSize;}	virtual Double_t ConfidenceLevel() const {return 1.-fSize;}
	// Set the DataSet	// Set the DataSet
	virtual void SetData(RooAbsData& data) { fData = &data; }	virtual void SetData(RooAbsData& data) { fData = &data; }
	// Set the Pdf	// Set the Pdf
	virtual void SetPdf(RooAbsPdf& pdf) { fPdf = &pdf; }	virtual void SetPdf(RooAbsPdf& pdf) { fPdf = &pdf; }


	// specify the parameters of interest in the interval	// specify the parameters of interest in the interval

	virtual void SetParameters(const RooArgSet& set) {fPOI = &set;}	virtual void SetParameters(const RooArgSet& set) { fPOI.removeAll();
		fPOI.add(set); }

	// specify the nuisance parameters (eg. the rest of the parameters)	// specify the nuisance parameters (eg. the rest of the parameters)

	virtual void SetNuisanceParameters(const RooArgSet& set) {fNuisParams	virtual void SetNuisanceParameters(const RooArgSet& set) {fNuisParams
	= &set;}	.removeAll(); fNuisParams.add(set);}

	// set the size of the test (rate of Type I error) ( Eg. 0.05 for a 9 5% Confidence Interval)	// set the size of the test (rate of Type I error) ( Eg. 0.05 for a 9 5% Confidence Interval)
	virtual void SetTestSize(Double_t size) {fSize = size;}	virtual void SetTestSize(Double_t size) {fSize = size;}
	// set the confidence level for the interval (eg. 0.95 for a 95% Conf idence Interval)	// set the confidence level for the interval (eg. 0.95 for a 95% Conf idence Interval)
	virtual void SetConfidenceLevel(Double_t cl) {fSize = 1.-cl;}	virtual void SetConfidenceLevel(Double_t cl) {fSize = 1.-cl;}

	virtual void SetModel(const ModelConfig &);	virtual void SetModel(const ModelConfig &);

	RooAbsData* GetPointsToScan() {	RooAbsData* GetPointsToScan() {
	if(!fPointsToTest) CreateParameterPoints();	if(!fPointsToTest) CreateParameterPoints();
	return fPointsToTest;	return fPointsToTest;

	skipping to change at line 96	skipping to change at line 99

	// initializes fPointsToTest data member (mutable)	// initializes fPointsToTest data member (mutable)
	void CreateParameterPoints() const;	void CreateParameterPoints() const;

	// initializes fTestStatSampler data member (mutable)	// initializes fTestStatSampler data member (mutable)
	void CreateTestStatSampler() const;	void CreateTestStatSampler() const;

	Double_t fSize; // size of the test (eg. specified rate of Type I err or)	Double_t fSize; // size of the test (eg. specified rate of Type I err or)
	RooAbsPdf * fPdf; // common PDF	RooAbsPdf * fPdf; // common PDF
	RooAbsData * fData; // data set	RooAbsData * fData; // data set

	const RooArgSet* fPOI; // RooArgSet specifying parameters of interes	RooArgSet fPOI; // RooArgSet specifying parameters of interest for i
	t for interval	nterval
	const RooArgSet* fNuisParams;// RooArgSet specifying nuisance parame	RooArgSet fNuisParams;// RooArgSet specifying nuisance parameters fo
	ters for interval	r interval
	mutable ToyMCSampler* fTestStatSampler; // the test statistic sampler	mutable ToyMCSampler* fTestStatSampler; // the test statistic sampler
	mutable RooAbsData* fPointsToTest; // points to perform the construct ion	mutable RooAbsData* fPointsToTest; // points to perform the construct ion
	mutable ConfidenceBelt* fConfBelt;	mutable ConfidenceBelt* fConfBelt;
	bool fAdaptiveSampling; // controls use of adaptive sampling algorith m	bool fAdaptiveSampling; // controls use of adaptive sampling algorith m
	Int_t fNbins; // number of samples per variable	Int_t fNbins; // number of samples per variable
	Bool_t fFluctuateData; // tell ToyMCSampler to fluctuate number of e ntries in dataset	Bool_t fFluctuateData; // tell ToyMCSampler to fluctuate number of e ntries in dataset
	Bool_t fDoProfileConstruction; // instead of full construction over n uisance parametrs, do profile	Bool_t fDoProfileConstruction; // instead of full construction over n uisance parametrs, do profile
	bool fSaveBeltToFile; // controls use if ConfidenceBelt should be sav ed to a TFile	bool fSaveBeltToFile; // controls use if ConfidenceBelt should be sav ed to a TFile
	bool fCreateBelt; // controls use if ConfidenceBelt should be saved t o a TFile	bool fCreateBelt; // controls use if ConfidenceBelt should be saved t o a TFile


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

	FitResult.h	FitResult.h

	// @(#)root/mathcore:$Id: FitResult.h 28957 2009-06-12 13:40:04Z moneta $	// @(#)root/mathcore:$Id: FitResult.h 31261 2009-11-18 07:31:51Z moneta $
	// Author: L. Moneta Wed Aug 30 11:05:34 2006	// Author: L. Moneta Wed Aug 30 11:05:34 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 FitResult	// Header file for class FitResult

	skipping to change at line 113	skipping to change at line 113
	double MinFcnValue() const { return fVal; }	double MinFcnValue() const { return fVal; }

	///Number of function calls to find minimum	///Number of function calls to find minimum
	unsigned int NCalls() const { return fNCalls; }	unsigned int NCalls() const { return fNCalls; }

	///Expected distance from minimum	///Expected distance from minimum
	double Edm() const { return fEdm; }	double Edm() const { return fEdm; }

	/// get total number of parameters	/// get total number of parameters
	unsigned int NTotalParameters() const { return fParams.size(); }	unsigned int NTotalParameters() const { return fParams.size(); }

		/// total number of parameters (abbreviation)
		unsigned int NPar() const { return NTotalParameters(); }

	/// get total number of free parameters	/// get total number of free parameters
	unsigned int NFreeParameters() const { return fNFree; }	unsigned int NFreeParameters() const { return fNFree; }

	/// minimizer status code	/// minimizer status code
	int Status() const { return fStatus; }	int Status() const { return fStatus; }

	/ fitting quantities /	/ fitting quantities /

	/// Return pointer to model (fit) function with fitted parameter values.	/// Return pointer to model (fit) function with fitted parameter values.

	skipping to change at line 135	skipping to change at line 137
	/// Chi2 fit value	/// Chi2 fit value
	/// in case of likelihood must be computed ?	/// in case of likelihood must be computed ?
	double Chi2() const { return fChi2; }	double Chi2() const { return fChi2; }

	/// Number of degree of freedom	/// Number of degree of freedom
	unsigned int Ndf() const { return fNdf; }	unsigned int Ndf() const { return fNdf; }

	/// p value of the fit (chi2 probability)	/// p value of the fit (chi2 probability)
	double Prob() const;	double Prob() const;


	/// parameter errors	/// parameter errors (return st::vector)
	const std::vector<double> & Errors() const { return fErrors; }	const std::vector<double> & Errors() const { return fErrors; }

		/// parameter errors (return const pointer)
		const double * GetErrors() const { return &fErrors.front(); }


	/// parameter values	/// parameter values (return std::vector)
	const std::vector<double> & Parameters() const { return fParams; }	const std::vector<double> & Parameters() const { return fParams; }

		/// parameter values (return const pointer)
		const double * GetParams() const { return &fParams.front();}

	/// parameter value by index	/// parameter value by index
	double Value(unsigned int i) const { return fParams[i]; }	double Value(unsigned int i) const { return fParams[i]; }

	/// parameter error by index	/// parameter error by index
	double Error(unsigned int i) const {	double Error(unsigned int i) const {
	return (i < fErrors.size() ) ? fErrors[i] : 0;	return (i < fErrors.size() ) ? fErrors[i] : 0;
	}	}

	/// set the Minos errors for parameter i (called by the Fitter class whe n running Minos)	/// set the Minos errors for parameter i (called by the Fitter class whe n running Minos)

	skipping to change at line 204	skipping to change at line 210

	/// fill a correlation matrix elements using a generic symmetric matrix class implementing operator(i,j)	/// fill a correlation matrix elements using a generic symmetric matrix class implementing operator(i,j)
	/// the matrix must be previously allocates with right size (npar * npar )	/// the matrix must be previously allocates with right size (npar * npar )
	template<class Matrix>	template<class Matrix>
	void GetCorrelationMatrix(Matrix & mat) const {	void GetCorrelationMatrix(Matrix & mat) const {
	unsigned int npar = fErrors.size();	unsigned int npar = fErrors.size();
	assert(fCovMatrix.size() == npar*(npar+1)/2);	assert(fCovMatrix.size() == npar*(npar+1)/2);
	for (unsigned int i = 0; i< npar; ++i) {	for (unsigned int i = 0; i< npar; ++i) {
	for (unsigned int j = 0; j<=i; ++j) {	for (unsigned int j = 0; j<=i; ++j) {
	double tmp = fCovMatrix[i * (i +3)/2 ] * fCovMatrix[ j * (j+3)/ 2 ];	double tmp = fCovMatrix[i * (i +3)/2 ] * fCovMatrix[ j * (j+3)/ 2 ];

	if (tmp < 0)	mat(i,j) = (tmp > 0) ? fCovMatrix[j + i*(i+1)/2 ] / std::sqrt(t
	mat(i,j) = 0;	mp) : 0;
	else
	mat(i,j) = fCovMatrix[j + i*(i+1)/2 ] / std::sqrt(tmp);

	if (i != j) mat(j,i) = mat(i,j);	if (i != j) mat(j,i) = mat(i,j);


	}	}
	}	}
	}	}

	/**	/**
	get confidence intervals for an array of n points x.	get confidence intervals for an array of n points x.
	stride1 indicates the stride in the coordinate space while stride2 th e stride in dimension space.	stride1 indicates the stride in the coordinate space while stride2 th e stride in dimension space.
	For 1-dim points : stride1=1, stride2=1	For 1-dim points : stride1=1, stride2=1
	for multi-dim points arranged as (x0,x1,...,xN,y0,....yN) st ride1=1 stride2=n	for multi-dim points arranged as (x0,x1,...,xN,y0,....yN) st ride1=1 stride2=n
	for multi-dim points arraged as (x0,y0,..,x1,y1,...,xN,yN,..) st ride1=ndim, stride2=1	for multi-dim points arraged as (x0,y0,..,x1,y1,...,xN,yN,..) st ride1=ndim, stride2=1

	skipping to change at line 261	skipping to change at line 262
	bool IsParameterBound(unsigned int ipar) const;	bool IsParameterBound(unsigned int ipar) const;

	/// query if a parameter is fixed	/// query if a parameter is fixed
	bool IsParameterFixed(unsigned int ipar) const;	bool IsParameterFixed(unsigned int ipar) const;

	/// get name of parameter	/// get name of parameter
	std::string GetParameterName(unsigned int ipar) const;	std::string GetParameterName(unsigned int ipar) const;

	protected:	protected:


	private:	protected:

	/// Return pointer non const pointer to model (fit) function with fitted parameter values.	/// Return pointer non const pointer to model (fit) function with fitted parameter values.
	/// used by Fitter class	/// used by Fitter class
	IModelFunction * ModelFunction() { return fFitFunc; }	IModelFunction * ModelFunction() { return fFitFunc; }
	void SetModelFunction(IModelFunction * func) { fFitFunc = func; }	void SetModelFunction(IModelFunction * func) { fFitFunc = func; }

	friend class Fitter;	friend class Fitter;

	bool fValid; // flag for indicating valid fit	bool fValid; // flag for indicating valid fit
	bool fNormalized; // flag for indicating is errors are normalized	bool fNormalized; // flag for indicating is errors are normalized
	unsigned int fNFree; // number of fit free parameters (total paramet ers are in size of parameter vector)	unsigned int fNFree; // number of fit free parameters (total paramet ers are in size of parameter vector)
	unsigned int fNdf; // number of degree of freedom	unsigned int fNdf; // number of degree of freedom
	unsigned int fNCalls; // number of function calls	unsigned int fNCalls; // number of function calls
	int fStatus; // minimizer status code	int fStatus; // minimizer status code
	double fVal; // minimum function value	double fVal; // minimum function value
	double fEdm; // expected distance from mimimum	double fEdm; // expected distance from mimimum
	double fChi2; // fit chi2 value (different than fval in case of chi2 fits)	double fChi2; // fit chi2 value (different than fval in case of chi2 fits)

	IModelFunction * fFitFunc; // model function resulting from the fit. It is given by Fitter but it is managed by FitResult	IModelFunction * fFitFunc; //! model function resulting from the fit. I t is given by Fitter but it is managed by FitResult
	std::vector<unsigned int> fFixedParams; // list of fixed parameters	std::vector<unsigned int> fFixedParams; // list of fixed parameters
	std::vector<unsigned int> fBoundParams; // list of limited parameters	std::vector<unsigned int> fBoundParams; // list of limited parameters
	std::vector<double> fParams; // parameter values. Size is total number of parameters	std::vector<double> fParams; // parameter values. Size is total number of parameters
	std::vector<double> fErrors; // errors	std::vector<double> fErrors; // errors
	std::vector<double> fCovMatrix; // covariance matrix (size is n par*(npar+1)/2) where npar is total parameters	std::vector<double> fCovMatrix; // covariance matrix (size is n par*(npar+1)/2) where npar is total parameters
	std::vector<double> fGlobalCC; // global Correlation coefficie nt	std::vector<double> fGlobalCC; // global Correlation coefficie nt
	std::map<unsigned int, std::pair<double,double> > fMinosErrors; // map contains the two Minos errors	std::map<unsigned int, std::pair<double,double> > fMinosErrors; // map contains the two Minos errors
	std::string fMinimType; // string indicating type of minimi zer	std::string fMinimType; // string indicating type of minimi zer
	std::vector<std::string> fParNames; // parameter names (only with FCN o nly fites, when fFitFunc=0)	std::vector<std::string> fParNames; // parameter names (only with FCN o nly fites, when fFitFunc=0)


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

	G__ci.h	G__ci.h

	skipping to change at line 419	skipping to change at line 419

	/* temporary file generation */	/* temporary file generation */
	#if defined(G__WIN32)	#if defined(G__WIN32)
	#define G__TMPFILE	#define G__TMPFILE
	#endif	#endif

	/***********************************************************************	/***********************************************************************
	* Define G__EH_DUMMY_DELETE in order to avoid some compiler dependency	* Define G__EH_DUMMY_DELETE in order to avoid some compiler dependency
	* about 'void operator delete(void,[DLLID]_tag);'	* about 'void operator delete(void,[DLLID]_tag);'
	***********************************************************************/	***********************************************************************/

	#if defined(__HP_aCC) \|\| defined(G__VISUAL)	#if defined(__HP_aCC) \|\| defined(G__VISUAL) \|\| defined(__INTEL_COMPILER)
	#define G__EH_DUMMY_DELETE	#define G__EH_DUMMY_DELETE
	#endif	#endif

	#ifdef G__NONANSI	#ifdef G__NONANSI
	#ifdef G__ANSIHEADER	#ifdef G__ANSIHEADER
	#undef G__ANSIHEADER	#undef G__ANSIHEADER
	#endif	#endif
	#endif	#endif

	#ifndef G__IF_DUMMY	#ifndef G__IF_DUMMY

	skipping to change at line 1807	skipping to change at line 1807
	extern G__EXPORT int G__stepmode G__P((int stepmode));	extern G__EXPORT int G__stepmode G__P((int stepmode));
	extern G__EXPORT int G__tracemode G__P((int tracemode));	extern G__EXPORT int G__tracemode G__P((int tracemode));
	extern G__EXPORT int G__setbreakpoint G__P((const char breakline,const cha r breakfile));	extern G__EXPORT int G__setbreakpoint G__P((const char breakline,const cha r breakfile));
	extern G__EXPORT int G__getstepmode G__P((void));	extern G__EXPORT int G__getstepmode G__P((void));
	extern G__EXPORT int G__gettracemode G__P((void));	extern G__EXPORT int G__gettracemode G__P((void));
	extern G__EXPORT int G__printlinenum G__P((void));	extern G__EXPORT int G__printlinenum G__P((void));
	extern G__EXPORT int G__search_typename2 G__P((G__CONST char *typenamein,in t typein,int tagnum,int reftype,int parent_tagnum));	extern G__EXPORT int G__search_typename2 G__P((G__CONST char *typenamein,in t typein,int tagnum,int reftype,int parent_tagnum));
	extern G__EXPORT void G__set_atpause G__P((void (*p2f)()));	extern G__EXPORT void G__set_atpause G__P((void (*p2f)()));
	extern G__EXPORT void G__set_aterror G__P((void (*p2f)()));	extern G__EXPORT void G__set_aterror G__P((void (*p2f)()));
	extern G__EXPORT void G__p2f_void_void G__P((void* p2f));	extern G__EXPORT void G__p2f_void_void G__P((void* p2f));

	extern G__EXPORT void G__setglobalcomp G__P((int globalcomp));	extern G__EXPORT int G__setglobalcomp G__P((int globalcomp));
	extern G__EXPORT const char G__getmakeinfo G__P((const char item));	extern G__EXPORT const char G__getmakeinfo G__P((const char item));
	extern G__EXPORT const char G__getmakeinfo1 G__P((const char item));	extern G__EXPORT const char G__getmakeinfo1 G__P((const char item));
	extern G__EXPORT int G__get_security_error G__P((void));	extern G__EXPORT int G__get_security_error G__P((void));
	extern G__EXPORT char* G__map_cpp_name G__P((const char *in));	extern G__EXPORT char* G__map_cpp_name G__P((const char *in));
	extern G__EXPORT char* G__Charref G__P((G__value *buf));	extern G__EXPORT char* G__Charref G__P((G__value *buf));
	extern G__EXPORT short* G__Shortref G__P((G__value *buf));	extern G__EXPORT short* G__Shortref G__P((G__value *buf));
	extern G__EXPORT int* G__Intref G__P((G__value *buf));	extern G__EXPORT int* G__Intref G__P((G__value *buf));
	extern G__EXPORT long* G__Longref G__P((G__value *buf));	extern G__EXPORT long* G__Longref G__P((G__value *buf));
	extern G__EXPORT unsigned char* G__UCharref G__P((G__value *buf));	extern G__EXPORT unsigned char* G__UCharref G__P((G__value *buf));
	#ifdef G__BOOL4BYTE	#ifdef G__BOOL4BYTE

	skipping to change at line 2027	skipping to change at line 2027
	static void (*G__breakkey) G__P((int signame));	static void (*G__breakkey) G__P((int signame));
	static int (*G__stepmode) G__P((int stepmode));	static int (*G__stepmode) G__P((int stepmode));
	static int (*G__tracemode) G__P((int tracemode));	static int (*G__tracemode) G__P((int tracemode));
	static int (*G__getstepmode) G__P((void));	static int (*G__getstepmode) G__P((void));
	static int (*G__gettracemode) G__P((void));	static int (*G__gettracemode) G__P((void));
	static int (*G__printlinenum) G__P((void));	static int (*G__printlinenum) G__P((void));
	static int (G__search_typename2) G__P((G__CONST char typenamein,int typei n,int tagnum,int reftype,int parent_tagnum));	static int (G__search_typename2) G__P((G__CONST char typenamein,int typei n,int tagnum,int reftype,int parent_tagnum));
	static void (G__set_atpause) G__P((void (p2f)()));	static void (G__set_atpause) G__P((void (p2f)()));
	static void (G__set_aterror) G__P((void (p2f)()));	static void (G__set_aterror) G__P((void (p2f)()));
	static void (G__p2f_void_void) G__P((void p2f));	static void (G__p2f_void_void) G__P((void p2f));

	static void (*G__setglobalcomp) G__P((int globalcomp));	static int (*G__setglobalcomp) G__P((int globalcomp));
	static char* (G__getmakeinfo) G__P((char item));	static char* (G__getmakeinfo) G__P((char item));
	static int (*G__get_security_error) G__P((void));	static int (*G__get_security_error) G__P((void));
	static char* (G__map_cpp_name) G__P((char in));	static char* (G__map_cpp_name) G__P((char in));
	static char* (G__Charref) G__P((G__value buf));	static char* (G__Charref) G__P((G__value buf));
	static short* (G__Shortref) G__P((G__value buf));	static short* (G__Shortref) G__P((G__value buf));
	static int* (G__Intref) G__P((G__value buf));	static int* (G__Intref) G__P((G__value buf));
	static long* (G__Longref) G__P((G__value buf));	static long* (G__Longref) G__P((G__value buf));
	static unsigned char* (G__UCharref) G__P((G__value buf));	static unsigned char* (G__UCharref) G__P((G__value buf));
	static unsigned short* (G__UShortref) G__P((G__value buf));	static unsigned short* (G__UShortref) G__P((G__value buf));
	static unsigned int* (G__UIntref) G__P((G__value buf));	static unsigned int* (G__UIntref) G__P((G__value buf));

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

	GuiTypes.h	GuiTypes.h

	/* @(#)root/base:$Id: GuiTypes.h 20877 2007-11-19 11:17:07Z rdm $ */	/* @(#)root/base:$Id: GuiTypes.h 30919 2009-10-29 17:24:02Z rdm $ */

	/*************************************************************************	/*************************************************************************
	* 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_GuiTypes	#ifndef ROOT_GuiTypes

	skipping to change at line 206	skipping to change at line 206
	const Mask_t kKeyShiftMask = BIT(0);	const Mask_t kKeyShiftMask = BIT(0);
	const Mask_t kKeyLockMask = BIT(1);	const Mask_t kKeyLockMask = BIT(1);
	const Mask_t kKeyControlMask = BIT(2);	const Mask_t kKeyControlMask = BIT(2);
	const Mask_t kKeyMod1Mask = BIT(3); // typically the Alt key	const Mask_t kKeyMod1Mask = BIT(3); // typically the Alt key
	const Mask_t kKeyMod2Mask = BIT(4); // typically mod on numeric keys	const Mask_t kKeyMod2Mask = BIT(4); // typically mod on numeric keys
	const Mask_t kButton1Mask = BIT(8);	const Mask_t kButton1Mask = BIT(8);
	const Mask_t kButton2Mask = BIT(9);	const Mask_t kButton2Mask = BIT(9);
	const Mask_t kButton3Mask = BIT(10);	const Mask_t kButton3Mask = BIT(10);
	const Mask_t kButton4Mask = BIT(11);	const Mask_t kButton4Mask = BIT(11);
	const Mask_t kButton5Mask = BIT(12);	const Mask_t kButton5Mask = BIT(12);

		const Mask_t kButton6Mask = BIT(13);
		const Mask_t kButton7Mask = BIT(14);
	const Mask_t kAnyModifier = BIT(15);	const Mask_t kAnyModifier = BIT(15);

	// Button names. Used as arguments to GrabButton and as Event_t::fCode	// Button names. Used as arguments to GrabButton and as Event_t::fCode
	// for button events. Maps to the X11 values.	// for button events. Maps to the X11 values.
	enum EMouseButton { kAnyButton, kButton1, kButton2, kButton3,	enum EMouseButton { kAnyButton, kButton1, kButton2, kButton3,

	kButton4, kButton5 };	kButton4, kButton5, kButton6, kButton7 };

	// Some magic X notify modes used in TGTextEntry widget.	// Some magic X notify modes used in TGTextEntry widget.
	// Values must match the ones in /usr/include/X11/X.h. Check when porting.	// Values must match the ones in /usr/include/X11/X.h. Check when porting.
	enum EXMagic { kNotifyNormal = 0, kNotifyGrab = 1, kNotifyUngrab = 2,	enum EXMagic { kNotifyNormal = 0, kNotifyGrab = 1, kNotifyUngrab = 2,
	kNotifyPointer = 5, kColormapUninstalled = 0,	kNotifyPointer = 5, kColormapUninstalled = 0,
	kColormapInstalled = 1 };	kColormapInstalled = 1 };

	// Graphics context structure	// Graphics context structure
	struct GCValues_t {	struct GCValues_t {
	EGraphicsFunction fFunction; // logical operation	EGraphicsFunction fFunction; // logical operation

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

	MCMCCalculator.h	MCMCCalculator.h

	// @(#)root/roostats:$Id: MCMCCalculator.h 26805 2009-06-17 14:31:02Z kbela sco $	// @(#)root/roostats:$Id: MCMCCalculator.h 31276 2009-11-18 15:06:42Z monet a $
	// Authors: Kevin Belasco 17/06/2009	// Authors: Kevin Belasco 17/06/2009
	// Authors: Kyle Cranmer 17/06/2009	// Authors: Kyle Cranmer 17/06/2009
	/*************************************************************************	/*************************************************************************
	* 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 61	skipping to change at line 61
	class MCMCCalculator : public IntervalCalculator, public TNamed {	class MCMCCalculator : public IntervalCalculator, public TNamed {

	public:	public:
	// default constructor	// default constructor
	MCMCCalculator();	MCMCCalculator();

	// This constructor will set up a basic settings package including a	// This constructor will set up a basic settings package including a
	// ProposalFunction, number of iterations, burn in steps, confidence	// ProposalFunction, number of iterations, burn in steps, confidence
	// level, and interval determination method. Any of these basic	// level, and interval determination method. Any of these basic
	// settings can be overridden by calling one of the Set...() methods.	// settings can be overridden by calling one of the Set...() methods.

	MCMCCalculator(RooAbsData& data, RooAbsPdf& pdf, const RooArgSet& par	// Force to pass the a prior PDF for the parameter of interest
	amsOfInterest);	MCMCCalculator(RooAbsData& data, RooAbsPdf& pdf, const RooArgSet& par
		amsOfInterest, RooAbsPdf & priorPdf );


		// Constructor as before but without a prior.
		// In this case it is assumed the prior is already included in the mo
		del
		// This constructor will set up a basic settings package including a
		// ProposalFunction, number of iterations, burn in steps, confidence
		// level, and interval determination method. Any of these basic
		// settings can be overridden by calling one of the Set...() methods.
		MCMCCalculator(RooAbsData& data, RooAbsPdf& pdf, const RooArgSet& par
		amsOfInterest );

		// Constructor from a ModelConfig class.
	// This constructor will set up a basic settings package including a	// This constructor will set up a basic settings package including a
	// ProposalFunction, number of iterations, burn in steps, confidence	// ProposalFunction, number of iterations, burn in steps, confidence
	// level, and interval determination method. Any of these basic	// level, and interval determination method. Any of these basic
	// settings can be overridden by calling one of the Set...() methods.	// settings can be overridden by calling one of the Set...() methods.
	MCMCCalculator(RooAbsData& data, const ModelConfig& model);	MCMCCalculator(RooAbsData& data, const ModelConfig& model);

	// MCMCCalculator(RooWorkspace& ws, RooAbsData& data, RooAbsPdf& pdf,
	// RooArgSet& paramsOfInterest);

	// alternate constructor, no automatic basic settings	// alternate constructor, no automatic basic settings
	MCMCCalculator(RooAbsData& data, const ModelConfig& model, ProposalFu nction& proposalFunction,	MCMCCalculator(RooAbsData& data, const ModelConfig& model, ProposalFu nction& proposalFunction,
	Int_t numIters, RooArgList* axes = NULL, Double_t size = 0.05);	Int_t numIters, RooArgList* axes = NULL, Double_t size = 0.05);
	// MCMCCalculator(RooWorkspace& ws, RooAbsData& data, RooAbsPdf& pdf ,	// MCMCCalculator(RooWorkspace& ws, RooAbsData& data, RooAbsPdf& pdf ,
	// const RooArgSet& paramsOfInterest, ProposalFunction& proposalFu nction,	// const RooArgSet& paramsOfInterest, ProposalFunction& proposalFu nction,
	// Int_t numIters, RooArgList* axes = NULL, Double_t size = 0.05);	// Int_t numIters, RooArgList* axes = NULL, Double_t size = 0.05);

	// alternate constructor, no automatic basic settings	// alternate constructor, no automatic basic settings
	MCMCCalculator(RooAbsData& data, RooAbsPdf& pdf,	MCMCCalculator(RooAbsData& data, RooAbsPdf& pdf,

	const RooArgSet& paramsOfInterest, ProposalFunction& proposalFunct ion,	const RooArgSet& paramsOfInterest, RooAbsPdf & priorPd f, ProposalFunction& proposalFunction,
	Int_t numIters, RooArgList* axes = NULL, Double_t size = 0.05);	Int_t numIters, RooArgList* axes = NULL, Double_t size = 0.05);

	virtual ~MCMCCalculator() {}	virtual ~MCMCCalculator() {}

	// Main interface to get a ConfInterval	// Main interface to get a ConfInterval
	virtual MCMCInterval* GetInterval() const;	virtual MCMCInterval* GetInterval() const;

	// Get the size of the test (eg. rate of Type I error)	// Get the size of the test (eg. rate of Type I error)
	virtual Double_t Size() const {return fSize;}	virtual Double_t Size() const {return fSize;}
	// Get the Confidence level for the test	// Get the Confidence level for the test
	virtual Double_t ConfidenceLevel() const {return 1.-fSize;}	virtual Double_t ConfidenceLevel() const {return 1.-fSize;}

	virtual void SetModel(const ModelConfig & model);	virtual void SetModel(const ModelConfig & model);


	// Set the DataSet, add to the the workspace if not already there	// Set the DataSet if not already there
	virtual void SetData(RooAbsData& data) { fData = &data; }	virtual void SetData(RooAbsData& data) { fData = &data; }


	// Set the Pdf, add to the the workspace if not already there	// Set the Pdf if not already there
	virtual void SetPdf(RooAbsPdf& pdf) { fPdf = &pdf; }	virtual void SetPdf(RooAbsPdf& pdf) { fPdf = &pdf; }


		// Set the Prior Pdf if not already there
		virtual void SetPriorPdf(RooAbsPdf& pdf) { fPriorPdf = &pdf; }

	// specify the parameters of interest in the interval	// specify the parameters of interest in the interval

	virtual void SetParameters(const RooArgSet& set) { fPOI = &set; }	virtual void SetParameters(const RooArgSet& set) { fPOI.removeAll();
		fPOI.add(set); }

	// specify the nuisance parameters (eg. the rest of the parameters)	// specify the nuisance parameters (eg. the rest of the parameters)

	virtual void SetNuisanceParameters(const RooArgSet& set) {fNuisParams	virtual void SetNuisanceParameters(const RooArgSet& set) {fNuisParams
	= &set;}	.removeAll(); fNuisParams.add(set);}

	// set the size of the test (rate of Type I error) ( Eg. 0.05 for a 9 5% Confidence Interval)	// set the size of the test (rate of Type I error) ( Eg. 0.05 for a 9 5% Confidence Interval)
	virtual void SetTestSize(Double_t size) {fSize = size;}	virtual void SetTestSize(Double_t size) {fSize = size;}


	// set the confidence level for the interval (eg. 0.95 for a 95% Conf idence Interval)	// set the confidence level for the interval (eg. 0.95 for a 95% Conf idence Interval)
	virtual void SetConfidenceLevel(Double_t cl) {fSize = 1.-cl;}	virtual void SetConfidenceLevel(Double_t cl) {fSize = 1.-cl;}


	// set the proposal function for suggesting new points for the MCMC	// set the proposal function for suggesting new points for the MCMC
	virtual void SetProposalFunction(ProposalFunction& proposalFunction)	virtual void SetProposalFunction(ProposalFunction& proposalFunction)
	{ fPropFunc = &proposalFunction; }	{ fPropFunc = &proposalFunction; }


	// set the number of iterations to run the metropolis algorithm	// set the number of iterations to run the metropolis algorithm
	virtual void SetNumIters(Int_t numIters)	virtual void SetNumIters(Int_t numIters)
	{ fNumIters = numIters; }	{ fNumIters = numIters; }


	// set the number of steps in the chain to discard as burn-in,	// set the number of steps in the chain to discard as burn-in,
	// starting from the first	// starting from the first
	virtual void SetNumBurnInSteps(Int_t numBurnInSteps)	virtual void SetNumBurnInSteps(Int_t numBurnInSteps)
	{ fNumBurnInSteps = numBurnInSteps; }	{ fNumBurnInSteps = numBurnInSteps; }

	// set the number of bins to create for each axis when constructing t he interval	// set the number of bins to create for each axis when constructing t he interval
	virtual void SetNumBins(Int_t numBins) { fNumBins = numBins; }	virtual void SetNumBins(Int_t numBins) { fNumBins = numBins; }
	// set which variables to put on each axis	// set which variables to put on each axis
	virtual void SetAxes(RooArgList& axes)	virtual void SetAxes(RooArgList& axes)
	{ fAxes = &axes; }	{ fAxes = &axes; }
	// set whether to use kernel estimation to determine the interval	// set whether to use kernel estimation to determine the interval
	virtual void SetUseKeys(Bool_t useKeys) { fUseKeys = useKeys; }	virtual void SetUseKeys(Bool_t useKeys) { fUseKeys = useKeys; }
	// set whether to use sparse histogram (if using histogram at all)	// set whether to use sparse histogram (if using histogram at all)
	virtual void SetUseSparseHist(Bool_t useSparseHist)	virtual void SetUseSparseHist(Bool_t useSparseHist)
	{ fUseSparseHist = useSparseHist; }	{ fUseSparseHist = useSparseHist; }

	protected:	protected:


	Double_t fSize; // size of the test (eg. specified rate of Type I err	Double_t fSize; // size of the test (eg. specified rate of T
	or)	ype I error)
	//RooWorkspace* fWS; // owns all the components used by the calculato	RooArgSet fPOI; // parameters of interest for interval
	r	RooArgSet fNuisParams; // nuisance parameters for interval (not rea
	const RooArgSet * fPOI; // parameters of interest for interval	lly used)
	const RooArgSet * fNuisParams; // nuisance parameters for interval
	//Bool_t fOwnsWorkspace; // whether we own the workspace
	mutable ProposalFunction* fPropFunc; // Proposal function for MCMC in tegration	mutable ProposalFunction* fPropFunc; // Proposal function for MCMC in tegration

	RooAbsPdf * fPdf; // pointer to common PDF (owned by the workspace)	RooAbsPdf * fPdf; // pointer to common PDF (owned by the works
	RooAbsData * fData; // pointer to the data (owned by the workspace)	pace)
	// const char* fPdfName; // name of common PDF in workspace	RooAbsPdf * fPriorPdf; // pointer to prior PDF (owned by the works
	// const char* fDataName; // name of data set in workspace	pace)
		RooAbsData * fData; // pointer to the data (owned by the workspac
		e)
	Int_t fNumIters; // number of iterations to run metropolis algorithm	Int_t fNumIters; // number of iterations to run metropolis algorithm
	Int_t fNumBurnInSteps; // number of iterations to discard as burn-in, starting from the first	Int_t fNumBurnInSteps; // number of iterations to discard as burn-in, starting from the first
	Int_t fNumBins; // set the number of bins to create for each	Int_t fNumBins; // set the number of bins to create for each
	// axis when constructing the interval	// axis when constructing the interval
	RooArgList * fAxes; // which variables to put on each axis	RooArgList * fAxes; // which variables to put on each axis
	Bool_t fUseKeys; // whether to use kernel estimation to determine int erval	Bool_t fUseKeys; // whether to use kernel estimation to determine int erval
	Bool_t fUseSparseHist; // whether to use sparse histogram (if using h ist at all)	Bool_t fUseSparseHist; // whether to use sparse histogram (if using h ist at all)

	void SetupBasicUsage();	void SetupBasicUsage();
	void SetBins(const RooAbsCollection& coll, Int_t numBins) const	void SetBins(const RooAbsCollection& coll, Int_t numBins) const

End of changes. 16 change blocks.
	22 lines changed or deleted	42 lines changed or added

	MnUserTransformation.h	MnUserTransformation.h

	// @(#)root/minuit2:$Id: MnUserTransformation.h 26014 2008-10-29 16:37:28Z moneta $	// @(#)root/minuit2:$Id: MnUserTransformation.h 31182 2009-11-16 11:08:36Z moneta $
	// Authors: M. Winkler, F. James, L. Moneta, A. Zsenei 2003-2005	// Authors: M. Winkler, F. James, L. Moneta, A. Zsenei 2003-2005

	/**********************************************************************	/**********************************************************************
	* *	* *
	* Copyright (c) 2005 LCG ROOT Math team, CERN/PH-SFT *	* Copyright (c) 2005 LCG ROOT Math team, CERN/PH-SFT *
	* *	* *
	**********************************************************************/	**********************************************************************/

	#ifndef ROOT_Minuit2_MnUserTransformation	#ifndef ROOT_Minuit2_MnUserTransformation
	#define ROOT_Minuit2_MnUserTransformation	#define ROOT_Minuit2_MnUserTransformation

	skipping to change at line 175	skipping to change at line 175
	void SetValue(const std::string &, double);	void SetValue(const std::string &, double);
	void SetError(const std::string &, double);	void SetError(const std::string &, double);
	void SetLimits(const std::string &, double, double);	void SetLimits(const std::string &, double, double);
	void SetUpperLimit(const std::string &, double);	void SetUpperLimit(const std::string &, double);
	void SetLowerLimit(const std::string &, double);	void SetLowerLimit(const std::string &, double);
	void RemoveLimits(const std::string &);	void RemoveLimits(const std::string &);

	double Value(const std::string &) const;	double Value(const std::string &) const;
	double Error(const std::string &) const;	double Error(const std::string &) const;


	//convert Name into external number of Parameter	//convert Name into external number of Parameter (will assert if paramet er is not found)
	unsigned int Index(const std::string &) const;	unsigned int Index(const std::string &) const;

	//convert external number into Name of Parameter	// find parameter index given a name. If it is not found return a -1
		int FindIndex(const std::string & ) const;

		//convert external number into Name of Parameter (will assert if index i
		s out of range)
	const std::string & GetName(unsigned int) const;	const std::string & GetName(unsigned int) const;
	// mantain interface with const char * for backward compatibility	// mantain interface with const char * for backward compatibility
	const char* Name(unsigned int) const;	const char* Name(unsigned int) const;

	private:	private:

	MnMachinePrecision fPrecision;	MnMachinePrecision fPrecision;

	std::vector<MinuitParameter> fParameters;	std::vector<MinuitParameter> fParameters;
	std::vector<unsigned int> fExtOfInt;	std::vector<unsigned int> fExtOfInt;

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

	NeymanConstruction.h	NeymanConstruction.h

	// @(#)root/roostats:$Id: NeymanConstruction.h 26805 2009-01-13 17:45:57Z c ranmer $	// @(#)root/roostats:$Id: NeymanConstruction.h 31276 2009-11-18 15:06:42Z m oneta $
	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke
	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOSTATS_NeymanConstruction	#ifndef ROOSTATS_NeymanConstruction

	skipping to change at line 41	skipping to change at line 41

	namespace RooStats {	namespace RooStats {

	class ConfInterval;	class ConfInterval;

	class NeymanConstruction : public IntervalCalculator, public TNamed {	class NeymanConstruction : public IntervalCalculator, public TNamed {

	public:	public:

	NeymanConstruction();	NeymanConstruction();


	virtual ~NeymanConstruction();	virtual ~NeymanConstruction();

	// Main interface to get a ConfInterval (will be a PointSetInterval)	// Main interface to get a ConfInterval (will be a PointSetInterval)
	virtual ConfInterval* GetInterval() const;	virtual ConfInterval* GetInterval() const;
	virtual ConfInterval* GetIntervalUsingList() const;	virtual ConfInterval* GetIntervalUsingList() const;

	// Interface extended with I/O support	// Interface extended with I/O support
	virtual ConfInterval* GetInterval(const char* asciiFilePat) const;	virtual ConfInterval* GetInterval(const char* asciiFilePat) const;

	// Actually generate teh sampling distribution	// Actually generate teh sampling distribution

	skipping to change at line 76	skipping to change at line 77
	}	}
	// This class can make regularly spaced scans based on range stored i n RooRealVars.	// This class can make regularly spaced scans based on range stored i n RooRealVars.
	// Choose number of steps for a rastor scan (common for each dimensio n)	// Choose number of steps for a rastor scan (common for each dimensio n)
	// void SetNumSteps(Int_t);	// void SetNumSteps(Int_t);
	// This class can make regularly spaced scans based on range stored i n RooRealVars.	// This class can make regularly spaced scans based on range stored i n RooRealVars.
	// Choose number of steps for a rastor scan (specific for each dimens ion)	// Choose number of steps for a rastor scan (specific for each dimens ion)
	// void SetNumSteps(map<RooAbsArg, Int_t>)	// void SetNumSteps(map<RooAbsArg, Int_t>)

	// Get the size of the test (eg. rate of Type I error)	// Get the size of the test (eg. rate of Type I error)
	virtual Double_t Size() const {return fSize;}	virtual Double_t Size() const {return fSize;}


	// Get the Confidence level for the test	// Get the Confidence level for the test
	virtual Double_t ConfidenceLevel() const {return 1.-fSize;}	virtual Double_t ConfidenceLevel() const {return 1.-fSize;}

	virtual void SetModel(const ModelConfig &);	virtual void SetModel(const ModelConfig &);

	// Set the DataSet	// Set the DataSet
	virtual void SetData(RooAbsData& data) { fData = &data; }	virtual void SetData(RooAbsData& data) { fData = &data; }

	// Set the Pdf, add to the the workspace if not already there	// Set the Pdf, add to the the workspace if not already there
	virtual void SetPdf(RooAbsPdf& pdf) { fPdf = &pdf; }	virtual void SetPdf(RooAbsPdf& pdf) { fPdf = &pdf; }

	// specify the parameters of interest in the interval	// specify the parameters of interest in the interval

	virtual void SetParameters(const RooArgSet& set) {fPOI = &set;}	virtual void SetParameters(const RooArgSet& set) { fPOI.removeAll();
		fPOI.add(set); }

	// specify the nuisance parameters (eg. the rest of the parameters)	// specify the nuisance parameters (eg. the rest of the parameters)

	virtual void SetNuisanceParameters(const RooArgSet& set) {fNuisParams	virtual void SetNuisanceParameters(const RooArgSet& set) {fNuisParams
	= &set;}	.removeAll(); fNuisParams.add(set);}

	// set the size of the test (rate of Type I error) ( Eg. 0.05 for a 9 5% Confidence Interval)	// set the size of the test (rate of Type I error) ( Eg. 0.05 for a 9 5% Confidence Interval)
	virtual void SetTestSize(Double_t size) {fSize = size;}	virtual void SetTestSize(Double_t size) {fSize = size;}
	// set the confidence level for the interval (eg. 0.95 for a 95% Conf idence Interval)	// set the confidence level for the interval (eg. 0.95 for a 95% Conf idence Interval)
	virtual void SetConfidenceLevel(Double_t cl) {fSize = 1.-cl;}	virtual void SetConfidenceLevel(Double_t cl) {fSize = 1.-cl;}

	ConfidenceBelt* GetConfidenceBelt() {return fConfBelt;}	ConfidenceBelt* GetConfidenceBelt() {return fConfBelt;}

	void UseAdaptiveSampling(bool flag=true){fAdaptiveSampling=flag;}	void UseAdaptiveSampling(bool flag=true){fAdaptiveSampling=flag;}

	void SaveBeltToFile(bool flag=true){	void SaveBeltToFile(bool flag=true){
	fSaveBeltToFile = flag;	fSaveBeltToFile = flag;
	if(flag) fCreateBelt = true;	if(flag) fCreateBelt = true;
	}	}
	void CreateConfBelt(bool flag=true){fCreateBelt = flag;}	void CreateConfBelt(bool flag=true){fCreateBelt = flag;}

	private:	private:

	Double_t fSize; // size of the test (eg. specified rate of Type I err or)	Double_t fSize; // size of the test (eg. specified rate of Type I err or)
	RooAbsPdf * fPdf; // common PDF	RooAbsPdf * fPdf; // common PDF
	RooAbsData * fData; // data set	RooAbsData * fData; // data set

	const RooArgSet* fPOI; // RooArgSet specifying parameters of interes	RooArgSet fPOI; // RooArgSet specifying parameters of interest for i
	t for interval	nterval
	const RooArgSet* fNuisParams;// RooArgSet specifying nuisance parame	RooArgSet fNuisParams;// RooArgSet specifying nuisance parameters fo
	ters for interval	r interval
	TestStatSampler* fTestStatSampler;	TestStatSampler* fTestStatSampler;
	RooAbsData* fPointsToTest;	RooAbsData* fPointsToTest;
	Double_t fLeftSideFraction;	Double_t fLeftSideFraction;
	ConfidenceBelt* fConfBelt;	ConfidenceBelt* fConfBelt;
	bool fAdaptiveSampling; // controls use of adaptive sampling algorith m	bool fAdaptiveSampling; // controls use of adaptive sampling algorith m
	bool fSaveBeltToFile; // controls use if ConfidenceBelt should be sav ed to a TFile	bool fSaveBeltToFile; // controls use if ConfidenceBelt should be sav ed to a TFile
	bool fCreateBelt; // controls use if ConfidenceBelt should be saved t o a TFile	bool fCreateBelt; // controls use if ConfidenceBelt should be saved t o a TFile

	protected:	protected:
	ClassDef(NeymanConstruction,1) // Interface for tools setting limit s (producing confidence intervals)	ClassDef(NeymanConstruction,1) // Interface for tools setting limit s (producing confidence intervals)

End of changes. 6 change blocks.
	8 lines changed or deleted	13 lines changed or added

	ParamFunction.h	ParamFunction.h

	// @(#)root/mathmore:$Id: ParamFunction.h 24482 2008-06-23 15:33:08Z moneta $	// @(#)root/mathmore:$Id: ParamFunction.h 30749 2009-10-15 16:33:04Z brun $
	// Authors: L. Moneta, A. Zsenei 08/2005	// Authors: L. Moneta, A. Zsenei 08/2005

	/**********************************************************************	/**********************************************************************
	* *	* *
	* Copyright (c) 2004 ROOT Foundation, CERN/PH-SFT *	* Copyright (c) 2004 ROOT Foundation, CERN/PH-SFT *
	* *	* *
	* This library is free software; you can redistribute it and/or *	* This library is free software; you can redistribute it and/or *
	* modify it under the terms of the GNU General Public License *	* modify it under the terms of the GNU General Public License *
	* as published by the Free Software Foundation; either version 2 *	* as published by the Free Software Foundation; either version 2 *
	* of the License, or (at your option) any later version. *	* of the License, or (at your option) any later version. *

	skipping to change at line 48	skipping to change at line 48
	#endif	#endif

	#include <vector>	#include <vector>

	namespace ROOT {	namespace ROOT {
	namespace Math {	namespace Math {

	//_________________________________________________________________________ ____________	//_________________________________________________________________________ ____________
	/**	/**
	Base template class for all Parametric Functions.	Base template class for all Parametric Functions.

	The template argument is the type of parameteric funciton interface i s implementing like	The template argument is the type of parameteric function interface i s implementing like
	Parameteric 1D, Multi-Dim or gradient parametric.	Parameteric 1D, Multi-Dim or gradient parametric.

	A parameteric function is a Generic Function with parameters, so	A parameteric function is a Generic Function with parameters, so
	it is a function object which carries a state, the parameters.	it is a function object which carries a state, the parameters.
	The parameters are described with a standard vector of doubles.	The parameters are described with a standard vector of doubles.

	This class contains the default implementations for the methods defin ed in the	This class contains the default implementations for the methods defin ed in the
	IParamFunction interface for dealing with parameters	IParamFunction interface for dealing with parameters
	Specific parameteric function classes should derive from this class i f they want to profit from	Specific parameteric function classes should derive from this class i f they want to profit from
	default implementations for the abstract methods.	default implementations for the abstract methods.

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

	RooAbsPdf.h	RooAbsPdf.h

	skipping to change at line 87	skipping to change at line 87
	Bool_t _resampleProto ;	Bool_t _resampleProto ;
	TString _dsetName ;	TString _dsetName ;
	} ;	} ;

	GenSpec* prepareMultiGen(const RooArgSet &whatVars,	GenSpec* prepareMultiGen(const RooArgSet &whatVars,
	const RooCmdArg& arg1=RooCmdArg::none(),const Roo CmdArg& arg2=RooCmdArg::none(),	const RooCmdArg& arg1=RooCmdArg::none(),const Roo CmdArg& arg2=RooCmdArg::none(),
	const RooCmdArg& arg3=RooCmdArg::none(),const Roo CmdArg& arg4=RooCmdArg::none(),	const RooCmdArg& arg3=RooCmdArg::none(),const Roo CmdArg& arg4=RooCmdArg::none(),
	const RooCmdArg& arg5=RooCmdArg::none(),const Roo CmdArg& arg6=RooCmdArg::none()) ;	const RooCmdArg& arg5=RooCmdArg::none(),const Roo CmdArg& arg6=RooCmdArg::none()) ;
	RooDataSet* generate(GenSpec&) const ;	RooDataSet* generate(GenSpec&) const ;


	RooDataHist *generateBinned(const RooArgSet &whatVars, Int_t nEvents, con st RooCmdArg& arg1,	RooDataHist *generateBinned(const RooArgSet &whatVars, Double_t nEvents, const RooCmdArg& arg1,
	const RooCmdArg& arg2=RooCmdArg::none(), const RooCmdArg& arg3=RooCmdArg::none(),	const RooCmdArg& arg2=RooCmdArg::none(), const RooCmdArg& arg3=RooCmdArg::none(),
	const RooCmdArg& arg4=RooCmdArg::none(), const RooCmdArg& arg5=RooCmdArg::none()) ;	const RooCmdArg& arg4=RooCmdArg::none(), const RooCmdArg& arg5=RooCmdArg::none()) ;
	RooDataHist *generateBinned(const RooArgSet &whatVars,	RooDataHist *generateBinned(const RooArgSet &whatVars,
	const RooCmdArg& arg1=RooCmdArg::none(),const RooCmdArg& arg2=RooCmdArg::none(),	const RooCmdArg& arg1=RooCmdArg::none(),const RooCmdArg& arg2=RooCmdArg::none(),
	const RooCmdArg& arg3=RooCmdArg::none(),const RooCmdArg& arg4=RooCmdArg::none(),	const RooCmdArg& arg3=RooCmdArg::none(),const RooCmdArg& arg4=RooCmdArg::none(),
	const RooCmdArg& arg5=RooCmdArg::none(),const RooCmdArg& arg6=RooCmdArg::none()) ;	const RooCmdArg& arg5=RooCmdArg::none(),const RooCmdArg& arg6=RooCmdArg::none()) ;

	RooDataHist *generateBinned(const RooArgSet &whatVars, Int_t nEvents, Boo l_t expectedData=kFALSE, Bool_t extended=kFALSE) const;	RooDataHist *generateBinned(const RooArgSet &whatVars, Double_t nEvents, Bool_t expectedData=kFALSE, Bool_t extended=kFALSE) const;

	virtual RooPlot* plotOn(RooPlot* frame,	virtual RooPlot* plotOn(RooPlot* frame,
	const RooCmdArg& arg1=RooCmdArg::none(), const Roo CmdArg& arg2=RooCmdArg::none(),	const RooCmdArg& arg1=RooCmdArg::none(), const Roo CmdArg& arg2=RooCmdArg::none(),
	const RooCmdArg& arg3=RooCmdArg::none(), const Roo CmdArg& arg4=RooCmdArg::none(),	const RooCmdArg& arg3=RooCmdArg::none(), const Roo CmdArg& arg4=RooCmdArg::none(),
	const RooCmdArg& arg5=RooCmdArg::none(), const Roo CmdArg& arg6=RooCmdArg::none(),	const RooCmdArg& arg5=RooCmdArg::none(), const Roo CmdArg& arg6=RooCmdArg::none(),
	const RooCmdArg& arg7=RooCmdArg::none(), const Roo CmdArg& arg8=RooCmdArg::none(),	const RooCmdArg& arg7=RooCmdArg::none(), const Roo CmdArg& arg8=RooCmdArg::none(),
	const RooCmdArg& arg9=RooCmdArg::none(), const Roo CmdArg& arg10=RooCmdArg::none()	const RooCmdArg& arg9=RooCmdArg::none(), const Roo CmdArg& arg10=RooCmdArg::none()
	) const {	) const {
	return RooAbsReal::plotOn(frame,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8 ,arg9,arg10) ;	return RooAbsReal::plotOn(frame,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8 ,arg9,arg10) ;
	}	}

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

	RooGlobalFunc.h	RooGlobalFunc.h

	skipping to change at line 121	skipping to change at line 121
	RooCmdArg Weight(Double_t wgt) ;	RooCmdArg Weight(Double_t wgt) ;
	RooCmdArg Index(RooCategory& icat) ;	RooCmdArg Index(RooCategory& icat) ;
	RooCmdArg Import(const char* state, TH1& histo) ;	RooCmdArg Import(const char* state, TH1& histo) ;
	RooCmdArg Import(const char* state, RooDataHist& dhist) ;	RooCmdArg Import(const char* state, RooDataHist& dhist) ;
	RooCmdArg Import(TH1& histo) ;	RooCmdArg Import(TH1& histo) ;

	// RooDataSet::ctor arguments	// RooDataSet::ctor arguments
	RooCmdArg WeightVar(const char* name) ;	RooCmdArg WeightVar(const char* name) ;
	RooCmdArg WeightVar(const RooRealVar& arg) ;	RooCmdArg WeightVar(const RooRealVar& arg) ;
	RooCmdArg Import(const char* state, RooDataSet& data) ;	RooCmdArg Import(const char* state, RooDataSet& data) ;

	RooCmdArg Link(const char* state, RooDataSet& data) ;	RooCmdArg Link(const char* state, RooAbsData& data) ;
	RooCmdArg Import(RooDataSet& data) ;	RooCmdArg Import(RooDataSet& data) ;
	RooCmdArg Import(TTree& tree) ;	RooCmdArg Import(TTree& tree) ;
	RooCmdArg ImportFromFile(const char* fname, const char* tname) ;	RooCmdArg ImportFromFile(const char* fname, const char* tname) ;
	RooCmdArg StoreError(const RooArgSet& aset) ;	RooCmdArg StoreError(const RooArgSet& aset) ;
	RooCmdArg StoreAsymError(const RooArgSet& aset) ;	RooCmdArg StoreAsymError(const RooArgSet& aset) ;

	// RooChi2Var::ctor arguments	// RooChi2Var::ctor arguments
	RooCmdArg Extended(Bool_t flag=kTRUE) ;	RooCmdArg Extended(Bool_t flag=kTRUE) ;
	RooCmdArg DataError(Int_t) ;	RooCmdArg DataError(Int_t) ;
	RooCmdArg NumCPU(Int_t nCPU, Bool_t interleave=kFALSE) ;	RooCmdArg NumCPU(Int_t nCPU, Bool_t interleave=kFALSE) ;

	skipping to change at line 202	skipping to change at line 202

	// RooTreeData::statOn arguments	// RooTreeData::statOn arguments
	RooCmdArg What(const char* str) ;	RooCmdArg What(const char* str) ;

	// RooProdPdf::ctor arguments	// RooProdPdf::ctor arguments
	RooCmdArg Conditional(const RooArgSet& pdfSet, const RooArgSet& depSet, Boo l_t depsAreCond=kFALSE) ;	RooCmdArg Conditional(const RooArgSet& pdfSet, const RooArgSet& depSet, Boo l_t depsAreCond=kFALSE) ;

	// RooAbsPdf::generate arguments	// RooAbsPdf::generate arguments
	RooCmdArg ProtoData(const RooDataSet& protoData, Bool_t randomizeOrder=kFAL SE, Bool_t resample=kFALSE) ;	RooCmdArg ProtoData(const RooDataSet& protoData, Bool_t randomizeOrder=kFAL SE, Bool_t resample=kFALSE) ;
	RooCmdArg NumEvents(Int_t numEvents) ;	RooCmdArg NumEvents(Int_t numEvents) ;

		RooCmdArg NumEvents(Double_t numEvents) ;
	RooCmdArg ExpectedData(Bool_t flag=kTRUE) ;	RooCmdArg ExpectedData(Bool_t flag=kTRUE) ;
	RooCmdArg Asimov(Bool_t flag=kTRUE) ;	RooCmdArg Asimov(Bool_t flag=kTRUE) ;

	// RooAbsRealLValue::createHistogram arguments	// RooAbsRealLValue::createHistogram arguments
	RooCmdArg YVar(const RooAbsRealLValue& var, const RooCmdArg& arg=RooCmdArg: :none()) ;	RooCmdArg YVar(const RooAbsRealLValue& var, const RooCmdArg& arg=RooCmdArg: :none()) ;
	RooCmdArg ZVar(const RooAbsRealLValue& var, const RooCmdArg& arg=RooCmdArg: :none()) ;	RooCmdArg ZVar(const RooAbsRealLValue& var, const RooCmdArg& arg=RooCmdArg: :none()) ;
	RooCmdArg AxisLabel(const char* name) ;	RooCmdArg AxisLabel(const char* name) ;
	RooCmdArg Scaling(Bool_t flag) ;	RooCmdArg Scaling(Bool_t flag) ;

	// RooAbsReal::createIntegral arguments	// RooAbsReal::createIntegral arguments

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

	RooProfileLL.h	RooProfileLL.h

	skipping to change at line 42	skipping to change at line 42
	Bool_t alwaysStartFromMin() const { return _startFromMin ; }	Bool_t alwaysStartFromMin() const { return _startFromMin ; }

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

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

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


		void clearAbsMin() { _absMinValid = kFALSE ; }

	protected:	protected:

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

	RooRealProxy _nll ; // Input -log(L) function	RooRealProxy _nll ; // Input -log(L) function
	RooSetProxy _obs ; // Parameters of profile likelihood	RooSetProxy _obs ; // Parameters of profile likelihood
	RooSetProxy _par ; // Marginialized parameters of likelihood	RooSetProxy _par ; // Marginialized parameters of likelihood
	Bool_t _startFromMin ; // Always start minimization for global minimum?	Bool_t _startFromMin ; // Always start minimization for global minimum?

	TIterator* _piter ; //! Iterator over profile likelihood parameters to be minimized	TIterator* _piter ; //! Iterator over profile likelihood parameters to be minimized

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

	Rtypes.h	Rtypes.h

	/* @(#)root/base:$Id: Rtypes.h 28342 2009-04-23 21:27:43Z pcanal $ */	/* @(#)root/base:$Id: Rtypes.h 30773 2009-10-16 15:10:47Z rdm $ */

	/*************************************************************************	/*************************************************************************
	* 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_Rtypes	#ifndef ROOT_Rtypes

	skipping to change at line 152	skipping to change at line 152

	const ULong64_t kMaxULong64 = ULong64_t(~R__LL(0));	const ULong64_t kMaxULong64 = ULong64_t(~R__LL(0));
	const Long64_t kMaxLong64 = Long64_t(kMaxULong64 >> 1);	const Long64_t kMaxLong64 = Long64_t(kMaxULong64 >> 1);
	const Long64_t kMinLong64 = -kMaxLong64 - 1;	const Long64_t kMinLong64 = -kMaxLong64 - 1;

	const size_t kBitsPerByte = 8;	const size_t kBitsPerByte = 8;
	const Ssiz_t kNPOS = ~(Ssiz_t)0;	const Ssiz_t kNPOS = ~(Ssiz_t)0;

	//--- bit manipulation ---------------------------------------------------- -----	//--- bit manipulation ---------------------------------------------------- -----


	#define BIT(n) (1 << (n))	#define BIT(n) (R__ULL(1) << (n))
	#define SETBIT(n,i) ((n) \|= BIT(i))	#define SETBIT(n,i) ((n) \|= BIT(i))
	#define CLRBIT(n,i) ((n) &= ~BIT(i))	#define CLRBIT(n,i) ((n) &= ~BIT(i))
	#define TESTBIT(n,i) ((Bool_t)(((n) & BIT(i)) != 0))	#define TESTBIT(n,i) ((Bool_t)(((n) & BIT(i)) != 0))

	//---- debug global ------------------------------------------------------- -----	//---- debug global ------------------------------------------------------- -----

	R__EXTERN Int_t gDebug;	R__EXTERN Int_t gDebug;

	//---- ClassDef macros ---------------------------------------------------- -----	//---- ClassDef macros ---------------------------------------------------- -----


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

	SMatrix.h	SMatrix.h

	// @(#)root/smatrix:$Id: SMatrix.h 28954 2009-06-12 09:36:34Z moneta $	// @(#)root/smatrix:$Id: SMatrix.h 30749 2009-10-15 16:33:04Z brun $
	// Author: T. Glebe, L. Moneta, J. Palacios 2005	// Author: T. Glebe, L. Moneta, J. Palacios 2005

	#ifndef ROOT_Math_SMatrix	#ifndef ROOT_Math_SMatrix
	#define ROOT_Math_SMatrix	#define ROOT_Math_SMatrix

	/************************************************************************ *****	/************************************************************************ *****
	//	//
	// source:	// source:
	//	//
	// type: source code	// type: source code

	skipping to change at line 367	skipping to change at line 367
	read only access to matrix element, with indices starting from 0	read only access to matrix element, with indices starting from 0
	*/	*/
	const T& operator()(unsigned int i, unsigned int j) const;	const T& operator()(unsigned int i, unsigned int j) const;
	/**	/**
	read/write access to matrix element with indices starting from 0	read/write access to matrix element with indices starting from 0
	*/	*/
	T& operator()(unsigned int i, unsigned int j);	T& operator()(unsigned int i, unsigned int j);

	/**	/**
	read only access to matrix element, with indices starting from 0.	read only access to matrix element, with indices starting from 0.

	Fuction will check index values and it will assert if they are wrong	Function will check index values and it will assert if they are wrong
	*/	*/
	const T& At(unsigned int i, unsigned int j) const;	const T& At(unsigned int i, unsigned int j) const;
	/**	/**
	read/write access to matrix element with indices starting from 0.	read/write access to matrix element with indices starting from 0.

	Fuction will check index values and it will assert if they are wrong	Function will check index values and it will assert if they are wrong
	*/	*/
	T& At(unsigned int i, unsigned int j);	T& At(unsigned int i, unsigned int j);

	// helper class for implementing the m[i][j] operator	// helper class for implementing the m[i][j] operator

	class SMatrixRow {	class SMatrixRow {
	public:	public:
	SMatrixRow ( SMatrix<T,D1,D2,R> & rhs, unsigned int i ) :	SMatrixRow ( SMatrix<T,D1,D2,R> & rhs, unsigned int i ) :
	fMat(&rhs), fRow(i)	fMat(&rhs), fRow(i)
	{}	{}

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

	TArrayI.h	TArrayI.h

	// @(#)root/cont:$Id: TArrayI.h 20882 2007-11-19 11:31:26Z rdm $	// @(#)root/cont:$Id: TArrayI.h 30676 2009-10-12 13:54:12Z brun $
	// Author: Rene Brun 06/03/95	// Author: Rene Brun 06/03/95

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/


	skipping to change at line 40	skipping to change at line 40
	Int_t *fArray; //[fN] Array of fN 32 bit integers	Int_t *fArray; //[fN] Array of fN 32 bit integers

	TArrayI();	TArrayI();
	TArrayI(Int_t n);	TArrayI(Int_t n);
	TArrayI(Int_t n, const Int_t *array);	TArrayI(Int_t n, const Int_t *array);
	TArrayI(const TArrayI &array);	TArrayI(const TArrayI &array);
	TArrayI &operator=(const TArrayI &rhs);	TArrayI &operator=(const TArrayI &rhs);
	virtual ~TArrayI();	virtual ~TArrayI();

	void Adopt(Int_t n, Int_t *array);	void Adopt(Int_t n, Int_t *array);

	void AddAt(Int_t i, Int_t idx);	void AddAt(Int_t c, Int_t i);
	Int_t At(Int_t i) const ;	Int_t At(Int_t i) const ;
	void Copy(TArrayI &array) const {array.Set(fN,fArray);}	void Copy(TArrayI &array) const {array.Set(fN,fArray);}
	const Int_t *GetArray() const { return fArray; }	const Int_t *GetArray() const { return fArray; }
	Int_t *GetArray() { return fArray; }	Int_t *GetArray() { return fArray; }
	Double_t GetAt(Int_t i) const { return At(i); }	Double_t GetAt(Int_t i) const { return At(i); }
	Stat_t GetSum() const {Stat_t sum=0; for (Int_t i=0;i<fN;i++) sum+ =fArray[i]; return sum;}	Stat_t GetSum() const {Stat_t sum=0; for (Int_t i=0;i<fN;i++) sum+ =fArray[i]; return sum;}
	void Reset() {memset(fArray, 0, fN*sizeof(Int_t));}	void Reset() {memset(fArray, 0, fN*sizeof(Int_t));}
	void Reset(Int_t val) {for (Int_t i=0;i<fN;i++) fArray[i] = val ;}	void Reset(Int_t val) {for (Int_t i=0;i<fN;i++) fArray[i] = val ;}
	void Set(Int_t n);	void Set(Int_t n);
	void Set(Int_t n, const Int_t *array);	void Set(Int_t n, const Int_t *array);

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

	TArrayS.h	TArrayS.h

	// @(#)root/cont:$Id: TArrayS.h 20882 2007-11-19 11:31:26Z rdm $	// @(#)root/cont:$Id: TArrayS.h 30676 2009-10-12 13:54:12Z brun $
	// Author: Rene Brun 06/03/95	// Author: Rene Brun 06/03/95

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/


	skipping to change at line 40	skipping to change at line 40
	Short_t *fArray; //[fN] Array of fN shorts	Short_t *fArray; //[fN] Array of fN shorts

	TArrayS();	TArrayS();
	TArrayS(Int_t n);	TArrayS(Int_t n);
	TArrayS(Int_t n, const Short_t *array);	TArrayS(Int_t n, const Short_t *array);
	TArrayS(const TArrayS &array);	TArrayS(const TArrayS &array);
	TArrayS &operator=(const TArrayS &rhs);	TArrayS &operator=(const TArrayS &rhs);
	virtual ~TArrayS();	virtual ~TArrayS();

	void Adopt(Int_t n, Short_t *array);	void Adopt(Int_t n, Short_t *array);

	void AddAt(Short_t c, Int_t idx);	void AddAt(Short_t c, Int_t i);
	Short_t At(Int_t i) const ;	Short_t At(Int_t i) const ;
	void Copy(TArrayS &array) const {array.Set(fN,fArray);}	void Copy(TArrayS &array) const {array.Set(fN,fArray);}
	const Short_t *GetArray() const { return fArray; }	const Short_t *GetArray() const { return fArray; }
	Short_t *GetArray() { return fArray; }	Short_t *GetArray() { return fArray; }
	Double_t GetAt(Int_t i) const { return At(i); }	Double_t GetAt(Int_t i) const { return At(i); }
	Stat_t GetSum() const {Stat_t sum=0; for (Int_t i=0;i<fN;i++) su m+=fArray[i]; return sum;}	Stat_t GetSum() const {Stat_t sum=0; for (Int_t i=0;i<fN;i++) su m+=fArray[i]; return sum;}
	void Reset() {memset(fArray, 0,fN*sizeof(Short_t)) ;}	void Reset() {memset(fArray, 0,fN*sizeof(Short_t)) ;}
	void Reset(Short_t val) {for (Int_t i=0;i<fN;i++) fArray[i] = val;}	void Reset(Short_t val) {for (Int_t i=0;i<fN;i++) fArray[i] = val;}
	void Set(Int_t n);	void Set(Int_t n);
	void Set(Int_t n, const Short_t *array);	void Set(Int_t n, const Short_t *array);

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

	TBrowserImp.h	TBrowserImp.h

	// @(#)root/base:$Id: TBrowserImp.h 20877 2007-11-19 11:17:07Z rdm $	// @(#)root/base:$Id: TBrowserImp.h 30884 2009-10-27 12:26:33Z rdm $
	// Author: Fons Rademakers 15/11/95	// Author: Fons Rademakers 15/11/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 28	skipping to change at line 28
	// //	// //
	// ABC describing GUI independent browser implementation protocol. //	// ABC describing GUI independent browser implementation protocol. //
	// //	// //
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////

	#ifndef ROOT_TObject	#ifndef ROOT_TObject
	#include "TObject.h"	#include "TObject.h"
	#endif	#endif

	class TBrowser;	class TBrowser;

		class TGMainFrame;

	class TBrowserImp {	class TBrowserImp {

	protected:	protected:
	TBrowser *fBrowser; //TBrowser associated with this implementation	TBrowser *fBrowser; //TBrowser associated with this implementation
	Bool_t fShowCycles; //Show object cycle numbers in browser	Bool_t fShowCycles; //Show object cycle numbers in browser

	TBrowserImp(const TBrowserImp& br)	TBrowserImp(const TBrowserImp& br)
	: fBrowser(br.fBrowser), fShowCycles(br.fShowCycles) { }	: fBrowser(br.fBrowser), fShowCycles(br.fShowCycles) { }
	TBrowserImp& operator=(const TBrowserImp& br)	TBrowserImp& operator=(const TBrowserImp& br)

	skipping to change at line 66	skipping to change at line 67
	virtual void Refresh(Bool_t = kFALSE) { }	virtual void Refresh(Bool_t = kFALSE) { }
	virtual void Show() { }	virtual void Show() { }
	virtual void SetDrawOption(Option_t *option="");	virtual void SetDrawOption(Option_t *option="");
	virtual Option_t *GetDrawOption() const { return 0; }	virtual Option_t *GetDrawOption() const { return 0; }

	virtual Long_t ExecPlugin(const char , const char , const char *, I nt_t, Int_t) { return 0; }	virtual Long_t ExecPlugin(const char , const char , const char *, I nt_t, Int_t) { return 0; }
	virtual void SetStatusText(const char *, Int_t) { }	virtual void SetStatusText(const char *, Int_t) { }
	virtual void StartEmbedding(Int_t, Int_t) { }	virtual void StartEmbedding(Int_t, Int_t) { }
	virtual void StopEmbedding(const char *) { }	virtual void StopEmbedding(const char *) { }


		virtual TGMainFrame *GetMainFrame() const { return 0; }

	virtual TBrowser *GetBrowser() const { return fBrowser; }	virtual TBrowser *GetBrowser() const { return fBrowser; }
	virtual void SetBrowser(TBrowser *b) { fBrowser = b; }	virtual void SetBrowser(TBrowser *b) { fBrowser = b; }

	ClassDef(TBrowserImp,0) //ABC describing browser implementation protoco l	ClassDef(TBrowserImp,0) //ABC describing browser implementation protoco l
	};	};

	inline TBrowserImp::TBrowserImp(TBrowser , const char , UInt_t, UInt_t, O ption_t *)	inline TBrowserImp::TBrowserImp(TBrowser , const char , UInt_t, UInt_t, O ption_t *)
	: fBrowser(0), fShowCycles(kFALSE) { }	: fBrowser(0), fShowCycles(kFALSE) { }
	inline TBrowserImp::TBrowserImp(TBrowser , const char , Int_t, Int_t, UIn t_t, UInt_t, Option_t *)	inline TBrowserImp::TBrowserImp(TBrowser , const char , Int_t, Int_t, UIn t_t, UInt_t, Option_t *)
	: fBrowser(0), fShowCycles(kFALSE) { }	: fBrowser(0), fShowCycles(kFALSE) { }

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

	TClassDocOutput.h	TClassDocOutput.h

	// @(#)root/html:$Id: TClassDocOutput.h 23908 2008-05-19 15:25:29Z axel $	// @(#)root/html:$Id: TClassDocOutput.h 31111 2009-11-12 09:57:56Z 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. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOT_TClassDocOutput	#ifndef ROOT_TClassDocOutput
	#define ROOT_TClassDocOutput	#define ROOT_TClassDocOutput

	#ifndef ROOT_TDocOutput	#ifndef ROOT_TDocOutput
	#include "TDocOutput.h"	#include "TDocOutput.h"
	#endif	#endif

	class TDocParser;	class TDocParser;

		class TDocMethodWrapper;

	class TClassDocOutput: public TDocOutput {	class TClassDocOutput: public TDocOutput {
	protected:	protected:
	enum ETraverse {	enum ETraverse {
	kUp, kDown, kBoth // direction to traverse class tree in Class HtmlTree()	kUp, kDown, kBoth // direction to traverse class tree in Class HtmlTree()
	};	};

	Int_t fHierarchyLines; // counter for no. lines in hierarchy	Int_t fHierarchyLines; // counter for no. lines in hierarchy
	TClass* fCurrentClass; // class to generate output for	TClass* fCurrentClass; // class to generate output for
	TList* fCurrentClassesTypedefs; // typedefs to the current class	TList* fCurrentClassesTypedefs; // typedefs to the current class

	skipping to change at line 52	skipping to change at line 53
	void DescendHierarchy(std::ostream &out, TClass* basePtr, Int_ t maxLines=0, Int_t depth=1);	void DescendHierarchy(std::ostream &out, TClass* basePtr, Int_ t maxLines=0, Int_t depth=1);

	virtual void ListFunctions(std::ostream& classFile);	virtual void ListFunctions(std::ostream& classFile);
	virtual void ListDataMembers(std::ostream& classFile);	virtual void ListDataMembers(std::ostream& classFile);

	virtual void WriteClassDocHeader(std::ostream& classFile);	virtual void WriteClassDocHeader(std::ostream& classFile);
	virtual void WriteMethod(std::ostream & out, TString& ret,	virtual void WriteMethod(std::ostream & out, TString& ret,
	TString& name, TString& params,	TString& name, TString& params,
	const char* file, TString& anchor,	const char* file, TString& anchor,
	TString& comment, TString& codeOneLiner,	TString& comment, TString& codeOneLiner,

	TMethod* guessedMethod);	TDocMethodWrapper* guessedMethod);
	virtual void WriteClassDescription(std::ostream& out, const TString& d escription);	virtual void WriteClassDescription(std::ostream& out, const TString& d escription);

	public:	public:
	TClassDocOutput(THtml& html, TClass* cl, TList* typedefs);	TClassDocOutput(THtml& html, TClass* cl, TList* typedefs);
	virtual ~TClassDocOutput();	virtual ~TClassDocOutput();

	void Class2Html(Bool_t force=kFALSE);	void Class2Html(Bool_t force=kFALSE);
	Bool_t ClassDotCharts(std::ostream & out);	Bool_t ClassDotCharts(std::ostream & out);
	void CreateClassHierarchy(std::ostream& out, const char* docFi leName);	void CreateClassHierarchy(std::ostream& out, const char* docFi leName);


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

	TCollectionProxyFactory.h	TCollectionProxyFactory.h

	// @(#)root/io:$Id: TCollectionProxyFactory.h 25450 2008-09-18 21:13:42Z pc anal $	// @(#)root/io:$Id: TCollectionProxyFactory.h 30749 2009-10-15 16:33:04Z br un $
	// 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_TCollectionProxyFactory	#ifndef ROOT_TCollectionProxyFactory

	skipping to change at line 62	skipping to change at line 62

	/** @class TCollectionProxyFactory TCollectionProxyFactory.h cont/TCollecti onProxyFactory.h	/** @class TCollectionProxyFactory TCollectionProxyFactory.h cont/TCollecti onProxyFactory.h
	*	*
	* TCollectionProxyFactory	* TCollectionProxyFactory
	* Interface to collection proxy and streamer generator.	* Interface to collection proxy and streamer generator.
	*	*
	* Proxy around an arbitrary container, which implements basic	* Proxy around an arbitrary container, which implements basic
	* functionality and iteration. The purpose of this implementation	* functionality and iteration. The purpose of this implementation
	* is to shield any generated dictionary implementation from the	* is to shield any generated dictionary implementation from the
	* underlying streamer/proxy implementation and only expose	* underlying streamer/proxy implementation and only expose

	* the creation fucntions.	* the creation functions.
	*	*
	* In particular this is used to implement splitting and abstract	* In particular this is used to implement splitting and abstract
	* element access of any container. Access to compiled code is necessary	* element access of any container. Access to compiled code is necessary
	* to implement the abstract iteration sequence and functionality like	* to implement the abstract iteration sequence and functionality like
	* size(), clear(), resize(). resize() may be a void operation.	* size(), clear(), resize(). resize() may be a void operation.
	*	*
	* @author M.Frank	* @author M.Frank
	* @version 1.0	* @version 1.0
	*/	*/
	class TCollectionProxyFactory {	class TCollectionProxyFactory {

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

	TDatime.h	TDatime.h

	// @(#)root/base:$Id: TDatime.h 20877 2007-11-19 11:17:07Z rdm $	// @(#)root/base:$Id: TDatime.h 31064 2009-11-10 14:39:38Z rdm $
	// Author: Rene Brun 05/01/95	// Author: Rene Brun 05/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 61	skipping to change at line 61
	TDatime(const char *sqlDateTime);	TDatime(const char *sqlDateTime);
	virtual ~TDatime() { }	virtual ~TDatime() { }

	TDatime& operator=(const TDatime &d);	TDatime& operator=(const TDatime &d);

	const char *AsString() const;	const char *AsString() const;
	const char AsString(char out) const;	const char AsString(char out) const;
	const char *AsSQLString() const;	const char *AsSQLString() const;
	UInt_t Convert(Bool_t toGMT = kFALSE) const;	UInt_t Convert(Bool_t toGMT = kFALSE) const;
	void Copy(TDatime &datime) const;	void Copy(TDatime &datime) const;

	UInt_t Get() const { return fDatime; }	UInt_t Get() const;
	Int_t GetDate() const;	Int_t GetDate() const;
	Int_t GetTime() const;	Int_t GetTime() const;
	Int_t GetYear() const { return (fDatime>>26) + 1995; }	Int_t GetYear() const { return (fDatime>>26) + 1995; }
	Int_t GetMonth() const { return (fDatime<<6)>>28; }	Int_t GetMonth() const { return (fDatime<<6)>>28; }
	Int_t GetDay() const { return (fDatime<<10)>>27; }	Int_t GetDay() const { return (fDatime<<10)>>27; }
	Int_t GetDayOfWeek() const;	Int_t GetDayOfWeek() const;
	Int_t GetHour() const { return (fDatime<<15)>>27; }	Int_t GetHour() const { return (fDatime<<15)>>27; }
	Int_t GetMinute() const { return (fDatime<<20)>>26; }	Int_t GetMinute() const { return (fDatime<<20)>>26; }
	Int_t GetSecond() const { return (fDatime<<26)>>26; }	Int_t GetSecond() const { return (fDatime<<26)>>26; }
	void FillBuffer(char *&buffer);	void FillBuffer(char *&buffer);

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

	TEveLegoEventHandler.h	TEveLegoEventHandler.h

	// @(#)root/eve:$Id: TEveLegoEventHandler.h 30425 2009-09-24 19:45:11Z mate vz $	// @(#)root/eve:$Id: TEveLegoEventHandler.h 30819 2009-10-20 20:01:16Z mate vz $
	// 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 42	skipping to change at line 42

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

	public:	public:
	TEveCaloLego* fLego;	TEveCaloLego* fLego;

	TEveLegoEventHandler(TGWindow w, TObject obj, TEveCaloLego* lego = 0);	TEveLegoEventHandler(TGWindow w, TObject obj, TEveCaloLego* lego = 0);
	virtual ~TEveLegoEventHandler() {}	virtual ~TEveLegoEventHandler() {}

	virtual Bool_t HandleKey(Event_t *event);	virtual Bool_t HandleKey(Event_t *event);

	virtual Bool_t HandleDoubleClick(Event_t *event);

	Float_t GetTransTheta() {return fTransTheta;}	Float_t GetTransTheta() {return fTransTheta;}
	void SetTransTheta(Float_t h) {fTransTheta=h;}	void SetTransTheta(Float_t h) {fTransTheta=h;}

	TEveCaloLego* GetLego() { return fLego; }	TEveCaloLego* GetLego() { return fLego; }
	void SetLego( TEveCaloLego* x) { fLego = x; }	void SetLego( TEveCaloLego* x) { fLego = x; }

	ClassDef(TEveLegoEventHandler, 0); // A GL event handler class. Swiches perspective or orthographic camera.	ClassDef(TEveLegoEventHandler, 0); // A GL event handler class. Swiches perspective or orthographic camera.
	};	};


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

	TEveProjectionManager.h	TEveProjectionManager.h

	// @(#)root/eve:$Id: TEveProjectionManager.h 24314 2008-06-17 18:19:53Z mat evz $	// @(#)root/eve:$Id: TEveProjectionManager.h 30840 2009-10-23 09:03:14Z mat evz $
	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/


	skipping to change at line 42	skipping to change at line 42
	Float_t fCurrentDepth; // z depth of object being projected	Float_t fCurrentDepth; // z depth of object being projected

	List_t fDependentEls; // elements that depend on manager and need to be destroyed with it	List_t fDependentEls; // elements that depend on manager and need to be destroyed with it

	Bool_t fImportEmpty; // import sub-trees with no projectable elements	Bool_t fImportEmpty; // import sub-trees with no projectable elements

	virtual Bool_t ShouldImport(TEveElement* el);	virtual Bool_t ShouldImport(TEveElement* el);
	virtual void UpdateDependentElsAndScenes(TEveElement* root);	virtual void UpdateDependentElsAndScenes(TEveElement* root);

	public:	public:

	TEveProjectionManager();	TEveProjectionManager(TEveProjection::EPType_e type=TEveProjection::kPT_ Unknown);
	virtual ~TEveProjectionManager();	virtual ~TEveProjectionManager();

	void AddDependent(TEveElement* el);	void AddDependent(TEveElement* el);
	void RemoveDependent(TEveElement* el);	void RemoveDependent(TEveElement* el);

	void SetProjection(TEveProjection::EPType_e type);	void SetProjection(TEveProjection::EPType_e type);
	TEveProjection* GetProjection() { return fProjection; }	TEveProjection* GetProjection() { return fProjection; }

	virtual void UpdateName();	virtual void UpdateName();


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

	TEveRGBAPalette.h	TEveRGBAPalette.h

	// @(#)root/eve:$Id: TEveRGBAPalette.h 29357 2009-07-06 17:53:36Z matevz $	// @(#)root/eve:$Id: TEveRGBAPalette.h 30823 2009-10-21 13:58:59Z matevz $
	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOT_TEveRGBAPalette	#ifndef ROOT_TEveRGBAPalette
	#define ROOT_TEveRGBAPalette	#define ROOT_TEveRGBAPalette

	#include "TEveUtil.h"	#include "TEveUtil.h"

	#include "TObject.h"	#include "TObject.h"

		#include "TQObject.h"


	class TEveRGBAPalette : public TObject, public TEveRefCnt	class TEveRGBAPalette : public TObject,
		public TQObject,
		public TEveRefCnt
	{	{
	friend class TEveRGBAPaletteEditor;	friend class TEveRGBAPaletteEditor;
	friend class TEveRGBAPaletteSubEditor;	friend class TEveRGBAPaletteSubEditor;

	public:	public:
	enum ELimitAction_e { kLA_Cut, kLA_Mark, kLA_Clip, kLA_Wrap };	enum ELimitAction_e { kLA_Cut, kLA_Mark, kLA_Clip, kLA_Wrap };

	private:	private:
	TEveRGBAPalette(const TEveRGBAPalette&); // Not implemented	TEveRGBAPalette(const TEveRGBAPalette&); // Not implemented
	TEveRGBAPalette& operator=(const TEveRGBAPalette&); // Not implemented	TEveRGBAPalette& operator=(const TEveRGBAPalette&); // Not implemented

	skipping to change at line 136	skipping to change at line 139
	Color_t* PtrOverColor() { return &fOverColor; }	Color_t* PtrOverColor() { return &fOverColor; }
	UChar_t* GetOverRGBA() { return fOverRGBA; }	UChar_t* GetOverRGBA() { return fOverRGBA; }
	const UChar_t* GetOverRGBA() const { return fOverRGBA; }	const UChar_t* GetOverRGBA() const { return fOverRGBA; }

	void SetOverColor(Color_t ci);	void SetOverColor(Color_t ci);
	void SetOverColorPixel(Pixel_t pix);	void SetOverColorPixel(Pixel_t pix);
	void SetOverColorRGBA(UChar_t r, UChar_t g, UChar_t b, UChar_t a=255);	void SetOverColorRGBA(UChar_t r, UChar_t g, UChar_t b, UChar_t a=255);

	// ================================================================	// ================================================================


	// ?? Should we emit some SIGNALS ??	void MinMaxValChanged(); // SIGNAL
	// ?? Should we have a RendererTimeStamp ??

	ClassDef(TEveRGBAPalette, 1); // A generic, speed-optimised mapping from value to RGBA color supporting different wrapping and range truncation mod es.	ClassDef(TEveRGBAPalette, 1); // A generic, speed-optimised mapping from value to RGBA color supporting different wrapping and range truncation mod es.
	};	};

	/************************************************************************ **/	/************************************************************************ **/
	// Inlines for TEveRGBAPalette	// Inlines for TEveRGBAPalette
	/************************************************************************ **/	/************************************************************************ **/

	//_________________________________________________________________________ _____	//_________________________________________________________________________ _____
	inline Bool_t TEveRGBAPalette::WithinVisibleRange(Int_t val) const	inline Bool_t TEveRGBAPalette::WithinVisibleRange(Int_t val) const

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

	TEveSelection.h	TEveSelection.h

	// @(#)root/eve:$Id: TEveSelection.h 27157 2009-01-15 14:05:12Z brun $	// @(#)root/eve:$Id: TEveSelection.h 30891 2009-10-27 19:28:36Z 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 78	skipping to change at line 78
	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 RemoveImpliedSelected(TEveElement* el);	virtual void RemoveImpliedSelected(TEveElement* el);


	void SelectionAdded(TEveElement* el); // SIGNAL	void SelectionAdded(TEveElement* el); // SIGNAL
	void SelectionRemoved(TEveElement* el); // SIGNAL	void SelectionRemoved(TEveElement* el); // SIGNAL
	void SelectionCleared(); // SIGNAL	void SelectionCleared(); // SIGNAL
		void SelectionRepeated(TEveElement* el); // SIGNAL

	// ----------------------------------------------------------------	// ----------------------------------------------------------------
	// Interface to make selection active/non-active.	// Interface to make selection active/non-active.
	// Not used yet, assumed to be active all the time.	// Not used yet, assumed to be active all the time.

	virtual void ActivateSelection();	virtual void ActivateSelection();
	virtual void DeactivateSelection();	virtual void DeactivateSelection();

	// ----------------------------------------------------------------	// ----------------------------------------------------------------
	// User input processing.	// User input processing.

	TEveElement* MapPickedToSelected(TEveElement* el);	TEveElement* MapPickedToSelected(TEveElement* el);

	virtual void UserPickedElement(TEveElement* el, Bool_t multi=kFALSE);	virtual void UserPickedElement(TEveElement* el, Bool_t multi=kFALSE);

		virtual void UserRePickedElement(TEveElement* el);
		virtual void UserUnPickedElement(TEveElement* el);

	// ----------------------------------------------------------------	// ----------------------------------------------------------------

	ClassDef(TEveSelection, 0); // Container for selected and highlighted el ements.	ClassDef(TEveSelection, 0); // Container for selected and highlighted el ements.
	};	};

	#endif	#endif

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

	TEveStraightLineSet.h	TEveStraightLineSet.h

	// @(#)root/eve:$Id: TEveStraightLineSet.h 28197 2009-04-14 13:59:27Z matev z $	// @(#)root/eve:$Id: TEveStraightLineSet.h 30840 2009-10-23 09:03:14Z matev z $
	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/


	skipping to change at line 107	skipping to change at line 107
	virtual Bool_t GetRnrLines() { return fRnrLines; }	virtual Bool_t GetRnrLines() { return fRnrLines; }
	virtual Bool_t GetDepthTest() { return fDepthTest; }	virtual Bool_t GetDepthTest() { return fDepthTest; }

	virtual void SetRnrMarkers(Bool_t x) { fRnrMarkers = x; }	virtual void SetRnrMarkers(Bool_t x) { fRnrMarkers = x; }
	virtual void SetRnrLines(Bool_t x) { fRnrLines = x; }	virtual void SetRnrLines(Bool_t x) { fRnrLines = x; }
	virtual void SetDepthTest(Bool_t x) { fDepthTest = x; }	virtual void SetDepthTest(Bool_t x) { fDepthTest = x; }

	virtual void CopyVizParams(const TEveElement* el);	virtual void CopyVizParams(const TEveElement* el);
	virtual void WriteVizParams(ostream& out, const TString& var);	virtual void WriteVizParams(ostream& out, const TString& var);


	virtual TClass* ProjectedClass() const;	virtual TClass* ProjectedClass(const TEveProjection* p) const;

	virtual void ComputeBBox();	virtual void ComputeBBox();
	virtual void Paint(Option_t* option="");	virtual void Paint(Option_t* option="");

	ClassDef(TEveStraightLineSet, 1); // Set of straight lines with optional markers along the lines.	ClassDef(TEveStraightLineSet, 1); // Set of straight lines with optional markers along the lines.
	};	};

	/************************************************************************ **/	/************************************************************************ **/

	class TEveStraightLineSetProjected : public TEveStraightLineSet,	class TEveStraightLineSetProjected : public TEveStraightLineSet,
	public TEveProjected	public TEveProjected
	{	{
	private:	private:
	TEveStraightLineSetProjected(const TEveStraightLineSetProjected&); // Not implemented	TEveStraightLineSetProjected(const TEveStraightLineSetProjected&); // Not implemented
	TEveStraightLineSetProjected& operator=(const TEveStraightLineSetProject ed&); // Not implemented	TEveStraightLineSetProjected& operator=(const TEveStraightLineSetProject ed&); // Not implemented


		protected:
		virtual void SetDepthLocal(Float_t d);

	public:	public:
	TEveStraightLineSetProjected();	TEveStraightLineSetProjected();
	virtual ~TEveStraightLineSetProjected() {}	virtual ~TEveStraightLineSetProjected() {}

	virtual void SetProjection(TEveProjectionManager* mng, TEveProjectable* model);	virtual void SetProjection(TEveProjectionManager* mng, TEveProjectable* model);

	virtual void SetDepth(Float_t d);
	virtual void UpdateProjection();	virtual void UpdateProjection();

	ClassDef(TEveStraightLineSetProjected, 1); // Projected copy of a TEveSt raightLineSet.	ClassDef(TEveStraightLineSetProjected, 1); // Projected copy of a TEveSt raightLineSet.
	};	};

	#endif	#endif

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

	TEveText.h	TEveText.h

	// @(#)root/eve:$Id: TEveText.h 27157 2009-01-15 14:05:12Z brun $	// @(#)root/eve:$Id: TEveText.h 30702 2009-10-13 13:55:31Z matevz $
	// 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 43	skipping to change at line 43

	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


		Float_t fPolygonOffset[2]; // depth test

	public:	public:
	TEveText(const char* 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);

	skipping to change at line 67	skipping to change at line 69

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


		Float_t GetPolygonOffset(Int_t i) const { return fPolygonOffset[i]; }
		void SetPolygonOffset(Float_t factor, Float_t units);

	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(TEveText, 0); // Class for visualisation of text with FTGL font .	ClassDef(TEveText, 0); // Class for visualisation of text with FTGL font .
	};	};

	#endif	#endif

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

	TEveTrack.h	TEveTrack.h

	// @(#)root/eve:$Id: TEveTrack.h 29816 2009-08-18 15:51:02Z matevz $	// @(#)root/eve:$Id: TEveTrack.h 30840 2009-10-23 09:03:14Z 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 116	skipping to change at line 116
	//-------------------------------------------------------------------	//-------------------------------------------------------------------

	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 TEveProjection* p) const;

	Bool_t ShouldBreakTrack() const;	Bool_t ShouldBreakTrack() const;

	UChar_t GetBreakProjectedTracks() const { return fBreakProjectedTrac ks; }	UChar_t GetBreakProjectedTracks() const { return fBreakProjectedTrac ks; }
	void SetBreakProjectedTracks(UChar_t bt) { fBreakProjectedTracks = bt ; }	void SetBreakProjectedTracks(UChar_t bt) { fBreakProjectedTracks = bt ; }

	static Bool_t GetDefaultBreakProjectedTracks() { return fgDefau ltBreakProjectedTracks; }	static Bool_t GetDefaultBreakProjectedTracks() { return fgDefau ltBreakProjectedTracks; }
	static void SetDefaultBreakProjectedTracks(Bool_t bt) { fgDefaultBreak ProjectedTracks = bt; }	static void SetDefaultBreakProjectedTracks(Bool_t bt) { fgDefaultBreak ProjectedTracks = bt; }

	ClassDef(TEveTrack, 1); // Track with given vertex, momentum and optiona l referece-points (path-marks) along its path.	ClassDef(TEveTrack, 1); // Track with given vertex, momentum and optiona l referece-points (path-marks) along its path.
	};	};

	/************************************************************************ **/	/************************************************************************ **/
	// TEveTrackList	// TEveTrackList
	/************************************************************************ **/	/************************************************************************ **/

	class TEveTrackList : public TEveElementList,	class TEveTrackList : public TEveElementList,

	public TEveProjectable,
	public TAttMarker,	public TAttMarker,
	public TAttLine	public TAttLine
	{	{
	friend class TEveTrackListEditor;	friend class TEveTrackListEditor;

	private:	private:
	TEveTrackList(const TEveTrackList&); // Not implemented	TEveTrackList(const TEveTrackList&); // Not implemented
	TEveTrackList& operator=(const TEveTrackList&); // Not implemented	TEveTrackList& operator=(const TEveTrackList&); // Not implemented

	protected:	protected:

	skipping to change at line 222	skipping to change at line 221
	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

	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 TEveProjection* p) 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. 4 change blocks.
	4 lines changed or deleted	3 lines changed or added

	TEveViewer.h	TEveViewer.h

	// @(#)root/eve:$Id: TEveViewer.h 29323 2009-07-03 10:57:51Z matevz $	// @(#)root/eve:$Id: TEveViewer.h 31299 2009-11-18 21:06: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 56	skipping to change at line 56
	TEveViewer(const char* n="TEveViewer", const char* t="");	TEveViewer(const char* n="TEveViewer", const char* t="");
	virtual ~TEveViewer();	virtual ~TEveViewer();

	virtual void PreUndock();	virtual void PreUndock();
	virtual void PostDock();	virtual void PostDock();

	TGLViewer* GetGLViewer() const { return fGLViewer; }	TGLViewer* GetGLViewer() const { return fGLViewer; }
	void SetGLViewer(TGLViewer* viewer, TGFrame* frame);	void SetGLViewer(TGLViewer* viewer, TGFrame* frame);

	TGLSAViewer* SpawnGLViewer(TGedEditor* ged);	TGLSAViewer* SpawnGLViewer(TGedEditor* ged);

	TGLEmbeddedViewer* SpawnGLEmbeddedViewer(Int_t border=0);	TGLEmbeddedViewer* SpawnGLEmbeddedViewer(TGedEditor* ged, Int_t border=0 );

	void Redraw(Bool_t resetCameras=kFALSE);	void Redraw(Bool_t resetCameras=kFALSE);

	virtual void AddScene(TEveScene* scene);	virtual void AddScene(TEveScene* scene);

	virtual void RemoveElementLocal(TEveElement* el);	virtual void RemoveElementLocal(TEveElement* el);
	virtual void RemoveElementsLocal();	virtual void RemoveElementsLocal();

	virtual TObject* GetEditorObject(const TEveException& eh="TEveViewer::Ge tEditorObject ") const;	virtual TObject* GetEditorObject(const TEveException& eh="TEveViewer::Ge tEditorObject ") const;


	skipping to change at line 112	skipping to change at line 112
	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 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);

		void OnReClicked(TObject *obj, UInt_t button, UInt_t state);
		void OnUnClicked(TObject *obj, UInt_t button, UInt_t state);

	// --------------------------------	// --------------------------------

	Bool_t GetShowTooltip() const { return fShowTooltip; }	Bool_t GetShowTooltip() const { return fShowTooltip; }
	void SetShowTooltip(Bool_t x) { fShowTooltip = x; }	void SetShowTooltip(Bool_t x) { fShowTooltip = x; }

	Float_t GetColorBrightness() const { return fBrightness; }	Float_t GetColorBrightness() const { return fBrightness; }
	void SetColorBrightness(Float_t b);	void SetColorBrightness(Float_t b);

	Bool_t UseLightColorSet() const { return fUseLightColorSet; }	Bool_t UseLightColorSet() const { return fUseLightColorSet; }

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

	TFile.h	TFile.h

	// @(#)root/io:$Id: TFile.h 23122 2008-04-10 14:56:30Z rdm $	// @(#)root/io:$Id: TFile.h 30926 2009-10-30 12:50:27Z brun $
	// Author: Rene Brun 28/11/94	// Author: Rene Brun 28/11/94

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/


	skipping to change at line 54	skipping to change at line 54
	enum EAsyncOpenStatus { kAOSNotAsync = -1, kAOSFailure = 0,	enum EAsyncOpenStatus { kAOSNotAsync = -1, kAOSFailure = 0,
	kAOSInProgress = 1, kAOSSuccess = 2 };	kAOSInProgress = 1, kAOSSuccess = 2 };
	// Open timeout constants	// Open timeout constants
	enum EOpenTimeOut { kInstantTimeout = 0, kEternalTimeout = 999999999 };	enum EOpenTimeOut { kInstantTimeout = 0, kEternalTimeout = 999999999 };

	protected:	protected:
	Double_t fSumBuffer; //Sum of buffer sizes of objects writt en so far	Double_t fSumBuffer; //Sum of buffer sizes of objects writt en so far
	Double_t fSum2Buffer; //Sum of squares of buffer sizes of ob jects written so far	Double_t fSum2Buffer; //Sum of squares of buffer sizes of ob jects written so far
	Long64_t fBytesWrite; //Number of bytes written to this file	Long64_t fBytesWrite; //Number of bytes written to this file
	Long64_t fBytesRead; //Number of bytes read from this file	Long64_t fBytesRead; //Number of bytes read from this file

		Long64_t fBytesReadExtra; //Number of extra bytes (overhead) rea d by the readahead buffer
	Long64_t fBEGIN; //First used byte in file	Long64_t fBEGIN; //First used byte in file
	Long64_t fEND; //Last used byte in file	Long64_t fEND; //Last used byte in file
	Long64_t fSeekFree; //Location on disk of free segments st ructure	Long64_t fSeekFree; //Location on disk of free segments st ructure
	Long64_t fSeekInfo; //Location on disk of StreamerInfo rec ord	Long64_t fSeekInfo; //Location on disk of StreamerInfo rec ord
	Int_t fD; //File descriptor	Int_t fD; //File descriptor
	Int_t fVersion; //File format version	Int_t fVersion; //File format version
	Int_t fCompress; //Compression level from 0(not compres sed) to 9 (max compression)	Int_t fCompress; //Compression level from 0(not compres sed) to 9 (max compression)
	Int_t fNbytesFree; //Number of bytes for free segments st ructure	Int_t fNbytesFree; //Number of bytes for free segments st ructure
	Int_t fNbytesInfo; //Number of bytes for StreamerInfo rec ord	Int_t fNbytesInfo; //Number of bytes for StreamerInfo rec ord
	Int_t fWritten; //Number of objects written so far	Int_t fWritten; //Number of objects written so far

	skipping to change at line 94	skipping to change at line 95
	TUrl fUrl; //!URL of file	TUrl fUrl; //!URL of file

	TList *fInfoCache; //!Cached list of the streamer infos i n this file	TList *fInfoCache; //!Cached list of the streamer infos i n this file
	TList *fOpenPhases; //!Time info about open phases	TList *fOpenPhases; //!Time info about open phases

	static TList *fgAsyncOpenRequests; //List of handles for pending open requests	static TList *fgAsyncOpenRequests; //List of handles for pending open requests

	static TString fgCacheFileDir; //Directory where to locally s tage files	static TString fgCacheFileDir; //Directory where to locally s tage files
	static Bool_t fgCacheFileDisconnected; //Indicates, we trust in the f iles in the cache dir without stat on the cached file	static Bool_t fgCacheFileDisconnected; //Indicates, we trust in the f iles in the cache dir without stat on the cached file
	static Bool_t fgCacheFileForce; //Indicates, to force all READ to CACHEREAD	static Bool_t fgCacheFileForce; //Indicates, to force all READ to CACHEREAD

	static UInt_t fgOpenTimeout; //Timeout for open operations in ms - 0	static UInt_t fgOpenTimeout; //Timeout for open operations
	corresponds to blocking i/o	in ms - 0 corresponds to blocking i/o
	static Bool_t fgOnlyStaged ; //Before the file is opened, it is check	static Bool_t fgOnlyStaged ; //Before the file is opened, i
	ed, that the file is staged, if not, the open fails	t is checked, that the file is staged, if not, the open fails
	static Long64_t fgBytesWrite; //Number of bytes written by all TFile o	static Long64_t fgBytesWrite; //Number of bytes written by a
	bjects	ll TFile objects
	static Long64_t fgBytesRead; //Number of bytes read by all TFile obje	static Long64_t fgBytesRead; //Number of bytes read by all
	cts	TFile objects
	static Long64_t fgFileCounter; //Counter for all opened files	static Long64_t fgFileCounter; //Counter for all opened files
	static Int_t fgReadCalls; //Number of bytes read from all TFile ob	static Int_t fgReadCalls; //Number of bytes read from al
	jects	l TFile objects
	static Bool_t fgReadInfo; //if true (default) ReadStreamerInfo is	static Int_t fgReadaheadSize; //Readahead buffer size
	called when opening a file	static Bool_t fgReadInfo; //if true (default) ReadStream
		erInfo is called when opening a file

	virtual EAsyncOpenStatus GetAsyncOpenStatus() { return fAsyncOpenStatus; }	virtual EAsyncOpenStatus GetAsyncOpenStatus() { return fAsyncOpenStatus; }

	Long64_t GetRelOffset() const { return fOffset - fArchiveOffset; }
	virtual void Init(Bool_t create);	virtual void Init(Bool_t create);
	Bool_t FlushWriteCache();	Bool_t FlushWriteCache();
	Int_t ReadBufferViaCache(char *buf, Int_t len);	Int_t ReadBufferViaCache(char *buf, Int_t len);
	Int_t WriteBufferViaCache(const char *buf, Int_t len);	Int_t WriteBufferViaCache(const char *buf, Int_t len);

	// Interface to basic system I/O routines	// Interface to basic system I/O routines
	virtual Int_t SysOpen(const char *pathname, Int_t flags, UInt_t mode) ;	virtual Int_t SysOpen(const char *pathname, Int_t flags, UInt_t mode) ;
	virtual Int_t SysClose(Int_t fd);	virtual Int_t SysClose(Int_t fd);
	virtual Int_t SysRead(Int_t fd, void *buf, Int_t len);	virtual Int_t SysRead(Int_t fd, void *buf, Int_t len);
	virtual Int_t SysWrite(Int_t fd, const void *buf, Int_t len);	virtual Int_t SysWrite(Int_t fd, const void *buf, Int_t len);

	skipping to change at line 180	skipping to change at line 181
	virtual Int_t GetErrno() const;	virtual Int_t GetErrno() const;
	virtual void ResetErrno() const;	virtual void ResetErrno() const;
	Int_t GetFd() const { return fD; }	Int_t GetFd() const { return fD; }
	virtual const TUrl *GetEndpointUrl() const { return &fUrl; }	virtual const TUrl *GetEndpointUrl() const { return &fUrl; }
	TObjArray *GetListOfProcessIDs() const {return fProcessIDs;}	TObjArray *GetListOfProcessIDs() const {return fProcessIDs;}
	TList *GetListOfFree() const { return fFree; }	TList *GetListOfFree() const { return fFree; }
	virtual Int_t GetNfree() const { return fFree->GetSize(); }	virtual Int_t GetNfree() const { return fFree->GetSize(); }
	virtual Int_t GetNProcessIDs() const { return fNProcessIDs; }	virtual Int_t GetNProcessIDs() const { return fNProcessIDs; }
	Option_t *GetOption() const { return fOption.Data(); }	Option_t *GetOption() const { return fOption.Data(); }
	virtual Long64_t GetBytesRead() const { return fBytesRead; }	virtual Long64_t GetBytesRead() const { return fBytesRead; }

		virtual Long64_t GetBytesReadExtra() const { return fBytesReadExtra; }
	virtual Long64_t GetBytesWritten() const;	virtual Long64_t GetBytesWritten() const;
	virtual Int_t GetReadCalls() const { return fReadCalls; }	virtual Int_t GetReadCalls() const { return fReadCalls; }
	Int_t GetVersion() const { return fVersion; }	Int_t GetVersion() const { return fVersion; }
	Int_t GetRecordHeader(char *buf, Long64_t first, Int_t max bytes,	Int_t GetRecordHeader(char *buf, Long64_t first, Int_t max bytes,
	Int_t &nbytes, Int_t &objlen, Int_t &keylen);	Int_t &nbytes, Int_t &objlen, Int_t &keylen);
	virtual Int_t GetNbytesInfo() const {return fNbytesInfo;}	virtual Int_t GetNbytesInfo() const {return fNbytesInfo;}
	virtual Int_t GetNbytesFree() const {return fNbytesFree;}	virtual Int_t GetNbytesFree() const {return fNbytesFree;}

		Long64_t GetRelOffset() const { return fOffset - fArchiveOffs et; }
	virtual Long64_t GetSeekFree() const {return fSeekFree;}	virtual Long64_t GetSeekFree() const {return fSeekFree;}
	virtual Long64_t GetSeekInfo() const {return fSeekInfo;}	virtual Long64_t GetSeekInfo() const {return fSeekInfo;}
	virtual Long64_t GetSize() const;	virtual Long64_t GetSize() const;
	virtual TList *GetStreamerInfoList();	virtual TList *GetStreamerInfoList();
	const TList *GetStreamerInfoCache();	const TList *GetStreamerInfoCache();
	virtual void IncrementProcessIDs() { fNProcessIDs++; }	virtual void IncrementProcessIDs() { fNProcessIDs++; }
	virtual Bool_t IsArchive() const { return fIsArchive; }	virtual Bool_t IsArchive() const { return fIsArchive; }
	Bool_t IsBinary() const { return TestBit(kBinaryFile); }	Bool_t IsBinary() const { return TestBit(kBinaryFile); }
	Bool_t IsRaw() const { return !fIsRootFile; }	Bool_t IsRaw() const { return !fIsRootFile; }
	virtual Bool_t IsOpen() const;	virtual Bool_t IsOpen() const;

	skipping to change at line 251	skipping to change at line 254

	static EFileType GetType(const char name, Option_t option = "", TSt ring *prefix = 0);	static EFileType GetType(const char name, Option_t option = "", TSt ring *prefix = 0);

	static EAsyncOpenStatus GetAsyncOpenStatus(const char *name);	static EAsyncOpenStatus GetAsyncOpenStatus(const char *name);
	static EAsyncOpenStatus GetAsyncOpenStatus(TFileOpenHandle *handle);	static EAsyncOpenStatus GetAsyncOpenStatus(TFileOpenHandle *handle);
	static const TUrl GetEndpointUrl(const char name);	static const TUrl GetEndpointUrl(const char name);

	static Long64_t GetFileBytesRead();	static Long64_t GetFileBytesRead();
	static Long64_t GetFileBytesWritten();	static Long64_t GetFileBytesWritten();
	static Int_t GetFileReadCalls();	static Int_t GetFileReadCalls();

		static Int_t GetReadaheadSize();

	static void SetFileBytesRead(Long64_t bytes = 0);	static void SetFileBytesRead(Long64_t bytes = 0);
	static void SetFileBytesWritten(Long64_t bytes = 0);	static void SetFileBytesWritten(Long64_t bytes = 0);
	static void SetFileReadCalls(Int_t readcalls = 0);	static void SetFileReadCalls(Int_t readcalls = 0);

		static void SetReadaheadSize(Int_t bufsize = 256000);
	static void SetReadStreamerInfo(Bool_t readinfo=kTRUE);	static void SetReadStreamerInfo(Bool_t readinfo=kTRUE);

	static Long64_t GetFileCounter();	static Long64_t GetFileCounter();
	static void IncrementFileCounter();	static void IncrementFileCounter();

	static Bool_t SetCacheFileDir(const char *cacheDir, Bool_t operate Disconnected = kTRUE,	static Bool_t SetCacheFileDir(const char *cacheDir, Bool_t operate Disconnected = kTRUE,
	Bool_t forceCacheread = kFALSE);	Bool_t forceCacheread = kFALSE);
	static const char *GetCacheFileDir();	static const char *GetCacheFileDir();
	static Bool_t ShrinkCacheFileDir(Long64_t shrinkSize, Long_t clean upInteval = 0);	static Bool_t ShrinkCacheFileDir(Long64_t shrinkSize, Long_t clean upInteval = 0);
	static Bool_t Cp(const char src, const char dst, Bool_t progress bar = kTRUE,	static Bool_t Cp(const char src, const char dst, Bool_t progress bar = kTRUE,
	UInt_t buffersize = 1000000);	UInt_t buffersize = 1000000);

	static UInt_t SetOpenTimeout(UInt_t timeout); // in ms	static UInt_t SetOpenTimeout(UInt_t timeout); // in ms
	static UInt_t GetOpenTimeout(); // in ms	static UInt_t GetOpenTimeout(); // in ms
	static Bool_t SetOnlyStaged(Bool_t onlystaged);	static Bool_t SetOnlyStaged(Bool_t onlystaged);
	static Bool_t GetOnlyStaged();	static Bool_t GetOnlyStaged();


	ClassDef(TFile,7) //ROOT file	ClassDef(TFile,8) //ROOT file
	};	};

	//	//
	// Class holding info about the file being opened	// Class holding info about the file being opened
	//	//
	class TFileOpenHandle : public TNamed {	class TFileOpenHandle : public TNamed {

	friend class TFile;	friend class TFile;
	friend class TAlienFile;	friend class TAlienFile;


End of changes. 9 change blocks.
	16 lines changed or deleted	21 lines changed or added