ROOT: headers diff between 5.29.02 and 5.30.00 versions

	Api.h	Api.h

	skipping to change at line 278	skipping to change at line 278
	,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	* External readline interface
	*********************************************************************/	*********************************************************************/

	typedef char* (G__pGetline_t)(const char prompt);	typedef const char* (G__pGetline_t)(const char prompt);
	typedef void (G__pHistadd_t)(char line);	typedef void (G__pHistadd_t)(const char line);

	#ifndef __CINT__	#ifndef __CINT__
	G__EXPORT	G__EXPORT
	#endif	#endif
	G__pGetline_t G__GetGetlineFunc();	G__pGetline_t G__GetGetlineFunc();

	#ifndef __CINT__	#ifndef __CINT__
	G__EXPORT	G__EXPORT
	#endif	#endif
	G__pHistadd_t G__GetHistaddFunc();	G__pHistadd_t G__GetHistaddFunc();

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

	BayesianCalculator.h	BayesianCalculator.h

	// @(#)root/roostats:$Id: BayesianCalculator.h 38933 2011-04-19 20:15:51Z m oneta $	// @(#)root/roostats:$Id: BayesianCalculator.h 39977 2011-06-26 22:57:52Z 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 119	skipping to change at line 119
	void SetScanOfPosterior(int nbin = 100) { fNScanBins = nbin; }	void SetScanOfPosterior(int nbin = 100) { fNScanBins = nbin; }

	// set the number of iterations when running a MC integration algorit hm	// set the number of iterations when running a MC integration algorit hm
	// If not set use default algorithmic values	// If not set use default algorithmic values
	// In case of ToyMC sampling of the nuisance the value is 100	// In case of ToyMC sampling of the nuisance the value is 100
	// In case of using the GSL MCintegrations types the default value is	// In case of using the GSL MCintegrations types the default value is
	// defined in ROOT::Math::IntegratorMultiDimOptions::DefaultNCalls()	// defined in ROOT::Math::IntegratorMultiDimOptions::DefaultNCalls()
	virtual void SetNumIters(Int_t numIters) { fNumIterations = numIters ; }	virtual void SetNumIters(Int_t numIters) { fNumIterations = numIters ; }

	// set the integration type (possible type are) :	// set the integration type (possible type are) :

	// 1D integration ( used when only one nuisance and when the posterio
	r is scanned):
	// adaptive , gauss, nonadaptive
	// multidim:
	// ADAPTIVE, adaptive numerical integration
	// niter defines here the max numnber of function
	calls - can be reduced to make it faster
	// but the required tolerance will not be reached
	// VEGAS MC integration method based on importance sampling -
	niter is number of calls + extra parameter
	// can be configured using IntegratorMultiDimOptions
	class
	// MISER MC integration method based on stratified sampling
	// See also http://en.wikipedia.org/wiki/Monte_Carlo_i
	ntegration for VEGAS and MISER description
	// PLAIN simple MC integration method, niter defines number
	of calls
	//
	// Extra integration types are:
	//
	// TOYMC:
	// evaluate posterior by generating toy MC for the nuisance par
	ameters. It is a MC
	// integration, where the function is sampled according to the
	nuisance. It is convenient to use when all
	// the nuisance are uncorrelated and it is efficient to generat
	e them
	// The toy are generated by default for each poi values
	// (this method has been proposed and provided by J.P Chou)
	// 1-TOYMC : same method as before but in this case the toys are
	generated for each poi value
	//
	// ROOFIT:
	// use roofit default integration methods which will produce a
	nested integral (not reccomended for more
	// than 1 nuisance parameters)
	//
	// if type = 0 use default specified via class IntegratorMultiDimOpti
	ons::SetDefaultIntegrator
	void SetIntegrationType(const char * type);	void SetIntegrationType(const char * type);

	// return the mode (most probable value of the posterior function)	// return the mode (most probable value of the posterior function)
	double GetMode() const;	double GetMode() const;

	// force the nuisance pdf when using the toy mc sampling	// force the nuisance pdf when using the toy mc sampling
	void ForceNuisancePdf(RooAbsPdf & pdf) { fNuisancePdf = &pdf; }	void ForceNuisancePdf(RooAbsPdf & pdf) { fNuisancePdf = &pdf; }

	protected:	protected:


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

	BernsteinCorrection.h	BernsteinCorrection.h

	// @(#)root/roostats:$Id: BernsteinCorrection.h 31276 2009-11-18 15:06:42Z moneta $	// @(#)root/roostats:$Id: BernsteinCorrection.h 39391 2011-05-26 09:51:59Z 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

	BinarySearchTree.h	BinarySearchTree.h

	// @(#)root/tmva $Id: BinarySearchTree.h 38943 2011-04-20 08:03:25Z evt $	// @(#)root/tmva $Id: BinarySearchTree.h 40012 2011-06-27 16:03:11Z stelzer $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : BinarySearchTree *	* Class : BinarySearchTree *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* BinarySearchTree incl. volume Search method *	* BinarySearchTree incl. volume Search method *

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

	BinarySearchTreeNode.h	BinarySearchTreeNode.h

	// @(#)root/tmva $Id: BinarySearchTreeNode.h 38719 2011-04-04 12:22:28Z evt $	// @(#)root/tmva $Id: BinarySearchTreeNode.h 39395 2011-05-26 10:05:54Z mon eta $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Classes: Node, NodeID *	* Classes: Node, NodeID *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Node for the BinarySearch *	* Node for the BinarySearch *

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

	BinaryTree.h	BinaryTree.h

	// @(#)root/tmva $Id: BinaryTree.h 38943 2011-04-20 08:03:25Z evt $	// @(#)root/tmva $Id: BinaryTree.h 40012 2011-06-27 16:03:11Z stelzer $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss, Eckhard vo n Toerne	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss, Eckhard vo n Toerne

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : BinaryTree *	* Class : BinaryTree *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* BinaryTree: A base class for BinarySearch- or Decision-Trees *	* BinaryTree: A base class for BinarySearch- or Decision-Trees *

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

	Bits.h	Bits.h

	/* @(#)root/zip:$Id: Bits.h 20882 2007-11-19 11:31:26Z rdm $ */	/* @(#)root/zip:$Id: Bits.h 39887 2011-06-22 14:12:05Z rdm $ */
	/* Author: */	/* Author: */
	/*	/*

	Copyright (C) 1990-1993 Mark Adler, Richard B. Wales, Jean-loup Gailly,	Copyright (C) 1990-1993 Mark Adler, Richard B. Wales, Jean-loup Gailly,
	Kai Uwe Rommel and Igor Mandrichenko.	Kai Uwe Rommel and Igor Mandrichenko.
	For conditions of distribution and use, see copyright notice in zlib.h	For conditions of distribution and use, see copyright notice in zlib.h

	*/	*/
	/*	/*
	* Changed for ROOT. Functions names have a R__ prepended to differentiate	* Changed for ROOT. Functions names have a R__ prepended to differentiate
	* them from function names in later versions of zlib.	* them from function names in later versions of zlib.
	*/	*/

	#include "zlib.h"	#include "zlib.h"

		#include "RConfigure.h"
		#include "ZipLZMA.h"

		#include <stdio.h>

	/*	/*
	* bits.c by Jean-loup Gailly and Kai Uwe Rommel.	* bits.c by Jean-loup Gailly and Kai Uwe Rommel.
	*	*
	* This is a new version of im_bits.c originally written by Richard B. Wal es	* This is a new version of im_bits.c originally written by Richard B. Wal es
	*	*
	* PURPOSE	* PURPOSE
	*	*
	* Output variable-length bit strings. Compression can be done	* Output variable-length bit strings. Compression can be done
	* to a file or to memory.	* to a file or to memory.

	skipping to change at line 142	skipping to change at line 146

	#define PUTBYTE(b) \	#define PUTBYTE(b) \
	{ if (out_offset < out_size) { \	{ if (out_offset < out_size) { \
	out_buf[out_offset++] = (char) (b); \	out_buf[out_offset++] = (char) (b); \
	} else { \	} else { \
	R__flush_outbuf((b),1); \	R__flush_outbuf((b),1); \
	} \	} \
	}	}

	/* ======================================================================== ===	/* ======================================================================== ===

	By default R__ZipMode = 1 (new zip compression algorithm.	R__ZipMode is used to select the compression algorithm when R__zip is ca
	If R__ZipMode is set to 0 (via R__SetZipMode) the old zlib is used	lled
	*/	and when R__zipMultipleAlgorithm is called with its last argument set to
		0.
		R__ZipMode = 1 : ZLIB compression algorithm is used (default)
		R__ZipMode = 2 : LZMA compression algorithm is used
		R__ZipMode = 0 or 3 : a very old compression algorithm is used
		(the very old algorithm is supported for backward compatibility)
		The LZMA algorithm requires the external XZ package be installed when li
		nking
		is done. LZMA typically has significantly higher compression factors, bu
		t takes
		more CPU time and memory resources while compressing.
		*/
	int R__ZipMode = 1;	int R__ZipMode = 1;

	/* ======================================================================== ===	/* ======================================================================== ===
	* Prototypes for local functions	* Prototypes for local functions
	*/	*/
	local int R__mem_read OF((char *b, unsigned bsize));	local int R__mem_read OF((char *b, unsigned bsize));
	local void R__flush_outbuf OF((unsigned w, unsigned bytes));	local void R__flush_outbuf OF((unsigned w, unsigned bytes));

	/* ======================================================================== ===	/* ======================================================================== ===
	Function to set the ZipMode	Function to set the ZipMode

	skipping to change at line 401	skipping to change at line 412
	* src - input buffer *	* src - input buffer *
	* tgtsize - size of target buffer *	* tgtsize - size of target buffer *
	* *	* *
	* Output: tgt - target buffer (compressed) *	* Output: tgt - target buffer (compressed) *
	* irep - size of compressed data (0 - if error) *	* irep - size of compressed data (0 - if error) *
	* *	* *
	***********************************************************************/	***********************************************************************/
	#define HDRSIZE 9	#define HDRSIZE 9
	static int error_flag;	static int error_flag;


	void R__zip(int cxlevel, int srcsize, char src, int tgtsize, char tgt, int *irep)	void R__zipMultipleAlgorithm(int cxlevel, int srcsize, char src, int tgt size, char tgt, int *irep, int compressionAlgorithm)
	/* int cxlevel; compression level */	/* int cxlevel; compression level */
	/* int srcsize, tgtsize, irep; source and target sizes, replay /	/* int srcsize, tgtsize, irep; source and target sizes, replay /
	/* char tgt, src; source and target buffers */	/* char tgt, src; source and target buffers */

		/* compressionAlgorithm 0 = use global setting */
		/* 1 = zlib */
		/* 2 = lzma */
		/* 3 = old */
	{	{
	int err;	int err;
	int method = Z_DEFLATED;	int method = Z_DEFLATED;


	if (R__ZipMode != 0) {	if (cxlevel <= 0) {
		*irep = 0;
		return;
		}

		if (compressionAlgorithm == 0) {
		compressionAlgorithm = R__ZipMode;
		}

		// The LZMA compression algorithm from the XZ package
		if (compressionAlgorithm == 2) {
		R__zipLZMA(cxlevel, srcsize, src, tgtsize, tgt, irep);
		return;
		}

		// The very old algorithm for backward compatibility
		// 0 for selecting with R__ZipMode in a backward compatible way
		// 3 for selecting in other cases
		if (compressionAlgorithm == 3 \|\| compressionAlgorithm == 0) {
		ush att = (ush)UNKNOWN;
		ush flags = 0;
		if (cxlevel > 9) cxlevel = 9;
		level = cxlevel;

		*irep = 0;
		error_flag = 0;
		if (*tgtsize <= 0) R__error("target buffer too small");
		if (error_flag != 0) return;
		if (*srcsize > 0xffffff) R__error("source buffer too big");
		if (error_flag != 0) return;

		R__read_buf = R__mem_read;
		in_buf = src;
		in_size = (unsigned) (*srcsize);
		in_offset = 0;

		out_buf = tgt;
		out_size = (unsigned) (*tgtsize);
		out_offset = HDRSIZE;
		R__window_size = 0L;

		R__bi_init((FILE )NULL); / initialize bit routines */
		if (error_flag != 0) return;
		R__ct_init(&att, &method); /* initialize tree routines */
		if (error_flag != 0) return;
		R__lm_init(level, &flags); /* initialize compression */
		if (error_flag != 0) return;
		R__Deflate(); /* compress data */
		if (error_flag != 0) return;

		tgt[0] = 'C'; /* Signature 'C'-Chernyaev, 'S'-Smirnov */
		tgt[1] = 'S';
		tgt[2] = (char) method;

		out_size = out_offset - HDRSIZE; /* compressed size */
		tgt[3] = (char)(out_size & 0xff);
		tgt[4] = (char)((out_size >> 8) & 0xff);
		tgt[5] = (char)((out_size >> 16) & 0xff);

		tgt[6] = (char)(in_size & 0xff); /* decompressed size */
		tgt[7] = (char)((in_size >> 8) & 0xff);
		tgt[8] = (char)((in_size >> 16) & 0xff);

		*irep = out_offset;
		return;

		// 1 is for ZLIB (which is the default), ZLIB is also used for any illega
		l
		// algorithm setting
		} else {

	z_stream stream;	z_stream stream;
	*irep = 0;	*irep = 0;

	error_flag = 0;	error_flag = 0;

	if (*tgtsize <= HDRSIZE) R__error("target buffer too small");	if (*tgtsize <= 0) R__error("target buffer too small");
	if (error_flag != 0) return;	if (error_flag != 0) return;
	if (*srcsize > 0xffffff) R__error("source buffer too big");	if (*srcsize > 0xffffff) R__error("source buffer too big");
	if (error_flag != 0) return;	if (error_flag != 0) return;

	stream.next_in = (Bytef*)src;	stream.next_in = (Bytef*)src;
	stream.avail_in = (uInt)(*srcsize);	stream.avail_in = (uInt)(*srcsize);

	stream.next_out = (Bytef*)(&tgt[HDRSIZE]);	stream.next_out = (Bytef*)(&tgt[HDRSIZE]);
	stream.avail_out = (uInt)(*tgtsize);	stream.avail_out = (uInt)(*tgtsize);

	stream.zalloc = (alloc_func)0;	stream.zalloc = (alloc_func)0;
	stream.zfree = (free_func)0;	stream.zfree = (free_func)0;
	stream.opaque = (voidpf)0;	stream.opaque = (voidpf)0;


		if (cxlevel > 9) cxlevel = 9;
	err = deflateInit(&stream, cxlevel);	err = deflateInit(&stream, cxlevel);
	if (err != Z_OK) {	if (err != Z_OK) {
	printf("error %d in deflateInit (zlib)\n",err);	printf("error %d in deflateInit (zlib)\n",err);
	return;	return;
	}	}

	err = deflate(&stream, Z_FINISH);	err = deflate(&stream, Z_FINISH);
	if (err != Z_STREAM_END) {	if (err != Z_STREAM_END) {
	deflateEnd(&stream);	deflateEnd(&stream);
	/* No need to print an error message. We simply abandon the compress ion	/* No need to print an error message. We simply abandon the compress ion

	skipping to change at line 463	skipping to change at line 547
	out_size = stream.total_out; /* compressed size */	out_size = stream.total_out; /* compressed size */
	tgt[3] = (char)(out_size & 0xff);	tgt[3] = (char)(out_size & 0xff);
	tgt[4] = (char)((out_size >> 8) & 0xff);	tgt[4] = (char)((out_size >> 8) & 0xff);
	tgt[5] = (char)((out_size >> 16) & 0xff);	tgt[5] = (char)((out_size >> 16) & 0xff);

	tgt[6] = (char)(in_size & 0xff); /* decompressed size */	tgt[6] = (char)(in_size & 0xff); /* decompressed size */
	tgt[7] = (char)((in_size >> 8) & 0xff);	tgt[7] = (char)((in_size >> 8) & 0xff);
	tgt[8] = (char)((in_size >> 16) & 0xff);	tgt[8] = (char)((in_size >> 16) & 0xff);

	*irep = stream.total_out + HDRSIZE;	*irep = stream.total_out + HDRSIZE;

	} else {
	ush att = (ush)UNKNOWN;
	ush flags = 0;
	level = cxlevel;

	*irep = 0;
	error_flag = 0;
	if (*tgtsize <= HDRSIZE) R__error("target buffer too small");
	if (error_flag != 0) return;
	if (*srcsize > 0xffffff) R__error("source buffer too big");
	if (error_flag != 0) return;

	R__read_buf = R__mem_read;
	in_buf = src;
	in_size = (unsigned) (*srcsize);
	in_offset = 0;

	out_buf = tgt;
	out_size = (unsigned) (*tgtsize);
	out_offset = HDRSIZE;
	R__window_size = 0L;

	R__bi_init((FILE )NULL); / initialize bit routines */
	if (error_flag != 0) return;
	R__ct_init(&att, &method); /* initialize tree routines */
	if (error_flag != 0) return;
	R__lm_init(level, &flags); /* initialize compression */
	if (error_flag != 0) return;
	R__Deflate(); /* compress data */
	if (error_flag != 0) return;

	tgt[0] = 'C'; /* Signature 'C'-Chernyaev, 'S'-Smirnov */
	tgt[1] = 'S';
	tgt[2] = (char) method;

	out_size = out_offset - HDRSIZE; /* compressed size */
	tgt[3] = (char)(out_size & 0xff);
	tgt[4] = (char)((out_size >> 8) & 0xff);
	tgt[5] = (char)((out_size >> 16) & 0xff);

	tgt[6] = (char)(in_size & 0xff); /* decompressed size */
	tgt[7] = (char)((in_size >> 8) & 0xff);
	tgt[8] = (char)((in_size >> 16) & 0xff);

	*irep = out_offset;
	return;	return;
	}	}
	}	}


		void R__zip(int cxlevel, int srcsize, char src, int tgtsize, char tgt,
		int *irep)
		{
		R__zipMultipleAlgorithm(cxlevel, srcsize, src, tgtsize, tgt, irep, 0);
		}

	void R__error(char *msg)	void R__error(char *msg)
	{	{
	if (verbose) fprintf(stderr,"R__zip: %s\n",msg);	if (verbose) fprintf(stderr,"R__zip: %s\n",msg);
	error_flag = 1;	error_flag = 1;
	}	}

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

	ClassInfo.h	ClassInfo.h

	// @(#)root/tmva $Id: ClassInfo.h 29195 2009-06-24 10:39:49Z brun $	// @(#)root/tmva $Id: ClassInfo.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : ClassInfo *	* Class : ClassInfo *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Contains all the data information *	* Contains all the data information *

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

	ClassifierFactory.h	ClassifierFactory.h

	// @(#)Root/tmva $Id: ClassifierFactory.h 31458 2009-11-30 13:58:20Z stelze r $	// @(#)Root/tmva $Id: ClassifierFactory.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : Factory *	* Class : Factory *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* This template creates ClassifierFactory stores creator functors *	* This template creates ClassifierFactory stores creator functors *

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

	CombinedCalculator.h	CombinedCalculator.h

	// @(#)root/roostats:$Id: CombinedCalculator.h 35821 2010-09-28 08:18:13Z m oneta $	// @(#)root/roostats:$Id: CombinedCalculator.h 39391 2011-05-26 09:51:59Z 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

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

	ConfInterval.h	ConfInterval.h

	// @(#)root/roostats:$Id: ConfInterval.h 31276 2009-11-18 15:06:42Z moneta $	// @(#)root/roostats:$Id: ConfInterval.h 39391 2011-05-26 09:51:59Z 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

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

	ConfidenceBelt.h	ConfidenceBelt.h

	// @(#)root/roostats:$Id: ConfidenceBelt.h 36024 2010-10-01 16:03:30Z monet a $	// @(#)root/roostats:$Id: ConfidenceBelt.h 39391 2011-05-26 09:51:59Z 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

	Config.h	Config.h

	// @(#)root/tmva $Id: Config.h 38719 2011-04-04 12:22:28Z evt $	// @(#)root/tmva $Id: Config.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Joerg Stelzer, Fredrik Tegenfeldt, Helge Voss	// Author: Andreas Hoecker, Joerg Stelzer, Fredrik Tegenfeldt, Helge Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : Config *	* Class : Config *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* GLobal configuration settings (singleton) *	* GLobal configuration settings (singleton) *

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

	Configurable.h	Configurable.h

	// @(#)root/tmva $Id: Configurable.h 29195 2009-06-24 10:39:49Z brun $	// @(#)root/tmva $Id: Configurable.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : Configurable *	* Class : Configurable *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Base class for all classes with option parsing *	* Base class for all classes with option parsing *

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

	ConvergenceTest.h	ConvergenceTest.h

	// @(#)root/tmva $Id: ConvergenceTest.h 29122 2009-06-22 06:51:30Z brun $	// @(#)root/tmva $Id: ConvergenceTest.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : ConvergenceTest *	* Class : ConvergenceTest *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Contains all the data information *	* Contains all the data information *

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

	CrossEntropy.h	CrossEntropy.h

	// @(#)root/tmva $Id: CrossEntropy.h 38943 2011-04-20 08:03:25Z evt $	// @(#)root/tmva $Id: CrossEntropy.h 40012 2011-06-27 16:03:11Z stelzer $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : CrossEntropy *	* Class : CrossEntropy *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: Implementation of the CrossEntropy as separation criterion *	* Description: Implementation of the CrossEntropy as separation criterion *
	* *	* *

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

	DataInputHandler.h	DataInputHandler.h

	// @(#)root/tmva $Id: DataInputHandler.h 38475 2011-03-17 10:46:00Z evt $	// @(#)root/tmva $Id: DataInputHandler.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Peter Speckmayer, Joerg Stelzer, Helge Voss	// Author: Andreas Hoecker, Peter Speckmayer, Joerg Stelzer, Helge Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : DataInputHandler *	* Class : DataInputHandler *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Contains all the data information *	* Contains all the data information *

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

	DataSet.h	DataSet.h

	// @(#)root/tmva $Id: DataSet.h 38943 2011-04-20 08:03:25Z evt $	// @(#)root/tmva $Id: DataSet.h 40012 2011-06-27 16:03:11Z stelzer $
	// Author: Andreas Hoecker, Peter Speckmayer, Joerg Stelzer, Helge Voss	// Author: Andreas Hoecker, Peter Speckmayer, Joerg Stelzer, Helge Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : DataSet *	* Class : DataSet *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Contains all the data information *	* Contains all the data information *

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

	DataSetFactory.h	DataSetFactory.h

	// @(#)root/tmva $Id: DataSetFactory.h 33928 2010-06-15 16:19:31Z stelzer $	// @(#)root/tmva $Id: DataSetFactory.h 40024 2011-06-27 17:02:37Z stelzer $
	// Author: Andreas Hoecker, Peter Speckmayer, Joerg Stelzer, Eckhard von To erne, Helge Voss	// Author: Andreas Hoecker, Peter Speckmayer, Joerg Stelzer, Eckhard von To erne, Helge Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : DataSetFactory *	* Class : DataSetFactory *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Contains all the data information *	* Contains all the data information *

	skipping to change at line 83	skipping to change at line 83
	#endif	#endif

	namespace TMVA {	namespace TMVA {

	class DataSet;	class DataSet;
	class DataSetInfo;	class DataSetInfo;
	class DataInputHandler;	class DataInputHandler;
	class TreeInfo;	class TreeInfo;
	class MsgLogger;	class MsgLogger;


	typedef std::vector< Event* > EventVector;
	typedef std::vector< EventVector > EventVectorOf
	Classes;
	typedef std::map<Types::ETreeType, EventVectorOfClasses > EventVectorOf
	ClassesOfTreeType;
	typedef std::map<Types::ETreeType, EventVector > EventVectorOf
	TreeType;

	typedef std::vector< Double_t > ValuePerClass
	;
	typedef std::map<Types::ETreeType, ValuePerClass > ValuePerClass
	OfTreeType;

	typedef std::vector< Int_t > NumberPerClas
	s;
	typedef std::map<Types::ETreeType, NumberPerClass > NumberPerClas
	sOfTreeType;

	// =============== maybe move these elswhere (e.g. into the tools )	// =============== maybe move these elswhere (e.g. into the tools )

	// =============== functors =======================	// =============== functors =======================

	class RandomGenerator {	class RandomGenerator {
	public:	public:
	RandomGenerator( UInt_t seed ){	RandomGenerator( UInt_t seed ){
	fRandom.SetSeed( seed );	fRandom.SetSeed( seed );
	}	}
	UInt_t operator() ( UInt_t n ) {	UInt_t operator() ( UInt_t n ) {

	skipping to change at line 209	skipping to change at line 198
	inline compose_unary_t<F,G> compose_unary(const F& _f, const G& _g) {	inline compose_unary_t<F,G> compose_unary(const F& _f, const G& _g) {
	return compose_unary_t<F,G>(_f,_g);	return compose_unary_t<F,G>(_f,_g);
	}	}

	// =============== functors =======================	// =============== functors =======================

	// =========================================================	// =========================================================

	class DataSetFactory {	class DataSetFactory {


		typedef std::vector< Event* > EventVector
		;
		typedef std::vector< EventVector > EventVector
		OfClasses;
		typedef std::map<Types::ETreeType, EventVectorOfClasses > EventVector
		OfClassesOfTreeType;
		typedef std::map<Types::ETreeType, EventVector > EventVector
		OfTreeType;

		typedef std::vector< Double_t > ValuePerClass;
		typedef std::map<Types::ETreeType, ValuePerClass > ValuePerClassOfTre
		eType;

		class EventStats {
		public:
		Int_t nTrainingEventsRequested;
		Int_t nTestingEventsRequested;
		Int_t nInitialEvents;
		Int_t nEvBeforeCut;
		Int_t nEvAfterCut;
		Float_t nWeEvBeforeCut;
		Float_t nWeEvAfterCut;
		Double_t nNegWeights;
		Float_t* varAvLength;
		EventStats():
		nTrainingEventsRequested(0),
		nTestingEventsRequested(0),
		nInitialEvents(0),
		nEvBeforeCut(0),
		nEvAfterCut(0),
		nWeEvBeforeCut(0),
		nWeEvAfterCut(0),
		nNegWeights(0),
		varAvLength(0)
		{}
		~EventStats() { delete[] varAvLength; }
		Float_t cutScaling() const { return Float_t(nEvAfterCut)/nEvBefore
		Cut; }
		};

		typedef std::vector< int > NumberPerClass;
		typedef std::vector< EventStats > EvtStatsPerClas
		s;

	public:	public:

	// singleton class	// singleton class
	static DataSetFactory& Instance() { if (!fgInstance) fgInstance = new DataSetFactory(); return *fgInstance; }	static DataSetFactory& Instance() { if (!fgInstance) fgInstance = new DataSetFactory(); return *fgInstance; }
	static void destroyInstance() { if (fgInstance) { delete fgInstance; fgInstance=0; } }	static void destroyInstance() { if (fgInstance) { delete fgInstance; fgInstance=0; } }

	DataSet* CreateDataSet( DataSetInfo &, DataInputHandler& );	DataSet* CreateDataSet( DataSetInfo &, DataInputHandler& );

	protected:	protected:

	~DataSetFactory();	~DataSetFactory();

	DataSetFactory();	DataSetFactory();
	static DataSetFactory *fgInstance;	static DataSetFactory *fgInstance;

	DataSet* BuildInitialDataSet( DataSetInfo&, TMVA::DataInputHandler& );	DataSet* BuildInitialDataSet( DataSetInfo&, TMVA::DataInputHandler& );
	DataSet* BuildDynamicDataSet( DataSetInfo& );	DataSet* BuildDynamicDataSet( DataSetInfo& );

	// ---------- new versions	// ---------- new versions

	void BuildEventVector ( DataSetInfo& dsi,	void BuildEventVector ( DataSetInfo& dsi,
	DataInputHandler& dataInput,	DataInputHandler& dataInput,
	EventVectorOfClassesOfTreeType& tmpEv	EventVectorOfClassesOfTreeType& eventsma
	entVector);	p,
		EvtStatsPerClass& eventCounts);
	DataSet* MixEvents ( DataSetInfo& dsi,
	EventVectorOfClassesOfTreeType& tmpEv	DataSet* MixEvents ( DataSetInfo& dsi,
	entVector,	EventVectorOfClassesOfTreeType& eventsma
	NumberPerClassOfTreeType& nTrainTestE	p,
	vents,	EvtStatsPerClass& eventCounts,
	const TString& splitMode,	const TString& splitMode,
	const TString& mixMode,	const TString& mixMode,
	const TString& normMode,	const TString& normMode,
	UInt_t splitSeed);	UInt_t splitSeed);

	void RenormEvents ( DataSetInfo& dsi,	void RenormEvents ( DataSetInfo& dsi,
	EventVectorOfClassesOfTreeType& tmpEv	EventVectorOfClassesOfTreeType& eventsma
	entVector,	p,
	const TString& normMode );	const EvtStatsPerClass& eventCounts,
		const TString& normMode );
	void InitOptions ( DataSetInfo& dsi,
	NumberPerClassOfTreeType& nTrainTestE	void InitOptions ( DataSetInfo& dsi,
	vents,	EvtStatsPerClass& eventsmap,
	TString& normMode, UInt_t& splitSeed,	TString& normMode, UInt_t& splitSeed,
	TString& splitMode, TString& mixMode );	TString& splitMode, TString& mixMode );

	// ------------------------	// ------------------------

	// auxiliary functions to compute correlations	// auxiliary functions to compute correlations
	TMatrixD* CalcCorrelationMatrix( DataSet*, const UInt_t classNumber ) ;	TMatrixD* CalcCorrelationMatrix( DataSet*, const UInt_t classNumber ) ;
	TMatrixD* CalcCovarianceMatrix ( DataSet*, const UInt_t classNumber ) ;	TMatrixD* CalcCovarianceMatrix ( DataSet*, const UInt_t classNumber ) ;
	void CalcMinMax ( DataSet*, DataSetInfo& dsi );	void CalcMinMax ( DataSet*, DataSetInfo& dsi );

	// resets branch addresses to current event	// resets branch addresses to current event
	void ResetBranchAndEventAddresses( TTree* );	void ResetBranchAndEventAddresses( TTree* );

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

	DataSetInfo.h	DataSetInfo.h

	// // @(#)root/tmva $Id: DataSetInfo.h 37097 2010-11-30 12:28:05Z evt $	// // @(#)root/tmva $Id: DataSetInfo.h 40024 2011-06-27 17:02:37Z stelzer $
	// Author: Andreas Hoecker, Peter Speckmayer, Joerg Stelzer, Helge Voss	// Author: Andreas Hoecker, Peter Speckmayer, Joerg Stelzer, Helge Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : DataSetInfo *	* Class : DataSetInfo *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Contains all the data information *	* Contains all the data information *
	* *	* *
	* Authors (alphabetical): *	* Authors (alphabetical): *
	* Peter Speckmayer <speckmay@mail.cern.ch> - CERN, Switzerland *	* Peter Speckmayer <speckmay@mail.cern.ch> - CERN, Switzerland *
	* Joerg Stelzer <Joerg.Stelzer@cern.ch> - DESY, Germany *	* Joerg Stelzer <Joerg.Stelzer@cern.ch> - DESY, Germany *
	* *	* *

	* Copyright (c) 2008: *	* Copyright (c) 2008-2011: *
	* CERN, Switzerland *	* CERN, Switzerland *
	* MPI-K Heidelberg, Germany *	* MPI-K Heidelberg, Germany *
	* DESY Hamburg, Germany *	* DESY Hamburg, Germany *
	* *	* *
	* Redistribution and use in source and binary forms, with or without *	* Redistribution and use in source and binary forms, with or without *
	* modification, are permitted according to the terms listed in LICENSE *	* modification, are permitted according to the terms listed in LICENSE *
	* (http://tmva.sourceforge.net/LICENSE) *	* (http://tmva.sourceforge.net/LICENSE) *
	************************************************************************ ******/	************************************************************************ ******/

	#ifndef ROOT_TMVA_DataSetInfo	#ifndef ROOT_TMVA_DataSetInfo

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

	DataSetManager.h	DataSetManager.h

	// @(#)root/tmva $Id: DataSetManager.h 33928 2010-06-15 16:19:31Z stelzer $	// @(#)root/tmva $Id: DataSetManager.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Peter Speckmayer, Joerg Stelzer, Helge Voss	// Author: Andreas Hoecker, Peter Speckmayer, Joerg Stelzer, Helge Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : DataSetManager *	* Class : DataSetManager *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Singleton class for dataset management *	* Singleton class for dataset management *

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

	DebuggingSampler.h	DebuggingSampler.h

	// @(#)root/roostats:$Id: DebuggingSampler.h 34109 2010-06-24 15:00:16Z mon eta $	// @(#)root/roostats:$Id: DebuggingSampler.h 39391 2011-05-26 09:51:59Z 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 34109 2010-06-24 15:00:16Z mo neta $	// @(#)root/roostats:$Id: DebuggingTestStat.h 39391 2011-05-26 09:51:59Z 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

	DecisionTree.h	DecisionTree.h

	// @(#)root/tmva $Id: DecisionTree.h 38943 2011-04-20 08:03:25Z evt $	// @(#)root/tmva $Id: DecisionTree.h 40012 2011-06-27 16:03:11Z stelzer $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss, Jan Therha ag, Eckhard von Toerne	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss, Jan Therha ag, Eckhard von Toerne

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : DecisionTree *	* Class : DecisionTree *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Implementation of a Decision Tree *	* Implementation of a Decision Tree *

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

	DecisionTreeNode.h	DecisionTreeNode.h

	// @(#)root/tmva $Id: DecisionTreeNode.h 38943 2011-04-20 08:03:25Z evt $	// @(#)root/tmva $Id: DecisionTreeNode.h 40012 2011-06-27 16:03:11Z stelzer $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss, Eckhard vo n Toerne	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss, Eckhard vo n Toerne

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : DecisionTreeNode *	* Class : DecisionTreeNode *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Node for the Decision Tree *	* Node for the Decision Tree *

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

	Event.h	Event.h

	// @(#)root/tmva $Id: Event.h 38943 2011-04-20 08:03:25Z evt $	// @(#)root/tmva $Id: Event.h 40012 2011-06-27 16:03:11Z stelzer $
	// Author: Andreas Hoecker, Peter Speckmayer, Joerg Stelzer, Helge Voss, Ja n Therhaag	// Author: Andreas Hoecker, Peter Speckmayer, Joerg Stelzer, Helge Voss, Ja n Therhaag

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : Event *	* Class : Event *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Event container *	* Event container *

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

	Factory.h	Factory.h

	// @(#)root/tmva $Id: Factory.h 38943 2011-04-20 08:03:25Z evt $	// @(#)root/mathcore:$Id: Factory.h 37448 2010-12-09 20:20:56Z moneta $
	// Author: Andreas Hoecker, Peter Speckmayer, Joerg Stelzer, Helge Voss, Ka	// Author: L. Moneta Fri Dec 22 14:43:33 2006
	i Voss, Eckhard von Toerne, Jan Therhaag


	/**************************************************************************	/**********************************************************************
	********	* *
	* 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
	*
	* Jan Therhaag <Jan.Therhaag@cern.ch> - U of Bonn, Germany
	*
	* Eckhard v. Toerne <evt@uni-bonn.de> - U of Bonn, Germany
	*
	* Helge Voss <Helge.Voss@cern.ch> - MPI-K Heidelberg, German
	y *
	* Kai Voss <Kai.Voss@cern.ch> - U. of Victoria, Canada
	*
	*
	*
	* Copyright (c) 2005-2011:
	*
	* CERN, Switzerland
	*
	* U. of Victoria, Canada
	*
	* MPI-K Heidelberg, Germany
	*
	* U. of Bonn, 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 DataSetManager;
	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
	; }

	// optimize all booked methods (well, if desired by the method)
	void OptimizeAllMethods (TString fomType="ROCIntegral
	", TString fitType="FitGA");
	void OptimizeAllMethodsForClassification(TString fomType="ROCIntegral
	", TString fitType="FitGA") { OptimizeAllMethods(fomType,fitType); }
	void OptimizeAllMethodsForRegression (TString fomType="ROCIntegral
	", TString fitType="FitGA") { OptimizeAllMethods(fomType,fitType); }

	// training for all booked methods
	void TrainAllMethods ();
	void TrainAllMethodsForClassification( void ) { TrainAllMethods(); }
	void TrainAllMethodsForRegression ( void ) { TrainAllMethods(); }

	// 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

	DataSetManager* fDataSetManager; // DSMTEST

	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

	Types::EAnalysisType fAnalysisType; //! the t
	raining type


	protected:	namespace ROOT {

		namespace Math {

		class Minimizer;
		class DistSampler;

		//_________________________________________________________________________
		__
		/**
		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
		Supported Minimizers types are:
		Minuit (TMinuit), Minuit2, GSLMultiMin, GSLMultiFit, GSLSimAn, Linear
		, Fumili, Genetic
		If no name is given use default values defined in MinimizerOptions
		*/
		static ROOT::Math::Minimizer * CreateMinimizer(const std::string & minim
		izerType = "", const std::string & algoType = "");

		/**
		static method to create the distribution sampler class given a string
		specifying the type
		Supported sampler types are:
		Unuran, Foam
		If no name is given use default values defined in DistSamplerOptions
		*/
		static ROOT::Math::DistSampler * CreateDistSampler(const std::string & s
		amplerType ="");

		};


	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.
	360 lines changed or deleted	53 lines changed or added

	FeldmanCousins.h	FeldmanCousins.h

	// @(#)root/roostats:$Id: FeldmanCousins.h 38599 2011-03-24 08:37:05Z monet a $	// @(#)root/roostats:$Id: FeldmanCousins.h 39391 2011-05-26 09:51:59Z 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

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

	FitConfig.h	FitConfig.h

	// @(#)root/mathcore:$Id: FitConfig.h 29513 2009-07-17 15:30:07Z moneta $	// @(#)root/mathcore:$Id: FitConfig.h 39474 2011-05-30 07:48:13Z moneta $
	// Author: L. Moneta Thu Sep 21 16:21:29 2006	// Author: L. Moneta Thu Sep 21 16:21:29 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 FitConfig	// Header file for class FitConfig

	skipping to change at line 40	skipping to change at line 40
	namespace ROOT {	namespace ROOT {

	namespace Math {	namespace Math {

	class Minimizer;	class Minimizer;
	class MinimizerOptions;	class MinimizerOptions;
	}	}

	namespace Fit {	namespace Fit {


		class FitResult;

	//_________________________________________________________________________ __________	//_________________________________________________________________________ __________
	/**	/**
	Class describing the configuration of the fit, options and parameter set tings	Class describing the configuration of the fit, options and parameter set tings
	using the ROOT::Fit::ParameterSettings class	using the ROOT::Fit::ParameterSettings class

	@ingroup FitMain	@ingroup FitMain
	*/	*/
	class FitConfig {	class FitConfig {

	public:	public:

	skipping to change at line 92	skipping to change at line 94
	get the vector of parameter settings (const method)	get the vector of parameter settings (const method)
	*/	*/
	const std::vector<ROOT::Fit::ParameterSettings> & ParamsSettings() const { return fSettings; }	const std::vector<ROOT::Fit::ParameterSettings> & ParamsSettings() const { return fSettings; }

	/**	/**
	get the vector of parameter settings (non-const method)	get the vector of parameter settings (non-const method)
	*/	*/
	std::vector<ROOT::Fit::ParameterSettings> & ParamsSettings() { return fS ettings; }	std::vector<ROOT::Fit::ParameterSettings> & ParamsSettings() { return fS ettings; }

	/**	/**

		number of parameters settings
		*/
		unsigned int NPar() const { return fSettings.size(); }

		/**
	set the parameter settings from a model function.	set the parameter settings from a model function.
	Create always new parameter setting list from a given model function	Create always new parameter setting list from a given model function
	*/	*/
	void CreateParamsSettings(const ROOT::Math::IParamMultiFunction & func);	void CreateParamsSettings(const ROOT::Math::IParamMultiFunction & func);

	/**	/**
	set the parameter settings from number of parameters and a vector of values and optionally step values. If there are not existing or number of p arameters does not match existing one, create a new parameter setting list.	set the parameter settings from number of parameters and a vector of values and optionally step values. If there are not existing or number of p arameters does not match existing one, create a new parameter setting list.
	*/	*/
	void SetParamsSettings(unsigned int npar, const double * params, const d ouble * vstep = 0);	void SetParamsSettings(unsigned int npar, const double * params, const d ouble * vstep = 0);


		/*
		Set the parameter setting from a fit Result
		*/
		void SetFromFitResult (const FitResult & rhs);

	/**	/**
	create a new minimizer according to chosen configuration	create a new minimizer according to chosen configuration
	*/	*/
	ROOT::Math::Minimizer * CreateMinimizer();	ROOT::Math::Minimizer * CreateMinimizer();

	/**	/**
	access to the minimizer control parameter (non const method)	access to the minimizer control parameter (non const method)
	*/	*/
	ROOT::Math::MinimizerOptions & MinimizerOptions() { return fMinimizerOp ts; }	ROOT::Math::MinimizerOptions & MinimizerOptions() { return fMinimizerOp ts; }


	skipping to change at line 148	skipping to change at line 160
	flag to check if resulting errors are be normalized according to chi2 /ndf	flag to check if resulting errors are be normalized according to chi2 /ndf
	*/	*/
	bool NormalizeErrors() const { return fNormErrors; }	bool NormalizeErrors() const { return fNormErrors; }

	///do analysis for parabolic errors	///do analysis for parabolic errors
	bool ParabErrors() const { return fParabErrors; }	bool ParabErrors() const { return fParabErrors; }

	///do minos errros analysis on the parameters	///do minos errros analysis on the parameters
	bool MinosErrors() const { return fMinosErrors; }	bool MinosErrors() const { return fMinosErrors; }


		///Update configuration after a fit using the FitResult
		bool UpdateAfterFit() const { return fUpdateAfterFit; }

	/// return vector of parameter indeces for which the Minos Error will be computed	/// return vector of parameter indeces for which the Minos Error will be computed
	const std::vector<unsigned int> & MinosParams() const { return fMinosPar ams; }	const std::vector<unsigned int> & MinosParams() const { return fMinosPar ams; }

	/**	/**
	set the option to normalize the error on the result according to chi 2/ndf	set the option to normalize the error on the result according to chi 2/ndf
	*/	*/
	void SetNormErrors(bool on = true) { fNormErrors= on; }	void SetNormErrors(bool on = true) { fNormErrors= on; }

	///set parabolic erros	///set parabolic erros
	void SetParabErrors(bool on = true) { fParabErrors = on; }	void SetParabErrors(bool on = true) { fParabErrors = on; }

	skipping to change at line 170	skipping to change at line 185
	void SetMinosErrors(bool on = true) { fMinosErrors = on; }	void SetMinosErrors(bool on = true) { fMinosErrors = on; }

	/// set parameter indeces for running Minos	/// set parameter indeces for running Minos
	/// this can be used for running Minos on a subset of parameters - other wise is run on all of them	/// this can be used for running Minos on a subset of parameters - other wise is run on all of them
	/// if MinosErrors() is set	/// if MinosErrors() is set
	void SetMinosErrors(const std::vector<unsigned int> & paramInd ) {	void SetMinosErrors(const std::vector<unsigned int> & paramInd ) {
	fMinosErrors = true;	fMinosErrors = true;
	fMinosParams = paramInd;	fMinosParams = paramInd;
	}	}


		///Update configuration after a fit using the FitResult
		void SetUpdateAfterFit(bool on = true) { fUpdateAfterFit = on; }

	/**	/**
	static function to control default minimizer type and algorithm	static function to control default minimizer type and algorithm
	*/	*/
	static void SetDefaultMinimizer(const char * type, const char * algo = 0 );	static void SetDefaultMinimizer(const char * type, const char * algo = 0 );

	protected:	protected:

	private:	private:


	bool fNormErrors; // flag for error normalization	bool fNormErrors; // flag for error normalization
	bool fParabErrors; // get correct parabolic errors estimate (call Hess	bool fParabErrors; // get correct parabolic errors estimate (call H
	e after minimizing)	esse after minimizing)
	bool fMinosErrors; // do full error analysis using Minos	bool fMinosErrors; // do full error analysis using Minos
		bool fUpdateAfterFit; // update the configuration after a fit using th
		e result

	std::vector<ROOT::Fit::ParameterSettings> fSettings; // vector with the parameter settings	std::vector<ROOT::Fit::ParameterSettings> fSettings; // vector with the parameter settings
	std::vector<unsigned int> fMinosParams; // vector with the parameter indeces for running Minos	std::vector<unsigned int> fMinosParams; // vector with the parameter indeces for running Minos

	ROOT::Math::MinimizerOptions fMinimizerOpts; //minimizer control param eters including name and algo type	ROOT::Math::MinimizerOptions fMinimizerOpts; //minimizer control param eters including name and algo type

	};	};

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


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

	Fitter.h	Fitter.h

	// @(#)root/mathcore:$Id: Fitter.h 36764 2010-11-19 10:02:00Z moneta $	// @(#)root/mathcore:$Id: Fitter.h 39382 2011-05-26 08:31:43Z moneta $
	// Author: L. Moneta Wed Aug 30 11:05:19 2006	// Author: L. Moneta Wed Aug 30 11:05:19 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 Fitter	// Header file for class Fitter

	skipping to change at line 44	skipping to change at line 44
	#ifndef ROOT_Math_IParamFunctionfwd	#ifndef ROOT_Math_IParamFunctionfwd
	#include "Math/IParamFunctionfwd.h"	#include "Math/IParamFunctionfwd.h"
	#endif	#endif

	#include <memory>	#include <memory>

	namespace ROOT {	namespace ROOT {

	namespace Math {	namespace Math {
	class Minimizer;	class Minimizer;


		// should maybe put this in a FitMethodFunctionfwd file
		template<class FunctionType> class BasicFitMethodFunction;

		// define the normal and gradient function
		typedef BasicFitMethodFunction<ROOT::Math::IMultiGenFunction> FitMet
		hodFunction;
		typedef BasicFitMethodFunction<ROOT::Math::IMultiGradFunction> FitMet
		hodGradFunction;

	}	}

	/**	/**
	Namespace for the fitting classes	Namespace for the fitting classes
	@ingroup Fit	@ingroup Fit
	*/	*/

	namespace Fit {	namespace Fit {

	/**	/**

	skipping to change at line 68	skipping to change at line 76
	*/	*/

	//_________________________________________________________________________ __________	//_________________________________________________________________________ __________
	/**	/**
	Fitter class, entry point for performing all type of fits.	Fitter class, entry point for performing all type of fits.
	Fits are performed using the generic ROOT::Fit::Fitter::Fit method.	Fits are performed using the generic ROOT::Fit::Fitter::Fit method.
	The inputs are the data points and a model function (using a ROOT::Math: :IParamFunction)	The inputs are the data points and a model function (using a ROOT::Math: :IParamFunction)
	The result of the fit is returned and kept internally in the ROOT::Fit: :FitResult class.	The result of the fit is returned and kept internally in the ROOT::Fit: :FitResult class.
	The configuration of the fit (parameters, options, etc...) are specified in the	The configuration of the fit (parameters, options, etc...) are specified in the
	ROOT::Math::FitConfig class.	ROOT::Math::FitConfig class.

		After fitting the config of the fit will be modified to have the new val
		ues the resulting
		parameter of the fit with step sizes equal to the errors. FitConfig can
		be preserved with
		initial parameters by calling FitConfig.SetUpdateAfterFit(false);

	@ingroup FitMain	@ingroup FitMain
	*/	*/
	class Fitter {	class Fitter {

	public:	public:

	typedef ROOT::Math::IParamMultiFunction IModelFunction;	typedef ROOT::Math::IParamMultiFunction IModelFunction;
	typedef ROOT::Math::IParamMultiGradFunction IGradModelFunction;	typedef ROOT::Math::IParamMultiGradFunction IGradModelFunction;
	typedef ROOT::Math::IParamFunction IModel1DFunction;	typedef ROOT::Math::IParamFunction IModel1DFunction;

	skipping to change at line 127	skipping to change at line 138
	/**	/**
	fit a binned data set (default method: use chi2)	fit a binned data set (default method: use chi2)
	To be implemented option to do likelihood bin fit	To be implemented option to do likelihood bin fit
	*/	*/
	bool Fit(const BinData & data) {	bool Fit(const BinData & data) {
	return DoLeastSquareFit(data);	return DoLeastSquareFit(data);
	}	}
	/**	/**
	fit an binned data set using loglikelihood method	fit an binned data set using loglikelihood method
	*/	*/

	bool Fit(const UnBinData & data) {	bool Fit(const UnBinData & data, bool useWeight = false) {
	return DoLikelihoodFit(data);	return DoLikelihoodFit(data, useWeight);
	}	}

	/**	/**
	Likelihood fit	Likelihood fit
	*/	*/
	template <class Data>	template <class Data>

	bool LikelihoodFit(const Data & data) {	bool LikelihoodFit(const Data & data, bool useWeight = false) {
	return DoLikelihoodFit(data);	return DoLikelihoodFit(data, useWeight);
	}	}

	/**	/**
	fit a data set using any generic model function	fit a data set using any generic model function
	Pre-requisite on the function:	Pre-requisite on the function:
	*/	*/
	template < class Data , class Function>	template < class Data , class Function>

	bool LikelihoodFit( const Data & data, const Function & func) {	bool LikelihoodFit( const Data & data, const Function & func, bool useWe ight = false) {
	SetFunction(func);	SetFunction(func);

	return DoLikelihoodFit(data);	return DoLikelihoodFit(data, useWeight);
	}	}

	/**	/**
	Fit using the a generic FCN function as a C++ callable object impleme nting	Fit using the a generic FCN function as a C++ callable object impleme nting
	double () (const double *)	double () (const double *)
	Note that the function dimension (i.e. the number of parameter) is ne eded in this case	Note that the function dimension (i.e. the number of parameter) is ne eded in this case
	For the options see documentation for following methods FitFCN(IMulti GenFunction & fcn,..)	For the options see documentation for following methods FitFCN(IMulti GenFunction & fcn,..)
	*/	*/
	template <class Function>	template <class Function>
	bool FitFCN(unsigned int npar, Function & fcn, const double * params = 0, unsigned int dataSize = 0, bool chi2fit = false);	bool FitFCN(unsigned int npar, Function & fcn, const double * params = 0, unsigned int dataSize = 0, bool chi2fit = false);

	/**	/**

		Set a generic FCN function as a C++ callable object implementing
		double () (const double *)
		Note that the function dimension (i.e. the number of parameter) is ne
		eded in this case
		For the options see documentation for following methods FitFCN(IMulti
		GenFunction & fcn,..)
		*/
		template <class Function>
		bool SetFCN(unsigned int npar, Function & fcn, const double * params =
		0, unsigned int dataSize = 0, bool chi2fit = false);

		/**
	Fit using the given FCN function represented by a multi-dimensional f unction interface	Fit using the given FCN function represented by a multi-dimensional f unction interface
	(ROOT::Math::IMultiGenFunction).	(ROOT::Math::IMultiGenFunction).
	Give optionally the initial arameter values, data size to have the fi t Ndf correctly	Give optionally the initial arameter values, data size to have the fi t Ndf correctly
	set in the FitResult and flag specifying if it is a chi2 fit.	set in the FitResult and flag specifying if it is a chi2 fit.
	Note that if the parameters values are not given (params=0) the	Note that if the parameters values are not given (params=0) the
	current parameter settings are used. The parameter settings can be cr eated before	current parameter settings are used. The parameter settings can be cr eated before
	by using the FitConfig::SetParamsSetting. If they have not been creat ed they are created	by using the FitConfig::SetParamsSetting. If they have not been creat ed they are created
	automatically when the params pointer is not zero.	automatically when the params pointer is not zero.
	Note that passing a params != 0 will set the parameter settings to th e new value AND also the	Note that passing a params != 0 will set the parameter settings to th e new value AND also the
	step sizes to some pre-defined value (stepsize = 0.3 * abs(parameter_ value) )	step sizes to some pre-defined value (stepsize = 0.3 * abs(parameter_ value) )
	*/	*/

	bool FitFCN(const ROOT::Math::IMultiGenFunction & fcn, const double * pa	bool FitFCN(const ROOT::Math::IMultiGenFunction & fcn, const double * pa
	rams = 0, unsigned int dataSize = 0, bool chi2fit = false);	rams = 0, unsigned int dataSize = 0, bool
		chi2fit = false);

		/**
		Fit using a FitMethodFunction interface. Same as method above, but n
		ow extra information
		can be taken from the function class
		*/
		bool FitFCN(const ROOT::Math::FitMethodFunction & fcn, const double * pa
		rams = 0);

		/**
		Set the FCN function represented by a multi-dimensional function inte
		rface
		(ROOT::Math::IMultiGenFunction) and optionally the initial parameters
		See also note above for the initial parameters for FitFCN
		*/
		bool SetFCN(const ROOT::Math::IMultiGenFunction & fcn, const double * pa
		rams = 0, unsigned int dataSize = 0, bool chi2fit = false);

		/**
		Set the objective function (FCN) using a FitMethodFunction interfac
		e.
		Same as method above, but now extra information can be taken from th
		e function class
		*/
		bool SetFCN(const ROOT::Math::FitMethodFunction & fcn, const double * pa
		rams = 0);

	/**	/**
	Fit using the given FCN function representing a multi-dimensional gra dient function	Fit using the given FCN function representing a multi-dimensional gra dient function
	interface (ROOT::Math::IMultiGradFunction). In this case the minimize r will use the	interface (ROOT::Math::IMultiGradFunction). In this case the minimize r will use the
	gradient information provided by the function.	gradient information provided by the function.
	For the options same consideration as in the previous method	For the options same consideration as in the previous method
	*/	*/
	bool FitFCN(const ROOT::Math::IMultiGradFunction & fcn, const double * p arams = 0, unsigned int dataSize = 0, bool chi2fit = false);	bool FitFCN(const ROOT::Math::IMultiGradFunction & fcn, const double * p arams = 0, unsigned int dataSize = 0, bool chi2fit = false);

	/**	/**

		Fit using a FitMethodGradFunction interface. Same as method above, b
		ut now extra information
		can be taken from the function class
		*/
		bool FitFCN(const ROOT::Math::FitMethodGradFunction & fcn, const double
		* params = 0);

		/**
		Set the FCN function represented by a multi-dimensional gradient func
		tion interface
		(ROOT::Math::IMultiGenFunction) and optionally the initial parameters
		See also note above for the initial parameters for FitFCN
		*/
		bool SetFCN(const ROOT::Math::IMultiGradFunction & fcn, const double * p
		arams = 0, unsigned int dataSize = 0, bool chi2fit = false);

		/**
		Set the objective function (FCN) using a FitMethodGradFunction inte
		rface.
		Same as method above, but now extra information can be taken from th
		e function class
		*/
		bool SetFCN(const ROOT::Math::FitMethodGradFunction & fcn, const double
		* params = 0);

		/**
	fit using user provided FCN with Minuit-like interface	fit using user provided FCN with Minuit-like interface
	If npar = 0 it is assumed that the parameters are specified in the pa rameter settings created before	If npar = 0 it is assumed that the parameters are specified in the pa rameter settings created before
	For the options same consideration as in the previous method	For the options same consideration as in the previous method
	*/	*/
	typedef void (* MinuitFCN_t )(int &npar, double gin, double &f, double u, int flag);	typedef void (* MinuitFCN_t )(int &npar, double gin, double &f, double u, int flag);
	bool FitFCN( MinuitFCN_t fcn, int npar = 0, const double * params = 0, u nsigned int dataSize = 0, bool chi2fit = false);	bool FitFCN( MinuitFCN_t fcn, int npar = 0, const double * params = 0, u nsigned int dataSize = 0, bool chi2fit = false);

	/**	/**

		set objective function using user provided FCN with Minuit-like inter
		face
		If npar = 0 it is assumed that the parameters are specified in the pa
		rameter settings created before
		For the options same consideration as in the previous method
		*/
		bool SetFCN( MinuitFCN_t fcn, int npar = 0, const double * params = 0, u
		nsigned int dataSize = 0, bool chi2fit = false);

		/**
		Perform a fit with the previously set FCN function. Require SetFCN be
		fore
		*/
		bool FitFCN();

		/**
		Perform a simple FCN evaluation. FitResult will be modified and conta
		in the value of the FCN
		*/
		bool EvalFCN();

		/**
	do a linear fit on a set of bin-data	do a linear fit on a set of bin-data
	*/	*/
	bool LinearFit(const BinData & data) { return DoLinearFit(data); }	bool LinearFit(const BinData & data) { return DoLinearFit(data); }

	/**	/**
	Set the fitted function (model function) from a parametric function interface	Set the fitted function (model function) from a parametric function interface
	*/	*/
	void SetFunction(const IModelFunction & func);	void SetFunction(const IModelFunction & func);
	/**	/**
	Set the fitted function from a parametric 1D function interface	Set the fitted function from a parametric 1D function interface

	skipping to change at line 277	skipping to change at line 353
	return pointer to last used objective function	return pointer to last used objective function
	(is NULL in case fit is not yet done)	(is NULL in case fit is not yet done)
	This pointer will be valid as far as the data and the fitter class	This pointer will be valid as far as the data and the fitter class
	have not been deleted. To be used after the fitting.	have not been deleted. To be used after the fitting.
	The pointer should not be stored and will be invalided after performi ng a new fitting.	The pointer should not be stored and will be invalided after performi ng a new fitting.
	In this case a new instance of the function pointer will be re-create d and can be	In this case a new instance of the function pointer will be re-create d and can be
	obtained calling again GetFCN()	obtained calling again GetFCN()
	*/	*/
	ROOT::Math::IMultiGenFunction * GetFCN() const { return fObjFunction.get (); }	ROOT::Math::IMultiGenFunction * GetFCN() const { return fObjFunction.get (); }


		/**
		apply correction in the error matrix for the weights for likelihood f
		its
		This method can be called only after a fit and it assumes now that th
		e
		passed function (loglw2) is a log-likelihood function impelemented us
		ing the
		sum of weight squared
		*/
		bool ApplyWeightCorrection(const ROOT::Math::IMultiGenFunction & loglw2)
		;

	protected:	protected:

	/// least square fit	/// least square fit
	bool DoLeastSquareFit(const BinData & data);	bool DoLeastSquareFit(const BinData & data);
	/// binned likelihood fit	/// binned likelihood fit

	bool DoLikelihoodFit(const BinData & data);	bool DoLikelihoodFit(const BinData & data, bool useWeight);
	/// un-binned likelihood fit	/// un-binned likelihood fit

	bool DoLikelihoodFit(const UnBinData & data);	bool DoLikelihoodFit(const UnBinData & data, bool); //not yet impl
	/// linear least square fit	/// linear least square fit
	bool DoLinearFit(const BinData & data);	bool DoLinearFit(const BinData & data);


		// initialize the minimizer
		bool DoInitMinimizer();
	/// do minimization	/// do minimization

	template<class ObjFunc>	bool DoMinimization(const BaseFunc & f, const ROOT::Math::IMultiGenFunct
	bool DoMinimization(const ObjFunc & f, unsigned int dataSize, const ROOT	ion * chifunc = 0);
	::Math::IMultiGenFunction * chifunc = 0);	// do minimization after having set obj function
		bool DoMinimization(const ROOT::Math::IMultiGenFunction * chifunc = 0);
		// update config after fit
		void DoUpdateFitConfig();
		// get function calls from the FCN
		int GetNCallsFromFCN();

	private:	private:

	bool fUseGradient; // flag to indicate if using gradient or not	bool fUseGradient; // flag to indicate if using gradient or not


	bool fBinFit; // flag to indicate if fit is binned (in case o	bool fBinFit; // flag to indicate if fit is binned
	f false the fit is unbinned or undefined)	// in case of false the fit is unbinned or unde
		fined)
		// flag it is used to compute chi2 for binned l
		ikelihood fit

		int fFitType; // type of fit (0 undefined, 1 least square, 2 likelih
		ood)

		int fDataSize; // size of data sets (need for Fumili or LM fitters)

	IModelFunction * fFunc; // copy of the fitted function containing on o utput the fit result (managed by FitResult)	IModelFunction * fFunc; // copy of the fitted function containing on o utput the fit result (managed by FitResult)

	FitConfig fConfig; // fitter configuration (options and parameter settings)	FitConfig fConfig; // fitter configuration (options and parameter settings)

	std::auto_ptr<ROOT::Fit::FitResult> fResult; //! pointer to the object containing the result of the fit	std::auto_ptr<ROOT::Fit::FitResult> fResult; //! pointer to the object containing the result of the fit

	std::auto_ptr<ROOT::Math::Minimizer> fMinimizer; //! pointer to used m inimizer	std::auto_ptr<ROOT::Math::Minimizer> fMinimizer; //! pointer to used m inimizer

	std::auto_ptr<ROOT::Math::IMultiGenFunction> fObjFunction; //! pointer to used objective function	std::auto_ptr<ROOT::Math::IMultiGenFunction> fObjFunction; //! pointer to used objective function

	skipping to change at line 327	skipping to change at line 424

	#ifndef ROOT_Math_WrappedFunction	#ifndef ROOT_Math_WrappedFunction
	#include "Math/WrappedFunction.h"	#include "Math/WrappedFunction.h"
	#endif	#endif

	template<class Function>	template<class Function>
	bool ROOT::Fit::Fitter::FitFCN(unsigned int npar, Function & f, const doubl e * par, unsigned int datasize,bool chi2fit) {	bool ROOT::Fit::Fitter::FitFCN(unsigned int npar, Function & f, const doubl e * par, unsigned int datasize,bool chi2fit) {
	ROOT::Math::WrappedMultiFunction<Function &> wf(f,npar);	ROOT::Math::WrappedMultiFunction<Function &> wf(f,npar);
	return FitFCN(wf,par,datasize,chi2fit);	return FitFCN(wf,par,datasize,chi2fit);
	}	}

		template<class Function>
		bool ROOT::Fit::Fitter::SetFCN(unsigned int npar, Function & f, const doubl
		e * par, unsigned int datasize,bool chi2fit) {
		ROOT::Math::WrappedMultiFunction<Function &> wf(f,npar);
		return SetFCN(wf,par,datasize,chi2fit);
		}

	#endif // endif __CINT__	#endif // endif __CINT__

	#endif /* ROOT_Fit_Fitter */	#endif /* ROOT_Fit_Fitter */

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

	FitterBase.h	FitterBase.h

	// @(#)root/tmva $Id: FitterBase.h 29195 2009-06-24 10:39:49Z brun $	// @(#)root/tmva $Id: FitterBase.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Peter Speckmayer, Joerg Stelzer, Helge Voss	// Author: Andreas Hoecker, Peter Speckmayer, Joerg Stelzer, Helge Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : FitterBase *	* Class : FitterBase *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Base class for TMVA fitters *	* Base class for TMVA fitters *

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

	GeneticAlgorithm.h	GeneticAlgorithm.h

	// @(#)root/tmva $Id: GeneticAlgorithm.h 29195 2009-06-24 10:39:49Z brun $	// @(#)root/tmva $Id: GeneticAlgorithm.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Peter Speckmayer	// Author: Peter Speckmayer

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : GeneticAlgorithm *	* Class : GeneticAlgorithm *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Base definition for genetic algorithm *	* Base definition for genetic algorithm *

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

	GeneticFitter.h	GeneticFitter.h

	// @(#)root/tmva $Id: GeneticFitter.h 20882 2007-11-19 11:31:26Z rdm $	// @(#)root/tmva $Id: GeneticFitter.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Peter Speckmayer	// Author: Peter Speckmayer

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : GeneticFitter *	* Class : GeneticFitter *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Fitter using a Genetic Algorithm *	* Fitter using a Genetic Algorithm *

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

	GeneticGenes.h	GeneticGenes.h

	// @(#)root/tmva $Id: GeneticGenes.h 31458 2009-11-30 13:58:20Z stelzer $	// @(#)root/tmva $Id: GeneticGenes.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Peter Speckmayer	// Author: Peter Speckmayer

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : GeneticGenes *	* Class : GeneticGenes *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Genes definition for genetic algorithm *	* Genes definition for genetic algorithm *

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

	GeneticPopulation.h	GeneticPopulation.h

	// @(#)root/tmva $Id: GeneticPopulation.h 31574 2009-12-05 18:23:21Z stelze r $	// @(#)root/tmva $Id: GeneticPopulation.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Peter Speckmayer	// Author: Peter Speckmayer

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : GeneticPopulation *	* Class : GeneticPopulation *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Population definition for genetic algorithm *	* Population definition for genetic algorithm *

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

	GeneticRange.h	GeneticRange.h

	// @(#)root/tmva $Id: GeneticRange.h 29122 2009-06-22 06:51:30Z brun $	// @(#)root/tmva $Id: GeneticRange.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Peter Speckmayer	// Author: Peter Speckmayer

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : GeneticRange *	* Class : GeneticRange *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Range definition for genetic algorithm *	* Range definition for genetic algorithm *

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

	Getline.h	Getline.h

	/* @(#)root/clib:$Id: Getline.h 20882 2007-11-19 11:31:26Z rdm $ */	/* @(#)root/textinput:$Id: Getline.h 39492 2011-05-30 15:26:34Z axel $ */
	/* Author: */	/* Author: Axel Naumann <axel@cern.ch>, 2011-05-21 */

	/*************************************************************************	/*************************************************************************

	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2011, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For 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_Getline	#ifndef ROOT_Getline
	#define ROOT_Getline	#define ROOT_Getline

	#ifndef ROOT_DllImport	#ifndef ROOT_DllImport

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

	#ifndef __CINT__	#ifndef __CINT__
	#ifdef __cplusplus	#ifdef __cplusplus
	extern "C" {	extern "C" {
	#endif	#endif
	#endif	#endif

	typedef enum { kInit = -1, kLine1, kOneChar, kCleanUp } EGetLineMode;	typedef enum { kInit = -1, kLine1, kOneChar, kCleanUp } EGetLineMode;


	char Getline(const char prompt);	const char Getline(const char prompt);
	char Getlinem(EGetLineMode mode, const char prompt);	const char Getlinem(EGetLineMode mode, const char prompt);
	void Gl_config(const char *which, int value);	void Gl_config(const char *which, int value);
	void Gl_setwidth(int width);	void Gl_setwidth(int width);
	void Gl_windowchanged();	void Gl_windowchanged();
	void Gl_histsize(int size, int save);	void Gl_histsize(int size, int save);

	void Gl_histinit(char *file);	void Gl_histinit(const char *file);
	void Gl_histadd(char *buf);	void Gl_histadd(const char *buf);
	int Gl_eof();	int Gl_eof();

		void Gl_setColors(const char* colorTab, const char* colorTabComp, const cha
		r* colorBracket,
		const char* colorBadBracket, const char* colorPrompt);


	R__EXTERN int (Gl_in_hook)(char buf);
	R__EXTERN int (Gl_out_hook)(char buf);
	R__EXTERN int (Gl_tab_hook)(char buf, int prompt_width, int *cursor_loc);
	R__EXTERN int (*Gl_beep_hook)();	R__EXTERN int (*Gl_beep_hook)();
	R__EXTERN int (*Gl_in_key)(int key);	R__EXTERN int (*Gl_in_key)(int key);

	#ifndef __CINT__	#ifndef __CINT__
	#ifdef __cplusplus	#ifdef __cplusplus
	}	}
	#endif	#endif
	#endif	#endif

	#endif	#endif

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

	GiniIndex.h	GiniIndex.h

	// @(#)root/tmva $Id: GiniIndex.h 29122 2009-06-22 06:51:30Z brun $	// @(#)root/tmva $Id: GiniIndex.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : GiniIndex *	* Class : GiniIndex *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: Implementation of the GiniIndex as separation criterion *	* Description: Implementation of the GiniIndex as separation criterion *
	* Large Gini Indices (maximum 0.5) mean , that the sample is well *	* Large Gini Indices (maximum 0.5) mean , that the sample is well *

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

	GiniIndexWithLaplace.h	GiniIndexWithLaplace.h

	// @(#)root/tmva $Id: GiniIndexWithLaplace.h 29122 2009-06-22 06:51:30Z bru n $	// @(#)root/tmva $Id: GiniIndexWithLaplace.h 39395 2011-05-26 10:05:54Z mon eta $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : GiniIndexWithLaplace *	* Class : GiniIndexWithLaplace *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: Implementation of the GiniIndex With Laplace correction *	* Description: Implementation of the GiniIndex With Laplace correction *
	* as separation criterion *	* as separation criterion *

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

	HLFactory.h	HLFactory.h

	// @(#)root/roostats:$Id: HLFactory.h 35820 2010-09-28 07:42:50Z moneta $	// @(#)root/roostats:$Id: HLFactory.h 39391 2011-05-26 09:51:59Z 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

	HybridCalculator.h	HybridCalculator.h

	// @(#)root/roostats:$Id: HybridCalculator.h 37084 2010-11-29 21:37:13Z mon eta $	// @(#)root/roostats:$Id: HybridCalculator.h 39513 2011-05-31 17:49:43Z mon eta $
	/*************************************************************************	/*************************************************************************
	* 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_HybridCalculator	#ifndef ROOSTATS_HybridCalculator
	#define ROOSTATS_HybridCalculator	#define ROOSTATS_HybridCalculator

	skipping to change at line 24	skipping to change at line 24
	/*	/*
	BEGIN_HTML	BEGIN_HTML
	<p>	<p>
	This class extends the HybridCalculator with Importance Sampling. The use	This class extends the HybridCalculator with Importance Sampling. The use
	of ToyMCSampler as the TestStatSampler is assumed.	of ToyMCSampler as the TestStatSampler is assumed.
	</p>	</p>
	END_HTML	END_HTML
	*/	*/
	//	//


	#ifndef ROOSTATS_HybridCalculatorGeneric	#ifndef ROOSTATS_HypoTestCalculatorGeneric
	#include "RooStats/HybridCalculatorGeneric.h"	#include "RooStats/HypoTestCalculatorGeneric.h"
	#endif	#endif

	#ifndef ROOSTATS_ToyMCSampler	#ifndef ROOSTATS_ToyMCSampler
	#include "RooStats/ToyMCSampler.h"	#include "RooStats/ToyMCSampler.h"
	#endif	#endif

	namespace RooStats {	namespace RooStats {


	class HybridCalculator: public HybridCalculatorGeneric {	class HybridCalculator : public HypoTestCalculatorGeneric {

	public:	public:
	HybridCalculator(	HybridCalculator(
	const RooAbsData &data,	const RooAbsData &data,
	const ModelConfig &altModel,	const ModelConfig &altModel,
	const ModelConfig &nullModel,	const ModelConfig &nullModel,
	TestStatSampler* sampler=0	TestStatSampler* sampler=0
	) :	) :

	HybridCalculatorGeneric(data, altModel, nullModel, sampler),	HypoTestCalculatorGeneric(data, altModel, nullModel, sampler),
		fPriorNuisanceNull(0),
		fPriorNuisanceAlt(0),
	fNullImportanceDensity(NULL),	fNullImportanceDensity(NULL),
	fNullImportanceSnapshot(NULL),	fNullImportanceSnapshot(NULL),
	fAltImportanceDensity(NULL),	fAltImportanceDensity(NULL),
	fAltImportanceSnapshot(NULL),	fAltImportanceSnapshot(NULL),
	fNToysNull(0),	fNToysNull(0),
	fNToysAlt(0),	fNToysAlt(0),
	fNToysNullTail(0),	fNToysNullTail(0),
	fNToysAltTail(0)	fNToysAltTail(0)
	{	{
	}	}

	~HybridCalculator() {	~HybridCalculator() {
	if(fNullImportanceSnapshot) delete fNullImportanceSnapshot;	if(fNullImportanceSnapshot) delete fNullImportanceSnapshot;
	if(fAltImportanceSnapshot) delete fAltImportanceSnapshot;	if(fAltImportanceSnapshot) delete fAltImportanceSnapshot;
	}	}


		// Override the distribution used for marginalizing nuisance paramete
		rs that is infered from ModelConfig
		virtual void ForcePriorNuisanceNull(RooAbsPdf& priorNuisance) { fPrio
		rNuisanceNull = &priorNuisance; }
		virtual void ForcePriorNuisanceAlt(RooAbsPdf& priorNuisance) { fPrior
		NuisanceAlt = &priorNuisance; }

	// sets importance density and snapshot (optional)	// sets importance density and snapshot (optional)
	void SetNullImportanceDensity(RooAbsPdf p, const RooArgSet s = NULL ) {	void SetNullImportanceDensity(RooAbsPdf p, const RooArgSet s = NULL ) {
	fNullImportanceDensity = p;	fNullImportanceDensity = p;
	if(s) fNullImportanceSnapshot = (RooArgSet*)s->snapshot();	if(s) fNullImportanceSnapshot = (RooArgSet*)s->snapshot();
	else fNullImportanceSnapshot = NULL;	else fNullImportanceSnapshot = NULL;
	}	}

	// sets importance density and snapshot (optional)	// sets importance density and snapshot (optional)
	void SetAltImportanceDensity(RooAbsPdf p, const RooArgSet s = NULL) {	void SetAltImportanceDensity(RooAbsPdf p, const RooArgSet s = NULL) {
	fAltImportanceDensity = p;	fAltImportanceDensity = p;

	skipping to change at line 81	skipping to change at line 87
	else fAltImportanceSnapshot = NULL;	else fAltImportanceSnapshot = NULL;
	}	}

	// set number of toys	// set number of toys
	void SetToys(int toysNull, int toysAlt) { fNToysNull = toysNull; fNTo ysAlt = toysAlt; }	void SetToys(int toysNull, int toysAlt) { fNToysNull = toysNull; fNTo ysAlt = toysAlt; }

	// set least number of toys in tails	// set least number of toys in tails
	void SetNToysInTails(int toysNull, int toysAlt) { fNToysNullTail = to ysNull; fNToysAltTail = toysAlt; }	void SetNToysInTails(int toysNull, int toysAlt) { fNToysNullTail = to ysNull; fNToysAltTail = toysAlt; }

	protected:	protected:

		// check whether all input is consistent
		int CheckHook(void) const;

	// configure TestStatSampler for the Null run	// configure TestStatSampler for the Null run

	int PreNullHook(double obsTestStat) const;	int PreNullHook(RooArgSet* /parameterPoint/, double obsTestStat) co nst;

	// configure TestStatSampler for the Alt run	// configure TestStatSampler for the Alt run

	int PreAltHook(double obsTestStat) const;	int PreAltHook(RooArgSet* /parameterPoint/, double obsTestStat) con
		st;

		protected:
		RooAbsPdf *fPriorNuisanceNull;
		RooAbsPdf *fPriorNuisanceAlt;


	private:
	RooAbsPdf *fNullImportanceDensity;	RooAbsPdf *fNullImportanceDensity;
	const RooArgSet *fNullImportanceSnapshot;	const RooArgSet *fNullImportanceSnapshot;
	RooAbsPdf *fAltImportanceDensity;	RooAbsPdf *fAltImportanceDensity;
	const RooArgSet *fAltImportanceSnapshot;	const RooArgSet *fAltImportanceSnapshot;

	// different number of toys for null and alt	// different number of toys for null and alt
	int fNToysNull;	int fNToysNull;
	int fNToysAlt;	int fNToysAlt;

	// adaptive sampling	// adaptive sampling
	int fNToysNullTail;	int fNToysNullTail;
	int fNToysAltTail;	int fNToysAltTail;


	protected:	protected:
	ClassDef(HybridCalculator,1)	ClassDef(HybridCalculator,1)
	};	};
	}	}

	#endif	#endif

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

	HybridCalculatorOriginal.h	HybridCalculatorOriginal.h

	// @(#)root/roostats:$Id: HybridCalculatorOriginal.h 34109 2010-06-24 15:00 :16Z moneta $	// @(#)root/roostats:$Id: HybridCalculatorOriginal.h 39391 2011-05-26 09:51 :59Z moneta $

	/*************************************************************************	/*************************************************************************
	* Project: RooStats *	* Project: RooStats *
	* Package: RooFit/RooStats *	* Package: RooFit/RooStats *
	* Authors: *	* Authors: *
	* Danilo Piparo, Gregory Schott *	* Danilo Piparo, Gregory Schott *
	*************************************************************************	*************************************************************************
	* 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

	HybridPlot.h	HybridPlot.h

	// @(#)root/roostats:$Id: HybridPlot.h 30654 2009-10-09 15:07:52Z moneta $	// @(#)root/roostats:$Id: HybridPlot.h 39391 2011-05-26 09:51:59Z 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

	HybridResult.h	HybridResult.h

	// @(#)root/roostats:$Id: HybridResult.h 34109 2010-06-24 15:00:16Z moneta $	// @(#)root/roostats:$Id: HybridResult.h 39391 2011-05-26 09:51:59Z 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

	HypoTestCalculator.h	HypoTestCalculator.h

	// @(#)root/roostats:$Id: HypoTestCalculator.h 30462 2009-09-25 16:05:55Z m oneta $	// @(#)root/roostats:$Id: HypoTestCalculator.h 39391 2011-05-26 09:51:59Z 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_HypoTestCalculator	#ifndef ROOSTATS_HypoTestCalculator

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

	HypoTestInverter.h	HypoTestInverter.h

	// @(#)root/roostats:$Id: HypoTestInverter.h 31798 2009-12-10 14:57:15Z mon eta $	// @(#)root/roostats:$Id: HypoTestInverter.h 40052 2011-06-27 21:34:10Z 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_HypoTestInverter	#ifndef ROOSTATS_HypoTestInverter
	#define ROOSTATS_HypoTestInverter	#define ROOSTATS_HypoTestInverter

	#ifndef ROOSTATS_IntervalCalculator	#ifndef ROOSTATS_IntervalCalculator
	#include "RooStats/IntervalCalculator.h"	#include "RooStats/IntervalCalculator.h"
	#endif	#endif


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

	#ifndef ROOSTATS_HypoTestInverterResult	#ifndef ROOSTATS_HypoTestInverterResult
	#include "RooStats/HypoTestInverterResult.h"	#include "RooStats/HypoTestInverterResult.h"
	#endif	#endif

	class RooRealVar;	class RooRealVar;

		class TGraphErrors;

		#include <memory>

	namespace RooStats {	namespace RooStats {


	class HypoTestInverter : public IntervalCalculator, public TNamed {	//class HypoTestCalculator;
		class HybridCalculator;
		class FrequentistCalculator;
		class HypoTestCalculatorGeneric;
		class TestStatistic;

		class HypoTestInverter : public IntervalCalculator {

		public:

		enum ECalculatorType { kUndefined = 0, kHybrid = 1, kFrequentist = 2};

		// default constructor (used only for I/O)
		HypoTestInverter();

		// constructor from generic hypotest calculator
		HypoTestInverter( HypoTestCalculatorGeneric & hc,
		RooRealVar* scannedVariable =0,
		double size = 0.05) ;

		// constructor from hybrid calculator
		HypoTestInverter( HybridCalculator & hc,
		RooRealVar* scannedVariable = 0,
		double size = 0.05) ;

		// constructor from frequentist calculator
		HypoTestInverter( FrequentistCalculator & hc,
		RooRealVar* scannedVariable,
		double size = 0.05) ;

		// constructor from two ModelConfigs
		HypoTestInverter( RooAbsData& data, ModelConfig &b, ModelConfig &sb,
		RooRealVar * scannedVariable = 0, ECalculatorType typ
		e = kFrequentist,
		double size = 0.05) ;

		virtual HypoTestInverterResult* GetInterval() const;

		void Clear();

		// set for a fixed scan in nbins
		void SetFixedScan(int nBins, double xMin = 1, double xMax = -1) {
		fNBins = nBins;
		fXmin = xMin; fXmax = xMax;
		}

		// set auto scan (default)
		void SetAutoScan() { SetFixedScan(0); }

		bool RunFixedScan( int nBins, double xMin, double xMax ) const;

		bool RunOnePoint( double thisX, bool adaptive = false, double clTarget =
		-1 ) const;

		//bool RunAutoScan( double xMin, double xMax, double target, double epsi
		lon=0.005, unsigned int numAlgorithm=0 );

		bool RunLimit(double &limit, double &limitErr, double absTol = 0, double
		relTol = 0, const double *hint=0) const;

		void UseCLs( bool on = true) { fUseCLs = on; if (fResults) fResults->Use
		CLs(on); }

		virtual void SetData(RooAbsData &);

		virtual void SetModel(const ModelConfig &) { } // not needed

		// set the size of the test (rate of Type I error) ( Eg. 0.05 for a 95%
		Confidence Interval)
		virtual void SetTestSize(Double_t size) {fSize = size; if (fResults) fRe
		sults->SetTestSize(size); }
		// set the confidence level for the interval (eg. 0.95 for a 95% Confide
		nce Interval)
		virtual void SetConfidenceLevel(Double_t cl) {fSize = 1.-cl; if (fResul
		ts) fResults->SetConfidenceLevel(cl); }
		// Get the size of the test (eg. rate of Type I error)
		virtual Double_t Size() const {return fSize;}
		// Get the Confidence level for the test
		virtual Double_t ConfidenceLevel() const {return 1.-fSize;}

		// destructor
		virtual ~HypoTestInverter() ;

		// retrieved a reference to the internally used HypoTestCalculator
		// it might be invalid when the class is deleted
		HypoTestCalculatorGeneric * GetHypoTestCalculator() const { return fCalc
		ulator0; }

		// get the upper/lower limit distribution
		SamplingDistribution * GetLowerLimitDistribution(bool rebuild=false, int
		nToys = 100);
		SamplingDistribution * GetUpperLimitDistribution(bool rebuild=false, int
		nToys = 100);

		// function to rebuild the distributions
		SamplingDistribution * RebuildDistributions(bool isUpper=true, int nToys
		= 100,
		TList * clsDist = 0, TList *
		clsbDist= 0, TList * clbDist = 0);

		// get the test statistic
		TestStatistic * GetTestStatistic() const;

		// set the test statistic
		bool SetTestStatistic(TestStatistic& stat);

		// set verbose level (0,1,2)
		void SetVerbose(int level=1) { fVerbose = level; }


	public:	// set maximum number of toys
		void SetMaximumToys(int ntoys) { fMaxToys = ntoys;}


	// default constructor (used only for I/O)	// set numerical error in test statistic evaluation (default is zero)
	HypoTestInverter();	void SetNumErr(double err) { fNumErr = err; }


	// constructor	// set flag to close proof for every new run
	HypoTestInverter( HypoTestCalculator& myhc0,	static void SetCloseProof(Bool_t flag);
	RooRealVar& scannedVariable,
	double size = 0.05) ;


	virtual HypoTestInverterResult* GetInterval() const { return fResults; } ;	protected:


	bool RunAutoScan( double xMin, double xMax, double target, double epsil	// copy c-tor
	on=0.005, unsigned int numAlgorithm=0 );	HypoTestInverter(const HypoTestInverter & rhs);


	bool RunFixedScan( int nBins, double xMin, double xMax );	// assignment
		HypoTestInverter & operator=(const HypoTestInverter & rhs);


	bool RunOnePoint( double thisX );	void CreateResults() const;


	void UseCLs( bool on = true) { fUseCLs = on; if (fResults) fResults->Us	// run the hybrid at a single point
	eCLs(on); }	HypoTestResult * Eval( HypoTestCalculatorGeneric &hc, bool adaptive , do
		uble clsTarget) const;


	virtual void SetData(RooAbsData &) { } // not needed	// helper functions
		static RooRealVar * GetVariableToScan(const HypoTestCalculatorGeneric &h
		c);
		static void CheckInputModels(const HypoTestCalculatorGeneric &hc, const
		RooRealVar & scanVar);


	virtual void SetModel(const ModelConfig &) { } // not needed	private:


	// set the size of the test (rate of Type I error) ( Eg. 0.05 for a 95%	static unsigned int fgNToys;
	Confidence Interval)	static double fgCLAccuracy;
	virtual void SetTestSize(Double_t size) {fSize = size; if (fResults) f	static double fgAbsAccuracy;
	Results->SetTestSize(size); }	static double fgRelAccuracy;
	// set the confidence level for the interval (eg. 0.95 for a 95% Confid	static bool fgCloseProof;
	ence Interval)	static std::string fgAlgo;
	virtual void SetConfidenceLevel(Double_t cl) {fSize = 1.-cl; if (fResu
	lts) fResults->SetConfidenceLevel(cl); }
	// Get the size of the test (eg. rate of Type I error)
	virtual Double_t Size() const {return fSize;}
	// Get the Confidence level for the test
	virtual Double_t ConfidenceLevel() const {return 1.-fSize;}


	// destructor	// graph, used to compute the limit, not just for plotting!
	virtual ~HypoTestInverter() ;	mutable std::auto_ptr<TGraphErrors> fLimitPlot; //! plot of limits


	private:	// performance counter: remember how many toys have been thrown
		mutable int fTotalToysRun;
		int fMaxToys; // maximum number of toys to run


	void CreateResults();	HypoTestCalculatorGeneric* fCalculator0; // pointer to the calculator
		passed in the constructor
		auto_ptr<HypoTestCalculatorGeneric> fHC;
		RooRealVar* fScannedVariable; // pointer to the constrained variable
		mutable HypoTestInverterResult* fResults; // pointer to the result


	HypoTestCalculator* fCalculator0; // pointer to the calculator passed	bool fUseCLs;
	in the constructor	double fSize;
	RooRealVar* fScannedVariable; // pointer to the constrained variabl	int fVerbose;
	e	ECalculatorType fCalcType;
	HypoTestInverterResult* fResults;	int fNBins;
		double fXmin;
		double fXmax;
		double fNumErr;


	bool fUseCLs;	protected:
	double fSize;


	protected:	ClassDef(HypoTestInverter,2) // HypoTestInverter class


	ClassDef(HypoTestInverter,1) // HypoTestInverter class	};


	};
	}	}

	#endif	#endif

End of changes. 23 change blocks.
	48 lines changed or deleted	160 lines changed or added

	HypoTestInverterPlot.h	HypoTestInverterPlot.h

	// @(#)root/roostats:$Id: HypoTestInverterPlot.h 31276 2009-11-18 15:06:42Z moneta $	// @(#)root/roostats:$Id: HypoTestInverterPlot.h 39934 2011-06-24 09:15:34Z 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_HypoTestInverterPlot	#ifndef ROOSTATS_HypoTestInverterPlot
	#define ROOSTATS_HypoTestInverterPlot	#define ROOSTATS_HypoTestInverterPlot

	#include "TNamed.h"	#include "TNamed.h"

	class TGraphErrors;	class TGraphErrors;

		class TMultiGraph;

	namespace RooStats {	namespace RooStats {


	class HypoTestInverterResult;	class HypoTestInverterResult;
		class SamplingDistPlot;


	class HypoTestInverterPlot : public TNamed {	class HypoTestInverterPlot : public TNamed {


	public:	public:


	// constructor	// constructor
	HypoTestInverterPlot( const char* name,	HypoTestInverterPlot(HypoTestInverterResult* results ) ;
	const char* title,
	HypoTestInverterResult* results ) ;


	TGraphErrors* MakePlot() ;	HypoTestInverterPlot( const char* name,
		const char* title,
		HypoTestInverterResult* results ) ;


	// destructor	// return a TGraphErrors for the observed plot
	~HypoTestInverterPlot() ;	TGraphErrors* MakePlot(Option_t *opt="") ;


	private:	// return the TGraphAsymmErrors for the expected plots with the bands
		specified by
		TMultiGraph* MakeExpectedPlot(double sig1=1, double sig2=2) ;


	HypoTestInverterResult* fResults;	// plot the test statistic distributions
		// type =0 null and alt
		// type = 1 only null (S+B)
		// type = 2 only alt (B)
		SamplingDistPlot * MakeTestStatPlot(int index, int type=0, int nbins
		= 100);


	protected:	// Draw method
		void Draw(Option_t *opt="");


	ClassDef(HypoTestInverterPlot,1) // HypoTestInverterPlot class	// destructor
		~HypoTestInverterPlot() ;


	};	private:

		HypoTestInverterResult* fResults;

		protected:

		ClassDef(HypoTestInverterPlot,1) // HypoTestInverterPlot class

		};
	}	}

	#endif	#endif

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

	HypoTestInverterResult.h	HypoTestInverterResult.h

	// @(#)root/roostats:$Id: HypoTestInverterResult.h 36230 2010-10-09 20:21:0 2Z wouter $	// @(#)root/roostats:$Id: HypoTestInverterResult.h 40023 2011-06-27 16:58:4 4Z 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_HypoTestInverterResult	#ifndef ROOSTATS_HypoTestInverterResult

	skipping to change at line 24	skipping to change at line 24
	#ifndef ROOSTATS_SimpleInterval	#ifndef ROOSTATS_SimpleInterval
	#include "RooStats/SimpleInterval.h"	#include "RooStats/SimpleInterval.h"
	#endif	#endif

	#include "RooStats/HypoTestResult.h"	#include "RooStats/HypoTestResult.h"

	class RooRealVar;	class RooRealVar;

	namespace RooStats {	namespace RooStats {


	class HypoTestInverterResult : public SimpleInterval {	class SamplingDistribution;


	public:	class HypoTestInverterResult : public SimpleInterval {


	// default constructor	public:
	explicit HypoTestInverterResult(const char* name = 0);


	// constructor	// default constructor
	HypoTestInverterResult( const char* name,	explicit HypoTestInverterResult(const char* name = 0);
	const RooRealVar& scannedVariable,
	double cl ) ;


	// destructor	// constructor
	virtual ~HypoTestInverterResult();	HypoTestInverterResult( const char* name,
		const RooRealVar& scannedVariable,
		double cl ) ;


	// function to return the value of the parameter of interest for the i^	// destructor
	th entry in the results	virtual ~HypoTestInverterResult();
	double GetXValue( int index ) const ;


	// function to return the value of the confidence level for the i^th en	// merge with the content of another HypoTestInverterResult object
	try in the results	bool Add( const HypoTestInverterResult& otherResult );
	double GetYValue( int index ) const ;


	// function to return the estimated error on the value of the confidenc	// function to return the value of the parameter of interest for the i^t
	e level for the i^th entry in the results	h entry in the results
	double GetYError( int index ) const ;	double GetXValue( int index ) const ;


	// return a pointer to the i^th result object	// function to return the value of the confidence level for the i^th ent
	HypoTestResult* GetResult( int index ) const ;	ry in the results
		double GetYValue( int index ) const ;


	// number of entries in the results array	// function to return the estimated error on the value of the confidence
	int ArraySize() const { return fXValues.size(); };	level for the i^th entry in the results
		double GetYError( int index ) const ;


	// set the size of the test (rate of Type I error) (eg. 0.05 for a 95%	// return the observed CLsplusb value for the i-th entry
	Confidence Interval)	double CLsplusb( int index) const;
	virtual void SetTestSize( Double_t size ) { fConfidenceLevel = 1.-size;
	}


	// set the confidence level for the interval (eg. 0.95 for a 95% Confid	// return the observed CLb value for the i-th entry
	ence Interval)	double CLb( int index) const;
	virtual void SetConfidenceLevel( Double_t cl ) { fConfidenceLevel = cl;
	}


	// flag to switch between using CLsb (default) or CLs as confidence lev	// return the observed CLb value for the i-th entry
	el	double CLs( int index) const;
	void UseCLs( bool on = true ) { fUseCLs = on; }


	// lower and upper bound of the confidence interval (to get upper/lower	// return the observed CLsplusb value for the i-th entry
	limits, multiply the size( = 1-confidence level ) by 2	double CLsplusbError( int index) const;
	Double_t LowerLimit();
	Double_t UpperLimit();


	// rough estimation of the error on the computed bound of the confidenc	// return the observed CLb value for the i-th entry
	e interval	double CLbError( int index) const;
	// Estimate of lower limit error
	//function evaluates only a rought error on the lower limit. Be careful
	when using this estimation
	Double_t LowerLimitEstimatedError();


	// Estimate of lower limit error	// return the observed CLb value for the i-th entry
	//function evaluates only a rought error on the lower limit. Be careful	double CLsError( int index) const;
	when using this estimation
	Double_t UpperLimitEstimatedError();


	private:	// return a pointer to the i^th result object
		HypoTestResult* GetResult( int index ) const ;


	// merge with the content of another HypoTestInverterResult object	double GetLastYValue( ) const { return GetYValue( fXValues.size()-1);
	bool Add( const HypoTestInverterResult& otherResult );	}


	double CalculateEstimatedError(double target);	double GetLastXValue( ) const { return GetXValue( fXValues.size()-1);
	int FindClosestPointIndex(double target);	}
	double FindInterpolatedLimit(double target);


	protected:	double GetLastYError( ) const { return GetYError( fXValues.size()-1); }


	bool fUseCLs;	HypoTestResult * GetLastResult( ) const { return GetResult( fXValues.s
	bool fInterpolateLowerLimit;	ize()-1); }
	bool fInterpolateUpperLimit;


	std::vector<double> fXValues;	// number of entries in the results array
		int ArraySize() const { return fXValues.size(); };


	TList fYObjects;	int FindIndex(double xvalue) const;


	friend class HypoTestInverter;	// set the size of the test (rate of Type I error) (eg. 0.05 for a 95% C
		onfidence Interval)
		virtual void SetTestSize( Double_t size ) { fConfidenceLevel = 1.-size;
		}


	ClassDef(HypoTestInverterResult,1) // HypoTestInverterResult class	// set the confidence level for the interval (eg. 0.95 for a 95% Confide
	};	nce Interval)
		virtual void SetConfidenceLevel( Double_t cl ) { fConfidenceLevel = cl;
		}

		// flag to switch between using CLsb (default) or CLs as confidence leve
		l
		void UseCLs( bool on = true ) { fUseCLs = on; }

		// lower and upper bound of the confidence interval (to get upper/lower
		limits, multiply the size( = 1-confidence level ) by 2
		Double_t LowerLimit();
		Double_t UpperLimit();

		// rough estimation of the error on the computed bound of the confidence
		interval
		// Estimate of lower limit error
		//function evaluates only a rought error on the lower limit. Be careful
		when using this estimation
		Double_t LowerLimitEstimatedError();

		// Estimate of lower limit error
		//function evaluates only a rought error on the lower limit. Be careful
		when using this estimation
		Double_t UpperLimitEstimatedError();

		// return expected distribution of p-values (Cls or Clsplusb)

		SamplingDistribution * GetExpectedPValueDist(int index) const;

		SamplingDistribution * GetBackgroundTestStatDist(int index ) const;

		SamplingDistribution * GetSignalAndBackgroundTestStatDist(int index) con
		st;

		// same in terms of alt and null
		SamplingDistribution * GetNullTestStatDist(int index) const {
		return GetSignalAndBackgroundTestStatDist(index);
		}
		SamplingDistribution * GetAltTestStatDist(int index) const {
		return GetBackgroundTestStatDist(index);
		}

		// get expected lower limit distributions
		// implemented using interpolation
		SamplingDistribution* GetLowerLimitDistribution( ) const { return GetLim
		itDistribution(true); }

		// get expected upper limit distributions
		// implemented using interpolation
		SamplingDistribution* GetUpperLimitDistribution( ) const { return GetLim
		itDistribution(false); }

		// get Limit value correspnding at the desired nsigma level (0) is media
		n -1 sigma is 1 sigma
		double GetExpectedLowerLimit(double nsig = 0) const ;

		// get Limit value correspnding at the desired nsigma level (0) is media
		n -1 sigma is 1 sigma
		double GetExpectedUpperLimit(double nsig = 0) const ;

		double FindInterpolatedLimit(double target, bool lowSearch = false, doub
		le xmin=1, double xmax=0);

		enum InterpolOption_t { kLinear, kSpline };

		// set the interpolation option, linear (kLinear ) or spline (kSpline)
		void SetInterpolationOption( InterpolOption_t opt) { fInterpolOption = o
		pt; }

		InterpolOption_t GetInterpolationOption() const { return fInterpolOption
		; }

		private:

		double CalculateEstimatedError(double target);
		int FindClosestPointIndex(double target);

		SamplingDistribution* GetLimitDistribution(bool lower ) const;

		double GetExpectedLimit(double nsig, bool lower ) const ;

		double GetGraphX(const TGraph & g, double y0, bool lowSearch = false, do
		uble xmin=1, double xmax=0) const;

		protected:

		bool fUseCLs;
		bool fInterpolateLowerLimit;
		bool fInterpolateUpperLimit;
		bool fFittedLowerLimit;
		bool fFittedUpperLimit;
		InterpolOption_t fInterpolOption; // interpolatation option (linear or
		spline)

		double fLowerLimitError;
		double fUpperLimitError;

		std::vector<double> fXValues;

		TList fYObjects; // list of HypoTestResult for each point
		TList fExpPValues; // list of expected sampling distribution for eac
		h point

		friend class HypoTestInverter;
		friend class HypoTestInverterPlot;
		friend class HypoTestInverterOriginal;

		ClassDef(HypoTestInverterResult,3) // HypoTestInverterResult class
		};
	}	}

	#endif	#endif

End of changes. 26 change blocks.
	64 lines changed or deleted	161 lines changed or added

	HypoTestPlot.h	HypoTestPlot.h

	// @(#)root/roostats:$Id: HypoTestPlot.h 36602 2010-11-11 16:52:13Z moneta $	// @(#)root/roostats:$Id: HypoTestPlot.h 39391 2011-05-26 09:51:59Z moneta $
	/*************************************************************************	/*************************************************************************
	* 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_HypoTestPlot	#ifndef ROOSTATS_HypoTestPlot
	#define ROOSTATS_HypoTestPlot	#define ROOSTATS_HypoTestPlot

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

	HypoTestResult.h	HypoTestResult.h

	// @(#)root/roostats:$Id: HypoTestResult.h 38933 2011-04-19 20:15:51Z monet a $	// @(#)root/roostats:$Id: HypoTestResult.h 39934 2011-06-24 09:15:34Z monet a $
	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke, S ven Kreiss	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke, S ven Kreiss
	/*************************************************************************	/*************************************************************************
	* 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. *
	*************************************************************************/	*************************************************************************/


		//_________________________________________________
		/*
		BEGIN_HTML
		<p>
		The p-value of the null for a given test statistic is rigorously defined an
		d
		this is the starting point for the following conventions.
		</p>

		<h3>Conventions used in this class</h3>
		<p>
		The p-value for the null and alternate are on the <b>same side</b> of the
		observed value of the test statistic. This is the more standard
		convention and avoids confusion when doing inverted tests.
		</p>
		<p>
		For exclusion, we also want the formula
		CLs = CLs+b / CLb to hold which therefore defines our conventions
		for CLs+b and CLb. CLs was specifically invented for exclusion
		and therefore all quantities need be related through the assignments
		as they are for exclusion: <b>CLs+b = p_{s+b}; CLb = p_b</b>. This
		is derived by considering the scenarios of a powerful and not powerful
		inverted test, where for the not so powerful test, CLs must be
		close to one.
		</p>
		<p>
		For results of Hypothesis tests,
		CLs has no similar direct interpretation as for exclusion and can
		be larger than one.
		</p>

		END_HTML
		*/
		//

	#ifndef ROOSTATS_HypoTestResult	#ifndef ROOSTATS_HypoTestResult
	#define ROOSTATS_HypoTestResult	#define ROOSTATS_HypoTestResult

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

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

	skipping to change at line 51	skipping to change at line 85
	// add values from another HypoTestResult	// add values from another HypoTestResult
	virtual void Append(const HypoTestResult *other);	virtual void Append(const HypoTestResult *other);

	// 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 !fBackgroundIsAlt ? NullPValue( ) : AlternatePValue(); }

	// Convert AlternatePValue into a "confidence level"	// Convert AlternatePValue into a "confidence level"

	virtual Double_t CLsplusb() const { return AlternatePValue(); }	virtual Double_t CLsplusb() const { return !fBackgroundIsAlt ? Altern atePValue() : NullPValue(); }

	// CLs is simply CLs+b/CLb (not a method, but a quantity)	// CLs is simply CLs+b/CLb (not a method, but a quantity)
	virtual Double_t CLs() const {	virtual Double_t CLs() const {
	double thisCLb = CLb();	double thisCLb = CLb();
	if (thisCLb == 0) {	if (thisCLb == 0) {
	std::cout << "Error: Cannot compute CLs because CLb = 0. Return ing CLs = -1\n";	std::cout << "Error: Cannot compute CLs because CLb = 0. Return ing CLs = -1\n";
	return -1;	return -1;
	}	}
	double thisCLsb = CLsplusb();	double thisCLsb = CLsplusb();
	return thisCLsb / thisCLb;	return thisCLsb / thisCLb;

	skipping to change at line 82	skipping to change at line 116
	Double_t GetTestStatisticData(void) const { return fTestStatisticData ; }	Double_t GetTestStatisticData(void) const { return fTestStatisticData ; }
	Bool_t HasTestStatisticData(void) const;	Bool_t HasTestStatisticData(void) const;

	void SetAltDistribution(SamplingDistribution *alt);	void SetAltDistribution(SamplingDistribution *alt);
	void SetNullDistribution(SamplingDistribution *null);	void SetNullDistribution(SamplingDistribution *null);
	void SetTestStatisticData(const Double_t tsd);	void SetTestStatisticData(const Double_t tsd);

	void SetPValueIsRightTail(Bool_t pr);	void SetPValueIsRightTail(Bool_t pr);
	Bool_t GetPValueIsRightTail(void) const { return fPValueIsRightTail; }	Bool_t GetPValueIsRightTail(void) const { return fPValueIsRightTail; }


		void SetBackgroundAsAlt(Bool_t l = kTRUE) { fBackgroundIsAlt = l; }
		Bool_t GetBackGroundIsAlt(void) const { return fBackgroundIsAlt; }

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

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

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

	Double_t NullPValueError() const;	Double_t NullPValueError() const;

	void Print(const Option_t* = "") const {	void Print(const Option_t* = "") const {
	// Print out some information about the results	// Print out some information about the results

		// Note: use Alt/Null labels for the hypotheses here as the Null
		// might be the s+b hypothesis.

	cout << endl << "Results " << GetName() << ": " << endl;	cout << endl << "Results " << GetName() << ": " << endl;
	if(HasTestStatisticData() && fNullDistr) {	if(HasTestStatisticData() && fNullDistr) {
	cout << " - Null p-value = " << NullPValue() << " +/- " << Null PValueError() << endl;	cout << " - Null p-value = " << NullPValue() << " +/- " << Null PValueError() << endl;
	cout << " - Significance = " << Significance() << " sigma" << e ndl;	cout << " - Significance = " << Significance() << " sigma" << e ndl;
	}	}
	if(fAltDistr)	if(fAltDistr)

	cout << " - Number of S+B toys: " << fAltDistr->GetSize() << st d::endl;	cout << " - Number of Alt toys: " << fAltDistr->GetSize() << st d::endl;
	if(fNullDistr)	if(fNullDistr)

	cout << " - Number of B toys: " << fNullDistr->GetSize() << std ::endl;	cout << " - Number of Null toys: " << fNullDistr->GetSize() << std::endl;
	if(HasTestStatisticData())	if(HasTestStatisticData())
	cout << " - Test statistic evaluated on data: " << fTestStatist icData << std::endl;	cout << " - Test statistic evaluated on data: " << fTestStatist icData << std::endl;
	if(HasTestStatisticData() && fNullDistr)	if(HasTestStatisticData() && fNullDistr)
	cout << " - CL_b: " << CLb() << " +/- " << CLbError() << std::e ndl;	cout << " - CL_b: " << CLb() << " +/- " << CLbError() << std::e ndl;
	if(HasTestStatisticData() && fAltDistr)	if(HasTestStatisticData() && fAltDistr)
	cout << " - CL_s+b: " << CLsplusb() << " +/- " << CLsplusbError () << std::endl;	cout << " - CL_s+b: " << CLsplusb() << " +/- " << CLsplusbError () << std::endl;
	if(HasTestStatisticData() && fAltDistr && fNullDistr)	if(HasTestStatisticData() && fAltDistr && fNullDistr)
	cout << " - CL_s: " << CLs() << " +/- " << CLsError() << std:: endl;	cout << " - CL_s: " << CLs() << " +/- " << CLsError() << std:: endl;

	return;	return;

	skipping to change at line 130	skipping to change at line 169
	protected:	protected:

	mutable Double_t fNullPValue; // p-value for the null hypothesis (sma ll number means disfavored)	mutable Double_t fNullPValue; // p-value for the null hypothesis (sma ll number means disfavored)
	mutable Double_t fAlternatePValue; // p-value for the alternate hypot hesis (small number means disfavored)	mutable Double_t fAlternatePValue; // p-value for the alternate hypot hesis (small number means disfavored)
	mutable Double_t fNullPValueError; // error of p-value for the null h ypothesis (small number means disfavored)	mutable Double_t fNullPValueError; // error of p-value for the null h ypothesis (small number means disfavored)
	mutable Double_t fAlternatePValueError; // error of p-value for the a lternate hypothesis (small number means disfavored)	mutable Double_t fAlternatePValueError; // error of p-value for the a lternate hypothesis (small number means disfavored)
	Double_t fTestStatisticData; // result of the test statistic evaluate d on data	Double_t fTestStatisticData; // result of the test statistic evaluate d on data
	SamplingDistribution *fNullDistr;	SamplingDistribution *fNullDistr;
	SamplingDistribution *fAltDistr;	SamplingDistribution *fAltDistr;
	Bool_t fPValueIsRightTail;	Bool_t fPValueIsRightTail;

		Bool_t fBackgroundIsAlt;


	ClassDef(HypoTestResult,1) // Base class to represent results of a h ypothesis test	ClassDef(HypoTestResult,2) // Base class to represent results of a h ypothesis test

	};	};
	}	}

	#endif	#endif

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

	IFitterTarget.h	IFitterTarget.h

	// @(#)root/tmva $Id: IFitterTarget.h 29122 2009-06-22 06:51:30Z brun $	// @(#)root/tmva $Id: IFitterTarget.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Peter Speckmayer	// Author: Andreas Hoecker, Peter Speckmayer

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : IFitterTarget *	* Class : IFitterTarget *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Interface for generic fitter *	* Interface for generic fitter *

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

	IMethod.h	IMethod.h

	// @(#)root/tmva $Id: IMethod.h 36966 2010-11-26 09:50:13Z evt $	// @(#)root/tmva $Id: IMethod.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : IMethod *	* Class : IMethod *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Interface for all concrete MVA method implementations *	* Interface for all concrete MVA method implementations *

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

	Interval.h	Interval.h

	// @(#)root/tmva $Id: Interval.h 38943 2011-04-20 08:03:25Z evt $	// @(#)root/tmva $Id: Interval.h 40012 2011-06-27 16:03:11Z stelzer $
	// Author: Peter Speckmayer	// Author: Peter Speckmayer

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : Interval *	* Class : Interval *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Generic range definition (used, eg, in genetic algorithm) *	* Generic range definition (used, eg, in genetic algorithm) *

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

	IntervalCalculator.h	IntervalCalculator.h

	// @(#)root/roostats:$Id: IntervalCalculator.h 31276 2009-11-18 15:06:42Z m oneta $	// @(#)root/roostats:$Id: IntervalCalculator.h 39391 2011-05-26 09:51:59Z 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

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

	KDEKernel.h	KDEKernel.h

	// @(#)root/tmva $Id: KDEKernel.h 29195 2009-06-24 10:39:49Z brun $	// @(#)root/tmva $Id: KDEKernel.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Asen Christov	// Author: Asen Christov

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : KDEKernel *	* Class : KDEKernel *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* The Probability Density Functions (PDFs) used for the Likelihood an alysis *	* The Probability Density Functions (PDFs) used for the Likelihood an alysis *

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

	LDA.h	LDA.h

	// $Id: LDA.h 29195 2009-06-24 10:39:49Z brun $	// $Id: LDA.h 39395 2011-05-26 10:05:54Z moneta $
	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : LDA *	* Class : LDA *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Local LDA method used by MethodKNN to compute MVA value. *	* Local LDA method used by MethodKNN to compute MVA value. *
	* This is experimental code under development. This class computes *	* This is experimental code under development. This class computes *
	* parameters of signal and background PDFs using Gaussian aproximatio n. *	* parameters of signal and background PDFs using Gaussian aproximatio n. *

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

	LikelihoodInterval.h	LikelihoodInterval.h

	// @(#)root/roostats:$Id: LikelihoodInterval.h 33206 2010-04-26 09:59:06Z m oneta $	// @(#)root/roostats:$Id: LikelihoodInterval.h 39391 2011-05-26 09:51:59Z 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

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

	LikelihoodIntervalPlot.h	LikelihoodIntervalPlot.h

	// @(#)root/roostats:$Id: LikelihoodIntervalPlot.h 31793 2009-12-10 14:43:5 1Z moneta $	// @(#)root/roostats:$Id: LikelihoodIntervalPlot.h 39391 2011-05-26 09:51:5 9Z 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

	MCFitter.h	MCFitter.h

	// @(#)root/tmva $Id: MCFitter.h 23334 2008-04-19 18:38:57Z brun $	// @(#)root/tmva $Id: MCFitter.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Peter Speckmayer, Joerg Stelzer, Helge Voss	// Author: Andreas Hoecker, Peter Speckmayer, Joerg Stelzer, Helge Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : MCFitter *	* Class : MCFitter *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Fitter using Monte Carlo sampling of parameters *	* Fitter using Monte Carlo sampling of parameters *

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

	MCMCCalculator.h	MCMCCalculator.h

	// @(#)root/roostats:$Id: MCMCCalculator.h 34109 2010-06-24 15:00:16Z monet a $	// @(#)root/roostats:$Id: MCMCCalculator.h 39391 2011-05-26 09:51:59Z 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. *
	*************************************************************************/	*************************************************************************/


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

	MCMCInterval.h	MCMCInterval.h

	// @(#)root/roostats:$Id: MCMCInterval.h 35821 2010-09-28 08:18:13Z moneta $	// @(#)root/roostats:$Id: MCMCInterval.h 39391 2011-05-26 09:51:59Z 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

	MCMCIntervalPlot.h	MCMCIntervalPlot.h

	// @(#)root/roostats:$Id: MCMCIntervalPlot.h 34109 2010-06-24 15:00:16Z mon eta $	// @(#)root/roostats:$Id: MCMCIntervalPlot.h 39391 2011-05-26 09:51:59Z 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 35820 2010-09-28 07:42:50Z moneta $	// @(#)root/roostats:$Id: MarkovChain.h 39391 2011-05-26 09:51:59Z 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

	MethodANNBase.h	MethodANNBase.h

	// @(#)root/tmva $Id: MethodANNBase.h 38609 2011-03-24 16:06:32Z evt $	// @(#)root/tmva $Id: MethodANNBase.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Peter Speckmayer, Matt Jachowski, Jan Therhaag	// Author: Andreas Hoecker, Peter Speckmayer, Matt Jachowski, Jan Therhaag

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : MethodANNBase *	* Class : MethodANNBase *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Artificial neural network base class for the discrimination of sign al *	* Artificial neural network base class for the discrimination of sign al *

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

	MethodBDT.h	MethodBDT.h

	// @(#)root/tmva $Id: MethodBDT.h 38943 2011-04-20 08:03:25Z evt $	// @(#)root/tmva $Id: MethodBDT.h 40012 2011-06-27 16:03:11Z stelzer $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss, Jan Therha ag	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss, Jan Therha ag

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : MethodBDT (Boosted Decision Trees) *	* Class : MethodBDT (Boosted Decision Trees) *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Analysis of Boosted Decision Trees *	* Analysis of Boosted Decision Trees *

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

	MethodBayesClassifier.h	MethodBayesClassifier.h

	// @(#)root/tmva $Id: MethodBayesClassifier.h 36966 2010-11-26 09:50:13Z ev t $	// @(#)root/tmva $Id: MethodBayesClassifier.h 39395 2011-05-26 10:05:54Z mo neta $
	// Author: Abhishek Narain	// Author: Abhishek Narain

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : MethodBayesClassifier *	* Class : MethodBayesClassifier *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Bayesian Classifier *	* Bayesian Classifier *

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

	MethodBoost.h	MethodBoost.h

	// @(#)root/tmva $Id: MethodBoost.h 38609 2011-03-24 16:06:32Z evt $	// @(#)root/tmva $Id: MethodBoost.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss,Or Cohen, J an Therhaag, Eckhard von Toerne	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss,Or Cohen, J an Therhaag, Eckhard von Toerne

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : MethodCompositeBase *	* Class : MethodCompositeBase *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Virtual base class for all MVA method *	* Virtual base class for all MVA method *

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

	MethodCFMlpANN.h	MethodCFMlpANN.h

	// @(#)root/tmva $Id: MethodCFMlpANN.h 36966 2010-11-26 09:50:13Z evt $	// @(#)root/tmva $Id: MethodCFMlpANN.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : MethodCFMlpANN *	* Class : MethodCFMlpANN *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Interface for Clermond-Ferrand artificial neural network. *	* Interface for Clermond-Ferrand artificial neural network. *

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

	MethodCFMlpANN_Utils.h	MethodCFMlpANN_Utils.h

	// @(#)root/tmva $Id: MethodCFMlpANN_Utils.h 37181 2010-12-02 13:45:02Z evt $	// @(#)root/tmva $Id: MethodCFMlpANN_Utils.h 39395 2011-05-26 10:05:54Z mon eta $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : MethodCFMlpANN_utils *	* Class : MethodCFMlpANN_utils *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Reference for the original FORTRAN version "mlpl3.F": *	* Reference for the original FORTRAN version "mlpl3.F": *
	* Authors : J. Proriol and contributions from ALEPH-Clermont-Fd *	* Authors : J. Proriol and contributions from ALEPH-Clermont-Fd *

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

	MethodCFMlpANN_def.h	MethodCFMlpANN_def.h

	// @(#)root/tmva $Id: MethodCFMlpANN_def.h 20882 2007-11-19 11:31:26Z rdm $	// @(#)root/tmva $Id: MethodCFMlpANN_def.h 39395 2011-05-26 10:05:54Z monet a $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Header : MethodCFMlpANN_def *	* Header : MethodCFMlpANN_def *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Common definition for CFMlpANN method *	* Common definition for CFMlpANN method *

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

	MethodCategory.h	MethodCategory.h

	// @(#)root/tmva $Id: MethodCategory.h 38475 2011-03-17 10:46:00Z evt $	// @(#)root/tmva $Id: MethodCategory.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss,Or Cohen	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss,Or Cohen

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : MethodCompositeBase *	* Class : MethodCompositeBase *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Virtual base class for all MVA method *	* Virtual base class for all MVA method *

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

	MethodCommittee.h	MethodCommittee.h

	// @(#)root/tmva $Id: MethodCommittee.h 36966 2010-11-26 09:50:13Z evt $	// @(#)root/tmva $Id: MethodCommittee.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : MethodCommittee *	* Class : MethodCommittee *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Boosting *	* Boosting *

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

	MethodCompositeBase.h	MethodCompositeBase.h

	// @(#)root/tmva $Id: MethodCompositeBase.h 36966 2010-11-26 09:50:13Z evt $	// @(#)root/tmva $Id: MethodCompositeBase.h 39395 2011-05-26 10:05:54Z mone ta $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss,Or Cohen	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss,Or Cohen

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : MethodCompositeBase *	* Class : MethodCompositeBase *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Virtual base class for all MVA method *	* Virtual base class for all MVA method *

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

	MethodCuts.h	MethodCuts.h

	// @(#)root/tmva $Id: MethodCuts.h 36966 2010-11-26 09:50:13Z evt $	// @(#)root/tmva $Id: MethodCuts.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Matt Jachowski, Peter Speckmayer, Helge Voss, K ai Voss	// Author: Andreas Hoecker, Matt Jachowski, Peter Speckmayer, Helge Voss, K ai Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : MethodCuts *	* Class : MethodCuts *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Multivariate optimisation of signal efficiency for given background *	* Multivariate optimisation of signal efficiency for given background *

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

	MethodDT.h	MethodDT.h

	// @(#)root/tmva $Id: MethodDT.h 36966 2010-11-26 09:50:13Z evt $	// @(#)root/tmva $Id: MethodDT.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : MethodDT (Boosted Decision Trees) *	* Class : MethodDT (Boosted Decision Trees) *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Analysis of Boosted Decision Trees *	* Analysis of Boosted Decision Trees *

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

	MethodFDA.h	MethodFDA.h

	// @(#)root/tmva $Id: MethodFDA.h 36966 2010-11-26 09:50:13Z evt $	// @(#)root/tmva $Id: MethodFDA.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Peter Speckmayer	// Author: Andreas Hoecker, Peter Speckmayer

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : MethodFDA *	* Class : MethodFDA *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Function discriminant analysis (FDA). This simple classifier *	* Function discriminant analysis (FDA). This simple classifier *

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

	MethodFisher.h	MethodFisher.h

	// @(#)root/tmva $Id: MethodFisher.h 36966 2010-11-26 09:50:13Z evt $	// @(#)root/tmva $Id: MethodFisher.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Xavier Prudent, Joerg Stelzer, Helge Voss, Kai Voss	// Author: Andreas Hoecker, Xavier Prudent, Joerg Stelzer, Helge Voss, Kai Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : MethodFisher *	* Class : MethodFisher *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Analysis of Fisher discriminant (Fisher or Mahalanobis approach) *	* Analysis of Fisher discriminant (Fisher or Mahalanobis approach) *

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

	MethodHMatrix.h	MethodHMatrix.h

	// @(#)root/tmva $Id: MethodHMatrix.h 38475 2011-03-17 10:46:00Z evt $	// @(#)root/tmva $Id: MethodHMatrix.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : MethodHMatrix *	* Class : MethodHMatrix *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* H-Matrix method, which is implemented as a simple comparison of *	* H-Matrix method, which is implemented as a simple comparison of *

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

	MethodKNN.h	MethodKNN.h

	// @(#)root/tmva $Id: MethodKNN.h 36966 2010-11-26 09:50:13Z evt $	// @(#)root/tmva $Id: MethodKNN.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Rustem Ospanov	// Author: Rustem Ospanov

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : MethodKNN *	* Class : MethodKNN *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Analysis of k-nearest neighbor *	* Analysis of k-nearest neighbor *

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

	MethodLikelihood.h	MethodLikelihood.h

	// @(#)root/tmva $Id: MethodLikelihood.h 38609 2011-03-24 16:06:32Z evt $	// @(#)root/tmva $Id: MethodLikelihood.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss, Peter Spec kmayer, Eckhard von Toerne, Jan Therhaag	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss, Peter Spec kmayer, Eckhard von Toerne, Jan Therhaag

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : MethodLikelihood *	* Class : MethodLikelihood *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Likelihood analysis ("non-parametric approach") *	* Likelihood analysis ("non-parametric approach") *

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

	MethodMLP.h	MethodMLP.h

	// @(#)root/tmva $Id: MethodMLP.h 38609 2011-03-24 16:06:32Z evt $	// @(#)root/tmva $Id: MethodMLP.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Krzysztof Danielowski, Andreas Hoecker, Matt Jachowski, Kamil Kr aszewski, Maciej Kruk, Peter Speckmayer, Joerg Stelzer, Eckhard von Toerne, Jan Therhaag, Jiahang Zhong	// Author: Krzysztof Danielowski, Andreas Hoecker, Matt Jachowski, Kamil Kr aszewski, Maciej Kruk, Peter Speckmayer, Joerg Stelzer, Eckhard von Toerne, Jan Therhaag, Jiahang Zhong

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : MethodMLP *	* Class : MethodMLP *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* ANN Multilayer Perceptron class for the discrimination of signal *	* ANN Multilayer Perceptron class for the discrimination of signal *

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

	MethodPDEFoam.h	MethodPDEFoam.h

	// @(#)root/tmva $Id: MethodPDEFoam.h 38475 2011-03-17 10:46:00Z evt $	// @(#)root/tmva $Id: MethodPDEFoam.h 40027 2011-06-27 17:12:07Z stelzer $
	// Author: Tancredi Carli, Dominik Dannheim, Alexander Voigt	// Author: Tancredi Carli, Dominik Dannheim, Alexander Voigt

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate Data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate Data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : MethodPDEFoam *	* Class : MethodPDEFoam *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* The PDEFoam method is an extension of the PDERS method, which divid es *	* The PDEFoam method is an extension of the PDERS method, which divid es *

	skipping to change at line 42	skipping to change at line 42
	* (http://tmva.sourceforge.net/LICENSE) *	* (http://tmva.sourceforge.net/LICENSE) *
	************************************************************************ ******/	************************************************************************ ******/

	#ifndef ROOT_TMVA_MethodPDEFoam	#ifndef ROOT_TMVA_MethodPDEFoam
	#define ROOT_TMVA_MethodPDEFoam	#define ROOT_TMVA_MethodPDEFoam

	/////////////////////////////////////////////////////////////////////////// ///	/////////////////////////////////////////////////////////////////////////// ///
	// //	// //
	// MethodPDEFoam //	// MethodPDEFoam //
	// //	// //

	// The PDEFoam method is an
	//
	// extension of the PDERS method, which divides the multi-dimensional
	//
	// phase space in a finite number of hyper-rectangles (cells) of constant
	//
	// event density.
	//
	// This "foam" of cells is filled with averaged probability-density
	//
	// information sampled from a training event sample.
	//
	//
	//
	// For a given number of cells, the binning algorithm adjusts the size
	//
	// and position of the cells inside the multidimensional phase space
	//
	// based on a binary-split algorithm, minimizing the variance of the
	//
	// event density in the cell.
	//
	// The binned event density information of the final foam is stored in
	//
	// binary trees, allowing for a fast and memory-efficient classification
	//
	// of events.
	//
	//
	//
	// The implementation of PDEFoam is based on the Monte-Carlo integration
	//
	// package TFoam included in the analysis package ROOT.
	//
	//
	//
	/////////////////////////////////////////////////////////////////////////// ///	/////////////////////////////////////////////////////////////////////////// ///

	#ifndef ROOT_TRandom3	#ifndef ROOT_TRandom3
	#include "TRandom3.h"	#include "TRandom3.h"
	#endif	#endif

	#ifndef ROOT_TMVA_MethodBase	#ifndef ROOT_TMVA_MethodBase
	#include "TMVA/MethodBase.h"	#include "TMVA/MethodBase.h"
	#endif	#endif


	skipping to change at line 121	skipping to change at line 103
	#endif	#endif
	#ifndef ROOT_TMVA_PDEFoamKernelLinN	#ifndef ROOT_TMVA_PDEFoamKernelLinN
	#include "TMVA/PDEFoamKernelLinN.h"	#include "TMVA/PDEFoamKernelLinN.h"
	#endif	#endif
	#ifndef ROOT_TMVA_PDEFoamKernelGauss	#ifndef ROOT_TMVA_PDEFoamKernelGauss
	#include "TMVA/PDEFoamKernelGauss.h"	#include "TMVA/PDEFoamKernelGauss.h"
	#endif	#endif

	namespace TMVA {	namespace TMVA {


	// kernel types
	enum EKernel { kNone=0, kGaus=1, kLinN=2 };

	class MethodPDEFoam : public MethodBase {	class MethodPDEFoam : public MethodBase {

	public:	public:


		// kernel types
		typedef enum EKernel { kNone=0, kGaus=1, kLinN=2 } EKernel;

	MethodPDEFoam( const TString& jobName,	MethodPDEFoam( const TString& jobName,
	const TString& methodTitle,	const TString& methodTitle,
	DataSetInfo& dsi,	DataSetInfo& dsi,
	const TString& theOption = "PDEFoam",	const TString& theOption = "PDEFoam",
	TDirectory* theTargetDir = 0 );	TDirectory* theTargetDir = 0 );

	MethodPDEFoam( DataSetInfo& dsi,	MethodPDEFoam( DataSetInfo& dsi,
	const TString& theWeightFile,	const TString& theWeightFile,
	TDirectory* theTargetDir = NULL );	TDirectory* theTargetDir = NULL );


	skipping to change at line 162	skipping to change at line 144
	// write weights to stream	// write weights to stream
	void AddWeightsXMLTo( void* parent ) const;	void AddWeightsXMLTo( void* parent ) const;

	// read weights from stream	// read weights from stream
	void ReadWeightsFromStream( std::istream & i );	void ReadWeightsFromStream( std::istream & i );
	void ReadWeightsFromXML ( void* wghtnode );	void ReadWeightsFromXML ( void* wghtnode );

	// write/read pure foams to/from file	// write/read pure foams to/from file
	void WriteFoamsToFile() const;	void WriteFoamsToFile() const;
	void ReadFoamsFromFile();	void ReadFoamsFromFile();

		PDEFoam* ReadClonedFoamFromFile(TFile*, const TString&);

	// calculate the MVA value	// calculate the MVA value
	Double_t GetMvaValue( Double_t* err = 0, Double_t* errUpper = 0 );	Double_t GetMvaValue( Double_t* err = 0, Double_t* errUpper = 0 );

	// calculate multiclass MVA values	// calculate multiclass MVA values
	const std::vector<Float_t>& GetMulticlassValues();	const std::vector<Float_t>& GetMulticlassValues();

	// regression procedure	// regression procedure
	virtual const std::vector<Float_t>& GetRegressionValues();	virtual const std::vector<Float_t>& GetRegressionValues();


	skipping to change at line 257	skipping to change at line 240
	TString fTargetSelectionStr; // method of selecting the target (only mulit target regr.)	TString fTargetSelectionStr; // method of selecting the target (only mulit target regr.)
	ETargetSelection fTargetSelection; // method of selecting the target (only mulit target regr.)	ETargetSelection fTargetSelection; // method of selecting the target (only mulit target regr.)
	Bool_t fFillFoamWithOrigWeights; // fill the foam with boost w eights	Bool_t fFillFoamWithOrigWeights; // fill the foam with boost w eights
	Bool_t fUseYesNoCell; // return -1 or 1 for bg or signal li ke event	Bool_t fUseYesNoCell; // return -1 or 1 for bg or signal li ke event
	TString fDTLogic; // use DT algorithm to split cells	TString fDTLogic; // use DT algorithm to split cells
	EDTSeparation fDTSeparation; // enum which specifies the separatio n to use for the DT logic	EDTSeparation fDTSeparation; // enum which specifies the separatio n to use for the DT logic
	Bool_t fPeekMax; // BACKWARDS COMPATIBILITY: peek up c ell with max. driver integral for split	Bool_t fPeekMax; // BACKWARDS COMPATIBILITY: peek up c ell with max. driver integral for split

	std::vector<Float_t> fXmin, fXmax; // range for histograms and foams	std::vector<Float_t> fXmin, fXmax; // range for histograms and foams


	// foams and densities	std::vector<PDEFoam*> fFoam; // grown PDEFoams
	// foam[0]=signal, if Sig and BG are Seperated; else foam[0]=signal/b
	g
	// foam[1]=background, if Sig and BG are Seperated; else it is not us
	ed
	std::vector<PDEFoam*> fFoam;

	// default initialisation called by all constructors	// default initialisation called by all constructors
	void Init( void );	void Init( void );

	ClassDef(MethodPDEFoam,0) // Multi-dimensional probability density es timator using TFoam (PDE-Foam)	ClassDef(MethodPDEFoam,0) // Multi-dimensional probability density es timator using TFoam (PDE-Foam)
	};	};

	} // namespace TMVA	} // namespace TMVA

	#endif // MethodPDEFoam_H	#endif // MethodPDEFoam_H

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

	MethodPDERS.h	MethodPDERS.h

	// @(#)root/tmva $Id: MethodPDERS.h 36966 2010-11-26 09:50:13Z evt $	// @(#)root/tmva $Id: MethodPDERS.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Yair Mahalalel, Joerg Stelzer, Helge Voss, Kai Voss	// Author: Andreas Hoecker, Yair Mahalalel, Joerg Stelzer, Helge Voss, Kai Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : MethodPDERS *	* Class : MethodPDERS *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Multidimensional Likelihood using the "Probability density estimato r *	* Multidimensional Likelihood using the "Probability density estimato r *

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

	MethodRuleFit.h	MethodRuleFit.h

	// @(#)root/tmva $Id: MethodRuleFit.h 36966 2010-11-26 09:50:13Z evt $	// @(#)root/tmva $Id: MethodRuleFit.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Fredrik Tegenfeldt	// Author: Fredrik Tegenfeldt

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : MethodRuleFit *	* Class : MethodRuleFit *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Friedman's RuleFit method *	* Friedman's RuleFit method *

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

	MethodSVM.h	MethodSVM.h

	// @(#)root/tmva $Id: MethodSVM.h 38719 2011-04-04 12:22:28Z evt $	// @(#)root/tmva $Id: MethodSVM.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Marcin Wolter, Andrzej Zemla	// Author: Marcin Wolter, Andrzej Zemla

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : MethodSVM *	* Class : MethodSVM *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Support Vector Machine *	* Support Vector Machine *

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

	MethodTMlpANN.h	MethodTMlpANN.h

	// @(#)root/tmva $Id: MethodTMlpANN.h 36966 2010-11-26 09:50:13Z evt $	// @(#)root/tmva $Id: MethodTMlpANN.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : MethodTMlpANN *	* Class : MethodTMlpANN *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Implementation of interface for Root-integrated artificial neural *	* Implementation of interface for Root-integrated artificial neural *

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

	MetropolisHastings.h	MetropolisHastings.h

	// @(#)root/roostats:$Id: MetropolisHastings.h 31276 2009-11-18 15:06:42Z m oneta $	// @(#)root/roostats:$Id: MetropolisHastings.h 39391 2011-05-26 09:51:59Z 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 36905 2010-11-24 15:44:34Z moneta $	// @(#)root/mathcore:$Id: Minimizer.h 39382 2011-05-26 08:31:43Z 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 213	skipping to change at line 213

	/// return errors at the minimum	/// return errors at the minimum
	virtual const double * Errors() const = 0;	virtual const double * Errors() const = 0;

	/** return covariance matrices elements	/** return covariance matrices elements
	if the variable is fixed the matrix is zero	if the variable is fixed the matrix is zero
	The ordering of the variables is the same as in errors	The ordering of the variables is the same as in errors
	*/	*/
	virtual double CovMatrix(unsigned int i, unsigned int j) const = 0;	virtual double CovMatrix(unsigned int i, unsigned int j) const = 0;


		/**
		Fill the passed array with the covariance matrix elements
		if the variable is fixed or const the value is zero.
		The array will be filled as cov[i *ndim + j]
		The ordering of the variables is the same as in errors and parameter
		value.
		This is different from the direct interface of Minuit2 or TMinuit wh
		ere the
		values were obtained only to variable parameters
		*/
		virtual bool GetCovMatrix(double * /cov/) const { return false; }

		/**
		Fill the passed array with the Hessian matrix elements
		The Hessian matrix is the matrix of the second derivatives
		and is the inverse of the covariance matrix
		If the variable is fixed or const the values for that variables are
		zero.
		The array will be filled as h[i *ndim + j]
		*/
		virtual bool GetHessianMatrix(double * /* h */) const { return false; }

	///return status of covariance matrix	///return status of covariance matrix
	/// using Minuit convention {0 not calculated 1 approximated 2 made pos def , 3 accurate}	/// using Minuit convention {0 not calculated 1 approximated 2 made pos def , 3 accurate}
	/// Minimizer who implements covariance matrix calculation will re-imple ment the method	/// Minimizer who implements covariance matrix calculation will re-imple ment the method
	virtual int CovMatrixStatus() const { return 0; }	virtual int CovMatrixStatus() const { return 0; }

	/**	/**
	return correlation coefficient between variable i and j.	return correlation coefficient between variable i and j.
	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 Correlation(unsigned int i, unsigned int j ) const {	virtual double Correlation(unsigned int i, unsigned int j ) const {

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

	Minuit2Minimizer.h	Minuit2Minimizer.h

	skipping to change at line 172	skipping to change at line 172
	/// this is <= Function().NDim() which is the total	/// this is <= Function().NDim() which is the total
	virtual unsigned int NFree() const { return fState.VariableParameters(); }	virtual unsigned int NFree() const { return fState.VariableParameters(); }

	/// minimizer provides error and error matrix	/// minimizer provides error and error matrix
	virtual bool ProvidesError() const { return true; }	virtual bool ProvidesError() const { return true; }

	/// return errors at the minimum	/// return errors at the minimum
	virtual const double * Errors() const;	virtual const double * Errors() const;

	/**	/**

	return covariance matrices elements	return covariance matrix elements
	if the variable is fixed or const the value is zero	if the variable is fixed or const the value is zero
	The ordering of the variables is the same as in errors and parameter value.	The ordering of the variables is the same as in errors and parameter value.
	This is different from the direct interface of Minuit2 or TMinuit wh ere the	This is different from the direct interface of Minuit2 or TMinuit wh ere the
	values were obtained only to variable parameters	values were obtained only to variable parameters
	*/	*/
	virtual double CovMatrix(unsigned int i, unsigned int j) const;	virtual double CovMatrix(unsigned int i, unsigned int j) const;

	/**	/**

		Fill the passed array with the covariance matrix elements
		if the variable is fixed or const the value is zero.
		The array will be filled as cov[i *ndim + j]
		The ordering of the variables is the same as in errors and parameter
		value.
		This is different from the direct interface of Minuit2 or TMinuit wh
		ere the
		values were obtained only to variable parameters
		*/
		virtual bool GetCovMatrix(double * cov) const;

		/**
		Fill the passed array with the Hessian matrix elements
		The Hessian matrix is the matrix of the second derivatives
		and is the inverse of the covariance matrix
		If the variable is fixed or const the values for that variables are
		zero.
		The array will be filled as h[i *ndim + j]
		*/
		virtual bool GetHessianMatrix(double * h) const;

		/**
	return the status of the covariance matrix	return the status of the covariance matrix
	*/	*/
	virtual int CovMatrixStatus() const;	virtual int CovMatrixStatus() const;
	/**	/**
	return correlation coefficient between variable i and j.	return correlation coefficient between variable i and j.
	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 Correlation(unsigned int i, unsigned int j ) const;	virtual double Correlation(unsigned int i, unsigned int j ) const;

	/**	/**

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

	MinuitFitter.h	MinuitFitter.h

	// @(#)root/tmva $Id: MinuitFitter.h 20882 2007-11-19 11:31:26Z rdm $	// @(#)root/tmva $Id: MinuitFitter.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker	// Author: Andreas Hoecker

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : MinuitFitter *	* Class : MinuitFitter *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Fitter using MINUIT *	* Fitter using MINUIT *

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

	MinuitWrapper.h	MinuitWrapper.h

	// @(#)root/tmva $Id: MinuitWrapper.h 29122 2009-06-22 06:51:30Z brun $	// @(#)root/tmva $Id: MinuitWrapper.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Peter Speckmayer	// Author: Peter Speckmayer

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : MinuitWrapper *	* Class : MinuitWrapper *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Wrapper around MINUIT *	* Wrapper around MINUIT *

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

	MisClassificationError.h	MisClassificationError.h

	// @(#)root/tmva $Id: MisClassificationError.h 29122 2009-06-22 06:51:30Z b run $	// @(#)root/tmva $Id: MisClassificationError.h 39395 2011-05-26 10:05:54Z m oneta $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : MisClassificationError *	* Class : MisClassificationError *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Implementation of the MisClassificationError as separation *	* Implementation of the MisClassificationError as separation *

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

	MnMinos.h	MnMinos.h

	// @(#)root/minuit2:$Id: MnMinos.h 23654 2008-05-06 07:30:34Z moneta $	// @(#)root/minuit2:$Id: MnMinos.h 39212 2011-05-17 08:41:02Z 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_MnMinos	#ifndef ROOT_Minuit2_MnMinos
	#define ROOT_Minuit2_MnMinos	#define ROOT_Minuit2_MnMinos

	skipping to change at line 47	skipping to change at line 47
	/// construct from FCN + Minimum + strategy	/// construct from FCN + Minimum + strategy
	MnMinos(const FCNBase& fcn, const FunctionMinimum& min, unsigned int str a = 1);	MnMinos(const FCNBase& fcn, const FunctionMinimum& min, unsigned int str a = 1);

	/// construct from FCN + Minimum + strategy	/// construct from FCN + Minimum + strategy
	MnMinos(const FCNBase& fcn, const FunctionMinimum& min, const MnStrategy & stra);	MnMinos(const FCNBase& fcn, const FunctionMinimum& min, const MnStrategy & stra);

	~MnMinos() {}	~MnMinos() {}

	/// returns the negative (pair.first) and the positive (pair.second)	/// returns the negative (pair.first) and the positive (pair.second)
	/// Minos Error of the Parameter	/// Minos Error of the Parameter

	std::pair<double,double> operator()(unsigned int, unsigned int maxcalls = 0) const;	std::pair<double,double> operator()(unsigned int, unsigned int maxcalls = 0, double toler = 0.1) const;

	/// calculate one side (negative or positive Error) of the Parameter	/// calculate one side (negative or positive Error) of the Parameter

	double Lower(unsigned int, unsigned int maxcalls = 0) const;	/// give as input (optionally) maxcalls and tolerance
	double Upper(unsigned int, unsigned int maxcalls = 0) const;	double Lower(unsigned int, unsigned int maxcalls = 0, double toler = 0.1
		) const;
		double Upper(unsigned int, unsigned int maxcalls = 0, double toler = 0.1
		) const;


	MnCross Loval(unsigned int, unsigned int maxcalls = 0) const;	MnCross Loval(unsigned int, unsigned int maxcalls = 0, double toler = 0.
	MnCross Upval(unsigned int, unsigned int maxcalls = 0) const;	1) const;
		MnCross Upval(unsigned int, unsigned int maxcalls = 0, double toler = 0.
		1) const;

	/// ask for MinosError (Lower + Upper)	/// ask for MinosError (Lower + Upper)
	/// can be printed via std::cout	/// can be printed via std::cout

	MinosError Minos(unsigned int, unsigned int maxcalls = 0) const;	MinosError Minos(unsigned int, unsigned int maxcalls = 0, double toler = 0.1) const;

	protected:	protected:

	/// internal method to get crossing value via MnFunctionCross	/// internal method to get crossing value via MnFunctionCross

	MnCross FindCrossValue(int dir , unsigned int, unsigned int maxcalls = 0 ) const;	MnCross FindCrossValue(int dir , unsigned int, unsigned int maxcalls, do uble toler) const;

	private:	private:

	const FCNBase& fFCN;	const FCNBase& fFCN;
	const FunctionMinimum& fMinimum;	const FunctionMinimum& fMinimum;
	MnStrategy fStrategy;	MnStrategy fStrategy;
	};	};

	} // namespace Minuit2	} // namespace Minuit2


End of changes. 6 change blocks.
	8 lines changed or deleted	13 lines changed or added

	MnUserCovariance.h	MnUserCovariance.h

	// @(#)root/minuit2:$Id: MnUserCovariance.h 20880 2007-11-19 11:23:41Z rdm $	// @(#)root/minuit2:$Id: MnUserCovariance.h 39383 2011-05-26 08:35:47Z mone ta $
	// 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_MnUserCovariance	#ifndef ROOT_Minuit2_MnUserCovariance
	#define ROOT_Minuit2_MnUserCovariance	#define ROOT_Minuit2_MnUserCovariance

	skipping to change at line 34	skipping to change at line 34
	Class containing the covariance matrix data represented as a vector of	Class containing the covariance matrix data represented as a vector of
	size n*(n+1)/2	size n*(n+1)/2
	Used to hide internal matrix representation to user	Used to hide internal matrix representation to user
	*/	*/
	class MnUserCovariance {	class MnUserCovariance {

	public:	public:

	MnUserCovariance() : fData(std::vector<double>()), fNRow(0) {}	MnUserCovariance() : fData(std::vector<double>()), fNRow(0) {}


		// safe constructor using std::vector
	MnUserCovariance(const std::vector<double>& data, unsigned int nrow) :	MnUserCovariance(const std::vector<double>& data, unsigned int nrow) :
	fData(data), fNRow(nrow) {	fData(data), fNRow(nrow) {
	assert(data.size() == nrow*(nrow+1)/2);	assert(data.size() == nrow*(nrow+1)/2);
	}	}


		// unsafe constructor using just a pointer
		MnUserCovariance(const double * data, unsigned int nrow) :
		fData(std::vector<double>(data,data+nrow*(nrow+1)/2)),
		fNRow(nrow) {
		}

	MnUserCovariance(unsigned int n) :	MnUserCovariance(unsigned int n) :
	fData(std::vector<double>(n*(n+1)/2, 0.)), fNRow(n) {}	fData(std::vector<double>(n*(n+1)/2, 0.)), fNRow(n) {}

	~MnUserCovariance() {}	~MnUserCovariance() {}

	MnUserCovariance(const MnUserCovariance& cov) : fData(cov.fData), fNRow(c ov.fNRow) {}	MnUserCovariance(const MnUserCovariance& cov) : fData(cov.fData), fNRow(c ov.fNRow) {}

	MnUserCovariance& operator=(const MnUserCovariance& cov) {	MnUserCovariance& operator=(const MnUserCovariance& cov) {
	fData = cov.fData;	fData = cov.fData;
	fNRow = cov.fNRow;	fNRow = cov.fNRow;

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

	ModelConfig.h	ModelConfig.h

	// @(#)root/roostats:$Id: ModelConfig.h 37084 2010-11-29 21:37:13Z moneta $	// @(#)root/roostats:$Id: ModelConfig.h 39391 2011-05-26 09:51:59Z moneta $
	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke, S ven Kreiss	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke, S ven Kreiss
	/*************************************************************************	/*************************************************************************
	* 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

	ModulekNN.h	ModulekNN.h

	// @(#)root/tmva $Id: ModulekNN.h 35738 2010-09-26 09:17:57Z stelzer $	// @(#)root/tmva $Id: ModulekNN.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Rustem Ospanov	// Author: Rustem Ospanov

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : ModulekNN *	* Class : ModulekNN *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Module for k-nearest neighbor algorithm *	* Module for k-nearest neighbor algorithm *

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

	MsgLogger.h	MsgLogger.h

	// @(#)root/tmva $Id: MsgLogger.h 38609 2011-03-24 16:06:32Z evt $	// @(#)root/tmva $Id: MsgLogger.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Attila Krasznahorkay, Andreas Hoecker, Joerg Stelzer, Eckhard vo n Toerne	// Author: Attila Krasznahorkay, Andreas Hoecker, Joerg Stelzer, Eckhard vo n Toerne

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : MsgLogger *	* Class : MsgLogger *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* TMVA output logger class producing nicely formatted log messages *	* TMVA output logger class producing nicely formatted log messages *

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

	NeymanConstruction.h	NeymanConstruction.h

	// @(#)root/roostats:$Id: NeymanConstruction.h 37403 2010-12-08 15:59:22Z m oneta $	// @(#)root/roostats:$Id: NeymanConstruction.h 39391 2011-05-26 09:51:59Z 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

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

	Node.h	Node.h

	// @(#)root/tmva $Id: Node.h 38943 2011-04-20 08:03:25Z evt $	// @(#)root/tmva $Id: Node.h 40012 2011-06-27 16:03:11Z stelzer $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Classes: Node *	* Classes: Node *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Node for the BinarySearch or Decision Trees *	* Node for the BinarySearch or Decision Trees *

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

	NodekNN.h	NodekNN.h

	// @(#)root/tmva $Id: NodekNN.h 31458 2009-11-30 13:58:20Z stelzer $	// @(#)root/tmva $Id: NodekNN.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Rustem Ospanov	// Author: Rustem Ospanov

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : Node *	* Class : Node *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* kd-tree (binary tree) template *	* kd-tree (binary tree) template *

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

	NumEventsTestStat.h	NumEventsTestStat.h

	// @(#)root/roostats:$Id: NumEventsTestStat.h 37983 2011-02-04 16:03:47Z mo neta $	// @(#)root/roostats:$Id: NumEventsTestStat.h 39391 2011-05-26 09:51:59Z 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

	NumberCountingPdfFactory.h	NumberCountingPdfFactory.h

	// @(#)root/roostats:$Id: NumberCountingPdfFactory.h 26324 2008-11-20 17:17 :32Z moneta $	// @(#)root/roostats:$Id: NumberCountingPdfFactory.h 39391 2011-05-26 09:51 :59Z moneta $
	// Author: Kyle Cranmer 28/07/2008	// Author: Kyle Cranmer 28/07/2008

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


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

	NumberCountingUtils.h	NumberCountingUtils.h

	// @(#)root/roostats:$Id: NumberCountingUtils.h 29179 2009-06-23 18:39:27Z brun $	// @(#)root/roostats:$Id: NumberCountingUtils.h 39391 2011-05-26 09:51:59Z moneta $
	// Author: Kyle Cranmer 28/07/2008	// Author: Kyle Cranmer 28/07/2008

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


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

	OptimizeConfigParameters.h	OptimizeConfigParameters.h

	skipping to change at line 75	skipping to change at line 75
	//default constructor	//default constructor
	OptimizeConfigParameters(MethodBase * const method, std::map<TString, TMVA::Interval> tuneParameters, TString fomType="Separation", TString optim izationType = "GA");	OptimizeConfigParameters(MethodBase * const method, std::map<TString, TMVA::Interval> tuneParameters, TString fomType="Separation", TString optim izationType = "GA");

	// destructor	// destructor
	virtual ~OptimizeConfigParameters();	virtual ~OptimizeConfigParameters();
	// could later be changed to be set via option string...	// could later be changed to be set via option string...
	// but for now it's impler like this	// but for now it's impler like this
	std::map<TString,Double_t> optimize();	std::map<TString,Double_t> optimize();

	private:	private:

		std::vector< int > GetScanIndices( int val, std::vector<int> base);
	void optimizeScan();	void optimizeScan();
	void optimizeFit();	void optimizeFit();

	Double_t EstimatorFunction( std::vector<Double_t> & );	Double_t EstimatorFunction( std::vector<Double_t> & );

	Double_t GetFOM();	Double_t GetFOM();

	MethodBase* GetMethod(){return fMethod;}	MethodBase* GetMethod(){return fMethod;}

	void GetMVADists();	void GetMVADists();
	Double_t GetSeparation();	Double_t GetSeparation();
	Double_t GetROCIntegral();	Double_t GetROCIntegral();

	Double_t GetSigEffAt( Double_t bkgEff = 0.1);	Double_t GetSigEffAtBkgEff( Double_t bkgEff = 0.1);
		Double_t GetBkgEffAtSigEff( Double_t sigEff = 0.5);
		Double_t GetBkgRejAtSigEff( Double_t sigEff = 0.5);

	MethodBase* const fMethod; // The MVA method to be evaluated	MethodBase* const fMethod; // The MVA method to be evaluated
	std::vector<Float_t> fFOMvsIter; // graph showing the dev elompment of the Figure Of Merit values during the fit	std::vector<Float_t> fFOMvsIter; // graph showing the dev elompment of the Figure Of Merit values during the fit
	std::map<TString,TMVA::Interval> fTuneParameters; // parameters inclu ded in the tuning	std::map<TString,TMVA::Interval> fTuneParameters; // parameters inclu ded in the tuning
	std::map<TString,Double_t> fTunedParameters; // parameters incl uded in the tuning	std::map<TString,Double_t> fTunedParameters; // parameters incl uded in the tuning
	std::map< std::vector<Double_t> , Double_t> fAlreadyTrainedParCombin ation; // save parameters for which the FOM is already known (GA seems to e valuate the same parameters several times)	std::map< std::vector<Double_t> , Double_t> fAlreadyTrainedParCombin ation; // save parameters for which the FOM is already known (GA seems to e valuate the same parameters several times)
	TString fFOMType; // the FOM type (Separation, ROC integ ra.. whaeter you implemented..	TString fFOMType; // the FOM type (Separation, ROC integ ra.. whaeter you implemented..
	TString fOptimizationFitType; // which type of optimisation procedure to be used	TString fOptimizationFitType; // which type of optimisation procedure to be used
	TH1D *fMvaSig; // MVA distrituion for signal events, used for spline fit	TH1D *fMvaSig; // MVA distrituion for signal events, used for spline fit
	TH1D *fMvaBkg; // MVA distrituion for bakgr. events, used for spline fit	TH1D *fMvaBkg; // MVA distrituion for bakgr. events, used for spline fit

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

	Option.h	Option.h

	// @(#)root/tmva $Id: Option.h 34301 2010-07-02 11:32:29Z stelzer $	// @(#)root/tmva $Id: Option.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : Option *	* Class : Option *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Option container *	* Option container *

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

	PDEFoamCell.h	PDEFoamCell.h

	// @(#)root/tmva $Id: PDEFoamCell.h 38475 2011-03-17 10:46:00Z evt $	// @(#)root/tmva $Id: PDEFoamCell.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: S. Jadach, Tancredi Carli, Dominik Dannheim, Alexander Voigt	// Author: S. Jadach, Tancredi Carli, Dominik Dannheim, Alexander Voigt

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Classes: PDEFoamCell *	* Classes: PDEFoamCell *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Objects of this class are hyperrectangular cells organized in *	* Objects of this class are hyperrectangular cells organized in *

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

	PDEFoamDecisionTree.h	PDEFoamDecisionTree.h

	// @(#)root/tmva $Id: PDEFoamDecisionTree.h 38475 2011-03-17 10:46:00Z evt $	// @(#)root/tmva $Id: PDEFoamDecisionTree.h 39395 2011-05-26 10:05:54Z mone ta $
	// Author: Alexander Voigt	// Author: Alexander Voigt

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Classes: PDEFoamDecisionTree *	* Classes: PDEFoamDecisionTree *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Class for decision tree like PDEFoam. It overrides *	* Class for decision tree like PDEFoam. It overrides *

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

	PDEFoamDecisionTreeDensity.h	PDEFoamDecisionTreeDensity.h

	// @(#)root/tmva $Id: PDEFoamDecisionTreeDensity.h 38475 2011-03-17 10:46:0 0Z evt $	// @(#)root/tmva $Id: PDEFoamDecisionTreeDensity.h 39395 2011-05-26 10:05:5 4Z moneta $
	// Author: Alexander Voigt	// Author: Alexander Voigt

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Classes: PDEFoamDecisionTreeDensity *	* Classes: PDEFoamDecisionTreeDensity *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Class PDEFoamDecisionTreeDensity is a class representing *	* Class PDEFoamDecisionTreeDensity is a class representing *

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

	PDEFoamDiscriminant.h	PDEFoamDiscriminant.h

	// @(#)root/tmva $Id: PDEFoamDiscriminant.h 38475 2011-03-17 10:46:00Z evt $	// @(#)root/tmva $Id: PDEFoamDiscriminant.h 39395 2011-05-26 10:05:54Z mone ta $
	// Author: Tancredi Carli, Dominik Dannheim, Alexander Voigt	// Author: Tancredi Carli, Dominik Dannheim, Alexander Voigt

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Classes: PDEFoamDiscriminant *	* Classes: PDEFoamDiscriminant *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Concrete PDEFoam sub-class. This foam stores the discriminant D *	* Concrete PDEFoam sub-class. This foam stores the discriminant D *

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

	PDEFoamDiscriminantDensity.h	PDEFoamDiscriminantDensity.h

	// @(#)root/tmva $Id: PDEFoamDiscriminantDensity.h 38475 2011-03-17 10:46:0 0Z evt $	// @(#)root/tmva $Id: PDEFoamDiscriminantDensity.h 39395 2011-05-26 10:05:5 4Z moneta $
	// Author: Tancredi Carli, Dominik Dannheim, Alexander Voigt	// Author: Tancredi Carli, Dominik Dannheim, Alexander Voigt

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Classes: PDEFoamDiscriminantDensity *	* Classes: PDEFoamDiscriminantDensity *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Class PDEFoamDiscriminantDensity is a class representing *	* Class PDEFoamDiscriminantDensity is a class representing *

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

	PDEFoamEvent.h	PDEFoamEvent.h

	// @(#)root/tmva $Id: PDEFoamEvent.h 38475 2011-03-17 10:46:00Z evt $	// @(#)root/tmva $Id: PDEFoamEvent.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Tancredi Carli, Dominik Dannheim, Alexander Voigt	// Author: Tancredi Carli, Dominik Dannheim, Alexander Voigt

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Classes: PDEFoamEvent *	* Classes: PDEFoamEvent *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Concrete PDEFoam sub-class. This foam stores the number of *	* Concrete PDEFoam sub-class. This foam stores the number of *

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

	PDEFoamEventDensity.h	PDEFoamEventDensity.h

	// @(#)root/tmva $Id: PDEFoamEventDensity.h 38475 2011-03-17 10:46:00Z evt $	// @(#)root/tmva $Id: PDEFoamEventDensity.h 39395 2011-05-26 10:05:54Z mone ta $
	// Author: Tancredi Carli, Dominik Dannheim, Alexander Voigt	// Author: Tancredi Carli, Dominik Dannheim, Alexander Voigt

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Classes: PDEFoamEventDensity *	* Classes: PDEFoamEventDensity *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Class PDEFoamEventDensity is a class representing *	* Class PDEFoamEventDensity is a class representing *

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

	PDEFoamKernelBase.h	PDEFoamKernelBase.h

	// @(#)root/tmva $Id: PDEFoamKernelBase.h 38475 2011-03-17 10:46:00Z evt $	// @(#)root/tmva $Id: PDEFoamKernelBase.h 40020 2011-06-27 16:46:42Z stelze r $
	// Author: Dominik Dannheim, Alexander Voigt	// Author: Dominik Dannheim, Alexander Voigt

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Classes: PDEFoamKernelBase *	* Classes: PDEFoamKernelBase *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* PDEFoam kernel interface *	* PDEFoam kernel interface *

	skipping to change at line 59	skipping to change at line 59
	PDEFoamKernelBase(); // Constructor	PDEFoamKernelBase(); // Constructor
	PDEFoamKernelBase(const PDEFoamKernelBase&); // Copy constructor	PDEFoamKernelBase(const PDEFoamKernelBase&); // Copy constructor
	virtual ~PDEFoamKernelBase(); // Destructor	virtual ~PDEFoamKernelBase(); // Destructor

	// kernel estimator	// kernel estimator
	virtual Float_t Estimate(PDEFoam*, std::vector<Float_t>&, ECellValue) = 0;	virtual Float_t Estimate(PDEFoam*, std::vector<Float_t>&, ECellValue) = 0;

	// Message logger	// Message logger
	MsgLogger& Log() const { return *fLogger; }	MsgLogger& Log() const { return *fLogger; }


	ClassDef(PDEFoamKernelBase, 1) // PDEFoam kernel	ClassDef(PDEFoamKernelBase, 1) // PDEFoam kernel interface
	}; // end of PDEFoamKernelBase	}; // end of PDEFoamKernelBase
	} // namespace TMVA	} // namespace TMVA

	#endif	#endif

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

	PDEFoamKernelGauss.h	PDEFoamKernelGauss.h

	// @(#)root/tmva $Id: PDEFoamKernelGauss.h 38475 2011-03-17 10:46:00Z evt $	// @(#)root/tmva $Id: PDEFoamKernelGauss.h 40020 2011-06-27 16:46:42Z stelz er $
	// Author: Dominik Dannheim, Alexander Voigt	// Author: Dominik Dannheim, Alexander Voigt

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Classes: PDEFoamKernelGauss *	* Classes: PDEFoamKernelGauss *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* PDEFoam kernel, which weights all cell values by a gauss function. *	* PDEFoam kernel, which weights all cell values by a gauss function. *

	skipping to change at line 64	skipping to change at line 64
	Float_t GetAverageNeighborsValue(PDEFoam*, std::vector<Float_t>&, ECe llValue);	Float_t GetAverageNeighborsValue(PDEFoam*, std::vector<Float_t>&, ECe llValue);

	public:	public:
	PDEFoamKernelGauss(Float_t sigma); // Constructor	PDEFoamKernelGauss(Float_t sigma); // Constructor
	PDEFoamKernelGauss(const PDEFoamKernelGauss&); // Copy Constructor	PDEFoamKernelGauss(const PDEFoamKernelGauss&); // Copy Constructor
	virtual ~PDEFoamKernelGauss() {}; // Destructor	virtual ~PDEFoamKernelGauss() {}; // Destructor

	// kernel estimator	// kernel estimator
	virtual Float_t Estimate(PDEFoam*, std::vector<Float_t>&, ECellValue) ;	virtual Float_t Estimate(PDEFoam*, std::vector<Float_t>&, ECellValue) ;


	ClassDef(PDEFoamKernelGauss, 1) // PDEFoam kernel	ClassDef(PDEFoamKernelGauss, 1) // Gaussian PDEFoam kernel estimator
	}; // end of PDEFoamKernelGauss	}; // end of PDEFoamKernelGauss
	} // namespace TMVA	} // namespace TMVA

	#endif	#endif

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

	PDEFoamKernelLinN.h	PDEFoamKernelLinN.h

	// @(#)root/tmva $Id: PDEFoamKernelLinN.h 38475 2011-03-17 10:46:00Z evt $	// @(#)root/tmva $Id: PDEFoamKernelLinN.h 40020 2011-06-27 16:46:42Z stelze r $
	// Author: Dominik Dannheim, Alexander Voigt	// Author: Dominik Dannheim, Alexander Voigt

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Classes: PDEFoamKernelLinN *	* Classes: PDEFoamKernelLinN *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* PDEFoam kernel, which linear weights with the neighbor cells. *	* PDEFoam kernel, which linear weights with the neighbor cells. *

	skipping to change at line 59	skipping to change at line 59
	Float_t GetAverageNeighborsValue(PDEFoam*, std::vector<Float_t>&, ECe llValue);	Float_t GetAverageNeighborsValue(PDEFoam*, std::vector<Float_t>&, ECe llValue);

	public:	public:
	PDEFoamKernelLinN(); // Constructor	PDEFoamKernelLinN(); // Constructor
	PDEFoamKernelLinN(const PDEFoamKernelLinN&); // Copy Constructor	PDEFoamKernelLinN(const PDEFoamKernelLinN&); // Copy Constructor
	virtual ~PDEFoamKernelLinN() {}; // Destructor	virtual ~PDEFoamKernelLinN() {}; // Destructor

	// kernel estimator	// kernel estimator
	virtual Float_t Estimate(PDEFoam*, std::vector<Float_t>&, ECellValue) ;	virtual Float_t Estimate(PDEFoam*, std::vector<Float_t>&, ECellValue) ;


	ClassDef(PDEFoamKernelLinN, 1) // PDEFoam kernel	ClassDef(PDEFoamKernelLinN, 1) // next neighbor PDEFoam kernel estima tor
	}; // end of PDEFoamKernelLinN	}; // end of PDEFoamKernelLinN
	} // namespace TMVA	} // namespace TMVA

	#endif	#endif

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

	PDEFoamKernelTrivial.h	PDEFoamKernelTrivial.h

	// @(#)root/tmva $Id: PDEFoamKernelTrivial.h 38475 2011-03-17 10:46:00Z evt $	// @(#)root/tmva $Id: PDEFoamKernelTrivial.h 40020 2011-06-27 16:46:42Z ste lzer $
	// Author: Dominik Dannheim, Alexander Voigt	// Author: Dominik Dannheim, Alexander Voigt

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Classes: PDEFoamKernelTrivial *	* Classes: PDEFoamKernelTrivial *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Trivial PDEFoam kernel *	* Trivial PDEFoam kernel *

	skipping to change at line 52	skipping to change at line 52
	{	{

	public:	public:
	PDEFoamKernelTrivial(); // Constructor	PDEFoamKernelTrivial(); // Constructor
	PDEFoamKernelTrivial(const PDEFoamKernelTrivial&); // Copy Constructo r	PDEFoamKernelTrivial(const PDEFoamKernelTrivial&); // Copy Constructo r
	virtual ~PDEFoamKernelTrivial() {}; // Destructor	virtual ~PDEFoamKernelTrivial() {}; // Destructor

	// kernel estimator	// kernel estimator
	virtual Float_t Estimate(PDEFoam*, std::vector<Float_t>&, ECellValue) ;	virtual Float_t Estimate(PDEFoam*, std::vector<Float_t>&, ECellValue) ;


	ClassDef(PDEFoamKernelTrivial, 1) // trivial PDEFoam kernel	ClassDef(PDEFoamKernelTrivial, 1) // trivial PDEFoam kernel estimator
	}; // end of PDEFoamKernelTrivial	}; // end of PDEFoamKernelTrivial
	} // namespace TMVA	} // namespace TMVA

	#endif	#endif

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

	PDEFoamMultiTarget.h	PDEFoamMultiTarget.h

	// @(#)root/tmva $Id: PDEFoamMultiTarget.h 38938 2011-04-20 07:12:51Z evt $	// @(#)root/tmva $Id: PDEFoamMultiTarget.h 39395 2011-05-26 10:05:54Z monet a $
	// Author: Tancredi Carli, Dominik Dannheim, Alexander Voigt	// Author: Tancredi Carli, Dominik Dannheim, Alexander Voigt

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Classes: PDEFoamMultiTarget *	* Classes: PDEFoamMultiTarget *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Concrete PDEFoamEvent sub-class. This foam stores the number *	* Concrete PDEFoamEvent sub-class. This foam stores the number *

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

	PDEFoamTarget.h	PDEFoamTarget.h

	// @(#)root/tmva $Id: PDEFoamTarget.h 38938 2011-04-20 07:12:51Z evt $	// @(#)root/tmva $Id: PDEFoamTarget.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Tancredi Carli, Dominik Dannheim, Alexander Voigt	// Author: Tancredi Carli, Dominik Dannheim, Alexander Voigt

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Classes: PDEFoamTarget *	* Classes: PDEFoamTarget *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Concrete PDEFoam sub-class. This foam stores the first target *	* Concrete PDEFoam sub-class. This foam stores the first target *

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

	PDEFoamTargetDensity.h	PDEFoamTargetDensity.h

	// @(#)root/tmva $Id: PDEFoamTargetDensity.h 38475 2011-03-17 10:46:00Z evt $	// @(#)root/tmva $Id: PDEFoamTargetDensity.h 39395 2011-05-26 10:05:54Z mon eta $
	// Author: Tancredi Carli, Dominik Dannheim, Alexander Voigt	// Author: Tancredi Carli, Dominik Dannheim, Alexander Voigt

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Classes: PDEFoamTargetDensity *	* Classes: PDEFoamTargetDensity *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Class PDEFoamTargetDensity is a class representing *	* Class PDEFoamTargetDensity is a class representing *

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

	PDEFoamVect.h	PDEFoamVect.h

	// @(#)root/tmva $Id: PDEFoamVect.h 38475 2011-03-17 10:46:00Z evt $	// @(#)root/tmva $Id: PDEFoamVect.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: S. Jadach, Tancredi Carli, Dominik Dannheim, Alexander Voigt	// Author: S. Jadach, Tancredi Carli, Dominik Dannheim, Alexander Voigt

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Classes: PDEFoamVect *	* Classes: PDEFoamVect *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Auxiliary class PDEFoamVect of n-dimensional vector, with dynamic *	* Auxiliary class PDEFoamVect of n-dimensional vector, with dynamic *

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

	PDF.h	PDF.h

	// @(#)root/tmva $Id: PDF.h 38609 2011-03-24 16:06:32Z evt $	// @(#)root/tmva $Id: PDF.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Asen Christov, Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai V oss , Jan Therhaag	// Author: Asen Christov, Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai V oss , Jan Therhaag

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : PDF *	* Class : PDF *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* PDF wrapper for histograms; uses user-defined spline interpolation *	* PDF wrapper for histograms; uses user-defined spline interpolation *

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

	PdfProposal.h	PdfProposal.h

	// @(#)root/roostats:$Id: PdfProposal.h 34109 2010-06-24 15:00:16Z moneta $	// @(#)root/roostats:$Id: PdfProposal.h 39391 2011-05-26 09:51:59Z 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.h 31276 2009-11-18 15:06:42Z mon eta $	// @(#)root/roostats:$Id: PointSetInterval.h 39391 2011-05-26 09:51:59Z 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

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

	PoissonLikelihoodFCN.h	PoissonLikelihoodFCN.h

	// @(#)root/mathcore:$Id: PoissonLikelihoodFCN.h 37232 2010-12-03 18:09:43Z moneta $	// @(#)root/mathcore:$Id: PoissonLikelihoodFCN.h 39382 2011-05-26 08:31:43Z 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, const IModelFunction & func) :	PoissonLikelihoodFCN (const BinData & data, const IModelFunction & func, int weight = 0) :
	BaseObjFunction(func.NPar(), data.Size() ),	BaseObjFunction(func.NPar(), data.Size() ),
	fData(data),	fData(data),
	fFunc(func),	fFunc(func),
	fNEffPoints(0),	fNEffPoints(0),

		fWeight(weight),
	fGrad ( std::vector<double> ( func.NPar() ) )	fGrad ( std::vector<double> ( func.NPar() ) )
	{ }	{ }

	/**	/**
	Destructor (no operations)	Destructor (no operations)
	*/	*/
	~PoissonLikelihoodFCN () {}	~PoissonLikelihoodFCN () {}

	private:	private:
	// usually copying is non trivial, so we declare but don't implement the m	// usually copying is non trivial, so we declare but don't implement the m

	skipping to change at line 93	skipping to change at line 94
	PoissonLikelihoodFCN(const PoissonLikelihoodFCN &);	PoissonLikelihoodFCN(const PoissonLikelihoodFCN &);

	/**	/**
	Assignment operator	Assignment operator
	*/	*/
	PoissonLikelihoodFCN & operator = (const PoissonLikelihoodFCN &);	PoissonLikelihoodFCN & operator = (const PoissonLikelihoodFCN &);

	public:	public:

	/// clone the function (need to return Base for Windows)	/// clone the function (need to return Base for Windows)

	virtual BaseFunction * Clone() const { return new PoissonLikelihoodFCN( fData,fFunc); }	virtual BaseFunction * Clone() const { return new PoissonLikelihoodFCN( fData,fFunc,fWeight); }

	// effective points used in the fit	// effective points used in the fit
	virtual unsigned int NFitPoints() const { return fNEffPoints; }	virtual unsigned int NFitPoints() const { return fNEffPoints; }

	/// i-th likelihood element and its gradient	/// i-th likelihood element and its gradient
	virtual double DataElement(const double * x, unsigned int i, double * g) const {	virtual double DataElement(const double * x, unsigned int i, double * g) const {
	if (i==0) this->UpdateNCalls();	if (i==0) this->UpdateNCalls();
	return FitUtil::EvaluatePoissonBinPdf(fFunc, fData, x, i, g);	return FitUtil::EvaluatePoissonBinPdf(fFunc, fData, x, i, g);
	}	}


	skipping to change at line 119	skipping to change at line 120

	/// get type of fit method function	/// get type of fit method function
	virtual typename BaseObjFunction::Type_t Type() const { return BaseObjF unction::kLogLikelihood; }	virtual typename BaseObjFunction::Type_t Type() const { return BaseObjF unction::kLogLikelihood; }

	/// access to const reference to the data	/// access to const reference to the data
	virtual const BinData & Data() const { return fData; }	virtual const BinData & Data() const { return fData; }

	/// access to const reference to the model function	/// access to const reference to the model function
	virtual const IModelFunction & ModelFunction() const { return fFunc; }	virtual const IModelFunction & ModelFunction() const { return fFunc; }


		bool IsWeighted() const { return (fWeight != 0); }

		// Use the weights in evaluating the likelihood
		void UseSumOfWeights() {
		if (fWeight == 0) return; // do nothing if it was not weighted
		fWeight = 1;
		}

		// Use sum of the weight squared in evaluating the likelihood
		// (this is needed for calculating the errors)
		void UseSumOfWeightSquare() {
		if (fWeight == 0) return; // do nothing if it was not weighted
		fWeight = 2;
		}

	protected:	protected:

	private:	private:

	/**	/**
	Evaluation of the function (required by interface)	Evaluation of the function (required by interface)
	*/	*/
	virtual double DoEval (const double * x) const {	virtual double DoEval (const double * x) const {
	this->UpdateNCalls();	this->UpdateNCalls();

	return FitUtil::EvaluatePoissonLogL(fFunc, fData, x, fNEffPoints);	return FitUtil::EvaluatePoissonLogL(fFunc, fData, x, fWeight, fNEffPo ints);
	}	}

	// 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;
	const 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


		int fWeight; // flag to indicate if needs to evaluate using weight or w
		eight squared

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

	};	};

	// define useful typedef's	// define useful typedef's
	typedef PoissonLikelihoodFCN<ROOT::Math::IMultiGenFunction> PoissonLL Function;	typedef PoissonLikelihoodFCN<ROOT::Math::IMultiGenFunction> PoissonLL Function;
	typedef PoissonLikelihoodFCN<ROOT::Math::IMultiGradFunction> PoissonL LGradFunction;	typedef PoissonLikelihoodFCN<ROOT::Math::IMultiGradFunction> PoissonL LGradFunction;

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


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

	ProfileLikelihoodCalculator.h	ProfileLikelihoodCalculator.h

	// @(#)root/roostats:$Id: ProfileLikelihoodCalculator.h 34109 2010-06-24 15 :00:16Z moneta $	// @(#)root/roostats:$Id: ProfileLikelihoodCalculator.h 39391 2011-05-26 09 :51:59Z 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

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

	ProfileLikelihoodTestStat.h	ProfileLikelihoodTestStat.h

	// @(#)root/roostats:$Id: ProfileLikelihoodTestStat.h 38599 2011-03-24 08:3 7:05Z moneta $	// @(#)root/roostats:$Id: ProfileLikelihoodTestStat.h 40023 2011-06-27 16:5 8:44Z 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

	skipping to change at line 64	skipping to change at line 64

	public:	public:
	ProfileLikelihoodTestStat() {	ProfileLikelihoodTestStat() {
	// Proof constructor. Do not use.	// Proof constructor. Do not use.
	fPdf = 0;	fPdf = 0;
	fProfile = 0;	fProfile = 0;
	fNll = 0;	fNll = 0;
	fCachedBestFitParams = 0;	fCachedBestFitParams = 0;
	fLastData = 0;	fLastData = 0;
	fOneSided = false;	fOneSided = false;

		fReuseNll = false;
	}	}
	ProfileLikelihoodTestStat(RooAbsPdf& pdf) {	ProfileLikelihoodTestStat(RooAbsPdf& pdf) {
	fPdf = &pdf;	fPdf = &pdf;
	fProfile = 0;	fProfile = 0;
	fNll = 0;	fNll = 0;
	fCachedBestFitParams = 0;	fCachedBestFitParams = 0;
	fLastData = 0;	fLastData = 0;
	fOneSided = false;	fOneSided = false;

		fReuseNll = false;
	}	}
	virtual ~ProfileLikelihoodTestStat() {	virtual ~ProfileLikelihoodTestStat() {
	// delete fRand;	// delete fRand;
	// delete fTestStatistic;	// delete fTestStatistic;
	if(fProfile) delete fProfile;	if(fProfile) delete fProfile;
	if(fNll) delete fNll;	if(fNll) delete fNll;
	if(fCachedBestFitParams) delete fCachedBestFitParams;	if(fCachedBestFitParams) delete fCachedBestFitParams;
	}	}
	void SetOneSided(Bool_t flag=true) {fOneSided = flag;}	void SetOneSided(Bool_t flag=true) {fOneSided = flag;}


		static void SetAlwaysReuseNLL(Bool_t flag) { fgAlwaysReuseNll = flag ;
		}
		void SetReuseNLL(Bool_t flag) { fReuseNll = flag ; }

	// Main interface to evaluate the test statistic on a dataset	// Main interface to evaluate the test statistic on a dataset
	virtual Double_t Evaluate(RooAbsData& data, RooArgSet& paramsOfInteres t) {	virtual Double_t Evaluate(RooAbsData& data, RooArgSet& paramsOfInteres t) {
	if (!&data) {	if (!&data) {
	cout << "problem with data" << endl;	cout << "problem with data" << endl;
	return 0 ;	return 0 ;
	}	}

	RooRealVar* firstPOI = (RooRealVar*) paramsOfInterest.first();	RooRealVar* firstPOI = (RooRealVar*) paramsOfInterest.first();
	double initial_mu_value = firstPOI->getVal();	double initial_mu_value = firstPOI->getVal();
	//paramsOfInterest.getRealValue(firstPOI->GetName());	//paramsOfInterest.getRealValue(firstPOI->GetName());

	RooFit::MsgLevel msglevel = RooMsgService::instance().globalKillBelo w();	RooFit::MsgLevel msglevel = RooMsgService::instance().globalKillBelo w();
	RooMsgService::instance().setGlobalKillBelow(RooFit::FATAL);	RooMsgService::instance().setGlobalKillBelow(RooFit::FATAL);

	// simple	// simple

	RooAbsReal* nll = fPdf->createNLL(data, RooFit::CloneData(kFALSE));	Bool_t reuse=(fReuseNll \|\| fgAlwaysReuseNll) ;
	RooAbsReal* profile = nll->createProfile(paramsOfInterest);
		Bool_t created(kFALSE) ;
		if (!reuse \|\| fNll==0) {
		fNll = (RooNLLVar*) fPdf->createNLL(data, RooFit::CloneData(kFALSE)
		);
		fProfile = (RooProfileLL*) fNll->createProfile(paramsOfInterest);
		created = kTRUE ;
		//cout << "creating profile LL " << fNll << " " << fProfile << " da
		ta = " << &data << endl ;
		}
		if (reuse && !created) {
		//cout << "reusing profile LL " << fNll << " new data = " << &data
		<< endl ;
		fNll->setData(data,kFALSE) ;
		if (fProfile) delete fProfile ;
		fProfile = (RooProfileLL*) fNll->createProfile(paramsOfInterest) ;
		//fProfile->clearAbsMin() ;
		}

	// make sure we set the variables attached to this nll	// make sure we set the variables attached to this nll

	RooArgSet* attachedSet = nll->getVariables();	RooArgSet* attachedSet = fNll->getVariables();

	*attachedSet = paramsOfInterest;	*attachedSet = paramsOfInterest;


	// fPdf->setEvalErrorLoggingMode(RooAbsReal::CountErrors);	// fPdf->setEvalErrorLoggingMode(RooAbsReal::CountErrors);
	// profile->setEvalErrorLoggingMode(RooAbsReal::CountErrors);	// profile->setEvalErrorLoggingMode(RooAbsReal::CountErrors);
	// ((RooProfileLL*)profile)->nll().setEvalErrorLoggingMode(Roo AbsReal::CountErrors);	// ((RooProfileLL*)profile)->nll().setEvalErrorLoggingMode(Roo AbsReal::CountErrors);
	// nll->setEvalErrorLoggingMode(RooAbsReal::CountErrors);	// nll->setEvalErrorLoggingMode(RooAbsReal::CountErrors);

	double ret = profile->getVal();	//cout << "evaluating profile LL" << endl ;
		double ret = fProfile->getVal();
		// cout << "profile value = " << ret << endl ;
	// cout <<"eval errors pdf = "<<fPdf->numEvalErrors() << endl;	// cout <<"eval errors pdf = "<<fPdf->numEvalErrors() << endl;
	// cout <<"eval errors profile = "<<profile->numEvalErrors() < < endl;	// cout <<"eval errors profile = "<<profile->numEvalErrors() < < endl;
	// cout <<"eval errors profile->nll = "<<((RooProfileLL*)profi le)->nll().numEvalErrors() << endl;	// cout <<"eval errors profile->nll = "<<((RooProfileLL*)profi le)->nll().numEvalErrors() << endl;
	// cout <<"eval errors nll = "<<nll->numEvalErrors() << endl;	// cout <<"eval errors nll = "<<nll->numEvalErrors() << endl;
	// if(profile->numEvalErrors()>0)	// if(profile->numEvalErrors()>0)
	// cout <<"eval errors = "<<profile->numEvalErrors() < < endl;	// cout <<"eval errors = "<<profile->numEvalErrors() < < endl;
	// paramsOfInterest.Print("v");	// paramsOfInterest.Print("v");
	// cout << "ret = " << ret << endl;	// cout << "ret = " << ret << endl;

	if(fOneSided){	if(fOneSided){

	double fit_favored_mu = ((RooProfileLL*) profile)->bestFitObs().get RealValue(firstPOI->GetName()) ;	double fit_favored_mu = ((RooProfileLL*) fProfile)->bestFitObs().ge tRealValue(firstPOI->GetName()) ;

	if( fit_favored_mu > initial_mu_value)	if( fit_favored_mu > initial_mu_value)
	// cout <<"fit-favored_mu, initial value" << fit_favored_mu << " " << initial_mu_value<<endl;	// cout <<"fit-favored_mu, initial value" << fit_favored_mu << " " << initial_mu_value<<endl;
	ret = 0 ;	ret = 0 ;
	}	}
	delete attachedSet;	delete attachedSet;

	delete nll;
	nll = 0;	if (!reuse) {
	delete profile;	//cout << "deleting ProfileLL " << fNll << " " << fProfile << endl
		;
		delete fNll;
		fNll = 0;
		delete fProfile;
		fProfile = 0 ;
		}

	RooMsgService::instance().setGlobalKillBelow(msglevel);	RooMsgService::instance().setGlobalKillBelow(msglevel);

	//////////////////////////////////////////////////////	//////////////////////////////////////////////////////
	// return here and forget about the following code	// return here and forget about the following code
	return ret;	return ret;

	//////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////
	// OLD version with some handling for local minima	// OLD version with some handling for local minima
	// (not used right now)	// (not used right now)
	/////////////////////////////////////////////////////////	/////////////////////////////////////////////////////////

	skipping to change at line 208	skipping to change at line 238
	// RooProfileLL::bestFitParams returns best fit of nuisance parameters only	// RooProfileLL::bestFitParams returns best fit of nuisance parameters only
	// fCachedBestFitParams = (RooArgSet*) (fProfile->be stFitParams().clone("lastBestFit"));	// fCachedBestFitParams = (RooArgSet*) (fProfile->be stFitParams().clone("lastBestFit"));
	// ProfileLL::getParameters returns current value of the par ameters	// ProfileLL::getParameters returns current value of the par ameters
	// fCachedBestFitParams = (RooArgSet*) (fProfile->ge tParameters(data)->clone("lastBestFit"));	// fCachedBestFitParams = (RooArgSet*) (fProfile->ge tParameters(data)->clone("lastBestFit"));
	//cout << "making fCachedBestFitParams: " << fCachedBestFitP arams << fCachedBestFitParams->getSize() << endl;	//cout << "making fCachedBestFitParams: " << fCachedBestFitP arams << fCachedBestFitParams->getSize() << endl;

	// store original values, since minimization will change the m.	// store original values, since minimization will change the m.
	RooArgSet* origParamVals = (RooArgSet*) paramsOfInterest.sna pshot();	RooArgSet* origParamVals = (RooArgSet*) paramsOfInterest.sna pshot();

	// find minimum	// find minimum

	RooMinuit minuit(*nll);	RooMinuit minuit(*fNll);
	minuit.setPrintLevel(-999);	minuit.setPrintLevel(-999);
	minuit.setNoWarn();	minuit.setNoWarn();
	minuit.migrad();	minuit.migrad();

	// store the best fit values for future use	// store the best fit values for future use

	fCachedBestFitParams = (RooArgSet*) (nll->getParameters(data )->snapshot());	fCachedBestFitParams = (RooArgSet*) (fNll->getParameters(dat a)->snapshot());

	// restore parameters	// restore parameters
	SetParameters(origParamVals, &paramsOfInterest);	SetParameters(origParamVals, &paramsOfInterest);

	// evaluate to force this profile to evaluate and store	// evaluate to force this profile to evaluate and store
	// best fit parameters for this data	// best fit parameters for this data
	fProfile->getVal();	fProfile->getVal();

	// cleanup	// cleanup
	delete origParamVals;	delete origParamVals;

	skipping to change at line 281	skipping to change at line 311

	// set parameters to point being requested	// set parameters to point being requested
	SetParameters(&paramsOfInterest, fProfile->getParameters(data)) ;	SetParameters(&paramsOfInterest, fProfile->getParameters(data)) ;

	value = fProfile->getVal();	value = fProfile->getVal();
	//cout << "now profileLL = " << value << endl;	//cout << "now profileLL = " << value << endl;
	}	}
	// cout << "now profileLL = " << value << endl;	// cout << "now profileLL = " << value << endl;
	RooMsgService::instance().setGlobalKillBelow(RooFit::DEBUG);	RooMsgService::instance().setGlobalKillBelow(RooFit::DEBUG);
	return value;	return value;


	}	}

	virtual const TString GetVarName() const {return "Profile Likelihood Ratio";}	virtual const TString GetVarName() const {return "Profile Likelihood Ratio";}

	// const bool PValueIsRightTail(void) { return false; } // overw rites default	// const bool PValueIsRightTail(void) { return false; } // overw rites default

	private:	private:

	RooProfileLL* fProfile;	RooProfileLL* fProfile; //!
	RooAbsPdf* fPdf;	RooAbsPdf* fPdf;

	RooNLLVar* fNll;	RooNLLVar* fNll; //!
	const RooArgSet* fCachedBestFitParams;	const RooArgSet* fCachedBestFitParams;
	RooAbsData* fLastData;	RooAbsData* fLastData;
	// Double_t fLastMLE;	// Double_t fLastMLE;
	Bool_t fOneSided;	Bool_t fOneSided;


		static Bool_t fgAlwaysReuseNll ;
		Bool_t fReuseNll ;

	protected:	protected:

	ClassDef(ProfileLikelihoodTestStat,2) // implements the profile lik elihood ratio as a test statistic to be used with several tools	ClassDef(ProfileLikelihoodTestStat,4) // implements the profile lik elihood ratio as a test statistic to be used with several tools
	};	};
	}	}

	#endif	#endif

End of changes. 17 change blocks.
	14 lines changed or deleted	53 lines changed or added

	ProofConfig.h	ProofConfig.h

	// @(#)root/roostats:$Id: ProofConfig.h 37564 2010-12-13 13:47:23Z moneta $	// @(#)root/roostats:$Id: ProofConfig.h 39934 2011-06-24 09:15:34Z moneta $
	/*************************************************************************	/*************************************************************************
	* 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_ProofConfig	#ifndef ROOSTATS_ProofConfig
	#define ROOSTATS_ProofConfig	#define ROOSTATS_ProofConfig

	//_________________________________________________	//_________________________________________________
	/*	/*
	BEGIN_HTML	BEGIN_HTML
	<p>	<p>
	Holds configuration options for proof and proof-lite.	Holds configuration options for proof and proof-lite.

	This class will be expanded in the future to hold more specific configurati on	This class will be expanded in the future to hold more specific configurati on
	options for the tools in RooStats.	options for the tools in RooStats.
	</p>	</p>


		<p>
		Access to TProof::Mgr for configuration is still possible as usual
		(e.g. to set Root Version to be used on workers). You can do:</p>
		<ul>
		<li>TProof::Mgr("my.server.url")->ShowROOTVersions()</li>
		<li>TProof::Mgr("my.server.url")->SetROOTVersion("v5-27-06_dbg")</li>
		</ul>

		<p>
		See doc: http://root.cern.ch/drupal/content/changing-default-root-version
		</p>
	END_HTML	END_HTML
	*/	*/
	//	//

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

	#include "RooWorkspace.h"	#include "RooWorkspace.h"

		#include "RooStudyManager.h"

	namespace RooStats {	namespace RooStats {

	class ProofConfig {	class ProofConfig {

	public:	public:

	ProofConfig(RooWorkspace &w, Int_t nExperiments = 8, const char *host = "", Bool_t showGui = kTRUE) :	ProofConfig(RooWorkspace &w, Int_t nExperiments = 8, const char *host = "", Bool_t showGui = kFALSE) :
	fWorkspace(w),	fWorkspace(w),
	fNExperiments(nExperiments),	fNExperiments(nExperiments),
	fHost(host),	fHost(host),
	fShowGui(showGui)	fShowGui(showGui)
	{	{
	}	}

	virtual ~ProofConfig() {	virtual ~ProofConfig() {

		ProofConfig::CloseProof();
	}	}


		/// close all proof connections
		static void CloseProof(Option_t *option = "s") { RooStudyManager::clo
		seProof(option); }

	// returns fWorkspace	// returns fWorkspace
	RooWorkspace& GetWorkspace(void) { return fWorkspace; }	RooWorkspace& GetWorkspace(void) { return fWorkspace; }
	// returns fHost	// returns fHost
	const char* GetHost(void) { return fHost; }	const char* GetHost(void) { return fHost; }
	// return fNExperiments	// return fNExperiments
	Int_t GetNExperiments(void) { return fNExperiments; }	Int_t GetNExperiments(void) { return fNExperiments; }
	// return fShowGui	// return fShowGui
	Bool_t GetShowGui(void) { return fShowGui; }	Bool_t GetShowGui(void) { return fShowGui; }

	protected:	protected:

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

	ProposalFunction.h	ProposalFunction.h

	// @(#)root/roostats:$Id: ProposalFunction.h 34109 2010-06-24 15:00:16Z mon eta $	// @(#)root/roostats:$Id: ProposalFunction.h 39391 2011-05-26 09:51:59Z 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 31276 2009-11-18 15:06:42Z monet a $	// @(#)root/roostats:$Id: ProposalHelper.h 39391 2011-05-26 09:51:59Z 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 37326 2010-12-06 11:07:19Z rdm $ */	/* @(#)root/base:$Id: RConfig.h 39359 2011-05-24 14:51:26Z axel $ */

	/*************************************************************************	/*************************************************************************
	* 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 140	skipping to change at line 140
	# define NEED_SIGJMP	# define NEED_SIGJMP
	# if __SUNPRO_CC > 0x420	# if __SUNPRO_CC > 0x420
	# define R__SOLARIS_CC50	# define R__SOLARIS_CC50
	# define R__ANSISTREAM /* ANSI C++ Standard Library conformant */	# define R__ANSISTREAM /* ANSI C++ Standard Library conformant */
	# define R__SSTREAM /* use sstream or strstream header */	# define R__SSTREAM /* use sstream or strstream header */
	# define R__PLACEMENTINLINE /* placement new/delete is inline in <new> */	# define R__PLACEMENTINLINE /* placement new/delete is inline in <new> */
	# endif	# endif
	# if __SUNPRO_CC >= 0x420	# if __SUNPRO_CC >= 0x420
	# define R__SUNCCBUG /* to work around a compiler bug */	# define R__SUNCCBUG /* to work around a compiler bug */
	# endif	# endif

		# if __SUNPRO_CC >= 0x5110
		# define R__THROWNEWDELETE
		# endif
	# if __GNUC__ >= 3 \|\| __GNUC_MINOR__ >= 90 /* modern egcs/gcc */	# if __GNUC__ >= 3 \|\| __GNUC_MINOR__ >= 90 /* modern egcs/gcc */
	# define R__SUNGCC3	# define R__SUNGCC3
	# endif	# endif
	#endif	#endif

	#if defined(__FCC_VERSION) /* Solaris with Fujitsu compiler */	#if defined(__FCC_VERSION) /* Solaris with Fujitsu compiler */
	# define R__SOLARIS	# define R__SOLARIS
	# define R__SEEK64	# define R__SEEK64
	# define ANSICPP	# define ANSICPP
	# define R__UNIX	# define R__UNIX

End of changes. 2 change blocks.
	1 lines changed or deleted	4 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.6.3p 2/i686-slc5-gcc43-opt PYTHONDIR=/afs/cern.ch/sw/lcg/external/Python/2.6.5/i 686-slc5-gcc43-opt linux --fail-on-missing --enable-builtin-pcre --enable-c intex --enable-explicitlink --enable-gdml --enable-genvector --enable-krb5 --enable-mathmore --enable-minuit2 --enable-mysql --enable-oracle --enable- python --enable-qt --enable-qtgsi --enable-reflex --enable-roofit --enable- table --enable-unuran --with-castor-incdir=/afs/cern.ch/sw/lcg/external/cas tor/2.1.8-10/i686-slc5-gcc43-opt/usr/include/shift --with-castor-libdir=/af s/cern.ch/sw/lcg/external/castor/2.1.8-10/i686-slc5-gcc43-opt/usr/lib --wit h-cern-libdir=/afs/cern.ch/sw/lcg/external/cernlib/2006a/i686-slc5-gcc43-op t/lib --with-dcap-libdir=/afs/cern.ch/sw/lcg/external/dcache_client/1.9.3p1 /i686-slc5-gcc43-opt/dcap/lib --with-dcap-incdir=/afs/cern.ch/sw/lcg/extern al/dcache_client/1.9.3p1/i686-slc5-gcc43-opt/dcap/include --with-fftw3-incd ir=/afs/cern.ch/sw/lcg/external/fftw3/3.1.2/i686-slc5-gcc43-opt/include --w ith-fftw3-libdir=/afs/cern.ch/sw/lcg/external/fftw3/3.1.2/i686-slc5-gcc43-o pt/lib --with-gccxml=/afs/cern.ch/sw/lcg/external/gccxml/0.9.0_20100114/i68 6-slc5-gcc43-opt/bin --with-gfal-libdir=/afs/cern.ch/sw/lcg/external/Grid/g fal/1.11.8-2/i686-slc5-gcc43-opt/lib --with-gfal-incdir=/afs/cern.ch/sw/lcg /external/Grid/gfal/1.11.8-2/i686-slc5-gcc43-opt/include --with-gsl-incdir= /afs/cern.ch/sw/lcg/external/GSL/1.10/i686-slc5-gcc43-opt/include --with-gs l-libdir=/afs/cern.ch/sw/lcg/external/GSL/1.10/i686-slc5-gcc43-opt/lib --wi th-mysql-incdir=/afs/cern.ch/sw/lcg/external/mysql/5.1.45/i686-slc5-gcc43-o pt/include/mysql --with-mysql-libdir=/afs/cern.ch/sw/lcg/external/mysql/5.1 .45/i686-slc5-gcc43-opt/lib/mysql --with-oracle-incdir=/afs/cern.ch/sw/lcg/ external/oracle/11.2.0.1.0p2/i686-slc5-gcc43-opt/include --with-oracle-libd ir=/afs/cern.ch/sw/lcg/external/oracle/11.2.0.1.0p2/i686-slc5-gcc43-opt/lib --with-rfio-incdir=/afs/cern.ch/sw/lcg/external/castor/2.1.8-10/i686-slc5- gcc43-opt/usr/include/shift --with-rfio-libdir=/afs/cern.ch/sw/lcg/external /castor/2.1.8-10/i686-slc5-gcc43-opt/usr/lib --with-pythia6-libdir=/afs/cer n.ch/sw/lcg/external/MCGenerators/pythia6/424.2/i686-slc5-gcc43-opt/lib --w ith-pythia8-incdir=/afs/cern.ch/sw/lcg/external/MCGenerators/pythia8/145/i6 86-slc5-gcc43-opt/include --with-pythia8-libdir=/afs/cern.ch/sw/lcg/externa l/MCGenerators/pythia8/145/i686-slc5-gcc43-opt/lib --with-gviz-incdir=/afs/ cern.ch/sw/lcg/external/graphviz/2.24.0/i686-slc5-gcc43-opt/include/graphvi z --with-gviz-libdir=/afs/cern.ch/sw/lcg/external/graphviz/2.24.0/i686-slc5 -gcc43-opt/lib"	#define R__CONFIGUREOPTIONS "QTDIR=/afs/cern.ch/sw/lcg/external/qt/4.6.3p 2/i686-slc5-gcc43-opt PYTHONDIR=/afs/cern.ch/sw/lcg/external/Python/2.6.5/i 686-slc5-gcc43-opt linux --fail-on-missing --enable-builtin-pcre --enable-c intex --enable-explicitlink --enable-gdml --enable-genvector --enable-krb5 --enable-mathmore --enable-minuit2 --enable-mysql --enable-oracle --enable- python --enable-qt --enable-qtgsi --enable-reflex --enable-roofit --enable- table --enable-unuran --with-castor-incdir=/afs/cern.ch/sw/lcg/external/cas tor/2.1.8-10/i686-slc5-gcc43-opt/usr/include/shift --with-castor-libdir=/af s/cern.ch/sw/lcg/external/castor/2.1.8-10/i686-slc5-gcc43-opt/usr/lib --wit h-cern-libdir=/afs/cern.ch/sw/lcg/external/cernlib/2006a/i686-slc5-gcc43-op t/lib --with-dcap-libdir=/afs/cern.ch/sw/lcg/external/dcache_client/1.9.3p1 /i686-slc5-gcc43-opt/dcap/lib --with-dcap-incdir=/afs/cern.ch/sw/lcg/extern al/dcache_client/1.9.3p1/i686-slc5-gcc43-opt/dcap/include --with-fftw3-incd ir=/afs/cern.ch/sw/lcg/external/fftw3/3.1.2/i686-slc5-gcc43-opt/include --w ith-fftw3-libdir=/afs/cern.ch/sw/lcg/external/fftw3/3.1.2/i686-slc5-gcc43-o pt/lib --with-gccxml=/afs/cern.ch/sw/lcg/external/gccxml/0.9.0_20100114/i68 6-slc5-gcc43-opt/bin --with-gfal-libdir=/afs/cern.ch/sw/lcg/external/Grid/g fal/1.11.8-2/i686-slc5-gcc43-opt/lib --with-gfal-incdir=/afs/cern.ch/sw/lcg /external/Grid/gfal/1.11.8-2/i686-slc5-gcc43-opt/include --with-gsl-incdir= /afs/cern.ch/sw/lcg/external/GSL/1.10/i686-slc5-gcc43-opt/include --with-gs l-libdir=/afs/cern.ch/sw/lcg/external/GSL/1.10/i686-slc5-gcc43-opt/lib --wi th-mysql-incdir=/afs/cern.ch/sw/lcg/external/mysql/5.1.45/i686-slc5-gcc43-o pt/include/mysql --with-mysql-libdir=/afs/cern.ch/sw/lcg/external/mysql/5.1 .45/i686-slc5-gcc43-opt/lib/mysql --with-oracle-incdir=/afs/cern.ch/sw/lcg/ external/oracle/11.2.0.1.0p2/i686-slc5-gcc43-opt/include --with-oracle-libd ir=/afs/cern.ch/sw/lcg/external/oracle/11.2.0.1.0p2/i686-slc5-gcc43-opt/lib --with-rfio-incdir=/afs/cern.ch/sw/lcg/external/castor/2.1.8-10/i686-slc5- gcc43-opt/usr/include/shift --with-rfio-libdir=/afs/cern.ch/sw/lcg/external /castor/2.1.8-10/i686-slc5-gcc43-opt/usr/lib --with-pythia6-libdir=/afs/cer n.ch/sw/lcg/external/MCGenerators/pythia6/424.2/i686-slc5-gcc43-opt/lib --w ith-pythia8-incdir=/afs/cern.ch/sw/lcg/external/MCGenerators/pythia8/145/i6 86-slc5-gcc43-opt/include --with-pythia8-libdir=/afs/cern.ch/sw/lcg/externa l/MCGenerators/pythia8/145/i686-slc5-gcc43-opt/lib --with-gviz-incdir=/afs/ cern.ch/sw/lcg/external/graphviz/2.24.0/i686-slc5-gcc43-opt/include/graphvi z --with-gviz-libdir=/afs/cern.ch/sw/lcg/external/graphviz/2.24.0/i686-slc5 -gcc43-opt/lib"

	#define R__CONFIGUREFEATURES "asimage astiff builtin_afterimage builtin_ft gl builtin_glew builtin_pcre castor cintex editline dcache exceptions expli citlink fftw3 gviz gdml genvector gfal krb5 ldap mathmore memstat minuit2 m ysql opengl oracle pythia8 python qt qtgsi reflex roofit rfio shadowpw shar ed ssl table tmva unuran x11 xft xml xrootd thread"	#define R__CONFIGUREFEATURES "asimage astiff builtin_afterimage builtin_ft gl builtin_glew builtin_pcre builtin_lzma castor cintex dcache exceptions e xplicitlink fftw3 gviz gdml genvector gfal krb5 ldap mathmore memstat minui t2 mysql opengl oracle pythia8 python qt qtgsi reflex roofit rfio shadowpw shared ssl table tmva unuran x11 xft xml xrootd thread"

	#endif	#endif

End of changes. 1 change blocks.
	1 lines changed or deleted	1 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.29/02"	#define ROOT_RELEASE "5.30/00"
	#define ROOT_RELEASE_DATE "Apr 21 2011"	#define ROOT_RELEASE_DATE "Jun 27 2011"
	#define ROOT_RELEASE_TIME "14:56:23"	#define ROOT_RELEASE_TIME "15:00:08"
	#define ROOT_SVN_REVISION 39003	#define ROOT_SVN_REVISION 39979
	#define ROOT_SVN_BRANCH "trunk"	#define ROOT_SVN_BRANCH "branches/v5-30-00-patches"
	#define ROOT_VERSION_CODE 335106	#define ROOT_VERSION_CODE 335360
	#define ROOT_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))	#define ROOT_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))

	#define ROOT_FULL_VERSION_CODE 85787136
	#define ROOT_FULL_VERSION(a,b,c,p) (((a) << 24) + ((b) << 16) + ((c) << 8)
	+ (p))

	#endif	#endif

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

	Ranking.h	Ranking.h

	// @(#)root/tmva $Id: Ranking.h 29195 2009-06-24 10:39:49Z brun $	// @(#)root/tmva $Id: Ranking.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : Ranking *	* Class : Ranking *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Virtual ranking class *	* Virtual ranking class *

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

	RatioOfProfiledLikelihoodsTestStat.h	RatioOfProfiledLikelihoodsTestStat.h

	// @(#)root/roostats:$Id: RatioOfProfiledLikelihoodsTestStat.h 36602 2010-1 1-11 16:52:13Z moneta $	// @(#)root/roostats:$Id: RatioOfProfiledLikelihoodsTestStat.h 39391 2011-0 5-26 09:51:59Z moneta $
	/*************************************************************************	/*************************************************************************
	* 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_RatioOfProfiledLikelihoodsTestStat	#ifndef ROOSTATS_RatioOfProfiledLikelihoodsTestStat
	#define ROOSTATS_RatioOfProfiledLikelihoodsTestStat	#define ROOSTATS_RatioOfProfiledLikelihoodsTestStat

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

	Reader.h	Reader.h

	// @(#)root/tmva $Id: Reader.h 38609 2011-03-24 16:06:32Z evt $	// @(#)root/tmva $Id: Reader.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Peter Speckmayer, Joerg Stelzer, Helge Voss, Ka i Voss, Eckhard von Toerne, Jan Therhaag	// Author: Andreas Hoecker, Peter Speckmayer, Joerg Stelzer, Helge Voss, Ka i Voss, Eckhard von Toerne, Jan Therhaag

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : Reader *	* Class : Reader *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Reader class to be used in the user application to interpret the tr ained *	* Reader class to be used in the user application to interpret the tr ained *

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

	RegressionVariance.h	RegressionVariance.h

	// @(#)root/tmva $Id: RegressionVariance.h 29122 2009-06-22 06:51:30Z brun $	// @(#)root/tmva $Id: RegressionVariance.h 39395 2011-05-26 10:05:54Z monet a $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : RegressionVariance *	* Class : RegressionVariance *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: Calculate the separation critiera useded in regression *	* Description: Calculate the separation critiera useded in regression *
	* *	* *

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

	Results.h	Results.h

	// @(#)root/tmva $Id: Results.h 38475 2011-03-17 10:46:00Z evt $	// @(#)root/tmva $Id: Results.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Peter Speckmayer, Joerg Stelzer, Helge Voss	// Author: Andreas Hoecker, Peter Speckmayer, Joerg Stelzer, Helge Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : Results *	* Class : Results *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Base-class for result-vectors *	* Base-class for result-vectors *

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

	ResultsClassification.h	ResultsClassification.h

	// @(#)root/tmva $Id: ResultsClassification.h 35727 2010-09-24 21:41:20Z st elzer $	// @(#)root/tmva $Id: ResultsClassification.h 39395 2011-05-26 10:05:54Z mo neta $
	// Author: Andreas Hoecker, Peter Speckmayer, Joerg Stelzer, Helge Voss	// Author: Andreas Hoecker, Peter Speckmayer, Joerg Stelzer, Helge Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : ResultsClassification *	* Class : ResultsClassification *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Base-class for result-vectors *	* Base-class for result-vectors *

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

	ResultsMulticlass.h	ResultsMulticlass.h

	// @(#)root/tmva $Id: ResultsMulticlass.h 38609 2011-03-24 16:06:32Z evt $	// @(#)root/tmva $Id: ResultsMulticlass.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Peter Speckmayer, Joerg Stelzer, Helge Voss, Ja n Therhaag	// Author: Andreas Hoecker, Peter Speckmayer, Joerg Stelzer, Helge Voss, Ja n Therhaag

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : ResultsMulticlass *	* Class : ResultsMulticlass *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Base-class for result-vectors *	* Base-class for result-vectors *

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

	ResultsRegression.h	ResultsRegression.h

	// @(#)root/tmva $Id: ResultsRegression.h 35727 2010-09-24 21:41:20Z stelze r $	// @(#)root/tmva $Id: ResultsRegression.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Peter Speckmayer, Joerg Stelzer, Helge Voss	// Author: Andreas Hoecker, Peter Speckmayer, Joerg Stelzer, Helge Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : ResultsRegression *	* Class : ResultsRegression *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Base-class for result-vectors *	* Base-class for result-vectors *

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

	RooAbsArg.h	RooAbsArg.h

	skipping to change at line 22	skipping to change at line 22
	* Redistribution and use in source and binary forms, *	* Redistribution and use in source and binary forms, *
	* with or without modification, are permitted according to the terms *	* with or without modification, are permitted according to the terms *
	* listed in LICENSE (http://roofit.sourceforge.net/license.txt) *	* listed in LICENSE (http://roofit.sourceforge.net/license.txt) *
	************************************************************************ */	************************************************************************ */
	#ifndef ROO_ABS_ARG	#ifndef ROO_ABS_ARG
	#define ROO_ABS_ARG	#define ROO_ABS_ARG

	#include <assert.h>	#include <assert.h>
	#include "TNamed.h"	#include "TNamed.h"
	#include "THashList.h"	#include "THashList.h"

		#include "TRefArray.h"
	#include "RooPrintable.h"	#include "RooPrintable.h"
	#include "RooRefCountList.h"	#include "RooRefCountList.h"
	#include "RooAbsCache.h"	#include "RooAbsCache.h"
	#include <map>	#include <map>
	#include <set>	#include <set>
	#include <deque>	#include <deque>

	class TTree ;	class TTree ;
	class RooArgSet ;	class RooArgSet ;
	class RooAbsCollection ;	class RooAbsCollection ;

	skipping to change at line 173	skipping to change at line 174
	virtual RooArgSet* getParameters(const RooArgSet* depList, Bool_t stripDi sconnected=kTRUE) const ;	virtual RooArgSet* getParameters(const RooArgSet* depList, Bool_t stripDi sconnected=kTRUE) const ;
	RooArgSet* getObservables(const RooArgSet& set, Bool_t valueOnly=kTRUE) c onst {	RooArgSet* getObservables(const RooArgSet& set, Bool_t valueOnly=kTRUE) c onst {
	// Return the observables of _this_ pdf given a set of observables	// Return the observables of _this_ pdf given a set of observables
	return getObservables(&set,valueOnly) ;	return getObservables(&set,valueOnly) ;
	}	}
	RooArgSet* getObservables(const RooAbsData* data) const ;	RooArgSet* getObservables(const RooAbsData* data) const ;
	RooArgSet* getObservables(const RooAbsData& data) const {	RooArgSet* getObservables(const RooAbsData& data) const {
	// Return the observables of _this_ pdf given the observables defined b y 'data'	// Return the observables of _this_ pdf given the observables defined b y 'data'
	return getObservables(&data) ;	return getObservables(&data) ;
	}	}

	virtual RooArgSet* getObservables(const RooArgSet* depList, Bool_t valueO nly=kTRUE) const ;	RooArgSet* getObservables(const RooArgSet* depList, Bool_t valueOnly=kTRU E) const ;
	Bool_t observableOverlaps(const RooAbsData* dset, const RooAbsArg& testAr g) const ;	Bool_t observableOverlaps(const RooAbsData* dset, const RooAbsArg& testAr g) const ;
	Bool_t observableOverlaps(const RooArgSet* depList, const RooAbsArg& test Arg) const ;	Bool_t observableOverlaps(const RooArgSet* depList, const RooAbsArg& test Arg) const ;
	virtual Bool_t checkObservables(const RooArgSet* nset) const ;	virtual Bool_t checkObservables(const RooArgSet* nset) const ;
	Bool_t recursiveCheckObservables(const RooArgSet* nset) const ;	Bool_t recursiveCheckObservables(const RooArgSet* nset) const ;
	RooArgSet* getComponents() const ;	RooArgSet* getComponents() const ;

	// --- Obsolete functions for backward compatibility	// --- Obsolete functions for backward compatibility
	inline RooArgSet* getDependents(const RooArgSet& set) const { return getO bservables(set) ; }	inline RooArgSet* getDependents(const RooArgSet& set) const { return getO bservables(set) ; }
	inline RooArgSet* getDependents(const RooAbsData* set) const { return get Observables(set) ; }	inline RooArgSet* getDependents(const RooAbsData* set) const { return get Observables(set) ; }
	inline RooArgSet* getDependents(const RooArgSet* depList) const { return getObservables(depList) ; }	inline RooArgSet* getDependents(const RooArgSet* depList) const { return getObservables(depList) ; }

	skipping to change at line 403	skipping to change at line 404
	virtual Bool_t importWorkspaceHook(RooWorkspace&) { return kFALSE ; } ;	virtual Bool_t importWorkspaceHook(RooWorkspace&) { return kFALSE ; } ;

	protected:	protected:

	// Proxy management	// Proxy management
	friend class RooAddModel ;	friend class RooAddModel ;
	friend class RooArgProxy ;	friend class RooArgProxy ;
	friend class RooSetProxy ;	friend class RooSetProxy ;
	friend class RooListProxy ;	friend class RooListProxy ;
	friend class RooObjectFactory ;	friend class RooObjectFactory ;

		friend class RooHistPdf ;
		friend class RooHistFunc ;
	void registerProxy(RooArgProxy& proxy) ;	void registerProxy(RooArgProxy& proxy) ;
	void registerProxy(RooSetProxy& proxy) ;	void registerProxy(RooSetProxy& proxy) ;
	void registerProxy(RooListProxy& proxy) ;	void registerProxy(RooListProxy& proxy) ;
	void unRegisterProxy(RooArgProxy& proxy) ;	void unRegisterProxy(RooArgProxy& proxy) ;
	void unRegisterProxy(RooSetProxy& proxy) ;	void unRegisterProxy(RooSetProxy& proxy) ;
	void unRegisterProxy(RooListProxy& proxy) ;	void unRegisterProxy(RooListProxy& proxy) ;
	RooAbsProxy* getProxy(Int_t index) const ;	RooAbsProxy* getProxy(Int_t index) const ;
	void setProxyNormSet(const RooArgSet* nset) ;	void setProxyNormSet(const RooArgSet* nset) ;
	Int_t numProxies() const ;	Int_t numProxies() const ;


	skipping to change at line 426	skipping to change at line 429
	std::set<std::string> _boolAttribTransient ; //! Transient boolean attrib utes (not copied in ctor)	std::set<std::string> _boolAttribTransient ; //! Transient boolean attrib utes (not copied in ctor)

	void printAttribList(ostream& os) const;	void printAttribList(ostream& os) const;

	// Hooks for RooTreeData interface	// Hooks for RooTreeData interface
	friend class RooCompositeDataStore ;	friend class RooCompositeDataStore ;
	friend class RooTreeDataStore ;	friend class RooTreeDataStore ;
	friend class RooTreeData ;	friend class RooTreeData ;
	friend class RooDataSet ;	friend class RooDataSet ;
	friend class RooRealMPFE ;	friend class RooRealMPFE ;

	friend class RooHistPdf ;
	virtual void syncCache(const RooArgSet* nset=0) = 0 ;	virtual void syncCache(const RooArgSet* nset=0) = 0 ;
	virtual void copyCache(const RooAbsArg* source, Bool_t valueOnly=kFALSE) = 0 ;	virtual void copyCache(const RooAbsArg* source, Bool_t valueOnly=kFALSE) = 0 ;
	virtual void attachToTree(TTree& t, Int_t bufSize=32000) = 0 ;	virtual void attachToTree(TTree& t, Int_t bufSize=32000) = 0 ;
	virtual void setTreeBranchStatus(TTree& t, Bool_t active) = 0 ;	virtual void setTreeBranchStatus(TTree& t, Bool_t active) = 0 ;
	virtual void fillTreeBranch(TTree& t) = 0 ;	virtual void fillTreeBranch(TTree& t) = 0 ;
	TString cleanBranchName() const ;	TString cleanBranchName() const ;

	// Global	// Global
	friend ostream& operator<<(ostream& os, const RooAbsArg &arg);	friend ostream& operator<<(ostream& os, const RooAbsArg &arg);
	friend istream& operator>>(istream& is, RooAbsArg &arg) ;	friend istream& operator>>(istream& is, RooAbsArg &arg) ;

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

	RooAbsData.h	RooAbsData.h

	skipping to change at line 131	skipping to change at line 131
	Double_t addToWgtOther ;	Double_t addToWgtOther ;
	Double_t xErrorSize ;	Double_t xErrorSize ;
	Bool_t refreshFrameNorm ;	Bool_t refreshFrameNorm ;
	Bool_t correctForBinWidth ;	Bool_t correctForBinWidth ;
	Double_t scaleFactor ;	Double_t scaleFactor ;
	} ;	} ;

	// Split a dataset by a category	// Split a dataset by a category
	virtual TList* split(const RooAbsCategory& splitCat, Bool_t createEmptyDa taSets=kFALSE) const ;	virtual TList* split(const RooAbsCategory& splitCat, Bool_t createEmptyDa taSets=kFALSE) const ;


		// Fast splitting for SimMaster setData
		Bool_t canSplitFast() const ;
		RooAbsData* getSimData(const char* idxstate) ;

	// Create 1,2, and 3D histograms from and fill it	// Create 1,2, and 3D histograms from and fill it
	TH1 createHistogram(const char name, const RooAbsRealLValue& xvar,	TH1 createHistogram(const char name, const RooAbsRealLValue& xvar,
	const RooCmdArg& arg1=RooCmdArg::none(), const RooCm dArg& arg2=RooCmdArg::none(),	const RooCmdArg& arg1=RooCmdArg::none(), const RooCm dArg& arg2=RooCmdArg::none(),
	const RooCmdArg& arg3=RooCmdArg::none(), const RooCm dArg& arg4=RooCmdArg::none(),	const RooCmdArg& arg3=RooCmdArg::none(), const RooCm dArg& arg4=RooCmdArg::none(),
	const RooCmdArg& arg5=RooCmdArg::none(), const RooCm dArg& arg6=RooCmdArg::none(),	const RooCmdArg& arg5=RooCmdArg::none(), const RooCm dArg& arg6=RooCmdArg::none(),
	const RooCmdArg& arg7=RooCmdArg::none(), const RooCm dArg& arg8=RooCmdArg::none()) const ;	const RooCmdArg& arg7=RooCmdArg::none(), const RooCm dArg& arg8=RooCmdArg::none()) const ;
	TH1* createHistogram(const char *name, const RooAbsRealLValue& xvar, cons t RooLinkedList& argList) const ;	TH1* createHistogram(const char *name, const RooAbsRealLValue& xvar, cons t RooLinkedList& argList) const ;
	TH1 createHistogram(const char varNameList, Int_t xbins=0, Int_t ybins= 0, Int_t zbins=0) const ;	TH1 createHistogram(const char varNameList, Int_t xbins=0, Int_t ybins= 0, Int_t zbins=0) const ;

	// Fill an existing histogram	// Fill an existing histogram

	skipping to change at line 193	skipping to change at line 197

	virtual RooPlot* statOn(RooPlot* frame, const char *what,	virtual RooPlot* statOn(RooPlot* frame, const char *what,
	const char *label= "", Int_t sigDigits= 2,	const char *label= "", Int_t sigDigits= 2,
	Option_t *options= "NELU", Double_t xmin=0.15,	Option_t *options= "NELU", Double_t xmin=0.15,
	Double_t xmax= 0.65,Double_t ymax=0.85,	Double_t xmax= 0.65,Double_t ymax=0.85,
	const char* cutSpec=0, const char* cutRange=0,	const char* cutSpec=0, const char* cutRange=0,
	const RooCmdArg* formatCmd=0);	const RooCmdArg* formatCmd=0);

	Bool_t hasFilledCache() const ;	Bool_t hasFilledCache() const ;


		void addOwnedComponent(const char* idxlabel, RooAbsData& data) ;
		static void claimVars(RooAbsData*) ;
		static Bool_t releaseVars(RooAbsData*) ;

	protected:	protected:

	Double_t corrcov(RooRealVar &x,RooRealVar &y, const char* cutSpec, const char* cutRange, Bool_t corr) const ;	Double_t corrcov(RooRealVar &x,RooRealVar &y, const char* cutSpec, const char* cutRange, Bool_t corr) const ;
	TMatrixDSym* corrcovMatrix(const RooArgList& vars, const char* cutSpec, c onst char* cutRange, Bool_t corr) const ;	TMatrixDSym* corrcovMatrix(const RooArgList& vars, const char* cutSpec, c onst char* cutRange, Bool_t corr) const ;

	virtual void optimizeReadingWithCaching(RooAbsArg& arg, const RooArgSet& cacheList, const RooArgSet& keepObsList) ;	virtual void optimizeReadingWithCaching(RooAbsArg& arg, const RooArgSet& cacheList, const RooArgSet& keepObsList) ;
	Bool_t allClientsCached(RooAbsArg*, const RooArgSet&) ;	Bool_t allClientsCached(RooAbsArg*, const RooArgSet&) ;

	// PlotOn implementation	// PlotOn implementation
	virtual RooPlot plotOn(RooPlot frame, PlotOpt o) const ;	virtual RooPlot plotOn(RooPlot frame, PlotOpt o) const ;

	skipping to change at line 232	skipping to change at line 240

	// Column structure definition	// Column structure definition
	RooArgSet _vars; // Dimensions of this data set	RooArgSet _vars; // Dimensions of this data set
	RooArgSet _cachedVars ; //! External variables cached with this data set	RooArgSet _cachedVars ; //! External variables cached with this data set

	TIterator *_iterator; //! Iterator over dimension variables	TIterator *_iterator; //! Iterator over dimension variables
	TIterator *_cacheIter ; //! Iterator over cached variables	TIterator *_cacheIter ; //! Iterator over cached variables

	RooAbsDataStore* _dstore ; // Data storage implementation	RooAbsDataStore* _dstore ; // Data storage implementation


		std::map<std::string,RooAbsData*> _ownedComponents ; // Owned external co
		mponents

	private:	private:


	ClassDef(RooAbsData,2) // Abstract data collection	ClassDef(RooAbsData,4) // Abstract data collection
	};	};

	#endif	#endif

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

	RooAbsPdf.h	RooAbsPdf.h

	skipping to change at line 65	skipping to change at line 65
	RooDataSet *generate(const RooArgSet &whatVars,	RooDataSet *generate(const RooArgSet &whatVars,
	const RooCmdArg& arg1=RooCmdArg::none(),const RooCmd Arg& arg2=RooCmdArg::none(),	const RooCmdArg& arg1=RooCmdArg::none(),const RooCmd Arg& arg2=RooCmdArg::none(),
	const RooCmdArg& arg3=RooCmdArg::none(),const RooCmd Arg& arg4=RooCmdArg::none(),	const RooCmdArg& arg3=RooCmdArg::none(),const RooCmd Arg& arg4=RooCmdArg::none(),
	const RooCmdArg& arg5=RooCmdArg::none(),const RooCmd Arg& arg6=RooCmdArg::none()) ;	const RooCmdArg& arg5=RooCmdArg::none(),const RooCmd Arg& arg6=RooCmdArg::none()) ;
	RooDataSet *generate(const RooArgSet &whatVars, Int_t nEvents = 0, Bool_t verbose=kFALSE) const;	RooDataSet *generate(const RooArgSet &whatVars, Int_t nEvents = 0, Bool_t verbose=kFALSE) const;
	RooDataSet *generate(const RooArgSet &whatVars, const RooDataSet &prototy pe, Int_t nEvents= 0,	RooDataSet *generate(const RooArgSet &whatVars, const RooDataSet &prototy pe, Int_t nEvents= 0,
	Bool_t verbose=kFALSE, Bool_t randProtoOrder=kFALSE, Bool_t resampleProto=kFALSE) const;	Bool_t verbose=kFALSE, Bool_t randProtoOrder=kFALSE, Bool_t resampleProto=kFALSE) const;

	class GenSpec {	class GenSpec {
	public:	public:

	~GenSpec() ;	virtual ~GenSpec() ;
		GenSpec() { _genContext = 0 ; _protoData = 0 ; }
	private:	private:
	GenSpec(RooAbsGenContext* context, const RooArgSet& whatVars, RooDataSe t* protoData, Int_t nGen, Bool_t extended,	GenSpec(RooAbsGenContext* context, const RooArgSet& whatVars, RooDataSe t* protoData, Int_t nGen, Bool_t extended,
	Bool_t randProto, Bool_t resampleProto, TString dsetName) ;	Bool_t randProto, Bool_t resampleProto, TString dsetName) ;
	GenSpec(const GenSpec& other) ;	GenSpec(const GenSpec& other) ;

	friend class RooAbsPdf ;	friend class RooAbsPdf ;
	RooAbsGenContext* _genContext ;	RooAbsGenContext* _genContext ;
	RooArgSet _whatVars ;	RooArgSet _whatVars ;
	RooDataSet* _protoData ;	RooDataSet* _protoData ;
	Int_t _nGen ;	Int_t _nGen ;
	Bool_t _extended ;	Bool_t _extended ;
	Bool_t _randProto ;	Bool_t _randProto ;
	Bool_t _resampleProto ;	Bool_t _resampleProto ;
	TString _dsetName ;	TString _dsetName ;

		ClassDef(GenSpec,0) // Generation specification
	} ;	} ;

	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, Double_t nEvents, const 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(),

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

	RooAddition.h	RooAddition.h

	skipping to change at line 51	skipping to change at line 51
	const RooArgList& list1() const { return _set ; }	const RooArgList& list1() const { return _set ; }
	const RooArgList& list() const { return _set ; }	const RooArgList& list() const { return _set ; }

	virtual Bool_t forceAnalyticalInt(const RooAbsArg& /dep/) const {	virtual Bool_t forceAnalyticalInt(const RooAbsArg& /dep/) const {
	// Force RooRealIntegral to offer all observables for internal integr ation	// Force RooRealIntegral to offer all observables for internal integr ation
	return kTRUE ;	return kTRUE ;
	}	}
	Int_t getAnalyticalIntegral(RooArgSet& allVars, RooArgSet& numVars, const char* rangeName=0) const;	Int_t getAnalyticalIntegral(RooArgSet& allVars, RooArgSet& numVars, const char* rangeName=0) const;
	Double_t analyticalIntegral(Int_t code, const char* rangeName=0) const ;	Double_t analyticalIntegral(Int_t code, const char* rangeName=0) const ;


		Bool_t setData(RooAbsData& data, Bool_t cloneData=kTRUE) ;

	protected:	protected:

	RooArgList _ownedList ; // List of owned components	RooArgList _ownedList ; // List of owned components
	RooListProxy _set ; // set of terms to be summed	RooListProxy _set ; // set of terms to be summed
	mutable TIterator* _setIter ; //! Iterator over set	mutable TIterator* _setIter ; //! Iterator over set

	class CacheElem : public RooAbsCacheElement {	class CacheElem : public RooAbsCacheElement {
	public:	public:
	virtual ~CacheElem();	virtual ~CacheElem();
	// Payload	// Payload

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

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

	* File: $Id: RooCacheManager.h 35300 2010-09-15 12:58:04Z pcanal $	* File: $Id: RooCacheManager.h 39912 2011-06-23 16:40:11Z moneta $
	* 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 57	skipping to change at line 57

	Int_t setObj(const RooArgSet* nset, T* obj, const TNamed* isetRangeName=0 ) {	Int_t setObj(const RooArgSet* nset, T* obj, const TNamed* isetRangeName=0 ) {
	// Setter function without integration set	// Setter function without integration set
	return setObj(nset,0,obj,isetRangeName) ;	return setObj(nset,0,obj,isetRangeName) ;
	}	}

	T* getObj(const RooArgSet* nset, const RooArgSet* iset, Int_t* sterileInd ex=0, const TNamed* isetRangeName=0) ;	T* getObj(const RooArgSet* nset, const RooArgSet* iset, Int_t* sterileInd ex=0, const TNamed* isetRangeName=0) ;
	Int_t setObj(const RooArgSet* nset, const RooArgSet* iset, T* obj, const TNamed* isetRangeName=0) ;	Int_t setObj(const RooArgSet* nset, const RooArgSet* iset, T* obj, const TNamed* isetRangeName=0) ;

	void reset() ;	void reset() ;

	void sterilize() ;	virtual void sterilize() ;

	Int_t lastIndex() const {	Int_t lastIndex() const {
	// Return index of slot used in last get or set operation	// Return index of slot used in last get or set operation
	return _lastIndex ;	return _lastIndex ;
	}	}
	Int_t cacheSize() const {	Int_t cacheSize() const {
	// Return size of cache	// Return size of cache
	return _size ;	return _size ;
	}	}


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

	RooDataSet.h	RooDataSet.h

	skipping to change at line 26	skipping to change at line 26
	#ifndef ROO_DATA_SET	#ifndef ROO_DATA_SET
	#define ROO_DATA_SET	#define ROO_DATA_SET

	class TDirectory ;	class TDirectory ;
	class RooAbsRealLValue ;	class RooAbsRealLValue ;
	class RooRealVar ;	class RooRealVar ;
	class RooDataHist ;	class RooDataHist ;
	#include "RooAbsData.h"	#include "RooAbsData.h"
	#include "RooDirItem.h"	#include "RooDirItem.h"


		#define USEMEMPOOL

	class RooDataSet : public RooAbsData, public RooDirItem {	class RooDataSet : public RooAbsData, public RooDirItem {
	public:	public:


		#ifdef USEMEMPOOL
		void* operator new (size_t bytes);
		void operator delete (void *ptr);
		#endif

	// Constructors, factory methods etc.	// Constructors, factory methods etc.
	RooDataSet() ;	RooDataSet() ;

	// Empty constructor	// Empty constructor
	RooDataSet(const char name, const char title, const RooArgSet& vars, co nst char* wgtVarName=0) ;	RooDataSet(const char name, const char title, const RooArgSet& vars, co nst char* wgtVarName=0) ;

	// Universal constructor	// Universal constructor
	RooDataSet(const char* name, const char* title, const RooArgSet& vars, co nst RooCmdArg& arg1, const RooCmdArg& arg2=RooCmdArg(),	RooDataSet(const char* name, const char* title, const RooArgSet& vars, co nst RooCmdArg& arg1, const RooCmdArg& arg2=RooCmdArg(),
	const RooCmdArg& arg3=RooCmdArg(), const RooCmdArg& arg4=RooCmd Arg(),const RooCmdArg& arg5=RooCmdArg(),	const RooCmdArg& arg3=RooCmdArg(), const RooCmdArg& arg4=RooCmd Arg(),const RooCmdArg& arg5=RooCmdArg(),
	const RooCmdArg& arg6=RooCmdArg(),const RooCmdArg& arg7=RooCmdA rg(),const RooCmdArg& arg8=RooCmdArg()) ;	const RooCmdArg& arg6=RooCmdArg(),const RooCmdArg& arg7=RooCmdA rg(),const RooCmdArg& arg8=RooCmdArg()) ;

	skipping to change at line 137	skipping to change at line 144
	RooAbsData* reduceEng(const RooArgSet& varSubset, const RooFormulaVar* cu tVar, const char* cutRange=0,	RooAbsData* reduceEng(const RooArgSet& varSubset, const RooFormulaVar* cu tVar, const char* cutRange=0,
	Int_t nStart=0, Int_t nStop=2000000000, Bool_t copyC ache=kTRUE) ;	Int_t nStart=0, Int_t nStop=2000000000, Bool_t copyC ache=kTRUE) ;
	RooDataSet(const char name, const char title, RooDataSet *ntuple,	RooDataSet(const char name, const char title, RooDataSet *ntuple,
	const RooArgSet& vars, const RooFormulaVar* cutVar, const char* cutRange, int nStart, int nStop, Bool_t copyCache, const char* wgtVarName= 0);	const RooArgSet& vars, const RooFormulaVar* cutVar, const char* cutRange, int nStart, int nStop, Bool_t copyCache, const char* wgtVarName= 0);

	RooArgSet addWgtVar(const RooArgSet& origVars, const RooAbsArg* wgtVar) ;	RooArgSet addWgtVar(const RooArgSet& origVars, const RooAbsArg* wgtVar) ;

	RooArgSet _varsNoWgt ; // Vars without weight variable	RooArgSet _varsNoWgt ; // Vars without weight variable
	RooRealVar* _wgtVar ; // Pointer to weight variable (if set)	RooRealVar* _wgtVar ; // Pointer to weight variable (if set)


		static void cleanup() ;
		static char* _poolBegin ; //! Start of memory pool
		static char* _poolCur ; //! Next free slot in memory pool
		static char* _poolEnd ; //! End of memory pool

	ClassDef(RooDataSet,2) // Unbinned data set	ClassDef(RooDataSet,2) // Unbinned data set
	};	};

	#endif	#endif

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

	RooGaussModel.h	RooGaussModel.h

	skipping to change at line 84	skipping to change at line 84
	RooComplex z(swt*c,u+c);	RooComplex z(swt*c,u+c);
	return (z.im()>-4.0) ? RooMath::FastComplexErrFuncRe(z)exp(-uu) : eva lCerfApprox(swt,u,c).re() ;	return (z.im()>-4.0) ? RooMath::FastComplexErrFuncRe(z)exp(-uu) : eva lCerfApprox(swt,u,c).re() ;
	}	}

	// Calculate Im(exp(-u^2) cwerf(swt*c + i(u+c))), taking care of numerica l instabilities	// Calculate Im(exp(-u^2) cwerf(swt*c + i(u+c))), taking care of numerica l instabilities
	inline Double_t evalCerfIm(Double_t swt, Double_t u, Double_t c) const {	inline Double_t evalCerfIm(Double_t swt, Double_t u, Double_t c) const {
	RooComplex z(swt*c,u+c);	RooComplex z(swt*c,u+c);
	return (z.im()>-4.0) ? RooMath::FastComplexErrFuncIm(z)exp(-uu) : eva lCerfApprox(swt,u,c).im() ;	return (z.im()>-4.0) ? RooMath::FastComplexErrFuncIm(z)exp(-uu) : eva lCerfApprox(swt,u,c).im() ;
	}	}


	// Calculate Re(exp(-u^2) cwerf(i(u+c)))
	// added FMV, 08/17/03
	inline Double_t evalCerfRe(Double_t u, Double_t c) const {
	return exp(u2c+cc) RooMath::erfc(u+c);
	}

	// Calculate common normalization factors	// Calculate common normalization factors

	// added FMV,07/24/03
	RooComplex evalCerfInt(Double_t sign, Double_t wt, Double_t tau, Double_t umin, Double_t umax, Double_t c) const ;	RooComplex evalCerfInt(Double_t sign, Double_t wt, Double_t tau, Double_t umin, Double_t umax, Double_t c) const ;

	Double_t evalCerfInt(Double_t sign, Double_t tau, Double_t umin, Double_t umax, Double_t c) const ;

	Bool_t _flatSFInt ;	Bool_t _flatSFInt ;

	Bool_t _asympInt ; // added FMV,07/24/03	Bool_t _asympInt ; // added FMV,07/24/03

	RooRealProxy mean ;	RooRealProxy mean ;
	RooRealProxy sigma ;	RooRealProxy sigma ;
	RooRealProxy msf ;	RooRealProxy msf ;
	RooRealProxy ssf ;	RooRealProxy ssf ;


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

	RooMinuit.h	RooMinuit.h

	skipping to change at line 74	skipping to change at line 74
	Int_t setPrintLevel(Int_t newLevel) ;	Int_t setPrintLevel(Int_t newLevel) ;
	void setNoWarn() ;	void setNoWarn() ;
	Int_t setWarnLevel(Int_t newLevel) ;	Int_t setWarnLevel(Int_t newLevel) ;
	void setPrintEvalErrors(Int_t numEvalErrors) { _printEvalErrors = numEval Errors ; }	void setPrintEvalErrors(Int_t numEvalErrors) { _printEvalErrors = numEval Errors ; }
	void setVerbose(Bool_t flag=kTRUE) { _verbose = flag ; }	void setVerbose(Bool_t flag=kTRUE) { _verbose = flag ; }
	void setProfile(Bool_t flag=kTRUE) { _profile = flag ; }	void setProfile(Bool_t flag=kTRUE) { _profile = flag ; }
	Bool_t setLogFile(const char* logfile=0) ;	Bool_t setLogFile(const char* logfile=0) ;

	static void cleanup() ;	static void cleanup() ;


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

	protected:	protected:

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

	friend void RooMinuitGlue(Int_t &np, Double_t gin, Double_t &f, Double_t par, Int_t flag) ;	friend void RooMinuitGlue(Int_t &np, Double_t gin, Double_t &f, Double_t par, Int_t flag) ;

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


	skipping to change at line 100	skipping to change at line 103

	Double_t getPdfParamVal(Int_t index) ;	Double_t getPdfParamVal(Int_t index) ;
	Double_t getPdfParamErr(Int_t index) ;	Double_t getPdfParamErr(Int_t index) ;
	virtual Bool_t setPdfParamVal(Int_t index, Double_t value, Bool_t verbose =kFALSE) ;	virtual Bool_t setPdfParamVal(Int_t index, Double_t value, Bool_t verbose =kFALSE) ;
	void setPdfParamErr(Int_t index, Double_t value) ;	void setPdfParamErr(Int_t index, Double_t value) ;
	void setPdfParamErr(Int_t index, Double_t loVal, Double_t hiVal) ;	void setPdfParamErr(Int_t index, Double_t loVal, Double_t hiVal) ;
	void clearPdfParamAsymErr(Int_t index) ;	void clearPdfParamAsymErr(Int_t index) ;

	private:	private:


		Int_t _evalCounter ;
	Int_t _printLevel ;	Int_t _printLevel ;
	Int_t _warnLevel ;	Int_t _warnLevel ;
	Int_t _status ;	Int_t _status ;
	Bool_t _optConst ;	Bool_t _optConst ;
	Bool_t _profile ;	Bool_t _profile ;
	Bool_t _handleLocalErrors ;	Bool_t _handleLocalErrors ;
	Int_t _numBadNLL ;	Int_t _numBadNLL ;
	Int_t _nPar ;	Int_t _nPar ;
	Int_t _printEvalErrors ;	Int_t _printEvalErrors ;
	Bool_t _doEvalErrorWall ;	Bool_t _doEvalErrorWall ;

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

	RooMomentMorph.h	RooMomentMorph.h

	skipping to change at line 55	skipping to change at line 55
	return kTRUE ;	return kTRUE ;
	}	}

	virtual Double_t getVal(const RooArgSet* set=0) const ;	virtual Double_t getVal(const RooArgSet* set=0) const ;
	RooAbsPdf* sumPdf(const RooArgSet* nset) ;	RooAbsPdf* sumPdf(const RooArgSet* nset) ;

	protected:	protected:

	class CacheElem : public RooAbsCacheElement {	class CacheElem : public RooAbsCacheElement {
	public:	public:

	CacheElem(RooAbsPdf& sumPdf, RooChangeTracker& tracker, RooArgList flis t) : _sumPdf(&sumPdf), _tracker(&tracker) { _frac.add(flist) ; } ;	CacheElem(RooAbsPdf& sumPdf, RooChangeTracker& tracker, const RooArgLis t& flist) : _sumPdf(&sumPdf), _tracker(&tracker) { _frac.add(flist) ; } ;
	void operModeHook(RooAbsArg::OperMode) {};	void operModeHook(RooAbsArg::OperMode) {};
	virtual ~CacheElem() ;	virtual ~CacheElem() ;
	virtual RooArgList containedArgs(Action) ;	virtual RooArgList containedArgs(Action) ;
	RooAbsPdf* _sumPdf ;	RooAbsPdf* _sumPdf ;
	RooChangeTracker* _tracker ;	RooChangeTracker* _tracker ;
	RooArgList _frac ;	RooArgList _frac ;

	RooRealVar* frac(Int_t i ) ;	RooRealVar* frac(Int_t i ) ;
	const RooRealVar* frac(Int_t i ) const ;	const RooRealVar* frac(Int_t i ) const ;
	void calculateFractions(const RooMomentMorph& self, Bool_t verbose=kTRU E) const;	void calculateFractions(const RooMomentMorph& self, Bool_t verbose=kTRU E) const;

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

	RooNormSetCache.h	RooNormSetCache.h

	skipping to change at line 34	skipping to change at line 34
	#include "RooHashTable.h"	#include "RooHashTable.h"

	class RooArgSet ;	class RooArgSet ;
	class RooSetPair ;	class RooSetPair ;

	typedef RooArgSet* pRooArgSet ;	typedef RooArgSet* pRooArgSet ;

	class RooNormSetCache {	class RooNormSetCache {

	public:	public:

	RooNormSetCache(Int_t regSize=10) ;	RooNormSetCache(Int_t regSize=64) ;
	RooNormSetCache(const RooNormSetCache& other) ;	RooNormSetCache(const RooNormSetCache& other) ;
	virtual ~RooNormSetCache() ;	virtual ~RooNormSetCache() ;

	void add(const RooArgSet* set1, const RooArgSet* set2=0) ;	void add(const RooArgSet* set1, const RooArgSet* set2=0) ;

	inline Int_t index(const RooArgSet* set1, const RooArgSet* set2=0, const TNamed* set2RangeName=0) {	inline Int_t index(const RooArgSet* set1, const RooArgSet* set2=0, const TNamed* set2RangeName=0) {

	// Match range name first	// Match range name first
	if (set2RangeName != _set2RangeName) return -1 ;	if (set2RangeName != _set2RangeName) return -1 ;


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

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

	* File: $Id: RooObjCacheManager.h 37505 2010-12-10 13:46:32Z wouter $	* File: $Id: RooObjCacheManager.h 39912 2011-06-23 16:40:11Z moneta $
	* 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 48	skipping to change at line 48
	virtual ~RooObjCacheManager() ;	virtual ~RooObjCacheManager() ;

	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 /) ;
	virtual void operModeHook() ;	virtual void operModeHook() ;
	virtual void optimizeCacheMode(const RooArgSet& /obs/, RooArgSet& /opt Set/, RooLinkedList& /processedNodes/) ;	virtual void optimizeCacheMode(const RooArgSet& /obs/, RooArgSet& /opt Set/, RooLinkedList& /processedNodes/) ;
	virtual void printCompactTreeHook(std::ostream&, const char *) ;	virtual void printCompactTreeHook(std::ostream&, const char *) ;
	virtual void findConstantNodes(const RooArgSet& /obs/, RooArgSet& /cac heList/, RooLinkedList& /processedNodes/) ;	virtual void findConstantNodes(const RooArgSet& /obs/, RooArgSet& /cac heList/, RooLinkedList& /processedNodes/) ;

	virtual void insertObjectHook(RooAbsCacheElement&) ;	virtual void insertObjectHook(RooAbsCacheElement&) ;


		void sterilize() ;

		static void doClearObsList(Bool_t flag) { _clearObsList = flag ; }
		static Bool_t clearObsList() { return _clearObsList ; }

	protected:	protected:

	Bool_t _clearOnRedirect ;	Bool_t _clearOnRedirect ;
	Bool_t _optCacheModeSeen ; //!	Bool_t _optCacheModeSeen ; //!

	std::list<RooArgSet*> _optCacheObsList ; //! list of all optCacheObservab les owned	std::list<RooArgSet*> _optCacheObsList ; //! list of all optCacheObservab les owned
	RooArgSet* _optCacheObservables ; //! current optCacheObservables	RooArgSet* _optCacheObservables ; //! current optCacheObservables


		static Bool_t _clearObsList ; // Clear obslist on sterilize?

	ClassDef(RooObjCacheManager,2) // Cache manager for generic caches that c ontain RooAbsArg objects	ClassDef(RooObjCacheManager,2) // Cache manager for generic caches that c ontain RooAbsArg objects
	} ;	} ;

	#endif	#endif

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

	RooRealConstant.h	RooRealConstant.h

	skipping to change at line 36	skipping to change at line 36

	class RooRealConstant {	class RooRealConstant {
	public:	public:

	inline RooRealConstant() {} ;	inline RooRealConstant() {} ;
	virtual ~RooRealConstant() {} ;	virtual ~RooRealConstant() {} ;
	static RooConstVar& value(Double_t value) ;	static RooConstVar& value(Double_t value) ;

	static void cleanup() ;	static void cleanup() ;


		static RooConstVar& removalDummy() ;

	protected:	protected:

	static void init() ;	static void init() ;

	static RooArgList* _constDB ; // List of already instantiated constant s	static RooArgList* _constDB ; // List of already instantiated constant s
	static TIterator* _constDBIter ; // Iterator over constants list	static TIterator* _constDBIter ; // Iterator over constants list

	ClassDef(RooRealConstant,0) // RooRealVar constants factory	ClassDef(RooRealConstant,0) // RooRealVar constants factory
	};	};


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

	RooRealIntegral.h	RooRealIntegral.h

	skipping to change at line 67	skipping to change at line 67
	void setCacheNumeric(Bool_t flag) {	void setCacheNumeric(Bool_t flag) {
	// If true, value of this interal is cached if it is (partially numeric )	// If true, value of this interal is cached if it is (partially numeric )
	_cacheNum = flag ;	_cacheNum = flag ;
	}	}

	Bool_t getCacheNumeric() {	Bool_t getCacheNumeric() {
	// If true, value of this interal is cached if it is (partially numeric )	// If true, value of this interal is cached if it is (partially numeric )
	return _cacheNum ;	return _cacheNum ;
	}	}


	static void setCacheAllNumeric(Int_t ndim) {	static void setCacheAllNumeric(Int_t ndim) ;
	// Global switch to cache all integral values that integrate at least n
	dim dimensions numerically
	_cacheAllNDim = ndim ;
	}


	static Int_t getCacheAllNumeric() {	static Int_t getCacheAllNumeric() ;
	// Return minimum dimensions of numeric integration for which values ar
	e cached.
	return _cacheAllNDim ;
	}

	virtual std::list<Double_t>* plotSamplingHint(RooAbsRealLValue& obs, Doub le_t xlo, Double_t xhi) const {	virtual std::list<Double_t>* plotSamplingHint(RooAbsRealLValue& obs, Doub le_t xlo, Double_t xhi) const {
	// Forward plot sampling hint of integrand	// Forward plot sampling hint of integrand
	return _function.arg().plotSamplingHint(obs,xlo,xhi) ;	return _function.arg().plotSamplingHint(obs,xlo,xhi) ;
	}	}

	virtual RooAbsReal* createIntegral(const RooArgSet& iset, const RooArgSet * nset=0, const RooNumIntConfig* cfg=0, const char* rangeName=0) const ;	virtual RooAbsReal* createIntegral(const RooArgSet& iset, const RooArgSet * nset=0, const RooNumIntConfig* cfg=0, const char* rangeName=0) const ;

	protected:	protected:


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

	RooStatsUtils.h	RooStatsUtils.h

	// @(#)root/roostats:$Id: RooStatsUtils.h 37161 2010-12-01 22:04:07Z moneta $	// @(#)root/roostats:$Id: RooStatsUtils.h 39391 2011-05-26 09:51:59Z moneta $
	// Author: Kyle Cranmer 28/07/2008	// Author: Kyle Cranmer 28/07/2008

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


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

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

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

	skipping to change at line 36	skipping to change at line 36
	class RooRealVar ;	class RooRealVar ;
	class RooWorkspace ;	class RooWorkspace ;
	class RooAbsStudy ;	class RooAbsStudy ;
	#include <list>	#include <list>

	class RooStudyPackage : public TNamed {	class RooStudyPackage : public TNamed {
	public:	public:

	RooStudyPackage() ;	RooStudyPackage() ;
	RooStudyPackage(RooWorkspace& w) ;	RooStudyPackage(RooWorkspace& w) ;

		RooStudyPackage(const RooStudyPackage&) ;
	void addStudy(RooAbsStudy& study) ;	void addStudy(RooAbsStudy& study) ;

		TObject* Clone(const char* /newname/="") const { return new RooStudyPac kage(*this) ; }

	RooWorkspace& wspace() { return *_ws ; }	RooWorkspace& wspace() { return *_ws ; }
	std::list<RooAbsStudy*>& studies() { return _studies ; }	std::list<RooAbsStudy*>& studies() { return _studies ; }

	void driver(Int_t nExperiments) ;	void driver(Int_t nExperiments) ;

	Int_t initRandom() ;	Int_t initRandom() ;
	void initialize() ;	void initialize() ;
	void runOne() ;	void runOne() ;
	void run(Int_t nExperiments) ;	void run(Int_t nExperiments) ;

	skipping to change at line 58	skipping to change at line 60

	void exportData(TList* olist, Int_t seqno) ;	void exportData(TList* olist, Int_t seqno) ;

	static void processFile(const char* infile, Int_t nexp) ;	static void processFile(const char* infile, Int_t nexp) ;

	protected:	protected:

	RooWorkspace* _ws ;	RooWorkspace* _ws ;
	std::list<RooAbsStudy*> _studies ;	std::list<RooAbsStudy*> _studies ;


	RooStudyPackage(const RooStudyPackage&) ;

	ClassDef(RooStudyPackage,1) // A general purpose workspace oriented paral lelizing study manager	ClassDef(RooStudyPackage,1) // A general purpose workspace oriented paral lelizing study manager
	} ;	} ;

	#endif	#endif

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

	RooWorkspace.h	RooWorkspace.h

	skipping to change at line 73	skipping to change at line 73

	// Transaction management interface for multi-step import operations	// Transaction management interface for multi-step import operations
	Bool_t startTransaction() ;	Bool_t startTransaction() ;
	Bool_t cancelTransaction() ;	Bool_t cancelTransaction() ;
	Bool_t commitTransaction() ;	Bool_t commitTransaction() ;

	// Named set management	// Named set management
	Bool_t defineSet(const char* name, const RooArgSet& aset, Bool_t importMi ssing=kFALSE) ;	Bool_t defineSet(const char* name, const RooArgSet& aset, Bool_t importMi ssing=kFALSE) ;
	Bool_t defineSet(const char* name, const char* contentList) ;	Bool_t defineSet(const char* name, const char* contentList) ;
	Bool_t extendSet(const char* name, const char* newContents) ;	Bool_t extendSet(const char* name, const char* newContents) ;

		Bool_t renameSet(const char* name, const char* newName) ;
		Bool_t removeSet(const char* name) ;
	const RooArgSet* set(const char* name) ;	const RooArgSet* set(const char* name) ;

	// Import, load and save parameter value snapshots	// Import, load and save parameter value snapshots
	Bool_t saveSnapshot(const char* name, const char* paramNames) ;	Bool_t saveSnapshot(const char* name, const char* paramNames) ;
	Bool_t saveSnapshot(const char* name, const RooArgSet& params, Bool_t imp ortValues=kFALSE) ;	Bool_t saveSnapshot(const char* name, const RooArgSet& params, Bool_t imp ortValues=kFALSE) ;
	Bool_t loadSnapshot(const char* name) ;	Bool_t loadSnapshot(const char* name) ;

	void merge(const RooWorkspace& /other/) {} ;	void merge(const RooWorkspace& /other/) {} ;

	// Join p.d.f.s and datasets for simultaneous analysis	// Join p.d.f.s and datasets for simultaneous analysis

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 35471 2010-09-20 16:35:01Z rdm $ */	/* @(#)root/base:$Id: Rtypes.h 39635 2011-06-09 15:37:27Z pcanal $ */

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

	#ifndef ROOT_Rtypes	#ifndef ROOT_Rtypes

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

	//---- forward declared class types --------------------------------------- -----	//---- forward declared class types --------------------------------------- -----

	class TClass;	class TClass;
	class TBuffer;	class TBuffer;
	class TDirectory;	class TDirectory;
	class TMemberInspector;	class TMemberInspector;
	class TObject;	class TObject;
	class TNamed;	class TNamed;
	class TRootIOCtor;	class TRootIOCtor;

		class TCollection;
		class TFileMergeInfo;
	class TString;	class TString;

	//---- types -------------------------------------------------------------- -----	//---- types -------------------------------------------------------------- -----

	typedef char Char_t; //Signed Character 1 byte (char)	typedef char Char_t; //Signed Character 1 byte (char)
	typedef unsigned char UChar_t; //Unsigned Character 1 byte (unsigned c har)	typedef unsigned char UChar_t; //Unsigned Character 1 byte (unsigned c har)
	typedef short Short_t; //Signed Short integer 2 bytes (short)	typedef short Short_t; //Signed Short integer 2 bytes (short)
	typedef unsigned short UShort_t; //Unsigned Short integer 2 bytes (unsig ned short)	typedef unsigned short UShort_t; //Unsigned Short integer 2 bytes (unsig ned short)
	#ifdef R__INT16	#ifdef R__INT16
	typedef long Int_t; //Signed integer 4 bytes	typedef long Int_t; //Signed integer 4 bytes

	skipping to change at line 186	skipping to change at line 188
	// template <class RootClass> Short_t GetClassVersion(RootClass *);	// template <class RootClass> Short_t GetClassVersion(RootClass *);

	namespace ROOT {	namespace ROOT {

	class TGenericClassInfo;	class TGenericClassInfo;
	typedef void (NewFunc_t)(void *);	typedef void (NewFunc_t)(void *);
	typedef void (NewArrFunc_t)(Long_t size, void *arena);	typedef void (NewArrFunc_t)(Long_t size, void *arena);
	typedef void (DelFunc_t)(void );	typedef void (DelFunc_t)(void );
	typedef void (DelArrFunc_t)(void );	typedef void (DelArrFunc_t)(void );
	typedef void (DesFunc_t)(void );	typedef void (DesFunc_t)(void );

	typedef void (DirAutoAdd_t)(void , TDirectory*);	typedef void (DirAutoAdd_t)(void , TDirectory *);
		typedef Long64_t (MergeFunc_t)(void , TCollection , TFileMergeInfo )
		;

	template <class RootClass> Short_t SetClassVersion(RootClass *);	template <class RootClass> Short_t SetClassVersion(RootClass *);

	extern TClass CreateClass(const char cname, Version_t id,	extern TClass CreateClass(const char cname, Version_t id,
	const type_info &info, TVirtualIsAProxy *isa,	const type_info &info, TVirtualIsAProxy *isa,
	ShowMembersFunc_t show,	ShowMembersFunc_t show,
	const char dfil, const char ifil,	const char dfil, const char ifil,
	Int_t dl, Int_t il);	Int_t dl, Int_t il);
	extern void AddClass(const char *cname, Version_t id, const type_info &i nfo,	extern void AddClass(const char *cname, Version_t id, const type_info &i nfo,
	VoidFuncPtr_t dict, Int_t pragmabits);	VoidFuncPtr_t dict, Int_t pragmabits);

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

	Rule.h	Rule.h

	// @(#)root/tmva $Id: Rule.h 29195 2009-06-24 10:39:49Z brun $	// @(#)root/tmva $Id: Rule.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Joerg Stelzer, Fredrik Tegenfeldt, Helge Voss	// Author: Andreas Hoecker, Joerg Stelzer, Fredrik Tegenfeldt, Helge Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : Rule *	* Class : Rule *
	* *	* *
	* Description: *	* Description: *
	* A class describung a 'rule' *	* A class describung a 'rule' *
	* Each internal node of a tree defines a rule from all the parental n odes. *	* Each internal node of a tree defines a rule from all the parental n odes. *

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

	RuleCut.h	RuleCut.h

	// @(#)root/tmva $Id: RuleCut.h 35732 2010-09-25 11:49:37Z stelzer $	// @(#)root/tmva $Id: RuleCut.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Joerg Stelzer, Fredrik Tegenfeldt, Helge Voss	// Author: Andreas Hoecker, Joerg Stelzer, Fredrik Tegenfeldt, Helge Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : Rule *	* Class : Rule *
	* *	* *
	* Description: *	* Description: *
	* A class describing a 'rule cut' *	* A class describing a 'rule cut' *
	* *	* *

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

	RuleEnsemble.h	RuleEnsemble.h

	// @(#)root/tmva $Id: RuleEnsemble.h 33928 2010-06-15 16:19:31Z stelzer $	// @(#)root/tmva $Id: RuleEnsemble.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Joerg Stelzer, Fredrik Tegenfeldt, Helge Voss	// Author: Andreas Hoecker, Joerg Stelzer, Fredrik Tegenfeldt, Helge Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : RuleEnsemble *	* Class : RuleEnsemble *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* A class generating an ensemble of rules *	* A class generating an ensemble of rules *

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

	RuleFit.h	RuleFit.h

	// @(#)root/tmva $Id: RuleFit.h 29195 2009-06-24 10:39:49Z brun $	// @(#)root/tmva $Id: RuleFit.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Joerg Stelzer, Fredrik Tegenfeldt, Helge Voss	// Author: Andreas Hoecker, Joerg Stelzer, Fredrik Tegenfeldt, Helge Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : RuleFit *	* Class : RuleFit *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* A class implementing various fits of rule ensembles *	* A class implementing various fits of rule ensembles *

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

	RuleFitAPI.h	RuleFitAPI.h

	// @(#)root/tmva $Id: RuleFitAPI.h 31574 2009-12-05 18:23:21Z stelzer $	// @(#)root/tmva $Id: RuleFitAPI.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Joerg Stelzer, Fredrik Tegenfeldt, Helge Voss	// Author: Andreas Hoecker, Joerg Stelzer, Fredrik Tegenfeldt, Helge Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : RuleFitAPI *	* Class : RuleFitAPI *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Interface to Friedman's RuleFit method *	* Interface to Friedman's RuleFit method *

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

	RuleFitParams.h	RuleFitParams.h

	// @(#)root/tmva $Id: RuleFitParams.h 33928 2010-06-15 16:19:31Z stelzer $	// @(#)root/tmva $Id: RuleFitParams.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Joerg Stelzer, Fredrik Tegenfeldt, Helge Voss	// Author: Andreas Hoecker, Joerg Stelzer, Fredrik Tegenfeldt, Helge Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : RuleFitParams *	* Class : RuleFitParams *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* A class doing the actual fitting of a linear model using rules as *	* A class doing the actual fitting of a linear model using rules as *

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

	SPlot.h	SPlot.h

	// @(#)root/roostats:$Id: SPlot.h 29107 2009-06-19 14:26:42Z moneta $	// @(#)root/roostats:$Id: SPlot.h 39391 2011-05-26 09:51:59Z moneta $
	// Author: Kyle Cranmer 21/07/2008	// Author: Kyle Cranmer 21/07/2008

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


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

	SVEvent.h	SVEvent.h

	// @(#)root/tmva $Id: SVEvent.h 38719 2011-04-04 12:22:28Z evt $	// @(#)root/tmva $Id: SVEvent.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andrzej Zemla	// Author: Andrzej Zemla

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : SVEvent *	* Class : SVEvent *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Event class for Support Vector Machine *	* Event class for Support Vector Machine *

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

	SVKernelFunction.h	SVKernelFunction.h

	// @(#)root/tmva $Id: SVKernelFunction.h 31458 2009-11-30 13:58:20Z stelzer $	// @(#)root/tmva $Id: SVKernelFunction.h 40012 2011-06-27 16:03:11Z stelzer $
	// Author: Andrzej Zemla	// Author: Andrzej Zemla

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : SVKernelFunction *	* Class : SVKernelFunction *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Kernel for Support Vector Machine *	* Kernel for Support Vector Machine *

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

	SVKernelMatrix.h	SVKernelMatrix.h

	// @(#)root/tmva $Id: SVKernelMatrix.h 31458 2009-11-30 13:58:20Z stelzer $	// @(#)root/tmva $Id: SVKernelMatrix.h 40012 2011-06-27 16:03:11Z stelzer $
	// Author: Andrzej Zemla	// Author: Andrzej Zemla

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : SVKernelMatrix *	* Class : SVKernelMatrix *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Kernel matrix for Support Vector Machine *	* Kernel matrix for Support Vector Machine *

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

	SVWorkingSet.h	SVWorkingSet.h

	// @(#)root/tmva $Id: SVWorkingSet.h 31458 2009-11-30 13:58:20Z stelzer $	// @(#)root/tmva $Id: SVWorkingSet.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andrzej Zemla	// Author: Andrzej Zemla

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : SVWorkingSet *	* Class : SVWorkingSet *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Working class for Support Vector Machine *	* Working class for Support Vector Machine *

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

	SamplingDistPlot.h	SamplingDistPlot.h

	// @(#)root/roostats:$Id: SamplingDistPlot.h 37333 2010-12-06 14:26:57Z mon eta $	// @(#)root/roostats:$Id: SamplingDistPlot.h 39391 2011-05-26 09:51:59Z mon eta $
	// Authors: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke	// Authors: 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_SamplingDistPlot	#ifndef ROOSTATS_SamplingDistPlot

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 38933 2011-04-19 20:15:51Z moneta $	// @(#)root/roostats:$Id: SamplingDistribution.h 39391 2011-05-26 09:51:59Z 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

	SdivSqrtSplusB.h	SdivSqrtSplusB.h

	// @(#)root/tmva $Id: SdivSqrtSplusB.h 38943 2011-04-20 08:03:25Z evt $	// @(#)root/tmva $Id: SdivSqrtSplusB.h 40012 2011-06-27 16:03:11Z stelzer $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : SdivSqrtSplusB *	* Class : SdivSqrtSplusB *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: Implementation of the SdivSqrtSplusB as separation criterio n *	* Description: Implementation of the SdivSqrtSplusB as separation criterio n *
	* S/sqrt(S + B) *	* S/sqrt(S + B) *

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

	SeparationBase.h	SeparationBase.h

	// @(#)root/tmva $Id: SeparationBase.h 38943 2011-04-20 08:03:25Z evt $	// @(#)root/tmva $Id: SeparationBase.h 40012 2011-06-27 16:03:11Z stelzer $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : SeparationBase *	* Class : SeparationBase *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: An interface to different separation critiera useded in var ious *	* Description: An interface to different separation critiera useded in var ious *
	* training algorithms, as there are: *	* training algorithms, as there are: *

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 31285 2009-11-18 16:38:36Z monet a $	// @(#)root/roostats:$Id: SimpleInterval.h 39391 2011-05-26 09:51:59Z 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

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

	SimpleLikelihoodRatioTestStat.h	SimpleLikelihoodRatioTestStat.h

	// @(#)root/roostats:$Id: SimpleLikelihoodRatioTestStat.h 38947 2011-04-20 08:23:25Z moneta $	// @(#)root/roostats:$Id: SimpleLikelihoodRatioTestStat.h 39956 2011-06-24 21:06:20Z wouter $
	/*************************************************************************	/*************************************************************************
	* 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_SimpleLikelihoodRatioTestStat	#ifndef ROOSTATS_SimpleLikelihoodRatioTestStat
	#define ROOSTATS_SimpleLikelihoodRatioTestStat	#define ROOSTATS_SimpleLikelihoodRatioTestStat

	skipping to change at line 49	skipping to change at line 49
	public:	public:

	//__________________________________	//__________________________________
	SimpleLikelihoodRatioTestStat() :	SimpleLikelihoodRatioTestStat() :
	fNullPdf(NULL), fAltPdf(NULL)	fNullPdf(NULL), fAltPdf(NULL)
	{	{
	// Constructor for proof. Do not use.	// Constructor for proof. Do not use.
	fFirstEval = true;	fFirstEval = true;
	fNullParameters = NULL;	fNullParameters = NULL;
	fAltParameters = NULL;	fAltParameters = NULL;

		fReuseNll=kFALSE ;
		fNllNull=NULL ;
		fNllAlt=NULL ;
	}	}

	//__________________________________	//__________________________________
	SimpleLikelihoodRatioTestStat(	SimpleLikelihoodRatioTestStat(
	RooAbsPdf& nullPdf,	RooAbsPdf& nullPdf,
	RooAbsPdf& altPdf	RooAbsPdf& altPdf
	) :	) :
	fFirstEval(true)	fFirstEval(true)
	{	{
	// Takes null and alternate parameters from PDF. Can be overridden .	// Takes null and alternate parameters from PDF. Can be overridden .

	skipping to change at line 71	skipping to change at line 74
	RooMsgService::instance().setGlobalKillBelow(RooFit::ERROR);	RooMsgService::instance().setGlobalKillBelow(RooFit::ERROR);
	w.import(nullPdf, RooFit::RecycleConflictNodes());	w.import(nullPdf, RooFit::RecycleConflictNodes());
	w.import(altPdf, RooFit::RecycleConflictNodes());	w.import(altPdf, RooFit::RecycleConflictNodes());
	RooMsgService::instance().setGlobalKillBelow(msglevel);	RooMsgService::instance().setGlobalKillBelow(msglevel);

	fNullPdf = w.pdf(nullPdf.GetName());	fNullPdf = w.pdf(nullPdf.GetName());
	fAltPdf = w.pdf(altPdf.GetName());	fAltPdf = w.pdf(altPdf.GetName());

	fNullParameters = (RooArgSet*) fNullPdf->getVariables()->snapshot( );	fNullParameters = (RooArgSet*) fNullPdf->getVariables()->snapshot( );
	fAltParameters = (RooArgSet*) fAltPdf->getVariables()->snapshot();	fAltParameters = (RooArgSet*) fAltPdf->getVariables()->snapshot();

		fReuseNll=kFALSE ;
		fNllNull=NULL ;
		fNllAlt=NULL ;
	}	}
	//__________________________________	//__________________________________
	SimpleLikelihoodRatioTestStat(	SimpleLikelihoodRatioTestStat(
	RooAbsPdf& nullPdf,	RooAbsPdf& nullPdf,
	RooAbsPdf& altPdf,	RooAbsPdf& altPdf,
	const RooArgSet& nullParameters,	const RooArgSet& nullParameters,
	const RooArgSet& altParameters	const RooArgSet& altParameters
	) :	) :
	fFirstEval(true)	fFirstEval(true)
	{	{

	skipping to change at line 95	skipping to change at line 101
	RooMsgService::instance().setGlobalKillBelow(RooFit::ERROR);	RooMsgService::instance().setGlobalKillBelow(RooFit::ERROR);
	w.import(nullPdf, RooFit::RecycleConflictNodes());	w.import(nullPdf, RooFit::RecycleConflictNodes());
	w.import(altPdf, RooFit::RecycleConflictNodes());	w.import(altPdf, RooFit::RecycleConflictNodes());
	RooMsgService::instance().setGlobalKillBelow(msglevel);	RooMsgService::instance().setGlobalKillBelow(msglevel);

	fNullPdf = w.pdf(nullPdf.GetName());	fNullPdf = w.pdf(nullPdf.GetName());
	fAltPdf = w.pdf(altPdf.GetName());	fAltPdf = w.pdf(altPdf.GetName());

	fNullParameters = (RooArgSet*) nullParameters.snapshot();	fNullParameters = (RooArgSet*) nullParameters.snapshot();
	fAltParameters = (RooArgSet*) altParameters.snapshot();	fAltParameters = (RooArgSet*) altParameters.snapshot();

		fReuseNll=kFALSE ;
		fNllNull=NULL ;
		fNllAlt=NULL ;
	}	}

	//______________________________	//______________________________
	virtual ~SimpleLikelihoodRatioTestStat() {	virtual ~SimpleLikelihoodRatioTestStat() {
	if (fNullParameters) delete fNullParameters;	if (fNullParameters) delete fNullParameters;
	if (fAltParameters) delete fAltParameters;	if (fAltParameters) delete fAltParameters;

		if (fNllNull) delete fNllNull ;
		if (fNllAlt) delete fNllAlt ;
	}	}


		static void setAlwaysReuseNLL(Bool_t flag) { fAlwaysReuseNll = flag ;
		}
		void setReuseNLL(Bool_t flag) { fReuseNll = flag ; }

	//_________________________________________	//_________________________________________
	void SetNullParameters(const RooArgSet& nullParameters) {	void SetNullParameters(const RooArgSet& nullParameters) {
	if (fNullParameters) delete fNullParameters;	if (fNullParameters) delete fNullParameters;
	fFirstEval = true;	fFirstEval = true;
	// if(fNullParameters) delete fNullParameters;	// if(fNullParameters) delete fNullParameters;
	fNullParameters = (RooArgSet*) nullParameters.snapshot();	fNullParameters = (RooArgSet*) nullParameters.snapshot();
	}	}

	//_________________________________________	//_________________________________________
	void SetAltParameters(const RooArgSet& altParameters) {	void SetAltParameters(const RooArgSet& altParameters) {

	skipping to change at line 151	skipping to change at line 165
	if (fFirstEval && ParamsAreEqual()) {	if (fFirstEval && ParamsAreEqual()) {
	oocoutW(fNullParameters,InputArguments)	oocoutW(fNullParameters,InputArguments)
	<< "Same RooArgSet used for null and alternate, so you must explicitly SetNullParameters and SetAlternateParameters or the likelihood r atio will always be 1."	<< "Same RooArgSet used for null and alternate, so you must explicitly SetNullParameters and SetAlternateParameters or the likelihood r atio will always be 1."
	<< endl;	<< endl;
	}	}
	fFirstEval = false;	fFirstEval = false;

	RooFit::MsgLevel msglevel = RooMsgService::instance().globalKillBe low();	RooFit::MsgLevel msglevel = RooMsgService::instance().globalKillBe low();
	RooMsgService::instance().setGlobalKillBelow(RooFit::FATAL);	RooMsgService::instance().setGlobalKillBelow(RooFit::FATAL);


	RooAbsReal *nll;	Bool_t reuse = (fReuseNll \|\| fAlwaysReuseNll) ;
	nll = fNullPdf->createNLL(data, RooFit::CloneData(kFALSE));
		Bool_t created = kFALSE ;
		if (!fNllNull) {
		fNllNull = (RooNLLVar*) fNullPdf->createNLL(data, RooFit::CloneDa
		ta(kFALSE));
		created = kTRUE ;
		}
		if (reuse && !created) {
		fNllNull->setData(data, kFALSE) ;
		}

	// make sure we set the variables attached to this nll	// make sure we set the variables attached to this nll

	RooArgSet* attachedSet = nll->getVariables();	RooArgSet* attachedSet = fNllNull->getVariables();
	attachedSet = fNullParameters;	attachedSet = fNullParameters;
	*attachedSet = nullPOI;	*attachedSet = nullPOI;

	double nullNLL = nll->getVal();	double nullNLL = fNllNull->getVal();


	delete nll;	delete fNllNull ; fNllNull = NULL ;
	delete attachedSet;	delete attachedSet;


	nll = fAltPdf->createNLL(data, RooFit::CloneData(kFALSE));	created = kFALSE ;
		if (!fNllAlt) {
		fNllAlt = (RooNLLVar*) fAltPdf->createNLL(data, RooFit::CloneData
		(kFALSE));
		created = kTRUE ;
		}
		if (reuse && !created) {
		fNllAlt->setData(data, kFALSE) ;
		}
	// make sure we set the variables attached to this nll	// make sure we set the variables attached to this nll

	attachedSet = nll->getVariables();	attachedSet = fNllAlt->getVariables();
	attachedSet = fAltParameters;	attachedSet = fAltParameters;

	double altNLL = nll->getVal();	double altNLL = fNllAlt->getVal();


	delete nll;	delete fNllAlt ; fNllAlt = NULL ;
	delete attachedSet;	delete attachedSet;

	RooMsgService::instance().setGlobalKillBelow(msglevel);	RooMsgService::instance().setGlobalKillBelow(msglevel);
	return nullNLL - altNLL;	return nullNLL - altNLL;
	}	}

	virtual const TString GetVarName() const {	virtual const TString GetVarName() const {
	return "log(L(#mu_{1}) / L(#mu_{0}))";	return "log(L(#mu_{1}) / L(#mu_{0}))";
	}	}

	private:	private:

	RooWorkspace w;	RooWorkspace w;

	RooAbsPdf* fNullPdf;	RooAbsPdf* fNullPdf;
	RooAbsPdf* fAltPdf;	RooAbsPdf* fAltPdf;
	RooArgSet* fNullParameters;	RooArgSet* fNullParameters;
	RooArgSet* fAltParameters;	RooArgSet* fAltParameters;
	bool fFirstEval;	bool fFirstEval;


		RooNLLVar* fNllNull ;
		RooNLLVar* fNllAlt ;
		static Bool_t fAlwaysReuseNll ;
		Bool_t fReuseNll ;

	protected:	protected:
	ClassDef(SimpleLikelihoodRatioTestStat,1)	ClassDef(SimpleLikelihoodRatioTestStat,1)
	};	};

	}	}

	#endif	#endif

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

	SimulatedAnnealing.h	SimulatedAnnealing.h

	// @(#)root/tmva $Id: SimulatedAnnealing.h 31574 2009-12-05 18:23:21Z stelz er $	// @(#)root/tmva $Id: SimulatedAnnealing.h 39395 2011-05-26 10:05:54Z monet a $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Krzysztof Danielowsk i, Kamil Kraszewski, Maciej Kruk	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Krzysztof Danielowsk i, Kamil Kraszewski, Maciej Kruk

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : SimulatedAnnealing *	* Class : SimulatedAnnealing *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Implementation of simulated annealing fitting procedure *	* Implementation of simulated annealing fitting procedure *

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

	SimulatedAnnealingFitter.h	SimulatedAnnealingFitter.h

	// @(#)root/tmva $Id: SimulatedAnnealingFitter.h 29122 2009-06-22 06:51:30Z brun $	// @(#)root/tmva $Id: SimulatedAnnealingFitter.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Krzysztof Danielowski, Kamil Kraszewski, Maciej Kruk	// Author: Andreas Hoecker, Krzysztof Danielowski, Kamil Kraszewski, Maciej Kruk

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : SimulatedAnnealingFitter *	* Class : SimulatedAnnealingFitter *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Fitter using Simulated Annealing algorithm *	* Fitter using Simulated Annealing algorithm *

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

	TActivation.h	TActivation.h

	// @(#)root/tmva $Id: TActivation.h 29122 2009-06-22 06:51:30Z brun $	// @(#)root/tmva $Id: TActivation.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Matt Jachowski	// Author: Matt Jachowski

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : TMVA::TActivation *	* Class : TMVA::TActivation *
	* *	* *
	* Description: *	* Description: *
	* Interface for TNeuron activation function classes. *	* Interface for TNeuron activation function classes. *
	* *	* *

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

	TActivationChooser.h	TActivationChooser.h

	// @(#)root/tmva $Id: TActivationChooser.h 29195 2009-06-24 10:39:49Z brun $	// @(#)root/tmva $Id: TActivationChooser.h 39395 2011-05-26 10:05:54Z monet a $
	// Author: Matt Jachowski	// Author: Matt Jachowski

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : TMVA::TActivationChooser *	* Class : TMVA::TActivationChooser *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Class for easily choosing activation functions. *	* Class for easily choosing activation functions. *

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

	TActivationIdentity.h	TActivationIdentity.h

	// @(#)root/tmva $Id: TActivationIdentity.h 29122 2009-06-22 06:51:30Z brun $	// @(#)root/tmva $Id: TActivationIdentity.h 39395 2011-05-26 10:05:54Z mone ta $
	// Author: Matt Jachowski	// Author: Matt Jachowski

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : TMVA::TActivationIdentity *	* Class : TMVA::TActivationIdentity *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Identity activation function for TNeuron *	* Identity activation function for TNeuron *

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

	TActivationRadial.h	TActivationRadial.h

	// @(#)root/tmva $Id: TActivationRadial.h 29122 2009-06-22 06:51:30Z brun $	// @(#)root/tmva $Id: TActivationRadial.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Matt Jachowski	// Author: Matt Jachowski

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : TMVA::TActivationRadial *	* Class : TMVA::TActivationRadial *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Radial basis activation function for TNeuron *	* Radial basis activation function for TNeuron *

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

	TActivationSigmoid.h	TActivationSigmoid.h

	// @(#)root/tmva $Id: TActivationSigmoid.h 29122 2009-06-22 06:51:30Z brun $	// @(#)root/tmva $Id: TActivationSigmoid.h 39395 2011-05-26 10:05:54Z monet a $
	// Author: Matt Jachowski	// Author: Matt Jachowski

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : TMVA::TActivationSigmoid *	* Class : TMVA::TActivationSigmoid *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Sigmoid activation function for TNeuron *	* Sigmoid activation function for TNeuron *

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

	TActivationTanh.h	TActivationTanh.h

	// @(#)root/tmva $Id: TActivationTanh.h 29122 2009-06-22 06:51:30Z brun $	// @(#)root/tmva $Id: TActivationTanh.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Matt Jachowski	// Author: Matt Jachowski

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : TMVA::TActivationTanh *	* Class : TMVA::TActivationTanh *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Tanh activation function for TNeuron *	* Tanh activation function for TNeuron *

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

	TBasket.h	TBasket.h

	// @(#)root/tree:$Id: TBasket.h 35231 2010-09-10 17:59:10Z pcanal $	// @(#)root/tree:$Id: TBasket.h 39643 2011-06-09 17:32:22Z pcanal $
	// Author: Rene Brun 19/01/96	// Author: Rene Brun 19/01/96

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


	skipping to change at line 41	skipping to change at line 41
	class TFile;	class TFile;
	class TTree;	class TTree;
	class TBranch;	class TBranch;

	class TBasket : public TKey {	class TBasket : public TKey {

	private:	private:
	TBasket(const TBasket&); // TBasket objects are not copiable.	TBasket(const TBasket&); // TBasket objects are not copiable.
	TBasket& operator=(const TBasket&); // TBasket objects are not copiable.	TBasket& operator=(const TBasket&); // TBasket objects are not copiable.


		// Internal corner cases for ReadBasketBuffers
		Int_t ReadBasketBuffersUnzip(char, Int_t, Bool_t, TFile);
		Int_t ReadBasketBuffersUncompressedCase();

		// Helper for managing the compressed buffer.
		void InitializeCompressedBuffer(Int_t len, TFile* file);

	protected:	protected:
	Int_t fBufferSize; //fBuffer length in bytes	Int_t fBufferSize; //fBuffer length in bytes
	Int_t fNevBufSize; //Length in Int_t of fEntryOffset OR fixed length of each entry if fEntryOffset is null!	Int_t fNevBufSize; //Length in Int_t of fEntryOffset OR fixed length of each entry if fEntryOffset is null!
	Int_t fNevBuf; //Number of entries in basket	Int_t fNevBuf; //Number of entries in basket
	Int_t fLast; //Pointer to last used byte in basket	Int_t fLast; //Pointer to last used byte in basket
	Bool_t fHeaderOnly; //True when only the basket header must be read/written	Bool_t fHeaderOnly; //True when only the basket header must be read/written
	Int_t *fDisplacement; //![fNevBuf] Displacement of entries in fB uffer(TKey)	Int_t *fDisplacement; //![fNevBuf] Displacement of entries in fB uffer(TKey)
	Int_t *fEntryOffset; //[fNevBuf] Offset of entries in fBuffer(T Key)	Int_t *fEntryOffset; //[fNevBuf] Offset of entries in fBuffer(T Key)
	TBranch *fBranch; //Pointer to the basket support branch	TBranch *fBranch; //Pointer to the basket support branch

	Int_t fCompressedSize; //!Size of the allocated memroy in fCompre	TBuffer *fCompressedBufferRef; //! Compressed buffer.
	ssedBuffer	Bool_t fOwnsCompressedBuffer; //! Whether or not we own the compres
	char *fCompressedBuffer;//!Temporary place holder for the compress	sed buffer.
	ed buffer if needed.	Int_t fLastWriteBufferSize; //! Size of the buffer last time we wr
		ote it to disk

	public:	public:

	TBasket();	TBasket();
	TBasket(TDirectory *motherDir);	TBasket(TDirectory *motherDir);
	TBasket(const char name, const char title, TBranch *branch);	TBasket(const char name, const char title, TBranch *branch);
	virtual ~TBasket();	virtual ~TBasket();

	virtual void AdjustSize(Int_t newsize);	virtual void AdjustSize(Int_t newsize);
	virtual void DeleteEntryOffset();	virtual void DeleteEntryOffset();

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

	TBranch.h	TBranch.h

	// @(#)root/tree:$Id: TBranch.h 38801 2011-04-11 20:10:24Z pcanal $	// @(#)root/tree:$Id: TBranch.h 39758 2011-06-15 16:37:28Z pcanal $
	// Author: Rene Brun 12/01/96	// Author: Rene Brun 12/01/96

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


	skipping to change at line 48	skipping to change at line 48
	#include "TDataType.h"	#include "TDataType.h"
	#endif	#endif

	class TTree;	class TTree;
	class TBasket;	class TBasket;
	class TLeaf;	class TLeaf;
	class TBrowser;	class TBrowser;
	class TDirectory;	class TDirectory;
	class TFile;	class TFile;
	class TClonesArray;	class TClonesArray;

		class TTreeCloner;

	const Int_t kDoNotProcess = BIT(10); // Active bit for branches	const Int_t kDoNotProcess = BIT(10); // Active bit for branches
	const Int_t kIsClone = BIT(11); // to indicate a TBranchClones	const Int_t kIsClone = BIT(11); // to indicate a TBranchClones
	const Int_t kBranchObject = BIT(12); // branch is a TObject*	const Int_t kBranchObject = BIT(12); // branch is a TObject*
	const Int_t kBranchAny = BIT(17); // branch is an object*	const Int_t kBranchAny = BIT(17); // branch is an object*
	const Int_t kMapObject = kBranchObject \| kBranchAny;	const Int_t kMapObject = kBranchObject \| kBranchAny;

	class TBranch : public TNamed , public TAttFill {	class TBranch : public TNamed , public TAttFill {

	protected:	protected:

		friend class TTreeCloner;
	// TBranch status bits	// TBranch status bits
	enum EStatusBits {	enum EStatusBits {
	kAutoDelete = BIT(15),	kAutoDelete = BIT(15),
	kDoNotUseBufferMap = BIT(22) // If set, at least one of the entry in the branch will use the buffer's map of classname and objects.	kDoNotUseBufferMap = BIT(22) // If set, at least one of the entry in the branch will use the buffer's map of classname and objects.
	};	};

	static Int_t fgCount; //! branch counter	static Int_t fgCount; //! branch counter

	Int_t fCompress; // (=1 branch is compressed, 0 otherwise)	Int_t fCompress; // Compression level and algorithm
	Int_t fBasketSize; // Initial Size of Basket Buffer	Int_t fBasketSize; // Initial Size of Basket Buffer
	Int_t fEntryOffsetLen; // Initial Length of fEntryOffset table i n the basket buffers	Int_t fEntryOffsetLen; // Initial Length of fEntryOffset table i n the basket buffers
	Int_t fWriteBasket; // Last basket number written	Int_t fWriteBasket; // Last basket number written
	Long64_t fEntryNumber; // Current entry number (last one filled in this branch)	Long64_t fEntryNumber; // Current entry number (last one filled in this branch)
	Int_t fOffset; // Offset of this branch	Int_t fOffset; // Offset of this branch
	Int_t fMaxBaskets; // Maximum number of Baskets so far	Int_t fMaxBaskets; // Maximum number of Baskets so far
	Int_t fNBaskets; //! Number of baskets in memory	Int_t fNBaskets; //! Number of baskets in memory
	Int_t fSplitLevel; // Branch split level	Int_t fSplitLevel; // Branch split level
	Int_t fNleaves; //! Number of leaves	Int_t fNleaves; //! Number of leaves
	Int_t fReadBasket; //! Current basket number when reading	Int_t fReadBasket; //! Current basket number when reading

	skipping to change at line 147	skipping to change at line 149
	Int_t FlushOneBasket(UInt_t which);	Int_t FlushOneBasket(UInt_t which);

	virtual char *GetAddress() const {return fAddress;}	virtual char *GetAddress() const {return fAddress;}
	TBasket *GetBasket(Int_t basket);	TBasket *GetBasket(Int_t basket);
	Int_t *GetBasketBytes() const {return fBasketBytes;}	Int_t *GetBasketBytes() const {return fBasketBytes;}
	Long64_t *GetBasketEntry() const {return fBasketEntry;}	Long64_t *GetBasketEntry() const {return fBasketEntry;}
	virtual Long64_t GetBasketSeek(Int_t basket) const;	virtual Long64_t GetBasketSeek(Int_t basket) const;
	virtual Int_t GetBasketSize() const {return fBasketSize;}	virtual Int_t GetBasketSize() const {return fBasketSize;}
	virtual TList *GetBrowsables();	virtual TList *GetBrowsables();
	virtual const char* GetClassName() const;	virtual const char* GetClassName() const;

	virtual Int_t GetCompressionLevel() const {return fCompress;}	Int_t GetCompressionAlgorithm() const;
		Int_t GetCompressionLevel() const;
		Int_t GetCompressionSettings() const;
	TDirectory *GetDirectory() const {return fDirectory;}	TDirectory *GetDirectory() const {return fDirectory;}
	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 Int_t GetEntryExport(Long64_t entry, Int_t getall, TClonesAr ray *list, Int_t n);	virtual Int_t GetEntryExport(Long64_t entry, Int_t getall, TClonesAr ray *list, Int_t n);
	Int_t GetEntryOffsetLen() const { return fEntryOffsetLen; }	Int_t GetEntryOffsetLen() const { return fEntryOffsetLen; }
	Int_t GetEvent(Long64_t entry=0) {return GetEntry(entry);}	Int_t GetEvent(Long64_t entry=0) {return GetEntry(entry);}
	const char *GetIconName() const;	const char *GetIconName() const;
	virtual Int_t GetExpectedType(TClass *&clptr,EDataType &type);	virtual Int_t GetExpectedType(TClass *&clptr,EDataType &type);
	virtual TLeaf GetLeaf(const char name) const;	virtual TLeaf GetLeaf(const char name) const;
	virtual TFile *GetFile(Int_t mode=0);	virtual TFile *GetFile(Int_t mode=0);
	const char *GetFileName() const {return fFileName.Data();}	const char *GetFileName() const {return fFileName.Data();}

	skipping to change at line 194	skipping to change at line 198
	virtual void ReadBasket(TBuffer &b);	virtual void ReadBasket(TBuffer &b);
	virtual void Refresh(TBranch *b);	virtual void Refresh(TBranch *b);
	virtual void Reset(Option_t *option="");	virtual void Reset(Option_t *option="");
	virtual void ResetAddress();	virtual void ResetAddress();
	virtual void ResetReadEntry() {fReadEntry = -1;}	virtual void ResetReadEntry() {fReadEntry = -1;}
	virtual void SetAddress(void *add);	virtual void SetAddress(void *add);
	virtual void SetObject(void *objadd);	virtual void SetObject(void *objadd);
	virtual void SetAutoDelete(Bool_t autodel=kTRUE);	virtual void SetAutoDelete(Bool_t autodel=kTRUE);
	virtual void SetBasketSize(Int_t buffsize);	virtual void SetBasketSize(Int_t buffsize);
	virtual void SetBufferAddress(TBuffer *entryBuffer);	virtual void SetBufferAddress(TBuffer *entryBuffer);

	virtual void SetCompressionLevel(Int_t level=1);	void SetCompressionAlgorithm(Int_t algorithm=0);
		void SetCompressionLevel(Int_t level=1);
		void SetCompressionSettings(Int_t settings=1);
	virtual void SetEntries(Long64_t entries);	virtual void SetEntries(Long64_t entries);
	virtual void SetEntryOffsetLen(Int_t len, Bool_t updateSubBranches = kFALSE);	virtual void SetEntryOffsetLen(Int_t len, Bool_t updateSubBranches = kFALSE);
	virtual void SetFirstEntry( Long64_t entry );	virtual void SetFirstEntry( Long64_t entry );
	virtual void SetFile(TFile *file=0);	virtual void SetFile(TFile *file=0);
	virtual void SetFile(const char *filename);	virtual void SetFile(const char *filename);
	virtual Bool_t SetMakeClass(Bool_t decomposeObj = kTRUE);	virtual Bool_t SetMakeClass(Bool_t decomposeObj = kTRUE);
	virtual void SetOffset(Int_t offset=0) {fOffset=offset;}	virtual void SetOffset(Int_t offset=0) {fOffset=offset;}
	virtual void SetStatus(Bool_t status=1);	virtual void SetStatus(Bool_t status=1);
	virtual void SetTree(TTree *tree) { fTree = tree;}	virtual void SetTree(TTree *tree) { fTree = tree;}
	virtual void SetupAddresses();	virtual void SetupAddresses();
	virtual void UpdateAddress() {;}	virtual void UpdateAddress() {;}
	virtual void UpdateFile();	virtual void UpdateFile();

	static void ResetCount();	static void ResetCount();

	ClassDef(TBranch,12); //Branch descriptor	ClassDef(TBranch,12); //Branch descriptor
	};	};


		//_________________________________________________________________________
		_____
		inline Int_t TBranch::GetCompressionAlgorithm() const
		{
		return (fCompress < 0) ? -1 : fCompress / 100;
		}

		//_________________________________________________________________________
		_____
		inline Int_t TBranch::GetCompressionLevel() const
		{
		return (fCompress < 0) ? -1 : fCompress % 100;
		}

		//_________________________________________________________________________
		_____
		inline Int_t TBranch::GetCompressionSettings() const
		{
		return (fCompress < 0) ? -1 : fCompress;
		}

	#endif	#endif

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

	TBranchClones.h	TBranchClones.h

	// @(#)root/tree:$Id: TBranchClones.h 33097 2010-04-19 21:47:55Z pcanal $	// @(#)root/tree:$Id: TBranchClones.h 39635 2011-06-09 15:37:27Z pcanal $
	// Author: Rene Brun 11/02/96	// Author: Rene Brun 11/02/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. *
	*************************************************************************/	*************************************************************************/


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

	TBranchElement.h	TBranchElement.h

	// @(#)root/tree:$Id: TBranchElement.h 38757 2011-04-07 04:22:58Z pcanal $	// @(#)root/tree:$Id: TBranchElement.h 39635 2011-06-09 15:37:27Z 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. *
	*************************************************************************/	*************************************************************************/


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

	TBranchObject.h	TBranchObject.h

	// @(#)root/tree:$Id: TBranchObject.h 38059 2011-02-13 21:12:16Z pcanal $	// @(#)root/tree:$Id: TBranchObject.h 39635 2011-06-09 15:37:27Z pcanal $
	// Author: Rene Brun 11/02/96	// Author: Rene Brun 11/02/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. *
	*************************************************************************/	*************************************************************************/


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

	TBranchRef.h	TBranchRef.h

	// @(#)root/tree:$Id: TBranchRef.h 38854 2011-04-14 18:03:34Z pcanal $	// @(#)root/tree:$Id: TBranchRef.h 39635 2011-06-09 15:37:27Z pcanal $
	// Author: Rene Brun 19/08/2004	// Author: Rene Brun 19/08/2004

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


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

	TBufferXML.h	TBufferXML.h

	// @(#)root/xml:$Id: TBufferXML.h 36061 2010-10-04 16:05:51Z pcanal $	// @(#)root/xml:$Id: TBufferXML.h 39697 2011-06-13 21:43:43Z pcanal $
	// Author: Sergey Linev 10.05.2004	// Author: Sergey Linev 10.05.2004

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


	skipping to change at line 234	skipping to change at line 234
	TBufferXML();	TBufferXML();

	// redefined protected virtual functions	// redefined protected virtual functions

	virtual void WriteObjectClass(const void actualObjStart, const TCla ss actualClass);	virtual void WriteObjectClass(const void actualObjStart, const TCla ss actualClass);

	// end redefined protected virtual functions	// end redefined protected virtual functions

	TXMLFile* XmlFile();	TXMLFile* XmlFile();


	void SetCompressionLevel(int level) { fCompressLevel = level	Int_t GetCompressionAlgorithm() const;
	; }	Int_t GetCompressionLevel() const;
		Int_t GetCompressionSettings() const;
		void SetCompressionAlgorithm(Int_t algorithm=0);
		void SetCompressionLevel(Int_t level=1);
		void SetCompressionSettings(Int_t settings=1);
	void SetXML(TXMLEngine* xml) { fXML = xml; }	void SetXML(TXMLEngine* xml) { fXML = xml; }

	void XmlWriteBlock(XMLNodePointer_t node);	void XmlWriteBlock(XMLNodePointer_t node);
	XMLNodePointer_t XmlWriteAny(const void* obj, const TClass* cl);	XMLNodePointer_t XmlWriteAny(const void* obj, const TClass* cl);

	void XmlReadBlock(XMLNodePointer_t node);	void XmlReadBlock(XMLNodePointer_t node);
	void* XmlReadAny(XMLNodePointer_t node, void* obj, TClass** c l);	void* XmlReadAny(XMLNodePointer_t node, void* obj, TClass** c l);

	TXMLStackObj* PushStack(XMLNodePointer_t current, Bool_t simple = kFA LSE);	TXMLStackObj* PushStack(XMLNodePointer_t current, Bool_t simple = kFA LSE);
	TXMLStackObj* PopStack();	TXMLStackObj* PopStack();

	skipping to change at line 324	skipping to change at line 329
	TExMap* fObjMap; //!	TExMap* fObjMap; //!
	TObjArray* fIdArray; //!	TObjArray* fIdArray; //!

	TString fValueBuf; //!	TString fValueBuf; //!

	Int_t fErrorFlag; //!	Int_t fErrorFlag; //!

	Bool_t fCanUseCompact; //! flag indicate that basic t ype (like Int_t) can be placed in the same tag	Bool_t fCanUseCompact; //! flag indicate that basic t ype (like Int_t) can be placed in the same tag
	Bool_t fExpectedChain; //! flag to resolve situation when several elements of same basic type stored as FastArray	Bool_t fExpectedChain; //! flag to resolve situation when several elements of same basic type stored as FastArray
	TClass* fExpectedBaseClass; //! pointer to class, which sh ould be stored as parent of current	TClass* fExpectedBaseClass; //! pointer to class, which sh ould be stored as parent of current

	Int_t fCompressLevel; //! compress level used to min imize size of file	Int_t fCompressLevel; //! compression level and algo rithm

	static const char* fgFloatFmt; //! printf argument for floats and doubles, either "%f" or "%e" or "%10f" and so on	static const char* fgFloatFmt; //! printf argument for floats and doubles, either "%f" or "%e" or "%10f" and so on

	ClassDef(TBufferXML,1) //a specialized TBuffer to read/write to XML files	ClassDef(TBufferXML,1) //a specialized TBuffer to read/write to XML files
	};	};


		//_________________________________________________________________________
		_____
		inline Int_t TBufferXML::GetCompressionAlgorithm() const
		{
		return (fCompressLevel < 0) ? -1 : fCompressLevel / 100;
		}

		//_________________________________________________________________________
		_____
		inline Int_t TBufferXML::GetCompressionLevel() const
		{
		return (fCompressLevel < 0) ? -1 : fCompressLevel % 100;
		}

		//_________________________________________________________________________
		_____
		inline Int_t TBufferXML::GetCompressionSettings() const
		{
		return (fCompressLevel < 0) ? -1 : fCompressLevel;
		}

	#endif	#endif

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

	TCint.h	TCint.h

	// @(#)root/meta:$Id: TCint.h 38517 2011-03-18 20:20:16Z pcanal $	// @(#)root/meta:$Id: TCint.h 39402 2011-05-26 12:56:31Z axel $
	// 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 109	skipping to change at line 109
	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 SetGetline(const char(getlineFunc)(const char* prompt),
	void (histaddFunc)(char line));	void (histaddFunc)(const char line));
	void Reset();	void Reset();
	void ResetAll();	void ResetAll();
	void ResetGlobals();	void ResetGlobals();
	void ResetGlobalVar(void *obj);	void ResetGlobalVar(void *obj);
	void RewindDictionary();	void RewindDictionary();
	Int_t DeleteGlobal(void *obj);	Int_t DeleteGlobal(void *obj);
	void SaveContext();	void SaveContext();
	void SaveGlobalsContext();	void SaveGlobalsContext();
	void UpdateListOfGlobals();	void UpdateListOfGlobals();
	void UpdateListOfGlobalFunctions();	void UpdateListOfGlobalFunctions();

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

	TDecompSVD.h	TDecompSVD.h

	// @(#)root/matrix:$Id: TDecompSVD.h 20882 2007-11-19 11:31:26Z rdm $	// @(#)root/matrix:$Id: TDecompSVD.h 39607 2011-06-08 15:03:23Z 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_TDecompSVD	#ifndef ROOT_TDecompSVD
	#define ROOT_TDecompSVD	#define ROOT_TDecompSVD

	skipping to change at line 53	skipping to change at line 53
	enum {kWorkMax = 100}; // size of work array	enum {kWorkMax = 100}; // size of work array

	TDecompSVD(): fU(), fV(), fSig() {}	TDecompSVD(): fU(), fV(), fSig() {}
	TDecompSVD(Int_t nrows,Int_t ncols);	TDecompSVD(Int_t nrows,Int_t ncols);
	TDecompSVD(Int_t row_lwb,Int_t row_upb,Int_t col_lwb,Int_t col_upb);	TDecompSVD(Int_t row_lwb,Int_t row_upb,Int_t col_lwb,Int_t col_upb);
	TDecompSVD(const TMatrixD &m,Double_t tol = 0.0);	TDecompSVD(const TMatrixD &m,Double_t tol = 0.0);
	TDecompSVD(const TDecompSVD &another);	TDecompSVD(const TDecompSVD &another);
	virtual ~TDecompSVD() {}	virtual ~TDecompSVD() {}

	const TMatrixD GetMatrix ();	const TMatrixD GetMatrix ();

	virtual Int_t GetNrows () const { return fU.GetNrows(); }	virtual Int_t GetNrows () const;
	virtual Int_t GetNcols () const { return fV.GetNcols(); }	virtual Int_t GetNcols () const;
	const TMatrixD &GetU () { if ( !TestBit(kDecomposed) ) Decompose();	const TMatrixD &GetU () { if ( !TestBit(kDecomposed) ) Decompose();
	return fU; }	return fU; }
	const TMatrixD &GetV () { if ( !TestBit(kDecomposed) ) Decompose();	const TMatrixD &GetV () { if ( !TestBit(kDecomposed) ) Decompose();
	return fV; }	return fV; }
	const TVectorD &GetSig () { if ( !TestBit(kDecomposed) ) Decompose();	const TVectorD &GetSig () { if ( !TestBit(kDecomposed) ) Decompose();
	return fSig; }	return fSig; }

	virtual void SetMatrix (const TMatrixD &a);	virtual void SetMatrix (const TMatrixD &a);

	virtual Bool_t Decompose ();	virtual Bool_t Decompose ();

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

	TDirectoryFile.h	TDirectoryFile.h

	// @(#)root/io:$Id: TDirectoryFile.h 34564 2010-07-23 02:50:45Z pcanal $	// @(#)root/io:$Id: TDirectoryFile.h 39635 2011-06-09 15:37:27Z pcanal $
	// Author: Rene Brun 22/01/2007	// Author: Rene Brun 22/01/2007

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


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

	TFile.h	TFile.h

	// @(#)root/io:$Id: TFile.h 35443 2010-09-20 10:06:47Z rdm $	// @(#)root/io:$Id: TFile.h 39697 2011-06-13 21:43:43Z pcanal $
	// Author: Rene Brun 28/11/94	// Author: Rene Brun 28/11/94

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


	skipping to change at line 38	skipping to change at line 38
	#endif	#endif

	class TFree;	class TFree;
	class TArrayC;	class TArrayC;
	class TArchiveFile;	class TArchiveFile;
	class TFileOpenHandle;	class TFileOpenHandle;
	class TFileCacheRead;	class TFileCacheRead;
	class TFileCacheWrite;	class TFileCacheWrite;
	class TProcessID;	class TProcessID;
	class TStopwatch;	class TStopwatch;

		class TFilePrefetch;

	class TFile : public TDirectoryFile {	class TFile : public TDirectoryFile {
	friend class TDirectoryFile;	friend class TDirectoryFile;

		friend class TFilePrefetch;

	public:	public:
	// Asynchronous open request status	// Asynchronous open request status
	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 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 and algorithm
	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
	Int_t fNProcessIDs; //Number of TProcessID written to this file	Int_t fNProcessIDs; //Number of TProcessID written to this file
	Int_t fReadCalls; //Number of read calls ( not counting the cache calls )	Int_t fReadCalls; //Number of read calls ( not counting the cache calls )
	TString fRealName; //Effective real file name (not origin al url)	TString fRealName; //Effective real file name (not origin al url)
	TString fOption; //File options	TString fOption; //File options
	Char_t fUnits; //Number of bytes for file pointers	Char_t fUnits; //Number of bytes for file pointers
	TList *fFree; //Free segments linked list table	TList *fFree; //Free segments linked list table
	TArrayC *fClassIndex; //!Index of TStreamerInfo classes writ ten to this file	TArrayC *fClassIndex; //!Index of TStreamerInfo classes writ ten to this file

	skipping to change at line 168	skipping to change at line 170
	virtual void Draw(Option_t *option="");	virtual void Draw(Option_t *option="");
	virtual void DrawMap(const char keys="",Option_t option=""); / / MENU*	virtual void DrawMap(const char keys="",Option_t option=""); / / MENU*
	virtual void FillBuffer(char *&buffer);	virtual void FillBuffer(char *&buffer);
	virtual void Flush();	virtual void Flush();
	TArchiveFile *GetArchive() const { return fArchive; }	TArchiveFile *GetArchive() const { return fArchive; }
	Int_t GetBestBuffer() const;	Int_t GetBestBuffer() const;
	virtual Int_t GetBytesToPrefetch() const;	virtual Int_t GetBytesToPrefetch() const;
	TFileCacheRead *GetCacheRead() const;	TFileCacheRead *GetCacheRead() const;
	TFileCacheWrite *GetCacheWrite() const;	TFileCacheWrite *GetCacheWrite() const;
	TArrayC *GetClassIndex() const { return fClassIndex; }	TArrayC *GetClassIndex() const { return fClassIndex; }

	Int_t GetCompressionLevel() const { return fCompress; }	Int_t GetCompressionAlgorithm() const;
		Int_t GetCompressionLevel() const;
		Int_t GetCompressionSettings() const;
	Float_t GetCompressionFactor();	Float_t GetCompressionFactor();
	virtual Long64_t GetEND() const { return fEND; }	virtual Long64_t GetEND() const { return fEND; }
	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; }

	skipping to change at line 221	skipping to change at line 225
	virtual Bool_t ReadBuffer(char *buf, Long64_t pos, Int_t len);	virtual Bool_t ReadBuffer(char *buf, Long64_t pos, Int_t len);
	virtual Bool_t ReadBuffers(char buf, Long64_t pos, Int_t *len, In t_t nbuf);	virtual Bool_t ReadBuffers(char buf, Long64_t pos, Int_t *len, In t_t nbuf);
	virtual void ReadFree();	virtual void ReadFree();
	virtual TProcessID *ReadProcessID(UShort_t pidf);	virtual TProcessID *ReadProcessID(UShort_t pidf);
	virtual void ReadStreamerInfo();	virtual void ReadStreamerInfo();
	virtual Int_t Recover();	virtual Int_t Recover();
	virtual Int_t ReOpen(Option_t *mode);	virtual Int_t ReOpen(Option_t *mode);
	virtual void Seek(Long64_t offset, ERelativeTo pos = kBeg);	virtual void Seek(Long64_t offset, ERelativeTo pos = kBeg);
	virtual void SetCacheRead(TFileCacheRead *cache);	virtual void SetCacheRead(TFileCacheRead *cache);
	virtual void SetCacheWrite(TFileCacheWrite *cache);	virtual void SetCacheWrite(TFileCacheWrite *cache);

		virtual void SetCompressionAlgorithm(Int_t algorithm=0);
	virtual void SetCompressionLevel(Int_t level=1);	virtual void SetCompressionLevel(Int_t level=1);

		virtual void SetCompressionSettings(Int_t settings=1);
	virtual void SetEND(Long64_t last) { fEND = last; }	virtual void SetEND(Long64_t last) { fEND = last; }
	virtual void SetOffset(Long64_t offset, ERelativeTo pos = kBeg);	virtual void SetOffset(Long64_t offset, ERelativeTo pos = kBeg);
	virtual void SetOption(Option_t *option=">") { fOption = option; }	virtual void SetOption(Option_t *option=">") { fOption = option; }
	virtual void SetReadCalls(Int_t readcalls = 0) { fReadCalls = rea dcalls; }	virtual void SetReadCalls(Int_t readcalls = 0) { fReadCalls = rea dcalls; }
	virtual void ShowStreamerInfo();	virtual void ShowStreamerInfo();
	virtual Int_t Sizeof() const;	virtual Int_t Sizeof() const;
	void SumBuffer(Int_t bufsize);	void SumBuffer(Int_t bufsize);
	virtual void UseCache(Int_t maxCacheSize = 10, Int_t pageSize = 0 );	virtual void UseCache(Int_t maxCacheSize = 10, Int_t pageSize = 0 );
	virtual Bool_t WriteBuffer(const char *buf, Int_t len);	virtual Bool_t WriteBuffer(const char *buf, Int_t len);
	virtual Int_t Write(const char *name=0, Int_t opt=0, Int_t bufsiz= 0);	virtual Int_t Write(const char *name=0, Int_t opt=0, Int_t bufsiz= 0);

	skipping to change at line 292	skipping to change at line 298
	//	//
	// 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;

	private:	private:
	TString fOpt; // Options	TString fOpt; // Options

	Int_t fCompress; // Compression factor	Int_t fCompress; // Compression level and algorithm
	Int_t fNetOpt; // Network options	Int_t fNetOpt; // Network options
	TFile *fFile; // TFile instance of the file being opened	TFile *fFile; // TFile instance of the file being opened

	TFileOpenHandle(TFile *f) : TNamed("",""), fOpt(""), fCompress(1),	TFileOpenHandle(TFile *f) : TNamed("",""), fOpt(""), fCompress(1),
	fNetOpt(0), fFile(f) { }	fNetOpt(0), fFile(f) { }
	TFileOpenHandle(const char n, const char o, const char *t, Int_t cmp,	TFileOpenHandle(const char n, const char o, const char *t, Int_t cmp,
	Int_t no) : TNamed(n,t), fOpt(o), fCompress(cmp),	Int_t no) : TNamed(n,t), fOpt(o), fCompress(cmp),
	fNetOpt(no), fFile(0) { }	fNetOpt(no), fFile(0) { }
	TFileOpenHandle(const TFileOpenHandle&);	TFileOpenHandle(const TFileOpenHandle&);
	TFileOpenHandle& operator=(const TFileOpenHandle&);	TFileOpenHandle& operator=(const TFileOpenHandle&);

	skipping to change at line 318	skipping to change at line 324

	Bool_t Matches(const char *name);	Bool_t Matches(const char *name);

	const char *GetOpt() const { return fOpt; }	const char *GetOpt() const { return fOpt; }
	Int_t GetCompress() const { return fCompress; }	Int_t GetCompress() const { return fCompress; }
	Int_t GetNetOpt() const { return fNetOpt; }	Int_t GetNetOpt() const { return fNetOpt; }
	};	};

	R__EXTERN TFile *gFile;	R__EXTERN TFile *gFile;


		//_________________________________________________________________________
		_____
		inline Int_t TFile::GetCompressionAlgorithm() const
		{
		return (fCompress < 0) ? -1 : fCompress / 100;
		}

		//_________________________________________________________________________
		_____
		inline Int_t TFile::GetCompressionLevel() const
		{
		return (fCompress < 0) ? -1 : fCompress % 100;
		}

		//_________________________________________________________________________
		_____
		inline Int_t TFile::GetCompressionSettings() const
		{
		return (fCompress < 0) ? -1 : fCompress;
		}

	#endif	#endif

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

	TFileCacheRead.h	TFileCacheRead.h

	// @(#)root/io:$Id: TFileCacheRead.h 31503 2009-12-02 10:36:50Z brun $	// @(#)root/io:$Id: TFileCacheRead.h 39466 2011-05-27 20:26:23Z pcanal $
	// 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 29	skipping to change at line 29
	// 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 TBranch;

		class TFilePrefetch;

	class TFileCacheRead : public TObject {	class TFileCacheRead : public TObject {

	protected:	protected:

		TFilePrefetch* fPrefetch; //!Object that does the asynchronous rea ding in another thread
	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;

		Bool_t fEnablePrefetching; //reading by prefetching asynchronousl y

	Int_t fNseek; //Number of blocks to be prefetched	Int_t fNseek; //Number of blocks to be prefetched
	Int_t fNtot; //Total size of prefetched blocks	Int_t fNtot; //Total size of prefetched blocks
	Int_t fNb; //Number of long buffers	Int_t fNb; //Number of long buffers
	Int_t fSeekSize; //Allocated size of fSeek	Int_t fSeekSize; //Allocated size of fSeek
	Long64_t *fSeek; //[fNseek] Position on file of buffers to be prefetched	Long64_t *fSeek; //[fNseek] Position on file of buffers to be prefetched
	Long64_t *fSeekSort; //[fNseek] Position on file of buffers to be prefetched (sorted)	Long64_t *fSeekSort; //[fNseek] Position on file of buffers to be prefetched (sorted)
	Int_t *fSeekIndex; //[fNseek] sorted index table of fSeek	Int_t *fSeekIndex; //[fNseek] sorted index table of fSeek
	Long64_t *fPos; //[fNb] start of long buffers	Long64_t *fPos; //[fNb] start of long buffers
	Int_t *fSeekLen; //[fNseek] Length of buffers to be prefet ched	Int_t *fSeekLen; //[fNseek] Length of buffers to be prefet ched
	Int_t *fSeekSortLen; //[fNseek] Length of buffers to be prefet ched (sorted)	Int_t *fSeekSortLen; //[fNseek] Length of buffers to be prefet ched (sorted)
	Int_t *fSeekPos; //[fNseek] Position of sorted blocks in f Buffer	Int_t *fSeekPos; //[fNseek] Position of sorted blocks in f Buffer
	Int_t *fLen; //[fNb] Length of long buffers	Int_t *fLen; //[fNb] Length of long buffers
	TFile *fFile; //Pointer to file	TFile *fFile; //Pointer to file
	char *fBuffer; //[fBufferSize] buffer of contiguous pref etched blocks	char *fBuffer; //[fBufferSize] buffer of contiguous pref etched blocks
	Bool_t fIsSorted; //True if fSeek array is sorted	Bool_t fIsSorted; //True if fSeek array is sorted
	Bool_t fIsTransferred; //True when fBuffer contains something v alid	Bool_t fIsTransferred; //True when fBuffer contains something v alid

		Long64_t fPrefetchedBlocks; // Number of blocks prefetched.

		//varibles for the second block prefetched with the same semantics as fo
		r the first one
		Int_t fBNseek;
		Int_t fBNtot;
		Int_t fBNb;
		Int_t fBSeekSize;
		Long64_t *fBSeek;
		Long64_t *fBSeekSort;
		Int_t *fBSeekIndex;
		Long64_t *fBPos;
		Int_t *fBSeekLen;
		Int_t *fBSeekSortLen;
		Int_t *fBSeekPos;
		Int_t *fBLen;
		Bool_t fBIsSorted;
		Bool_t fBIsTransferred;

	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(TBranch * /b/, Bool_t /subbranches/ = kFALSE) {}
	virtual void AddBranch(const char * /branch/, Bool_t /subbranc hes/ = 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 Int_t GetUnzipBuffer(char ** /buf/, Long64_t /pos/, In t_t /len/, Bool_t * /free/) { return -1; }	virtual Int_t GetUnzipBuffer(char ** /buf/, Long64_t /pos/, In t_t /len/, Bool_t * /free/) { return -1; }

		Long64_t GetPrefetchedBlocks() const { return fPrefetchedBloc ks; }
	virtual Bool_t IsAsyncReading() const { return fAsyncReading; };	virtual Bool_t IsAsyncReading() const { return fAsyncReading; };

		virtual void SetEnablePrefetching(Bool_t setPrefetching = kFALSE)
		{ fEnablePrefetching = setPrefetching; }
		virtual Bool_t IsEnablePrefetching() const { return fEnablePrefetch
		ing; };
	virtual Bool_t IsLearning() const {return kFALSE;}	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 ReadBufferExtNormal(char *buf, Long64_t pos, Int_t l
		en, Int_t &loc);
		virtual Int_t ReadBufferExtPrefetch(char *buf, Long64_t pos, Int_t
		len, Int_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 SetSkipZip(Bool_t /skip/ = kTRUE) {} // This funct ion is only used by TTreeCacheUnzip (ignore it)
	virtual void Sort();	virtual void Sort();

		virtual void SecondSort(); //Method used
		to sort and merge the chunks in the second block
		virtual void SecondPrefetch(Long64_t, Int_t); //Used to add
		chunks to the second block
		virtual TFilePrefetch* GetPrefetchObj();

	ClassDef(TFileCacheRead,1) //TFile cache when reading	ClassDef(TFileCacheRead,1) //TFile cache when reading
	};	};

	#endif	#endif

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

	TFileMerger.h	TFileMerger.h

	// @(#)root/proofplayer:$Id: TFileMerger.h 32130 2010-01-28 10:45:53Z rdm $	// @(#)root/io:$Id: TFileMerger.h 39826 2011-06-20 11:55:08Z pcanal $
	// Author: Andreas Peters + Fons Rademakers 26/5/2005	// Author: Andreas Peters + Fons Rademakers 26/5/2005

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


	skipping to change at line 50	skipping to change at line 50
	class TList;	class TList;
	class TFile;	class TFile;
	class TDirectory;	class TDirectory;

	class TFileMerger : public TObject {	class TFileMerger : public TObject {
	private:	private:
	TFileMerger(const TFileMerger&); // Not implemented	TFileMerger(const TFileMerger&); // Not implemented
	TFileMerger& operator=(const TFileMerger&); // Not implemented	TFileMerger& operator=(const TFileMerger&); // Not implemented

	protected:	protected:

	TStopwatch fWatch; // stop watch to measure file copy spee	TStopwatch fWatch; // stop watch to measure file copy spe
	d	ed
	TList *fFileList; // a list of files, which shall be merg	TList *fFileList; // a list of files, which shall be mer
	ed	ged
	TFile *fOutputFile; // the outputfile for merging	TFile *fOutputFile; // the outputfile for merging
	TString fOutputFilename; // the name of the outputfile for mergi	TString fOutputFilename; // the name of the outputfile for merg
	ng	ing
	TString fOutputFilename1; // the name of the temporary outputfile	Bool_t fFastMethod; // True if using Fast merging algorith
	for merging	m (default)
	Bool_t fFastMethod; // True if using Fast merging algorithm	Bool_t fNoTrees; // True if Trees should not be merged
	(default)	(default is kFALSE)
	Bool_t fNoTrees; // True if Trees should not be merged (	Bool_t fExplicitCompLevel;// True if the user explicitly request
	default is kFALSE)	ed a compressio level change (default kFALSE)
		Bool_t fCompressionChange;// True if the output and input have d
	Bool_t fLocal; // Makes local copies of merging fil	ifferent compression level (default kFALSE)
	es if True (default is kTRUE)	Int_t fPrintLevel; // How much information to print out a
	Bool_t fHistoOneGo; // Merger histos in one go (default	t run time.
	is kTRUE)
	TList *fMergeList; // list of the files need to be m	Bool_t fLocal; // Makes local copies of merging files
	erged	if True (default is kTRUE)
		Bool_t fHistoOneGo; // Merger histos in one go (default is
		kTRUE)
		TList *fMergeList; // list of the files need to be merged

	public:	public:
	TFileMerger(Bool_t isLocal = kTRUE, Bool_t histoOneGo = kTRUE);	TFileMerger(Bool_t isLocal = kTRUE, Bool_t histoOneGo = kTRUE);
	virtual ~TFileMerger();	virtual ~TFileMerger();


		Int_t GetPrintLevel() const { return fPrintLevel; }
		void SetPrintLevel(Int_t level) { fPrintLevel = level; }
		Bool_t HasCompressionChange() const { return fCompressionChange; }
	const char *GetOutputFileName() const { return fOutputFilename; }	const char *GetOutputFileName() const { return fOutputFilename; }
	TList *GetMergeList() const { return fMergeList; }	TList *GetMergeList() const { return fMergeList; }

	//--- file management interface	//--- file management interface
	virtual Bool_t SetCWD(const char * /path/) { MayNotUse("SetCWD"); retu rn kFALSE; }	virtual Bool_t SetCWD(const char * /path/) { MayNotUse("SetCWD"); retu rn kFALSE; }
	virtual const char *GetCWD() { MayNotUse("GetCWD"); return 0; }	virtual const char *GetCWD() { MayNotUse("GetCWD"); return 0; }

	//--- file merging interface	//--- file merging interface
	virtual void Reset();	virtual void Reset();
	virtual Bool_t AddFile(const char *url, Bool_t cpProgress = kTRUE);	virtual Bool_t AddFile(const char *url, Bool_t cpProgress = kTRUE);

	virtual Bool_t OutputFile(const char *url);	virtual Bool_t OutputFile(const char *url, Bool_t force = kTRUE);
		virtual Bool_t OutputFile(const char *url, Bool_t force, Int_t compressi
		onLevel);
	virtual void PrintFiles(Option_t *options);	virtual void PrintFiles(Option_t *options);
	virtual Bool_t Merge(Bool_t = kTRUE);	virtual Bool_t Merge(Bool_t = kTRUE);
	virtual Bool_t MergeRecursive(TDirectory target, TList sourcelist);	virtual Bool_t MergeRecursive(TDirectory target, TList sourcelist);
	virtual void SetFastMethod(Bool_t fast=kTRUE) {fFastMethod = fast;}	virtual void SetFastMethod(Bool_t fast=kTRUE) {fFastMethod = fast;}
	virtual void SetNotrees(Bool_t notrees=kFALSE) {fNoTrees = notrees;}	virtual void SetNotrees(Bool_t notrees=kFALSE) {fNoTrees = notrees;}

		virtual void RecursiveRemove(TObject *obj);


	ClassDef(TFileMerger,2) // File copying and merging services	ClassDef(TFileMerger,3) // File copying and merging services
	};	};

	#endif	#endif

End of changes. 6 change blocks.
	23 lines changed or deleted	32 lines changed or added

	TGComboBox.h	TGComboBox.h

	// @(#)root/gui:$Id: TGComboBox.h 34814 2010-08-16 08:59:15Z bellenot $	// @(#)root/gui:$Id: TGComboBox.h 39338 2011-05-23 11:50:22Z bellenot $
	// Author: Fons Rademakers 13/01/98	// Author: Fons Rademakers 13/01/98

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


	skipping to change at line 53	skipping to change at line 53
	protected:	protected:
	TGListBox *fListBox;	TGListBox *fListBox;
	TGLBEntry *fSelected;	TGLBEntry *fSelected;

	public:	public:
	TGComboBoxPopup(const TGWindow *p = 0, UInt_t w = 1, UInt_t h = 1,	TGComboBoxPopup(const TGWindow *p = 0, UInt_t w = 1, UInt_t h = 1,
	UInt_t options = kVerticalFrame,	UInt_t options = kVerticalFrame,
	Pixel_t back = GetWhitePixel());	Pixel_t back = GetWhitePixel());

	virtual Bool_t HandleButton(Event_t *);	virtual Bool_t HandleButton(Event_t *);

		void KeyPressed(TGFrame*, UInt_t, UInt_t);

	void SetListBox(TGListBox *lb) { fListBox = lb; }	void SetListBox(TGListBox *lb) { fListBox = lb; }
	void PlacePopup(Int_t x, Int_t y, UInt_t w, UInt_t h);	void PlacePopup(Int_t x, Int_t y, UInt_t w, UInt_t h);
	void EndPopup();	void EndPopup();

	ClassDef(TGComboBoxPopup,0) // Combobox popup window	ClassDef(TGComboBoxPopup,0) // Combobox popup window
	};	};

	class TGComboBox : public TGCompositeFrame, public TGWidget {	class TGComboBox : public TGCompositeFrame, public TGWidget {


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

	TGLAutoRotator.h	TGLAutoRotator.h

	// @(#)root/eve:$Id: TGLAutoRotator.h 36373 2010-10-19 17:43:35Z matevz $	// @(#)root/eve:$Id: TGLAutoRotator.h 39682 2011-06-11 05:37:08Z 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_TGLAutoRotator	#ifndef ROOT_TGLAutoRotator
	#define ROOT_TGLAutoRotator	#define ROOT_TGLAutoRotator

	#include "TObject.h"	#include "TObject.h"

		#include "TString.h"

	class TGLCamera;	class TGLCamera;
	class TGLViewer;	class TGLViewer;
	class TTimer;	class TTimer;
	class TStopwatch;	class TStopwatch;

	class TGLAutoRotator : public TObject	class TGLAutoRotator : public TObject
	{	{
	private:	private:
	TGLAutoRotator(const TGLAutoRotator&); // Not implemented	TGLAutoRotator(const TGLAutoRotator&); // Not implemented

	skipping to change at line 42	skipping to change at line 43
	TStopwatch *fWatch;	TStopwatch *fWatch;

	Double_t fDt;	Double_t fDt;
	Double_t fWPhi;	Double_t fWPhi;
	Double_t fWTheta, fATheta;	Double_t fWTheta, fATheta;
	Double_t fWDolly, fADolly;	Double_t fWDolly, fADolly;

	Double_t fThetaA0, fDollyA0;	Double_t fThetaA0, fDollyA0;
	Bool_t fTimerRunning;	Bool_t fTimerRunning;


		TString fImageName;
		Int_t fImageCount;
		Bool_t fImageAutoSave;

		TString fImageGUIBaseName;
		Int_t fImageGUIOutMode;

	public:	public:
	TGLAutoRotator(TGLViewer* v);	TGLAutoRotator(TGLViewer* v);
	virtual ~TGLAutoRotator();	virtual ~TGLAutoRotator();


		TGLViewer* GetViewer() const { return fViewer; }
	TGLCamera* GetCamera() const { return fCamera; }	TGLCamera* GetCamera() const { return fCamera; }

	// --------------------------------	// --------------------------------

	void Start();	void Start();
	void Stop();	void Stop();

	void Timeout();	void Timeout();

	// --------------------------------	// --------------------------------

	skipping to change at line 75	skipping to change at line 84
	Double_t GetWTheta() const { return fWTheta; }	Double_t GetWTheta() const { return fWTheta; }
	void SetWTheta(Double_t w) { fWTheta = w; }	void SetWTheta(Double_t w) { fWTheta = w; }
	Double_t GetATheta() const { return fATheta; }	Double_t GetATheta() const { return fATheta; }
	void SetATheta(Double_t a);	void SetATheta(Double_t a);

	Double_t GetWDolly() const { return fWDolly; }	Double_t GetWDolly() const { return fWDolly; }
	void SetWDolly(Double_t w) { fWDolly = w; }	void SetWDolly(Double_t w) { fWDolly = w; }
	Double_t GetADolly() const { return fADolly; }	Double_t GetADolly() const { return fADolly; }
	void SetADolly(Double_t a);	void SetADolly(Double_t a);


	ClassDef(TGLAutoRotator, 0); // Short description.	TString GetImageName() const { return fImageName; }
		void SetImageName(const TString& name) { fImageName = name; }
		Int_t GetImageCount() const { return fImageCount; }
		void SetImageCount(Int_t ic) { fImageCount = ic; }
		Bool_t GetImageAutoSave() const { return fImageAutoSave; }
		void SetImageAutoSave(Bool_t s) { fImageAutoSave = s; }

		void StartImageAutoSaveAnimatedGif(const TString& filename);
		void StartImageAutoSave(const TString& filename);
		void StopImageAutoSave();

		TString GetImageGUIBaseName() const { return fImageGUIBas
		eName; }
		void SetImageGUIBaseName(const TString& gname) { fImageGUIBaseName =
		gname; }

		Int_t GetImageGUIOutMode() const { return fImageGUIOutMode; }
		void SetImageGUIOutMode(Int_t m);

		void StartImageAutoSaveWithGUISettings();

		ClassDef(TGLAutoRotator, 0); // Automatic, timer-based, rotation of GL-v
		iewer's camera.
	};	};

	#endif	#endif

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

	TGLViewerEditor.h	TGLViewerEditor.h

	skipping to change at line 33	skipping to change at line 33
	#endif	#endif

	class TGCheckButton;	class TGCheckButton;
	class TGNumberEntry;	class TGNumberEntry;
	class TGButtonGroup;	class TGButtonGroup;
	class TGroupFrame;	class TGroupFrame;
	class TGRadioButton;	class TGRadioButton;
	class TGColorSelect;	class TGColorSelect;
	class TGComboBox;	class TGComboBox;
	class TGButton;	class TGButton;

		class TGTextEntry;
	class TGLViewer;	class TGLViewer;
	class TGTab;	class TGTab;

	class TGLLightSetSubEditor;	class TGLLightSetSubEditor;
	class TGLClipSetSubEditor;	class TGLClipSetSubEditor;

	class TGLViewerEditor : public TGedFrame	class TGLViewerEditor : public TGedFrame
	{	{
	private:	private:
	//Pointers to manipulate with tabs	//Pointers to manipulate with tabs

	skipping to change at line 98	skipping to change at line 99
	TGGroupFrame *fCamContainer;	TGGroupFrame *fCamContainer;
	TGComboBox* fCamMode;	TGComboBox* fCamMode;
	TGCheckButton* fCamOverlayOn;	TGCheckButton* fCamOverlayOn;

	TGLClipSetSubEditor *fClipSet;	TGLClipSetSubEditor *fClipSet;

	TGNumberEntry fARotDt, fARotWPhi;	TGNumberEntry fARotDt, fARotWPhi;
	TGNumberEntry fARotATheta, fARotWTheta;	TGNumberEntry fARotATheta, fARotWTheta;
	TGNumberEntry fARotADolly, fARotWDolly;	TGNumberEntry fARotADolly, fARotWDolly;


		TGTextEntry *fASavImageGUIBaseName;
		TGButtonGroup *fASavImageGUIOutMode;

	TGNumberEntry *fStereoZeroParallax;	TGNumberEntry *fStereoZeroParallax;
	TGNumberEntry *fStereoEyeOffsetFac;	TGNumberEntry *fStereoEyeOffsetFac;
	TGNumberEntry *fStereoFrustumAsymFac;	TGNumberEntry *fStereoFrustumAsymFac;


	//Model	// Model
	TGLViewer *fViewer;	TGLViewer *fViewer;
	Bool_t fIsInPad;	Bool_t fIsInPad;

	void ConnectSignals2Slots();	void ConnectSignals2Slots();

	TGLViewerEditor(const TGLViewerEditor &);	TGLViewerEditor(const TGLViewerEditor &);
	TGLViewerEditor &operator = (const TGLViewerEditor &);	TGLViewerEditor &operator = (const TGLViewerEditor &);

	void CreateStyleTab();	void CreateStyleTab();
	void CreateGuidesTab();	void CreateGuidesTab();

	skipping to change at line 140	skipping to change at line 144
	void DoResetCamerasOnUpdate();	void DoResetCamerasOnUpdate();
	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
	void UpdateViewerAxes(Int_t id);	void UpdateViewerAxes(Int_t id);
	void UpdateViewerReference();	void UpdateViewerReference();
	void DoCameraOverlay();	void DoCameraOverlay();
	// Extras	// Extras
	void UpdateRotator();	void UpdateRotator();
	void DoRotatorStart();	void DoRotatorStart();
	void DoRotatorStop();	void DoRotatorStop();

		void DoASavImageGUIBaseName(const char* t);
		void DoASavImageGUIOutMode(Int_t m);
		void DoASavImageStart();
		void DoASavImageStop();
	void UpdateStereo();	void UpdateStereo();

	void DetachFromPad(){fIsInPad = kFALSE;}	void DetachFromPad(){fIsInPad = kFALSE;}

	static TGNumberEntry* MakeLabeledNEntry(TGCompositeFrame* p, const char* name,	static TGNumberEntry* MakeLabeledNEntry(TGCompositeFrame* p, const char* name,
	Int_t labelw, Int_t nd=7, Int_t s=5);	Int_t labelw, Int_t nd=7, Int_t s=5);

	ClassDef(TGLViewerEditor, 0); //GUI for editing TGLViewer attributes	ClassDef(TGLViewerEditor, 0); //GUI for editing TGLViewer attributes
	};	};


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

	TGenericClassInfo.h	TGenericClassInfo.h

	// @(#)root/base:$Id: TGenericClassInfo.h 36954 2010-11-25 19:19:46Z pcanal $	// @(#)root/base:$Id: TGenericClassInfo.h 39635 2011-06-09 15:37:27Z pcanal $
	// Author: Philippe Canal 23/2/02	// Author: Philippe Canal 23/2/02

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


	skipping to change at line 51	skipping to change at line 51
	const char *fClassName;	const char *fClassName;
	const char *fDeclFileName;	const char *fDeclFileName;
	Int_t fDeclFileLine;	Int_t fDeclFileLine;
	VoidFuncPtr_t fDictionary;	VoidFuncPtr_t fDictionary;
	const type_info &fInfo;	const type_info &fInfo;
	const char *fImplFileName;	const char *fImplFileName;
	Int_t fImplFileLine;	Int_t fImplFileLine;
	TVirtualIsAProxy *fIsA;	TVirtualIsAProxy *fIsA;
	ShowMembersFunc_t fShowMembers;	ShowMembersFunc_t fShowMembers;
	Int_t fVersion;	Int_t fVersion;

		MergeFunc_t fMerge;
	NewFunc_t fNew;	NewFunc_t fNew;
	NewArrFunc_t fNewArray;	NewArrFunc_t fNewArray;
	DelFunc_t fDelete;	DelFunc_t fDelete;
	DelArrFunc_t fDeleteArray;	DelArrFunc_t fDeleteArray;
	DesFunc_t fDestructor;	DesFunc_t fDestructor;
	DirAutoAdd_t fDirAutoAdd;	DirAutoAdd_t fDirAutoAdd;
	TClassStreamer *fStreamer;	TClassStreamer *fStreamer;
	ClassStreamerFunc_t fStreamerFunc;	ClassStreamerFunc_t fStreamerFunc;
	TVirtualCollectionProxy *fCollectionProxy;	TVirtualCollectionProxy *fCollectionProxy;
	Int_t fSizeof;	Int_t fSizeof;

	skipping to change at line 128	skipping to change at line 129
	Short_t AdoptCollectionProxy(TVirtualCollec tionProxy*);	Short_t AdoptCollectionProxy(TVirtualCollec tionProxy*);
	void AdoptCollectionProxyInfo(TCollectio nProxyInfo*);	void AdoptCollectionProxyInfo(TCollectio nProxyInfo*);
	void AdoptCollectionStreamerInfo(TCollec tionProxyInfo*);	void AdoptCollectionStreamerInfo(TCollec tionProxyInfo*);
	Int_t SetDeclFile(const char *file, Int_t line);	Int_t SetDeclFile(const char *file, Int_t line);
	void SetDelete(DelFunc_t deleteFunc);	void SetDelete(DelFunc_t deleteFunc);
	void SetDeleteArray(DelArrFunc_t deleteA rrayFunc);	void SetDeleteArray(DelArrFunc_t deleteA rrayFunc);
	void SetDestructor(DesFunc_t destructorF unc);	void SetDestructor(DesFunc_t destructorF unc);
	void SetDirectoryAutoAdd(DirAutoAdd_t di rAutoAdd);	void SetDirectoryAutoAdd(DirAutoAdd_t di rAutoAdd);
	void SetFromTemplate();	void SetFromTemplate();
	Int_t SetImplFile(const char *file, Int_t line);	Int_t SetImplFile(const char *file, Int_t line);

		void SetMerge(MergeFunc_t);
	void SetNew(NewFunc_t newFunc);	void SetNew(NewFunc_t newFunc);
	void SetNewArray(NewArrFunc_t newArrayFu nc);	void SetNewArray(NewArrFunc_t newArrayFu nc);
	void SetReadRawRules( const std::vector< ROOT::TSchemaHelper>& rules );	void SetReadRawRules( const std::vector< ROOT::TSchemaHelper>& rules );
	void SetReadRules( const std::vector<ROO T::TSchemaHelper>& rules );	void SetReadRules( const std::vector<ROO T::TSchemaHelper>& rules );
	Short_t SetStreamer(ClassStreamerFunc_t);	Short_t SetStreamer(ClassStreamerFunc_t);
	void SetStreamerFunc(ClassStreamerFunc_t );	void SetStreamerFunc(ClassStreamerFunc_t );
	Short_t SetVersion(Short_t version);	Short_t SetVersion(Short_t version);

	// protected:	// protected:
	private:	private:

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

	TGeoChecker.h	TGeoChecker.h

	// @(#)root/geom:$Id: TGeoChecker.h 34887 2010-08-20 14:32:38Z agheata $	// @(#)root/geom:$Id: TGeoChecker.h 39340 2011-05-23 13:04:56Z agheata $
	// Author: Andrei Gheata 01/11/01	// Author: Andrei Gheata 01/11/01

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

	#ifndef ROOT_TGeoChecker	#ifndef ROOT_TGeoChecker
	#define ROOT_TGeoChecker	#define ROOT_TGeoChecker

	#ifndef ROOT_TObject	#ifndef ROOT_TObject
	#include "TObject.h"	#include "TObject.h"
	#endif	#endif

	// forward declarations	// forward declarations
	class TTree;	class TTree;

		class TGeoShape;
	class TGeoVolume;	class TGeoVolume;
	class TGeoVoxelFinder;	class TGeoVoxelFinder;
	class TGeoNode;	class TGeoNode;
	class TGeoManager;	class TGeoManager;
	class TGeoMatrix;	class TGeoMatrix;
	class TGeoOverlap;	class TGeoOverlap;
	class TBuffer3D;	class TBuffer3D;
	class TH2F;	class TH2F;
	class TStopwatch;	class TStopwatch;


	skipping to change at line 74	skipping to change at line 75
	// destructor	// destructor
	virtual ~TGeoChecker();	virtual ~TGeoChecker();
	// methods	// methods
	virtual void CheckBoundaryErrors(Int_t ntracks=1000000, Double_t rad ius=-1.);	virtual void CheckBoundaryErrors(Int_t ntracks=1000000, Double_t rad ius=-1.);
	virtual void CheckBoundaryReference(Int_t icheck=-1);	virtual void CheckBoundaryReference(Int_t icheck=-1);
	void CheckGeometryFull(Bool_t checkoverlaps=kTRUE, Bool_t ch eckcrossings=kTRUE, Int_t nrays=10000, const Double_t *vertex=NULL);	void CheckGeometryFull(Bool_t checkoverlaps=kTRUE, Bool_t ch eckcrossings=kTRUE, Int_t nrays=10000, const Double_t *vertex=NULL);
	void CheckGeometry(Int_t nrays, Double_t startx, Double_t st arty, Double_t startz) const;	void CheckGeometry(Int_t nrays, Double_t startx, Double_t st arty, Double_t startz) const;
	void CheckOverlaps(const TGeoVolume vol, Double_t ovlp=0.1, Option_t option="");	void CheckOverlaps(const TGeoVolume vol, Double_t ovlp=0.1, Option_t option="");
	void CheckOverlapsBySampling(TGeoVolume *vol, Double_t ovlp= 0.1, Int_t npoints=1000000) const;	void CheckOverlapsBySampling(TGeoVolume *vol, Double_t ovlp= 0.1, Int_t npoints=1000000) const;
	void CheckPoint(Double_t x=0, Double_t y=0, Double_t z=0, Op tion_t *option="");	void CheckPoint(Double_t x=0, Double_t y=0, Double_t z=0, Op tion_t *option="");

		void CheckShape(TGeoShape shape, Int_t testNo, Int_t nsampl es, Option_t option);
	Double_t CheckVoxels(TGeoVolume vol, TGeoVoxelFinder voxels, D ouble_t *xyz, Int_t npoints);	Double_t CheckVoxels(TGeoVolume vol, TGeoVoxelFinder voxels, D ouble_t *xyz, Int_t npoints);
	TH2F *LegoPlot(Int_t ntheta=60, Double_t themin=0., Double_t themax=180.,	TH2F *LegoPlot(Int_t ntheta=60, Double_t themin=0., Double_t themax=180.,
	Int_t nphi=90, Double_t phimin=0., Double_t phi max=360.,	Int_t nphi=90, Double_t phimin=0., Double_t phi max=360.,
	Double_t rmin=0., Double_t rmax=9999999, Option _t *option="");	Double_t rmin=0., Double_t rmax=9999999, Option _t *option="");
	void PrintOverlaps() const;	void PrintOverlaps() const;
	void RandomPoints(TGeoVolume vol, Int_t npoints, Option_t option);	void RandomPoints(TGeoVolume vol, Int_t npoints, Option_t option);
	void RandomRays(Int_t nrays, Double_t startx, Double_t start y, Double_t startz);	void RandomRays(Int_t nrays, Double_t startx, Double_t start y, Double_t startz);
	TGeoOverlap MakeCheckOverlap(const char name, TGeoVolume vol1, TG eoVolume vol2, TGeoMatrix mat1, TGeoMatrix mat2, Bool_t isovlp, Double_t ovlp);	TGeoOverlap MakeCheckOverlap(const char name, TGeoVolume vol1, TG eoVolume vol2, TGeoMatrix mat1, TGeoMatrix mat2, Bool_t isovlp, Double_t ovlp);
	void OpProgress(const char opname, Long64_t current, Long64 _t size, TStopwatch watch=0, Bool_t last=kFALSE, Bool_t refresh=kFALSE);	void OpProgress(const char opname, Long64_t current, Long64 _t size, TStopwatch watch=0, Bool_t last=kFALSE, Bool_t refresh=kFALSE);
	TGeoNode SamplePoints(Int_t npoints, Double_t &dist, Double_t ep sil, const char g3path);	TGeoNode SamplePoints(Int_t npoints, Double_t &dist, Double_t ep sil, const char g3path);

		void ShapeDistances(TGeoShape *shape, Int_t nsamples, Option
		_t *option);
		void ShapeSafety(TGeoShape *shape, Int_t nsamples, Option_t
		*option);
		void ShapeNormal(TGeoShape *shape, Int_t nsamples, Option_t
		*option);
	Double_t ShootRay(Double_t start, Double_t dirx, Double_t diry, Double_t dirz, Double_t array, Int_t &nelem, Int_t &dim, Double_t enpoin t=0) const;	Double_t ShootRay(Double_t start, Double_t dirx, Double_t diry, Double_t dirz, Double_t array, Int_t &nelem, Int_t &dim, Double_t enpoin t=0) const;
	void SetSelectedNode(TGeoNode *node) {fSelectedNode=node;}	void SetSelectedNode(TGeoNode *node) {fSelectedNode=node;}
	void SetNmeshPoints(Int_t npoints=1000);	void SetNmeshPoints(Int_t npoints=1000);
	void Test(Int_t npoints, Option_t *option);	void Test(Int_t npoints, Option_t *option);
	void TestOverlaps(const char *path);	void TestOverlaps(const char *path);
	Bool_t TestVoxels(TGeoVolume *vol, Int_t npoints=1000000);	Bool_t TestVoxels(TGeoVolume *vol, Int_t npoints=1000000);
	Double_t Weight(Double_t precision=0.01, Option_t *option="v");	Double_t Weight(Double_t precision=0.01, Option_t *option="v");

	ClassDef(TGeoChecker, 2) // a simple geometry checker	ClassDef(TGeoChecker, 2) // a simple geometry checker
	};	};

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

	TGeoTorus.h	TGeoTorus.h

	// @(#)root/base:$Id: TGeoTorus.h 24879 2008-07-18 08:04:40Z brun $	// @(#)root/base:$Id: TGeoTorus.h 39099 2011-05-04 15:01:53Z agheata $
	// Author: Andrei Gheata 28/07/03	// Author: Andrei Gheata 28/07/03

	/*************************************************************************	/*************************************************************************
	* 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 46	skipping to change at line 46
	Double_t fRmax; // outer radius	Double_t fRmax; // outer radius
	Double_t fPhi1; // starting phi	Double_t fPhi1; // starting phi
	Double_t fDphi; // phi extent	Double_t fDphi; // phi extent
	// methods	// methods

	public:	public:
	virtual Double_t Capacity() const;	virtual Double_t Capacity() const;
	Double_t Daxis(Double_t pt, Double_t dir, Double_t t) con st;	Double_t Daxis(Double_t pt, Double_t dir, Double_t t) con st;
	Double_t DDaxis(Double_t pt, Double_t dir, Double_t t) co nst;	Double_t DDaxis(Double_t pt, Double_t dir, Double_t t) co nst;
	Double_t DDDaxis(Double_t pt, Double_t dir, Double_t t) c onst;	Double_t DDDaxis(Double_t pt, Double_t dir, Double_t t) c onst;

	Double_t ToBoundary(Double_t pt, Double_t dir, Double_t r ) const;	Double_t ToBoundary(Double_t pt, Double_t dir, Double_t r , Bool_t in) const;
	Int_t SolveCubic(Double_t a, Double_t b, Double_t c, Dou ble_t *x) const;	Int_t SolveCubic(Double_t a, Double_t b, Double_t c, Dou ble_t *x) const;
	Int_t SolveQuartic(Double_t a, Double_t b, Double_t c, D ouble_t d, Double_t *x) const;	Int_t SolveQuartic(Double_t a, Double_t b, Double_t c, D ouble_t d, Double_t *x) const;
	public:	public:
	// constructors	// constructors
	TGeoTorus();	TGeoTorus();
	TGeoTorus(Double_t r, Double_t rmin, Double_t rmax, Double_t phi1=0, Dou ble_t dphi=360);	TGeoTorus(Double_t r, Double_t rmin, Double_t rmax, Double_t phi1=0, Dou ble_t dphi=360);
	TGeoTorus(const char * name, Double_t r, Double_t rmin, Double_t rmax, D ouble_t phi1=0, Double_t dphi=360);	TGeoTorus(const char * name, Double_t r, Double_t rmin, Double_t rmax, D ouble_t phi1=0, Double_t dphi=360);
	TGeoTorus(Double_t *params);	TGeoTorus(Double_t *params);
	// destructor	// destructor
	virtual ~TGeoTorus() {}	virtual ~TGeoTorus() {}

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

	TGeoXtru.h	TGeoXtru.h

	// @(#)root/geom:$Id: TGeoXtru.h 21425 2007-12-17 15:59:27Z brun $	// @(#)root/geom:$Id: TGeoXtru.h 39105 2011-05-05 08:57:04Z agheata $
	// Author: Mihaela Gheata 24/01/04	// Author: Mihaela Gheata 24/01/04

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


	skipping to change at line 58	skipping to change at line 58
	Int_t fIz; // !current z plane [0,fNz-1]	Int_t fIz; // !current z plane [0,fNz-1]

	TGeoXtru(const TGeoXtru&);	TGeoXtru(const TGeoXtru&);
	TGeoXtru& operator=(const TGeoXtru&);	TGeoXtru& operator=(const TGeoXtru&);

	// methods	// methods
	Double_t DistToPlane(Double_t point, Double_t dir, Int_t iz, Int_t ivert, Double_t stepmax, Bool_t in) const;	Double_t DistToPlane(Double_t point, Double_t dir, Int_t iz, Int_t ivert, Double_t stepmax, Bool_t in) const;
	void GetPlaneVertices(Int_t iz, Int_t ivert, Double_t * vert) const;	void GetPlaneVertices(Int_t iz, Int_t ivert, Double_t * vert) const;
	void GetPlaneNormal(const Double_t vert, Double_t nor m) const;	void GetPlaneNormal(const Double_t vert, Double_t nor m) const;
	Bool_t IsPointInsidePlane(Double_t point, Double_t vert , Double_t *norm) const;	Bool_t IsPointInsidePlane(Double_t point, Double_t vert , Double_t *norm) const;

	Double_t SafetyToSector(Double_t *point, Int_t iz, Double_t safmin);	Double_t SafetyToSector(Double_t *point, Int_t iz, Double_t safmin, Bool_t in);
	void SetIz(Int_t iz) {fIz = iz;}	void SetIz(Int_t iz) {fIz = iz;}
	void SetSeg(Int_t iseg) {fSeg = iseg;}	void SetSeg(Int_t iseg) {fSeg = iseg;}

	public:	public:
	// constructors	// constructors
	TGeoXtru();	TGeoXtru();
	TGeoXtru(Int_t nz);	TGeoXtru(Int_t nz);
	TGeoXtru(Double_t *param);	TGeoXtru(Double_t *param);
	// destructor	// destructor
	virtual ~TGeoXtru();	virtual ~TGeoXtru();

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

	THStack.h	THStack.h

	// @(#)root/hist:$Id: THStack.h 28509 2009-05-11 07:19:52Z brun $	// @(#)root/hist:$Id: THStack.h 39365 2011-05-24 19:53:19Z pcanal $
	// Author: Rene Brun 10/12/2001	// Author: Rene Brun 10/12/2001

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


	skipping to change at line 31	skipping to change at line 31
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////

	#ifndef ROOT_TH1	#ifndef ROOT_TH1
	#include "TH1.h"	#include "TH1.h"
	#endif	#endif
	#ifndef ROOT_TObjArray	#ifndef ROOT_TObjArray
	#include "TObjArray.h"	#include "TObjArray.h"
	#endif	#endif

	class TBrowser;	class TBrowser;

		class TFileMergeInfo;

	class THStack : public TNamed {	class THStack : public TNamed {
	private:	private:
	THStack& operator=(const THStack&); // Not implemented	THStack& operator=(const THStack&); // Not implemented

	protected:	protected:
	TList *fHists; //Pointer to array of TH1	TList *fHists; //Pointer to array of TH1
	TObjArray *fStack; //!Pointer to array of sums of TH1	TObjArray *fStack; //!Pointer to array of sums of TH1
	TH1 *fHistogram; //Pointer to histogram used for drawing axis	TH1 *fHistogram; //Pointer to histogram used for drawing axis
	Double_t fMaximum; //Maximum value for plotting along y	Double_t fMaximum; //Maximum value for plotting along y

	skipping to change at line 68	skipping to change at line 69
	virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);	virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);
	virtual void Draw(Option_t *chopt="");	virtual void Draw(Option_t *chopt="");
	TH1 *GetHistogram() const;	TH1 *GetHistogram() const;
	TList *GetHists() const { return fHists; }	TList *GetHists() const { return fHists; }
	TObjArray *GetStack();	TObjArray *GetStack();
	virtual Double_t GetMaximum(Option_t *option="");	virtual Double_t GetMaximum(Option_t *option="");
	virtual Double_t GetMinimum(Option_t *option="");	virtual Double_t GetMinimum(Option_t *option="");
	TAxis *GetXaxis() const;	TAxis *GetXaxis() const;
	TAxis *GetYaxis() const;	TAxis *GetYaxis() const;
	virtual void ls(Option_t *option="") const;	virtual void ls(Option_t *option="") const;

		virtual Long64_t Merge(TCollection* li, TFileMergeInfo *info);
	virtual void Modified();	virtual void Modified();
	virtual void Paint(Option_t *chopt="");	virtual void Paint(Option_t *chopt="");
	virtual void Print(Option_t *chopt="") const;	virtual void Print(Option_t *chopt="") const;
	virtual void RecursiveRemove(TObject *obj);	virtual void RecursiveRemove(TObject *obj);
	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(ostream &out, Option_t *option = "");
	virtual void SetHistogram(TH1 *h) {fHistogram = h;}	virtual void SetHistogram(TH1 *h) {fHistogram = h;}
	virtual void SetMaximum(Double_t maximum=-1111); // MENU	virtual void SetMaximum(Double_t maximum=-1111); // MENU
	virtual void SetMinimum(Double_t minimum=-1111); // MENU	virtual void SetMinimum(Double_t minimum=-1111); // MENU

	ClassDef(THStack,2) //A collection of histograms	ClassDef(THStack,2) //A collection of histograms

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

	TMatrixT.h	TMatrixT.h

	// @(#)root/matrix:$Id: TMatrixT.h 34744 2010-08-07 06:16:36Z brun $	// @(#)root/matrix:$Id: TMatrixT.h 39086 2011-05-04 09:36:17Z 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_TMatrixT	#ifndef ROOT_TMatrixT
	#define ROOT_TMatrixT	#define ROOT_TMatrixT

	skipping to change at line 57	skipping to change at line 57
	Int_t newSize,Int_t oldSize);	Int_t newSize,Int_t oldSize);
	void Allocate(Int_t nrows,Int_t ncols,Int_t row_lwb = 0,Int_t col_lw b = 0,Int_t init = 0,	void Allocate(Int_t nrows,Int_t ncols,Int_t row_lwb = 0,Int_t col_lw b = 0,Int_t init = 0,
	Int_t /nr_nonzeros/ = -1);	Int_t /nr_nonzeros/ = -1);

	public:	public:

	enum {kWorkMax = 100};	enum {kWorkMax = 100};
	enum EMatrixCreatorsOp1 { kZero,kUnit,kTransposed,kInverted,kAtA };	enum EMatrixCreatorsOp1 { kZero,kUnit,kTransposed,kInverted,kAtA };
	enum EMatrixCreatorsOp2 { kMult,kTransposeMult,kInvMult,kMultTranspose,k Plus,kMinus };	enum EMatrixCreatorsOp2 { kMult,kTransposeMult,kInvMult,kMultTranspose,k Plus,kMinus };


	TMatrixT(): fElements(0) { }	TMatrixT(): fDataStack(), fElements(0) { }
	TMatrixT(Int_t nrows,Int_t ncols);	TMatrixT(Int_t nrows,Int_t ncols);
	TMatrixT(Int_t row_lwb,Int_t row_upb,Int_t col_lwb,Int_t col_upb);	TMatrixT(Int_t row_lwb,Int_t row_upb,Int_t col_lwb,Int_t col_upb);
	TMatrixT(Int_t nrows,Int_t ncols,const Element data,Option_t option="" );	TMatrixT(Int_t nrows,Int_t ncols,const Element data,Option_t option="" );
	TMatrixT(Int_t row_lwb,Int_t row_upb,Int_t col_lwb,Int_t col_upb,const E lement data,Option_t option="");	TMatrixT(Int_t row_lwb,Int_t row_upb,Int_t col_lwb,Int_t col_upb,const E lement data,Option_t option="");
	TMatrixT(const TMatrixT <Element> &another);	TMatrixT(const TMatrixT <Element> &another);
	TMatrixT(const TMatrixTSym <Element> &another);	TMatrixT(const TMatrixTSym <Element> &another);
	TMatrixT(const TMatrixTSparse<Element> &another);	TMatrixT(const TMatrixTSparse<Element> &another);
	template <class Element2> TMatrixT(const TMatrixT<Element2> &another): f Elements(0)	template <class Element2> TMatrixT(const TMatrixT<Element2> &another): f Elements(0)
	{	{
	R__ASSERT(another.IsValid());	R__ASSERT(another.IsValid());

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

	TMessage.h	TMessage.h

	// @(#)root/net:$Id: TMessage.h 35752 2010-09-26 22:07:36Z rdm $	// @(#)root/net:$Id: TMessage.h 39697 2011-06-13 21:43:43Z pcanal $
	// Author: Fons Rademakers 19/12/96	// Author: Fons Rademakers 19/12/96

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


	skipping to change at line 49	skipping to change at line 49
	friend class TAuthenticate;	friend class TAuthenticate;
	friend class TSocket;	friend class TSocket;
	friend class TPSocket;	friend class TPSocket;
	friend class TXSocket;	friend class TXSocket;

	private:	private:
	TList *fInfos; //Array of TStreamerInfo used in WriteObject	TList *fInfos; //Array of TStreamerInfo used in WriteObject
	TBits fBitsPIDs; //Array of bits to mark the TProcessIDs uids writ ten to the message	TBits fBitsPIDs; //Array of bits to mark the TProcessIDs uids writ ten to the message
	UInt_t fWhat; //Message type	UInt_t fWhat; //Message type
	TClass *fClass; //If message is kMESS_OBJECT pointer to object's class	TClass *fClass; //If message is kMESS_OBJECT pointer to object's class

	Int_t fCompress; //Compression level from 0 (not compressed) to 9 (max compression)	Int_t fCompress; //Compression level and algorithm
	char *fBufComp; //Compressed buffer	char *fBufComp; //Compressed buffer
	char *fBufCompCur; //Current position in compressed buffer	char *fBufCompCur; //Current position in compressed buffer
	char *fCompPos; //Position of fBufCur when message was compressed	char *fCompPos; //Position of fBufCur when message was compressed
	Bool_t fEvolution; //True if support for schema evolution required	Bool_t fEvolution; //True if support for schema evolution required

	static Bool_t fgEvolution; //True if global support for schema evolutio n required	static Bool_t fgEvolution; //True if global support for schema evolutio n required

	// TMessage objects cannot be copied or assigned	// TMessage objects cannot be copied or assigned
	TMessage(const TMessage &); // not implemented	TMessage(const TMessage &); // not implemented
	void operator=(const TMessage &); // not implemented	void operator=(const TMessage &); // not implemented

	skipping to change at line 83	skipping to change at line 83
	void Forward();	void Forward();
	TClass *GetClass() const { return fClass;}	TClass *GetClass() const { return fClass;}
	void TagStreamerInfo(TVirtualStreamerInfo* info);	void TagStreamerInfo(TVirtualStreamerInfo* info);
	void Reset();	void Reset();
	void Reset(UInt_t what) { SetWhat(what); Reset(); }	void Reset(UInt_t what) { SetWhat(what); Reset(); }
	UInt_t What() const { return fWhat; }	UInt_t What() const { return fWhat; }
	void SetWhat(UInt_t what);	void SetWhat(UInt_t what);

	void EnableSchemaEvolution(Bool_t enable = kTRUE) { fEvolution = ena ble; }	void EnableSchemaEvolution(Bool_t enable = kTRUE) { fEvolution = ena ble; }
	Bool_t UsesSchemaEvolution() const { return fEvolution; }	Bool_t UsesSchemaEvolution() const { return fEvolution; }

	void SetCompressionLevel(Int_t level = 1);	Int_t GetCompressionAlgorithm() const;
	Int_t GetCompressionLevel() const { return fCompress; }	Int_t GetCompressionLevel() const;
		Int_t GetCompressionSettings() const;
		void SetCompressionAlgorithm(Int_t algorithm=0);
		void SetCompressionLevel(Int_t level=1);
		void SetCompressionSettings(Int_t settings=1);
	Int_t Compress();	Int_t Compress();
	Int_t Uncompress();	Int_t Uncompress();
	char *CompBuffer() const { return fBufComp; }	char *CompBuffer() const { return fBufComp; }
	Int_t CompLength() const { return (Int_t)(fBufCompCur - fBufComp); }	Int_t CompLength() const { return (Int_t)(fBufCompCur - fBufComp); }
	void WriteObject(const TObject *obj);	void WriteObject(const TObject *obj);
	UShort_t WriteProcessID(TProcessID *pid);	UShort_t WriteProcessID(TProcessID *pid);

	static void EnableSchemaEvolutionForAll(Bool_t enable = kTRUE);	static void EnableSchemaEvolutionForAll(Bool_t enable = kTRUE);
	static Bool_t UsesSchemaEvolutionForAll();	static Bool_t UsesSchemaEvolutionForAll();

	ClassDef(TMessage,0) // Message buffer class	ClassDef(TMessage,0) // Message buffer class
	};	};


		//_________________________________________________________________________
		_____
		inline Int_t TMessage::GetCompressionAlgorithm() const
		{
		return (fCompress < 0) ? -1 : fCompress / 100;
		}

		//_________________________________________________________________________
		_____
		inline Int_t TMessage::GetCompressionLevel() const
		{
		return (fCompress < 0) ? -1 : fCompress % 100;
		}

		//_________________________________________________________________________
		_____
		inline Int_t TMessage::GetCompressionSettings() const
		{
		return (fCompress < 0) ? -1 : fCompress;
		}

	#endif	#endif

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

	TMinuitMinimizer.h	TMinuitMinimizer.h

	// @(#)root/minuit:$Id: TMinuitMinimizer.h 35643 2010-09-23 12:48:32Z monet a $	// @(#)root/minuit:$Id: TMinuitMinimizer.h 39420 2011-05-26 15:00:28Z 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 143	skipping to change at line 143

	/// return errors at the minimum	/// return errors at the minimum
	virtual const double * Errors() const { return &fErrors.front(); }	virtual const double * Errors() const { return &fErrors.front(); }

	/** return covariance matrices elements	/** return covariance matrices elements
	if the variable is fixed the matrix is zero	if the variable is fixed the matrix is zero
	The ordering of the variables is the same as in errors	The ordering of the variables is the same as in errors
	*/	*/
	virtual double CovMatrix(unsigned int i, unsigned int j) const {	virtual double CovMatrix(unsigned int i, unsigned int j) const {
	return ( fCovar.size() > (i + fDim* j) ) ? fCovar[i + fDim* j] : 0;	return ( fCovar.size() > (i + fDim* j) ) ? fCovar[i + fDim* j] : 0;

	}	}

		/**
		Fill the passed array with the covariance matrix elements
		if the variable is fixed or const the value is zero.
		The array will be filled as cov[i *ndim + j]
		The ordering of the variables is the same as in errors and parameter
		value.
		This is different from the direct interface of Minuit2 or TMinuit wh
		ere the
		values were obtained only to variable parameters
		*/
		virtual bool GetCovMatrix(double * cov) const;

		/**
		Fill the passed array with the Hessian matrix elements
		The Hessian matrix is the matrix of the second derivatives
		and is the inverse of the covariance matrix
		If the variable is fixed or const the values for that variables are
		zero.
		The array will be filled as h[i *ndim + j]
		*/
		virtual bool GetHessianMatrix(double * h) const;

	///return status of covariance matrix	///return status of covariance matrix
	virtual int CovMatrixStatus() const;	virtual int CovMatrixStatus() const;

	///global correlation coefficient for variable i	///global correlation coefficient for variable i
	virtual double GlobalCC(unsigned int ) const;	virtual double GlobalCC(unsigned int ) const;

	/// minos error for variable i, return false if Minos failed	/// minos error for variable i, return false if Minos failed
	virtual bool GetMinosError(unsigned int i, double & errLow, double & err Up, int = 0);	virtual bool GetMinosError(unsigned int i, double & errLow, double & err Up, int = 0);


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

	TNeuronInput.h	TNeuronInput.h

	// @(#)root/tmva $Id: TNeuronInput.h 29122 2009-06-22 06:51:30Z brun $	// @(#)root/tmva $Id: TNeuronInput.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Matt Jachowski	// Author: Matt Jachowski

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : TMVA::TNeuronInput *	* Class : TMVA::TNeuronInput *
	* *	* *
	* Description: *	* Description: *
	* Interface for TNeuron input calculation classes *	* Interface for TNeuron input calculation classes *
	* *	* *

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

	TNeuronInputAbs.h	TNeuronInputAbs.h

	// @(#)root/tmva $Id: TNeuronInputAbs.h 29122 2009-06-22 06:51:30Z brun $	// @(#)root/tmva $Id: TNeuronInputAbs.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Matt Jachowski	// Author: Matt Jachowski

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : TMVA::TNeuronInputAbs *	* Class : TMVA::TNeuronInputAbs *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* TNeuron input calculator -- calculates the sum of the absolute valu es *	* TNeuron input calculator -- calculates the sum of the absolute valu es *

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

	TNeuronInputChooser.h	TNeuronInputChooser.h

	// @(#)root/tmva $Id: TNeuronInputChooser.h 29122 2009-06-22 06:51:30Z brun $	// @(#)root/tmva $Id: TNeuronInputChooser.h 39395 2011-05-26 10:05:54Z mone ta $
	// Author: Matt Jachowski	// Author: Matt Jachowski

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : TMVA::TNeuronInputChooser *	* Class : TMVA::TNeuronInputChooser *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Class for easily choosing neuron input functions. *	* Class for easily choosing neuron input functions. *

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

	TNeuronInputSqSum.h	TNeuronInputSqSum.h

	// @(#)root/tmva $Id: TNeuronInputSqSum.h 29122 2009-06-22 06:51:30Z brun $	// @(#)root/tmva $Id: TNeuronInputSqSum.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Matt Jachowski	// Author: Matt Jachowski

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : TMVA::TNeuronInputSqSum *	* Class : TMVA::TNeuronInputSqSum *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* TNeuron input calculator -- calculates the square *	* TNeuron input calculator -- calculates the square *

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

	TNeuronInputSum.h	TNeuronInputSum.h

	// @(#)root/tmva $Id: TNeuronInputSum.h 31458 2009-11-30 13:58:20Z stelzer $	// @(#)root/tmva $Id: TNeuronInputSum.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Matt Jachowski	// Author: Matt Jachowski

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : TMVA::TNeuronInputSum *	* Class : TMVA::TNeuronInputSum *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* TNeuron input calculator -- calculates the weighted sum of inputs. *	* TNeuron input calculator -- calculates the weighted sum of inputs. *

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

	TPacketizerUnit.h	TPacketizerUnit.h

	// @(#)root/proofplayer:$Id: TPacketizerUnit.h 34748 2010-08-09 10:18:05Z g anis $	// @(#)root/proofplayer:$Id: TPacketizerUnit.h 39088 2011-05-04 11:10:47Z g anis $
	// Author: Long Tran-Thanh 22/07/07	// Author: Long Tran-Thanh 22/07/07

		// Revised: G. Ganis, May 2011

	/*************************************************************************	/*************************************************************************
	* 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_TPacketizerUnit	#ifndef ROOT_TPacketizerUnit
	#define ROOT_TPacketizerUnit	#define ROOT_TPacketizerUnit

	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////
	// //	// //
	// TPacketizerUnit //	// TPacketizerUnit //
	// //	// //
	// This packetizer generates packets of generic units, representing the //	// This packetizer generates packets of generic units, representing the //
	// 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, //
		// with the goal of having all workers ending at the same time. //
	// //	// //
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////

	#ifndef ROOT_TVirtualPacketizer	#ifndef ROOT_TVirtualPacketizer
	#include "TVirtualPacketizer.h"	#include "TVirtualPacketizer.h"
	#endif	#endif
	#ifndef ROOT_TMap	#ifndef ROOT_TMap
	#include "TMap.h"	#include "TMap.h"
	#endif	#endif


	skipping to change at line 47	skipping to change at line 49
	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

	TMap *fSlaveStats; // Slave status, keyed by correspondig TSl ave	TMap *fWrkStats; // Worker status, keyed by correspondig TS lave
	TStopwatch *fStopwatch; // For measuring the start time of each pa cket	TStopwatch *fStopwatch; // For measuring the start time of each pa cket
	Long64_t fProcessing; // Event being processed	Long64_t fProcessing; // Event being processed
	Long64_t fAssigned; // Entries processed or being processed.	Long64_t fAssigned; // Entries processed or being processed.

	Long64_t fCalibNum; // Size of the calibrating packet	Double_t fCalibFrac; // Size of the calibrating packet as fract ion of Ntot/Nwrk
	Long64_t fNumPerWorker; // Number of cycles per worker, if this op tion	Long64_t fNumPerWorker; // Number of cycles per worker, if this op tion
	// is chosen	// is chosen

	TPacketizerUnit();	TPacketizerUnit();
	TPacketizerUnit(const TPacketizerUnit&); // no implementation, will generate	TPacketizerUnit(const TPacketizerUnit&); // no implementation, will generate
	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);	Float_t GetCurrentRate(Bool_t &all);

	Int_t GetActiveWorkers() { return fSlaveStats->GetSize(); }	Int_t GetActiveWorkers() { return fWrkStats->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. 6 change blocks.
	5 lines changed or deleted	7 lines changed or added

	TProofDraw.h	TProofDraw.h

	// @(#)root/proofplayer:$Id: TProofDraw.h 30068 2009-09-08 15:19:38Z ganis $	// @(#)root/proofplayer:$Id: TProofDraw.h 39173 2011-05-12 18:04:44Z ganis $
	// Author: Maarten Ballintijn 24/09/2003	// Author: Maarten Ballintijn 24/09/2003

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


	skipping to change at line 70	skipping to change at line 70
	TStatus *fStatus;	TStatus *fStatus;
	TString fSelection;	TString fSelection;
	TString fInitialExp;	TString fInitialExp;
	TTreeFormulaManager *fManager;	TTreeFormulaManager *fManager;
	TTree *fTree;	TTree *fTree;
	TTreeFormula *fVar[4]; // Pointer to variable formula	TTreeFormula *fVar[4]; // Pointer to variable formula
	TTreeFormula *fSelect; // Pointer to selection formula	TTreeFormula *fSelect; // Pointer to selection formula
	Int_t fMultiplicity; // Indicator of the variability o f the size of entries	Int_t fMultiplicity; // Indicator of the variability o f the size of entries
	Bool_t fObjEval; // true if fVar1 returns an objec t (or pointer to).	Bool_t fObjEval; // true if fVar1 returns an objec t (or pointer to).
	Int_t fDimension; // Dimension of the current expre ssion	Int_t fDimension; // Dimension of the current expre ssion

		Double_t fWeight; // Global weight for fill actions


		void FillWeight();
	void SetCanvas(const char *objname);	void SetCanvas(const char *objname);
	void SetDrawAtt(TObject *o);	void SetDrawAtt(TObject *o);
	void SetError(const char sub, const char mesg);	void SetError(const char sub, const char mesg);

	protected:	protected:
	enum { kWarn = BIT(12) };	enum { kWarn = BIT(12) };

	virtual Bool_t CompileVariables();	virtual Bool_t CompileVariables();
	virtual void ClearFormula();	virtual void ClearFormula();
	virtual Bool_t ProcessSingle(Long64_t /entry/, Int_t /i/);	virtual Bool_t ProcessSingle(Long64_t /entry/, Int_t /i/);

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

	TProofOutputFile.h	TProofOutputFile.h

	// @(#)root/proof:$Id: TProofOutputFile.h 38691 2011-03-31 13:01:24Z ganis $	// @(#)root/proof:$Id: TProofOutputFile.h 39171 2011-05-12 16:21:17Z ganis $
	// Author: Long Tran-Thanh 14/09/07	// Author: Long Tran-Thanh 14/09/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 39	skipping to change at line 39
	class TString;	class TString;
	class TList;	class TList;
	class TFile;	class TFile;
	class TFileCollection;	class TFileCollection;
	class TFileMerger;	class TFileMerger;

	class TProofOutputFile : public TNamed {	class TProofOutputFile : public TNamed {

	friend class TProof;	friend class TProof;
	friend class TProofPlayer;	friend class TProofPlayer;

		friend class TProofPlayerRemote;

	public:	public:
	enum ERunType { kMerge = 1, // Type of run: merge or datase t creation	enum ERunType { kMerge = 1, // Type of run: merge or datase t creation
	kDataset = 2};	kDataset = 2};
	enum ETypeOpt { kRemote = 1, // Merge from original copies	enum ETypeOpt { kRemote = 1, // Merge from original copies
	kLocal = 2, // Make local copies before mer ging	kLocal = 2, // Make local copies before mer ging
	kCreate = 4, // Create dataset	kCreate = 4, // Create dataset
	kRegister = 8, // Register dataset	kRegister = 8, // Register dataset
	kOverwrite = 16, // Force dataset replacement du ring registration	kOverwrite = 16, // Force dataset replacement du ring registration
	kVerify = 32}; // Verify the registered datase t	kVerify = 32}; // Verify the registered datase t

	skipping to change at line 70	skipping to change at line 71
	TString fLocalHost; // Host where the file was created	TString fLocalHost; // Host where the file was created
	Bool_t fIsLocal; // kTRUE if the file is in the sandbox	Bool_t fIsLocal; // kTRUE if the file is in the sandbox
	Bool_t fMerged;	Bool_t fMerged;
	ERunType fRunType; // Type of run (see enum ERunType)	ERunType fRunType; // Type of run (see enum ERunType)
	UInt_t fTypeOpt; // Option (see enum ETypeOpt)	UInt_t fTypeOpt; // Option (see enum ETypeOpt)

	TFileCollection *fDataSet; // Instance of the file collection in 'datas et' mode	TFileCollection *fDataSet; // Instance of the file collection in 'datas et' mode
	TFileMerger *fMerger; // Instance of the file merger in 'merge' mode	TFileMerger *fMerger; // Instance of the file merger in 'merge' mode

	void Init(const char path, const char dsname);	void Init(const char path, const char dsname);

	void SetFileName(const char* name);	void SetFileName(const char* name) { fFileName = name; }
	void SetDir(const char* dir) { fDir = dir; }	void SetDir(const char* dir, Bool_t raw = kFALSE) { if (raw) { fRawDir =
		dir; } else { fDir = dir; } }
		void SetMerged(Bool_t merged = kTRUE) { fMerged = merged; }
	void SetWorkerOrdinal(const char* ordinal) { fWorkerOrdinal = ordinal; }	void SetWorkerOrdinal(const char* ordinal) { fWorkerOrdinal = ordinal; }

	void AddFile(TFileMerger merger, const char path);	void AddFile(TFileMerger merger, const char path);
	void NotifyError(const char *errmsg);	void NotifyError(const char *errmsg);
	void Unlink(const char *path);	void Unlink(const char *path);

	protected:	protected:

	public:	public:
	enum EStatusBits { kOutputFileNameSet = BIT(16)};	enum EStatusBits { kOutputFileNameSet = BIT(16)};

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

	TProofServ.h	TProofServ.h

	// @(#)root/proof:$Id: TProofServ.h 38570 2011-03-23 12:05:17Z ganis $	// @(#)root/proof:$Id: TProofServ.h 39697 2011-06-13 21:43:43Z pcanal $
	// Author: Fons Rademakers 16/02/97	// Author: Fons Rademakers 16/02/97

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


	skipping to change at line 182	skipping to change at line 182
	Long64_t fMsgSizeHWM; //High-Water-Mark on the size of messag es with results	Long64_t fMsgSizeHWM; //High-Water-Mark on the size of messag es with results

	static FILE *fgErrorHandlerFile; // File where to log	static FILE *fgErrorHandlerFile; // File where to log
	static Int_t fgRecursive; // Keep track of recursive inputs durin g processing	static Int_t fgRecursive; // Keep track of recursive inputs durin g processing

	// Control sending information to syslog	// Control sending information to syslog
	static Int_t fgLogToSysLog; // >0 sent to syslog too	static Int_t fgLogToSysLog; // >0 sent to syslog too
	static TString fgSysLogService; // name of the syslog service (eg: pro ofm-0, proofw-0.67)	static TString fgSysLogService; // name of the syslog service (eg: pro ofm-0, proofw-0.67)
	static TString fgSysLogEntity; // logging entity (<user>:<group>)	static TString fgSysLogEntity; // logging entity (<user>:<group>)


		Int_t GetCompressionLevel() const;

	void RedirectOutput(const char dir = 0, const char mode = "w" );	void RedirectOutput(const char dir = 0, const char mode = "w" );
	Int_t CatMotd();	Int_t CatMotd();
	Int_t UnloadPackage(const char *package);	Int_t UnloadPackage(const char *package);
	Int_t UnloadPackages();	Int_t UnloadPackages();
	Int_t OldAuthSetup(TString &wconf);	Int_t OldAuthSetup(TString &wconf);
	Int_t GetPriority();	Int_t GetPriority();

	// Query handlers	// Query handlers
	TProofQueryResult MakeQueryResult(Long64_t nentries, const char opt,	TProofQueryResult MakeQueryResult(Long64_t nentries, const char opt,
	TList inl, Long64_t first, TDSet ds et,	TList inl, Long64_t first, TDSet ds et,

	skipping to change at line 221	skipping to change at line 223
	virtual Int_t HandleCache(TMessage mess, TString slb = 0);	virtual Int_t HandleCache(TMessage mess, TString slb = 0);
	virtual void HandleCheckFile(TMessage mess, TString slb = 0);	virtual void HandleCheckFile(TMessage mess, TString slb = 0);
	virtual Int_t HandleDataSets(TMessage mess, TString slb = 0);	virtual Int_t HandleDataSets(TMessage mess, TString slb = 0);
	virtual void HandleSubmerger(TMessage *mess);	virtual void HandleSubmerger(TMessage *mess);
	virtual void HandleFork(TMessage *mess);	virtual void HandleFork(TMessage *mess);
	virtual void HandleLibIncPath(TMessage *mess);	virtual void HandleLibIncPath(TMessage *mess);
	virtual void HandleProcess(TMessage mess, TString slb = 0);	virtual void HandleProcess(TMessage mess, TString slb = 0);
	virtual void HandleQueryList(TMessage *mess);	virtual void HandleQueryList(TMessage *mess);
	virtual void HandleRemove(TMessage mess, TString slb = 0);	virtual void HandleRemove(TMessage mess, TString slb = 0);
	virtual void HandleRetrieve(TMessage mess, TString slb = 0);	virtual void HandleRetrieve(TMessage mess, TString slb = 0);

	virtual void HandleWorkerLists(TMessage *mess);	virtual Int_t HandleWorkerLists(TMessage *mess);

	virtual void ProcessNext(TString *slb = 0);	virtual void ProcessNext(TString *slb = 0);
	virtual Int_t Setup();	virtual Int_t Setup();
	Int_t SetupCommon();	Int_t SetupCommon();
	virtual void MakePlayer();	virtual void MakePlayer();
	virtual void DeletePlayer();	virtual void DeletePlayer();

	virtual Int_t Fork();	virtual Int_t Fork();
	Int_t GetSessionStatus();	Int_t GetSessionStatus();
	Bool_t IsIdle();	Bool_t IsIdle();

	skipping to change at line 459	skipping to change at line 461
	class TIdleTOTimerGuard {	class TIdleTOTimerGuard {

	private:	private:
	TIdleTOTimer *fIdleTOTimer;	TIdleTOTimer *fIdleTOTimer;

	public:	public:
	TIdleTOTimerGuard(TIdleTOTimer *t) : fIdleTOTimer(t) { if (fIdleTOTimer) fIdleTOTimer->Stop(); }	TIdleTOTimerGuard(TIdleTOTimer *t) : fIdleTOTimer(t) { if (fIdleTOTimer) fIdleTOTimer->Stop(); }
	virtual ~TIdleTOTimerGuard() { if (fIdleTOTimer) fIdleTOTimer->Start(-1, kTRUE); }	virtual ~TIdleTOTimerGuard() { if (fIdleTOTimer) fIdleTOTimer->Start(-1, kTRUE); }
	};	};


		//_________________________________________________________________________
		_____
		inline Int_t TProofServ::GetCompressionLevel() const
		{
		return (fCompressMsg < 0) ? -1 : fCompressMsg % 100;
		}

	#endif	#endif

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

	TRandom1.h	TRandom1.h

	// @(#)root/mathcore:$Id: TRandom1.h 22866 2008-03-27 15:32:50Z rdm $	// @(#)root/mathcore:$Id: TRandom1.h 39607 2011-06-08 15:03:23Z moneta $
	// Author: Rene Brun 04/03/99	// Author: Rene Brun 04/03/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. *
	*************************************************************************/	*************************************************************************/


	skipping to change at line 50	skipping to change at line 50
	const UInt_t *fTheSeeds;	const UInt_t *fTheSeeds;
	const Double_t fMantissaBit24;	const Double_t fMantissaBit24;
	const Double_t fMantissaBit12;	const Double_t fMantissaBit12;

	public:	public:
	TRandom1();	TRandom1();
	TRandom1(UInt_t seed, Int_t lux = 3 );	TRandom1(UInt_t seed, Int_t lux = 3 );
	TRandom1(Int_t rowIndex, Int_t colIndex, Int_t lux );	TRandom1(Int_t rowIndex, Int_t colIndex, Int_t lux );
	virtual ~TRandom1();	virtual ~TRandom1();
	virtual Int_t GetLuxury() const {return fLuxury;}	virtual Int_t GetLuxury() const {return fLuxury;}

		// Get the current seed (first element of the table)
		virtual UInt_t GetSeed() const { return UInt_t ( fFloatSeedTable[0]
		/ fMantissaBit24 ) ; }
	// Gets the current seed.	// Gets the current seed.
	const UInt_t *GetTheSeeds() const {return fTheSeeds;}	const UInt_t *GetTheSeeds() const {return fTheSeeds;}
	// Gets the current array of seeds.	// Gets the current array of seeds.
	static void GetTableSeeds(UInt_t* seeds, Int_t index);	static void GetTableSeeds(UInt_t* seeds, Int_t index);
	// Gets back seed values stored in the table, given th e index.	// Gets back seed values stored in the table, given th e index.
	virtual Double_t Rndm(Int_t i=0);	virtual Double_t Rndm(Int_t i=0);
	virtual void RndmArray(Int_t size, Float_t *vect);	virtual void RndmArray(Int_t size, Float_t *vect);
	virtual void RndmArray(Int_t size, Double_t *vect);	virtual void RndmArray(Int_t size, Double_t *vect);
	virtual void SetSeed2(UInt_t seed, Int_t lux=3);	virtual void SetSeed2(UInt_t seed, Int_t lux=3);
	// Sets the state of the algorithm according to seed.	// Sets the state of the algorithm according to seed.

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

	TRandom3.h	TRandom3.h

	// @(#)root/mathcore:$Id: TRandom3.h 22866 2008-03-27 15:32:50Z rdm $	// @(#)root/mathcore:$Id: TRandom3.h 39607 2011-06-08 15:03:23Z moneta $
	// Author: Peter Malzacher 31/08/99	// Author: Peter Malzacher 31/08/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. *
	*************************************************************************/	*************************************************************************/


	skipping to change at line 36	skipping to change at line 36

	class TRandom3 : public TRandom {	class TRandom3 : public TRandom {

	private:	private:
	UInt_t fMt[624];	UInt_t fMt[624];
	Int_t fCount624;	Int_t fCount624;

	public:	public:
	TRandom3(UInt_t seed=4357);	TRandom3(UInt_t seed=4357);
	virtual ~TRandom3();	virtual ~TRandom3();

		// get the current seed (only first element of the seed table)
		virtual UInt_t GetSeed() const { return fMt[0];}
	virtual Double_t Rndm(Int_t i=0);	virtual Double_t Rndm(Int_t i=0);
	virtual void RndmArray(Int_t n, Float_t *array);	virtual void RndmArray(Int_t n, Float_t *array);
	virtual void RndmArray(Int_t n, Double_t *array);	virtual void RndmArray(Int_t n, Double_t *array);
	virtual void SetSeed(UInt_t seed=0);	virtual void SetSeed(UInt_t seed=0);

	ClassDef(TRandom3,2) //Random number generator: Mersenne Twistor	ClassDef(TRandom3,2) //Random number generator: Mersenne Twistor
	};	};

	R__EXTERN TRandom *gRandom;	R__EXTERN TRandom *gRandom;


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

	TRint.h	TRint.h

	// @(#)root/rint:$Id: TRint.h 20882 2007-11-19 11:31:26Z rdm $	// @(#)root/rint:$Id: TRint.h 39402 2011-05-26 12:56:31Z axel $
	// Author: Rene Brun 17/02/95	// Author: Rene Brun 17/02/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
	virtual ~TRint();	virtual ~TRint();
	virtual char *GetPrompt();	virtual char *GetPrompt();
	virtual const char SetPrompt(const char newPrompt);	virtual const char SetPrompt(const char newPrompt);
	virtual void SetEchoMode(Bool_t mode);	virtual void SetEchoMode(Bool_t mode);
	virtual void HandleException(Int_t sig);	virtual void HandleException(Int_t sig);
	virtual Bool_t HandleTermInput();	virtual Bool_t HandleTermInput();
	virtual void PrintLogo(Bool_t lite = kFALSE);	virtual void PrintLogo(Bool_t lite = kFALSE);
	virtual void Run(Bool_t retrn = kFALSE);	virtual void Run(Bool_t retrn = kFALSE);
	virtual void Terminate(int status);	virtual void Terminate(int status);
	void Interrupt() { fInterrupt = kTRUE; }	void Interrupt() { fInterrupt = kTRUE; }

		virtual Int_t TabCompletionHook(char buf, int pLoc, ostream& out );

	ClassDef(TRint,0); //ROOT Interactive Application Interface	ClassDef(TRint,0); //ROOT Interactive Application Interface
	};	};

	#endif	#endif

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

	TSpline1.h	TSpline1.h

	// @(#)root/tmva $Id: TSpline1.h 29122 2009-06-22 06:51:30Z brun $	// @(#)root/tmva $Id: TSpline1.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : TSpline1 *	* Class : TSpline1 *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Linear interpolation class; derivative of TSpline *	* Linear interpolation class; derivative of TSpline *

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

	TSpline2.h	TSpline2.h

	// @(#)root/tmva $Id: TSpline2.h 29122 2009-06-22 06:51:30Z brun $	// @(#)root/tmva $Id: TSpline2.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : TSpline2 *	* Class : TSpline2 *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Quadratic spline class; uses quadrax function for interpolation *	* Quadratic spline class; uses quadrax function for interpolation *

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

	TTabCom.h	TTabCom.h

	// @(#)root/rint:$Id: TTabCom.h 30215 2009-09-17 10:25:41Z rdm $	// @(#)root/rint:$Id: TTabCom.h 39402 2011-05-26 12:56:31Z axel $
	// Author: Christian Lacunza <lacunza@cdfsg6.lbl.gov> 27/04/99	// Author: Christian Lacunza <lacunza@cdfsg6.lbl.gov> 27/04/99

	// Modified by Artur Szostak <artur@alice.phy.uct.ac.za> : 1 June 2003	// Modified by Artur Szostak <artur@alice.phy.uct.ac.za> : 1 June 2003
	// Added support for namespaces.	// Added support for namespaces.

	/*************************************************************************	/*************************************************************************
	* 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. *

	skipping to change at line 44	skipping to change at line 44
	// list of prototypes. For a list of some limitations see the source. / /	// list of prototypes. For a list of some limitations see the source. / /
	// / /	// / /
	/////////////////////////////////////////////////////////////////////////// /	/////////////////////////////////////////////////////////////////////////// /

	#ifndef ROOT_TObjString	#ifndef ROOT_TObjString
	#include "TObjString.h"	#include "TObjString.h"
	#endif	#endif
	#ifndef ROOT_TRegExp	#ifndef ROOT_TRegExp
	#include "TRegexp.h"	#include "TRegexp.h"
	#endif	#endif

		#ifndef ROOT_Riosfwd
		#include "Riosfwd.h"
		#endif

	#define MAX_LEN_PAT 1024 // maximum length of a pattern	#define MAX_LEN_PAT 1024 // maximum length of a pattern
	#define dblquote(x) "\"" << x << "\""	#define dblquote(x) "\"" << x << "\""

	// forward declarations	// forward declarations
	class TList;	class TList;
	class TListIter;	class TListIter;
	class TSeqCollection;	class TSeqCollection;
	class TClass;	class TClass;


	skipping to change at line 65	skipping to change at line 68

	public: // constructors	public: // constructors
	TTabCom();	TTabCom();
	virtual ~TTabCom();	virtual ~TTabCom();

	public: // typedefs	public: // typedefs
	typedef TList TContainer;	typedef TList TContainer;
	typedef TListIter TContIter;	typedef TListIter TContIter;

	public: // member functions	public: // member functions

	Int_t Hook(char buf, int pLoc);	Int_t Hook(char buf, int pLoc, ostream& out);

	const TSeqCollection* GetListOfClasses();	const TSeqCollection* GetListOfClasses();
	const TSeqCollection* GetListOfCppDirectives();	const TSeqCollection* GetListOfCppDirectives();
	const TSeqCollection* GetListOfFilesInPath( const char path[] );	const TSeqCollection* GetListOfFilesInPath( const char path[] );
	const TSeqCollection* GetListOfEnvVars();	const TSeqCollection* GetListOfEnvVars();
	const TSeqCollection* GetListOfGlobalFunctions();	const TSeqCollection* GetListOfGlobalFunctions();
	const TSeqCollection* GetListOfGlobals();	const TSeqCollection* GetListOfGlobals();
	const TSeqCollection* GetListOfPragmas();	const TSeqCollection* GetListOfPragmas();
	const TSeqCollection* GetListOfSysIncFiles();	const TSeqCollection* GetListOfSysIncFiles();
	const TSeqCollection* GetListOfUsers();	const TSeqCollection* GetListOfUsers();

	skipping to change at line 194	skipping to change at line 197
	kCXX_GlobalProto,	kCXX_GlobalProto,

	// ------- make additions above this line ---------	// ------- make additions above this line ---------
	kNUM_PAT // kNUM_PAT must be last. (to fix array size)	kNUM_PAT // kNUM_PAT must be last. (to fix array size)
	};	};

	private: // member functions	private: // member functions
	TTabCom(const TTabCom &); //private and not implemented	TTabCom(const TTabCom &); //private and not implemented
	TTabCom& operator=(const TTabCom&); //private and not implemented	TTabCom& operator=(const TTabCom&); //private and not implemented


	Int_t Complete( const TRegexp& re, const TSeqCollection* pListOfCan	Int_t Complete(const TRegexp& re, const TSeqCollection* pListOfCand
	didates, const char appendage[], TString::ECaseCompare cmp = TString::kExac	idates,
	t);	const char appendage[], ostream& out, TString::ECase
		Compare cmp = TString::kExact);
	void CopyMatch( char dest[], const char localName[], const char ap pendage[]=0, const char fullName[]=0 ) const;	void CopyMatch( char dest[], const char localName[], const char ap pendage[]=0, const char fullName[]=0 ) const;
	EContext_t DetermineContext() const;	EContext_t DetermineContext() const;
	TString DeterminePath( const TString& fileName, const char defaultPat h[] ) const;	TString DeterminePath( const TString& fileName, const char defaultPat h[] ) const;
	TString ExtendPath( const char originalPath[], TString newBase ) cons t;	TString ExtendPath( const char originalPath[], TString newBase ) cons t;
	void InitPatterns();	void InitPatterns();
	TClass* MakeClassFromClassName( const char className[] ) const;	TClass* MakeClassFromClassName( const char className[] ) const;
	TClass* TryMakeClassFromClassName( const char className[] ) const;	TClass* TryMakeClassFromClassName( const char className[] ) const;
	TClass* MakeClassFromVarName( const char varName[], EContext_t& conte xt,	TClass* MakeClassFromVarName( const char varName[], EContext_t& conte xt,
	int iter=0);	int iter=0);
	void SetPattern( EContext_t handle, const char regexp[] );	void SetPattern( EContext_t handle, const char regexp[] );

	skipping to change at line 230	skipping to change at line 234
	int* fpLoc; // initialized by Hook()	int* fpLoc; // initialized by Hook()

	Pattern_t fPat[ kNUM_PAT ][ MAX_LEN_PAT ]; // array of patterns	Pattern_t fPat[ kNUM_PAT ][ MAX_LEN_PAT ]; // array of patterns
	const char* fRegExp[ kNUM_PAT ]; // corresponding regular e xpression plain text	const char* fRegExp[ kNUM_PAT ]; // corresponding regular e xpression plain text
	Bool_t fVarIsPointer; // frodo: pointer or not f lag	Bool_t fVarIsPointer; // frodo: pointer or not f lag
	Int_t fLastIter; // frodo: iteration counte r for recursive MakeClassFromVarName	Int_t fLastIter; // frodo: iteration counte r for recursive MakeClassFromVarName

	ClassDef(TTabCom,0) //Perform comand line completion when hitting <TAB>	ClassDef(TTabCom,0) //Perform comand line completion when hitting <TAB>
	};	};


	extern TTabCom *gTabCom;	R__EXTERN TTabCom *gTabCom;

	#endif	#endif

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

	TThread.h	TThread.h

	// @(#)root/thread:$Id: TThread.h 34686 2010-07-31 19:52:20Z pcanal $	// @(#)root/thread:$Id: TThread.h 39262 2011-05-19 09:10:49Z rdm $
	// Author: Fons Rademakers 02/07/97	// Author: Fons Rademakers 02/07/97

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


	skipping to change at line 139	skipping to change at line 139
	Int_t Kill();	Int_t Kill();
	Int_t Run(void *arg = 0);	Int_t Run(void *arg = 0);
	void SetPriority(EPriority pri);	void SetPriority(EPriority pri);
	void Delete(Option_t *option="") { TObject::Delete(option); }	void Delete(Option_t *option="") { TObject::Delete(option); }
	EPriority GetPriority() const { return fPriority; }	EPriority GetPriority() const { return fPriority; }
	EState GetState() const { return fState; }	EState GetState() const { return fState; }
	Long_t GetId() const { return fId; }	Long_t GetId() const { return fId; }
	static void Ps();	static void Ps();
	static void ps() { Ps(); }	static void ps() { Ps(); }


		static void Initialize();
	static Bool_t IsInitialized();	static Bool_t IsInitialized();

	Long_t Join(void **ret = 0);	Long_t Join(void **ret = 0);
	static Long_t Join(Long_t id, void **ret = 0);	static Long_t Join(Long_t id, void **ret = 0);

	static Int_t Exit(void *ret = 0);	static Int_t Exit(void *ret = 0);
	static Int_t Exists();	static Int_t Exists();
	static TThread *GetThread(Long_t id);	static TThread *GetThread(Long_t id);
	static TThread GetThread(const char name);	static TThread GetThread(const char name);


	skipping to change at line 177	skipping to change at line 178
	static Int_t SetCancelAsynchronous();	static Int_t SetCancelAsynchronous();
	static Int_t SetCancelDeferred();	static Int_t SetCancelDeferred();
	static Int_t CancelPoint();	static Int_t CancelPoint();
	static Int_t Kill(Long_t id);	static Int_t Kill(Long_t id);
	static Int_t Kill(const char *name);	static Int_t Kill(const char *name);
	static Int_t CleanUpPush(void free, void arg = 0);	static Int_t CleanUpPush(void free, void arg = 0);
	static Int_t CleanUpPop(Int_t exe = 0);	static Int_t CleanUpPop(Int_t exe = 0);
	static Int_t CleanUp();	static Int_t CleanUp();

	// XActions	// XActions

	static void Printf(const char *fmt, ...); // format and print	static void Printf(const char *fmt, ...) // format and print
		#if defined(__GNUC__) && !defined(__CINT__)
		__attribute__((format(printf, 1, 2)))
		#endif
		;
	static void XAction();	static void XAction();

	ClassDef(TThread,0) // Thread class	ClassDef(TThread,0) // Thread class
	};	};

	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////
	// //	// //
	// TThreadCleaner //	// TThreadCleaner //
	// //	// //
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////

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

	TTree.h	TTree.h

	// @(#)root/tree:$Id: TTree.h 38741 2011-04-05 18:12:39Z pcanal $	// @(#)root/tree:$Id: TTree.h 39643 2011-06-09 17:32:22Z pcanal $
	// Author: Rene Brun 12/01/96	// Author: Rene Brun 12/01/96

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


	skipping to change at line 89	skipping to change at line 89
	class TList;	class TList;
	class TSQLResult;	class TSQLResult;
	class TSelector;	class TSelector;
	class TPrincipal;	class TPrincipal;
	class TFriendElement;	class TFriendElement;
	class TCut;	class TCut;
	class TVirtualIndex;	class TVirtualIndex;
	class TBranchRef;	class TBranchRef;
	class TBasket;	class TBasket;
	class TStreamerInfo;	class TStreamerInfo;

		class TTreeCloner;
		class TFileMergeInfo;

	class TTree : public TNamed, public TAttLine, public TAttFill, public TAttM arker {	class TTree : public TNamed, public TAttLine, public TAttFill, public TAttM arker {

	protected:	protected:
	Long64_t fEntries; // Number of entries	Long64_t fEntries; // Number of entries
	Long64_t fTotBytes; // Total number of bytes in all bran ches before compression	Long64_t fTotBytes; // Total number of bytes in all bran ches before compression
	Long64_t fZipBytes; // Total number of bytes in all bran ches after compression	Long64_t fZipBytes; // Total number of bytes in all bran ches after compression
	Long64_t fSavedBytes; // Number of autosaved bytes	Long64_t fSavedBytes; // Number of autosaved bytes
	Long64_t fFlushedBytes; // Number of autoflushed bytes	Long64_t fFlushedBytes; // Number of autoflushed bytes
	Double_t fWeight; // Tree weight (see TTree::SetWeight )	Double_t fWeight; // Tree weight (see TTree::SetWeight )
	Int_t fTimerInterval; // Timer interval in milliseconds	Int_t fTimerInterval; // Timer interval in milliseconds
	Int_t fScanField; // Number of runs before prompting i n Scan	Int_t fScanField; // Number of runs before prompting i n Scan
	Int_t fUpdate; // Update frequency for EntryLoop	Int_t fUpdate; // Update frequency for EntryLoop
	Int_t fDefaultEntryOffsetLen; // Initial Length of fEntryOffs et table in the basket buffers	Int_t fDefaultEntryOffsetLen; // Initial Length of fEntryOffs et table in the basket buffers

		Int_t fNClusterRange; // Number of Cluster range in additi
		on to the one defined by 'AutoFlush'
		Int_t fMaxClusterRange; //! Memory allocated for the cluster
		range.
	Long64_t fMaxEntries; // Maximum number of entries in case of circular buffers	Long64_t fMaxEntries; // Maximum number of entries in case of circular buffers
	Long64_t fMaxEntryLoop; // Maximum number of entries to proc ess	Long64_t fMaxEntryLoop; // Maximum number of entries to proc ess
	Long64_t fMaxVirtualSize; // Maximum total size of buffers kep t in memory	Long64_t fMaxVirtualSize; // Maximum total size of buffers kep t in memory
	Long64_t fAutoSave; // Autosave tree when fAutoSave byte s produced	Long64_t fAutoSave; // Autosave tree when fAutoSave byte s produced
	Long64_t fAutoFlush; // Autoflush tree when fAutoFlush en tries written	Long64_t fAutoFlush; // Autoflush tree when fAutoFlush en tries written
	Long64_t fEstimate; // Number of entries to estimate his togram limits	Long64_t fEstimate; // Number of entries to estimate his togram limits

		Long64_t *fClusterRangeEnd; //[fNClusterRange] Last entry of a cl
		uster range.
		Long64_t *fClusterSize; //[fNClusterRange] Number of entries
		in each cluster for a given range.
	Long64_t fCacheSize; //! Maximum size of file buffers	Long64_t fCacheSize; //! Maximum size of file buffers
	Long64_t fChainOffset; //! Offset of 1st entry of this Tree in a TChain	Long64_t fChainOffset; //! Offset of 1st entry of this Tree in a TChain
	Long64_t fReadEntry; //! Number of the entry being process ed	Long64_t fReadEntry; //! Number of the entry being process ed
	Long64_t fTotalBuffers; //! Total number of bytes in branch b uffers	Long64_t fTotalBuffers; //! Total number of bytes in branch b uffers
	Int_t fPacketSize; //! Number of entries in one packet f or parallel root	Int_t fPacketSize; //! Number of entries in one packet f or parallel root
	Int_t fNfill; //! Local for EntryLoop	Int_t fNfill; //! Local for EntryLoop
	Int_t fDebug; //! Debug level	Int_t fDebug; //! Debug level
	Long64_t fDebugMin; //! First entry number to debug	Long64_t fDebugMin; //! First entry number to debug
	Long64_t fDebugMax; //! Last entry number to debug	Long64_t fDebugMax; //! Last entry number to debug
	Int_t fMakeClass; //! not zero when processing code gen erated by MakeClass	Int_t fMakeClass; //! not zero when processing code gen erated by MakeClass

	skipping to change at line 136	skipping to change at line 142
	TEntryList *fEntryList; //! Pointer to event selection list ( if one)	TEntryList *fEntryList; //! Pointer to event selection list ( if one)
	TArrayD fIndexValues; // Sorted index values	TArrayD fIndexValues; // Sorted index values
	TArrayI fIndex; // Index of sorted values	TArrayI fIndex; // Index of sorted values
	TVirtualIndex *fTreeIndex; // Pointer to the tree Index (if any )	TVirtualIndex *fTreeIndex; // Pointer to the tree Index (if any )
	TList *fFriends; // pointer to list of friend element s	TList *fFriends; // pointer to list of friend element s
	TList *fUserInfo; // pointer to a list of user objects associated to this Tree	TList *fUserInfo; // pointer to a list of user objects associated to this Tree
	TVirtualTreePlayer *fPlayer; //! Pointer to current Tree player	TVirtualTreePlayer *fPlayer; //! Pointer to current Tree player
	TList *fClones; //! List of cloned trees which share our addresses	TList *fClones; //! List of cloned trees which share our addresses
	TBranchRef *fBranchRef; // Branch supporting the TRefTable ( if any)	TBranchRef *fBranchRef; // Branch supporting the TRefTable ( if any)
	UInt_t fFriendLockStatus; //! Record which method is locking th e friend recursion	UInt_t fFriendLockStatus; //! Record which method is locking th e friend recursion

		TBuffer *fTransientBuffer; //! Pointer to the current transient buffer.

	static Int_t fgBranchStyle; // Old/New branch style	static Int_t fgBranchStyle; // Old/New branch style
	static Long64_t fgMaxTreeSize; // Maximum size of a file containg a Tree	static Long64_t fgMaxTreeSize; // Maximum size of a file containg a Tree

	private:	private:
	TTree(const TTree& tt); // not implemented	TTree(const TTree& tt); // not implemented
	TTree& operator=(const TTree& tt); // not implemented	TTree& operator=(const TTree& tt); // not implemented

	protected:	protected:
	void AddClone(TTree*);	void AddClone(TTree*);
	virtual void KeepCircular();	virtual void KeepCircular();
	virtual TBranch BranchImp(const char branchname, const char* classname , TClass* ptrClass, void* addobj, Int_t bufsize, Int_t splitlevel);	virtual TBranch BranchImp(const char branchname, const char* classname , TClass* ptrClass, void* addobj, Int_t bufsize, Int_t splitlevel);
	virtual TBranch BranchImp(const char branchname, TClass* ptrClass, voi d* addobj, Int_t bufsize, Int_t splitlevel);	virtual TBranch BranchImp(const char branchname, TClass* ptrClass, voi d* addobj, Int_t bufsize, Int_t splitlevel);
	virtual TBranch BranchImpRef(const char branchname, const char* classn ame, TClass* ptrClass, void* addobj, Int_t bufsize, Int_t splitlevel);	virtual TBranch BranchImpRef(const char branchname, const char* classn ame, TClass* ptrClass, void* addobj, Int_t bufsize, Int_t splitlevel);
	virtual TBranch BranchImpRef(const char branchname, TClass* ptrClass, EDataType datatype, void* addobj, Int_t bufsize, Int_t splitlevel);	virtual TBranch BranchImpRef(const char branchname, TClass* ptrClass, EDataType datatype, void* addobj, Int_t bufsize, Int_t splitlevel);
	virtual Int_t CheckBranchAddressType(TBranch* branch, TClass* ptrClas s, EDataType datatype, Bool_t ptr);	virtual Int_t CheckBranchAddressType(TBranch* branch, TClass* ptrClas s, EDataType datatype, Bool_t ptr);
	virtual TBranch BronchExec(const char name, const char* classname, voi d* addobj, Bool_t isptrptr, Int_t bufsize, Int_t splitlevel);	virtual TBranch BronchExec(const char name, const char* classname, voi d* addobj, Bool_t isptrptr, Int_t bufsize, Int_t splitlevel);
	friend TBranch TTreeBranchImpRef(TTree tree, const char* branchname, TClass* ptrClass, EDataType datatype, void* addobj, Int_t bufsize, Int_t sp litlevel);	friend TBranch TTreeBranchImpRef(TTree tree, const char* branchname, TClass* ptrClass, EDataType datatype, void* addobj, Int_t bufsize, Int_t sp litlevel);
	Int_t SetBranchAddressImp(TBranch branch, void addr, TBranch** ptr) ;	Int_t SetBranchAddressImp(TBranch branch, void addr, TBranch** ptr) ;


		char GetNewlineValue(istream &inputStream);
		void ImportClusterRanges(TTree *fromtree);

	class TFriendLock {	class TFriendLock {
	// Helper class to prevent infinite recursion in the	// Helper class to prevent infinite recursion in the
	// usage of TTree Friends. Implemented in TTree.cxx.	// usage of TTree Friends. Implemented in TTree.cxx.
	TTree *fTree; // Pointer to the locked tree	TTree *fTree; // Pointer to the locked tree
	UInt_t fMethodBit; // BIT for the locked method	UInt_t fMethodBit; // BIT for the locked method
	Bool_t fPrevious; // Previous value of the BIT.	Bool_t fPrevious; // Previous value of the BIT.

	protected:	protected:
	TFriendLock(const TFriendLock&);	TFriendLock(const TFriendLock&);
	TFriendLock& operator=(const TFriendLock&);	TFriendLock& operator=(const TFriendLock&);

	public:	public:
	TFriendLock(TTree* tree, UInt_t methodbit);	TFriendLock(TTree* tree, UInt_t methodbit);
	~TFriendLock();	~TFriendLock();
	};	};
	friend class TFriendLock;	friend class TFriendLock;
	// So that the index class can use TFriendLock:	// So that the index class can use TFriendLock:
	friend class TTreeIndex;	friend class TTreeIndex;
	friend class TChainIndex;	friend class TChainIndex;

		// So that the TTreeCloner can access the protected interfaces
		friend class TTreeCloner;

	// use to update fFriendLockStatus	// use to update fFriendLockStatus
	enum ELockStatusBits {	enum ELockStatusBits {
	kFindBranch = BIT(0),	kFindBranch = BIT(0),
	kFindLeaf = BIT(1),	kFindLeaf = BIT(1),
	kGetAlias = BIT(2),	kGetAlias = BIT(2),
	kGetBranch = BIT(3),	kGetBranch = BIT(3),
	kGetEntry = BIT(4),	kGetEntry = BIT(4),
	kGetEntryWithIndex = BIT(5),	kGetEntryWithIndex = BIT(5),
	kGetFriend = BIT(6),	kGetFriend = BIT(6),

	skipping to change at line 219	skipping to change at line 231
	enum {	enum {
	kForceRead = BIT(11),	kForceRead = BIT(11),
	kCircular = BIT(12)	kCircular = BIT(12)
	};	};

	// Split level modifier	// Split level modifier
	enum {	enum {
	kSplitCollectionOfPointers = 100	kSplitCollectionOfPointers = 100
	};	};


		class TClusterIterator
		{
		private:
		TTree *fTree; // TTree upon which we are iterating.
		Int_t fClusterRange; // Which cluster range are we looking at.
		Long64_t fStartEntry; // Where does the cluster start.
		Long64_t fNextEntry; // Where does the cluster end (exclusive).

		Long64_t GetEstimatedClusterSize();

		protected:
		friend class TTree;
		TClusterIterator(TTree *tree, Long64_t firstEntry);

		public:
		// Intentionally used the default copy constructor and default destru
		ctor
		// as the TClusterIterator does not own the TTree.
		// TClusterIterator(const TClusterIterator&);
		// ~TClusterIterator();

		// No public constructors, the iterator must be
		// created via TTree::GetClusterIterator

		// Move on to the next cluster and return the starting entry
		// of this next cluster
		Long64_t Next();

		// Return the start entry of the current cluster.
		Long64_t GetStartEntry() {
		return fStartEntry;
		}

		// Return the first entry of the next cluster.
		Long64_t GetNextEntry() {
		return fNextEntry;
		}

		Long64_t operator()() { return Next(); }
		};

	TTree();	TTree();
	TTree(const char* name, const char* title, Int_t splitlevel = 99);	TTree(const char* name, const char* title, Int_t splitlevel = 99);
	virtual ~TTree();	virtual ~TTree();

	virtual void AddBranchToCache(const char *bname, Bool_t subbr anches = kFALSE);	virtual void AddBranchToCache(const char *bname, Bool_t subbr anches = kFALSE);
	virtual void AddBranchToCache(TBranch *branch, Bool_t subbr anches = kFALSE);	virtual void AddBranchToCache(TBranch *branch, Bool_t subbr anches = kFALSE);
	virtual TFriendElement AddFriend(const char treename, const char* file name = "");	virtual TFriendElement AddFriend(const char treename, const char* file name = "");
	virtual TFriendElement AddFriend(const char treename, TFile* file);	virtual TFriendElement AddFriend(const char treename, TFile* file);
	virtual TFriendElement AddFriend(TTree tree, const char* alias = "", B ool_t warn = kFALSE);	virtual TFriendElement AddFriend(TTree tree, const char* alias = "", B ool_t warn = kFALSE);
	virtual void AddTotBytes(Int_t tot) { fTotBytes += tot; }	virtual void AddTotBytes(Int_t tot) { fTotBytes += tot; }

	skipping to change at line 306	skipping to change at line 358
	virtual Int_t Fit(const char* funcname, const char* varexp, co nst char* selection = "", Option_t* option = "", Option_t* goption = "", Lo ng64_t nentries = 1000000000, Long64_t firstentry = 0); // MENU	virtual Int_t Fit(const char* funcname, const char* varexp, co nst char* selection = "", Option_t* option = "", Option_t* goption = "", Lo ng64_t nentries = 1000000000, Long64_t firstentry = 0); // MENU
	virtual Int_t FlushBaskets() const;	virtual Int_t FlushBaskets() const;
	virtual const char GetAlias(const char aliasName) const;	virtual const char GetAlias(const char aliasName) const;
	virtual Long64_t GetAutoFlush() const {return fAutoFlush;}	virtual Long64_t GetAutoFlush() const {return fAutoFlush;}
	virtual Long64_t GetAutoSave() const {return fAutoSave;}	virtual Long64_t GetAutoSave() const {return fAutoSave;}
	virtual TBranch GetBranch(const char name);	virtual TBranch GetBranch(const char name);
	virtual TBranchRef *GetBranchRef() const { return fBranchRef; };	virtual TBranchRef *GetBranchRef() const { return fBranchRef; };
	virtual Bool_t GetBranchStatus(const char* branchname) const;	virtual Bool_t GetBranchStatus(const char* branchname) const;
	static Int_t GetBranchStyle();	static Int_t GetBranchStyle();
	virtual Long64_t GetCacheSize() const { return fCacheSize; }	virtual Long64_t GetCacheSize() const { return fCacheSize; }

		virtual TClusterIterator GetClusterIterator(Long64_t firstentry);
	virtual Long64_t GetChainEntryNumber(Long64_t entry) const { retu rn entry; }	virtual Long64_t GetChainEntryNumber(Long64_t entry) const { retu rn entry; }
	virtual Long64_t GetChainOffset() const { return fChainOffset; }	virtual Long64_t GetChainOffset() const { return fChainOffset; }
	TFile *GetCurrentFile() const;	TFile *GetCurrentFile() const;
	Int_t GetDefaultEntryOffsetLen() const {return fDefaul tEntryOffsetLen;}	Int_t GetDefaultEntryOffsetLen() const {return fDefaul tEntryOffsetLen;}
	Long64_t GetDebugMax() const { return fDebugMax; }	Long64_t GetDebugMax() const { return fDebugMax; }
	Long64_t GetDebugMin() const { return fDebugMin; }	Long64_t GetDebugMin() const { return fDebugMin; }
	TDirectory *GetDirectory() const { return fDirectory; }	TDirectory *GetDirectory() const { return fDirectory; }
	virtual Long64_t GetEntries() const { return fEntries; }	virtual Long64_t GetEntries() const { return fEntries; }
	virtual Long64_t GetEntries(const char *selection);	virtual Long64_t GetEntries(const char *selection);
	virtual Long64_t GetEntriesFast() const { return fEntries; }	virtual Long64_t GetEntriesFast() const { return fEntries; }

	skipping to change at line 359	skipping to change at line 412
	virtual Int_t GetNbranches() { return fBranches.GetEntriesFast (); }	virtual Int_t GetNbranches() { return fBranches.GetEntriesFast (); }
	TObject *GetNotify() const { return fNotify; }	TObject *GetNotify() const { return fNotify; }
	TVirtualTreePlayer *GetPlayer();	TVirtualTreePlayer *GetPlayer();
	virtual Int_t GetPacketSize() const { return fPacketSize; }	virtual Int_t GetPacketSize() const { return fPacketSize; }
	virtual Long64_t GetReadEntry() const { return fReadEntry; }	virtual Long64_t GetReadEntry() const { return fReadEntry; }
	virtual Long64_t GetReadEvent() const { return fReadEntry; }	virtual Long64_t GetReadEvent() const { return fReadEntry; }
	virtual Int_t GetScanField() const { return fScanField; }	virtual Int_t GetScanField() const { return fScanField; }
	TTreeFormula *GetSelect() { return GetPlayer()->GetSelect() ; }	TTreeFormula *GetSelect() { return GetPlayer()->GetSelect() ; }
	virtual Long64_t GetSelectedRows() { return GetPlayer()->GetSelec tedRows(); }	virtual Long64_t GetSelectedRows() { return GetPlayer()->GetSelec tedRows(); }
	virtual Int_t GetTimerInterval() const { return fTimerInterval ; }	virtual Int_t GetTimerInterval() const { return fTimerInterval ; }

		TBuffer* GetTransientBuffer(Int_t size);
	virtual Long64_t GetTotBytes() const { return fTotBytes; }	virtual Long64_t GetTotBytes() const { return fTotBytes; }
	virtual TTree GetTree() const { return const_cast<TTree>(this ); }	virtual TTree GetTree() const { return const_cast<TTree>(this ); }
	virtual TVirtualIndex *GetTreeIndex() const { return fTreeIndex; }	virtual TVirtualIndex *GetTreeIndex() const { return fTreeIndex; }
	virtual Int_t GetTreeNumber() const { return 0; }	virtual Int_t GetTreeNumber() const { return 0; }
	virtual Int_t GetUpdate() const { return fUpdate; }	virtual Int_t GetUpdate() const { return fUpdate; }
	virtual TList *GetUserInfo();	virtual TList *GetUserInfo();
	// See TSelectorDraw::GetVar	// See TSelectorDraw::GetVar
	TTreeFormula *GetVar(Int_t i) { return GetPlayer()->GetVar(i) ; }	TTreeFormula *GetVar(Int_t i) { return GetPlayer()->GetVar(i) ; }
	// See TSelectorDraw::GetVar	// See TSelectorDraw::GetVar
	TTreeFormula *GetVar1() { return GetPlayer()->GetVar1(); }	TTreeFormula *GetVar1() { return GetPlayer()->GetVar1(); }

	skipping to change at line 399	skipping to change at line 453
	Bool_t IsFolder() const { return kTRUE; }	Bool_t IsFolder() const { return kTRUE; }
	virtual Int_t LoadBaskets(Long64_t maxmemory = 2000000000);	virtual Int_t LoadBaskets(Long64_t maxmemory = 2000000000);
	virtual Long64_t LoadTree(Long64_t entry);	virtual Long64_t LoadTree(Long64_t entry);
	virtual Long64_t LoadTreeFriend(Long64_t entry, TTree* T);	virtual Long64_t LoadTreeFriend(Long64_t entry, TTree* T);
	virtual Int_t MakeClass(const char* classname = 0, Option_t* o ption = "");	virtual Int_t MakeClass(const char* classname = 0, Option_t* o ption = "");
	virtual Int_t MakeCode(const char* filename = 0);	virtual Int_t MakeCode(const char* filename = 0);
	virtual Int_t MakeProxy(const char* classname, const char* mac rofilename = 0, const char* cutfilename = 0, const char* option = 0, Int_t maxUnrolling = 3);	virtual Int_t MakeProxy(const char* classname, const char* mac rofilename = 0, const char* cutfilename = 0, const char* option = 0, Int_t maxUnrolling = 3);
	virtual Int_t MakeSelector(const char* selector = 0);	virtual Int_t MakeSelector(const char* selector = 0);
	Bool_t MemoryFull(Int_t nbytes);	Bool_t MemoryFull(Int_t nbytes);
	virtual Long64_t Merge(TCollection* list, Option_t* option = "");	virtual Long64_t Merge(TCollection* list, Option_t* option = "");

		virtual Long64_t Merge(TCollection* list, TFileMergeInfo *info);
	static TTree MergeTrees(TList list, Option_t* option = "");	static TTree MergeTrees(TList list, Option_t* option = "");
	virtual Bool_t Notify();	virtual Bool_t Notify();
	virtual void OptimizeBaskets(ULong64_t maxMemory=10000000, Fl oat_t minComp=1.1, Option_t *option="");	virtual void OptimizeBaskets(ULong64_t maxMemory=10000000, Fl oat_t minComp=1.1, Option_t *option="");
	TPrincipal Principal(const char varexp = "", const char* s election = "", Option_t* option = "np", Long64_t nentries = 1000000000, Lon g64_t firstentry = 0);	TPrincipal Principal(const char varexp = "", const char* s election = "", Option_t* option = "np", Long64_t nentries = 1000000000, Lon g64_t firstentry = 0);
	virtual void Print(Option_t* option = "") const; // MENU	virtual void Print(Option_t* option = "") const; // MENU
	virtual void PrintCacheStats(Option_t* option = "") const;	virtual void PrintCacheStats(Option_t* option = "") const;
	virtual Long64_t Process(const char* filename, Option_t* option = "", Long64_t nentries = 1000000000, Long64_t firstentry = 0); // MENU	virtual Long64_t Process(const char* filename, Option_t* option = "", Long64_t nentries = 1000000000, Long64_t firstentry = 0); // MENU
	#if defined(__CINT__)	#if defined(__CINT__)
	#if defined(R__MANUAL_DICT)	#if defined(R__MANUAL_DICT)
	virtual Long64_t Process(void* selector, Option_t* option = "", L ong64_t nentries = 1000000000, Long64_t firstentry = 0);	virtual Long64_t Process(void* selector, Option_t* option = "", L ong64_t nentries = 1000000000, Long64_t firstentry = 0);
	#endif	#endif
	#else	#else
	virtual Long64_t Process(TSelector* selector, Option_t* option = "", Long64_t nentries = 1000000000, Long64_t firstentry = 0);	virtual Long64_t Process(TSelector* selector, Option_t* option = "", Long64_t nentries = 1000000000, Long64_t firstentry = 0);
	#endif	#endif
	virtual Long64_t Project(const char* hname, const char* varexp, c onst char* selection = "", Option_t* option = "", Long64_t nentries = 10000 00000, Long64_t firstentry = 0);	virtual Long64_t Project(const char* hname, const char* varexp, c onst char* selection = "", Option_t* option = "", Long64_t nentries = 10000 00000, Long64_t firstentry = 0);
	virtual TSQLResult Query(const char varexp = "", const char* selec tion = "", Option_t* option = "", Long64_t nentries = 1000000000, Long64_t firstentry = 0);	virtual TSQLResult Query(const char varexp = "", const char* selec tion = "", Option_t* option = "", Long64_t nentries = 1000000000, Long64_t firstentry = 0);

	virtual Long64_t ReadFile(const char* filename, const char* branc	virtual Long64_t ReadFile(const char* filename, const char* branc
	hDescriptor = "");	hDescriptor = "", char delimiter = ' ');
	virtual Long64_t ReadStream(istream& inputStream, const char* bra	virtual Long64_t ReadStream(istream& inputStream, const char* bra
	nchDescriptor = "");	nchDescriptor = "", char delimiter = ' ');
	virtual void Refresh();	virtual void Refresh();
	virtual void RecursiveRemove(TObject *obj);	virtual void RecursiveRemove(TObject *obj);
	virtual void RemoveFriend(TTree*);	virtual void RemoveFriend(TTree*);
	virtual void Reset(Option_t* option = "");	virtual void Reset(Option_t* option = "");
	virtual void ResetBranchAddress(TBranch *);	virtual void ResetBranchAddress(TBranch *);
	virtual void ResetBranchAddresses();	virtual void ResetBranchAddresses();
	virtual Long64_t Scan(const char* varexp = "", const char* select ion = "", Option_t* option = "", Long64_t nentries = 1000000000, Long64_t f irstentry = 0); // MENU	virtual Long64_t Scan(const char* varexp = "", const char* select ion = "", Option_t* option = "", Long64_t nentries = 1000000000, Long64_t f irstentry = 0); // MENU
	virtual Bool_t SetAlias(const char* aliasName, const char* alia sFormula);	virtual Bool_t SetAlias(const char* aliasName, const char* alia sFormula);
	virtual void SetAutoSave(Long64_t autos = 300000000);	virtual void SetAutoSave(Long64_t autos = 300000000);
	virtual void SetAutoFlush(Long64_t autof = 30000000);	virtual void SetAutoFlush(Long64_t autof = 30000000);

	skipping to change at line 485	skipping to change at line 540
	virtual void SetWeight(Double_t w = 1, Option_t* option = "") ;	virtual void SetWeight(Double_t w = 1, Option_t* option = "") ;
	virtual void SetUpdate(Int_t freq = 0) { fUpdate = freq; }	virtual void SetUpdate(Int_t freq = 0) { fUpdate = freq; }
	virtual void Show(Long64_t entry = -1, Int_t lenmax = 20);	virtual void Show(Long64_t entry = -1, Int_t lenmax = 20);
	virtual void StartViewer(); // MENU	virtual void StartViewer(); // MENU
	virtual void StopCacheLearningPhase();	virtual void StopCacheLearningPhase();
	virtual Int_t UnbinnedFit(const char* funcname, const char* va rexp, const char* selection = "", Option_t* option = "", Long64_t nentries = 1000000000, Long64_t firstentry = 0);	virtual Int_t UnbinnedFit(const char* funcname, const char* va rexp, const char* selection = "", Option_t* option = "", Long64_t nentries = 1000000000, Long64_t firstentry = 0);
	void UseCurrentStyle();	void UseCurrentStyle();
	virtual Int_t Write(const char *name=0, Int_t option=0, Int_t bufsize=0);	virtual Int_t Write(const char *name=0, Int_t option=0, Int_t bufsize=0);
	virtual Int_t Write(const char *name=0, Int_t option=0, Int_t bufsize=0) const;	virtual Int_t Write(const char *name=0, Int_t option=0, Int_t bufsize=0) const;


	ClassDef(TTree,18) //Tree descriptor (the main ROOT I/O class)	ClassDef(TTree,19) //Tree descriptor (the main ROOT I/O class)
	};	};

	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////
	// //	// //
	// TTreeFriendLeafIter //	// TTreeFriendLeafIter //
	// //	// //
	// Iterator on all the leaves in a TTree and its friend //	// Iterator on all the leaves in a TTree and its friend //
	// //	// //
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////


End of changes. 13 change blocks.
	6 lines changed or deleted	66 lines changed or added

	TTreeCache.h	TTreeCache.h

	// @(#)root/tree:$Id: TTreeCache.h 34935 2010-08-23 09:13:37Z brun $	// @(#)root/tree:$Id: TTreeCache.h 39275 2011-05-19 18:17:37Z pcanal $
	// 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 51	skipping to change at line 51
	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
	Bool_t fIsLearning; //! true if cache is in learning mode	Bool_t fIsLearning; //! true if cache is in learning mode
	Bool_t fIsManual; //! true if cache is StopLearningPhase was used	Bool_t fIsManual; //! true if cache is StopLearningPhase was used

	static Int_t fgLearnEntries; //Number of entries used for learning mode	Bool_t fFirstBuffer; //! true if first buffer is used for prefe
		tching
		Bool_t fOneTime; //! used in the learning phase
		Bool_t fReverseRead; //! reading in reverse mode
		Int_t fFillTimes; //! how many times we can fill the curren
		t buffer
		Bool_t fFirstTime; //! save the fact that we processes the fi
		rst entry
		Long64_t fFirstEntry; //! save the value of the first entry
		Bool_t fReadDirectionSet; //! read direction established
		static Int_t fgLearnEntries; // number of entries used for learning m
		ode

	private:	private:
	TTreeCache(const TTreeCache &); //this class cannot be copied	TTreeCache(const TTreeCache &); //this class cannot be copied
	TTreeCache& operator=(const TTreeCache &);	TTreeCache& operator=(const TTreeCache &);

	public:	public:
	TTreeCache();	TTreeCache();
	TTreeCache(TTree *tree, Int_t buffersize=0);	TTreeCache(TTree *tree, Int_t buffersize=0);
	virtual ~TTreeCache();	virtual ~TTreeCache();
	virtual void AddBranch(TBranch *b, Bool_t subbranches = kFALSE);	virtual void AddBranch(TBranch *b, Bool_t subbranches = kFALSE);

	skipping to change at line 73	skipping to change at line 80
	Double_t GetEfficiency() const;	Double_t GetEfficiency() const;
	Double_t GetEfficiencyRel() const;	Double_t GetEfficiencyRel() const;
	static Int_t GetLearnEntries();	static Int_t GetLearnEntries();

	virtual Bool_t FillBuffer();	virtual Bool_t FillBuffer();
	TTree *GetOwner() const;	TTree *GetOwner() const;
	TTree *GetTree() const;	TTree *GetTree() const;
	virtual Bool_t IsLearning() const {return fIsLearning;}	virtual Bool_t IsLearning() const {return fIsLearning;}
	virtual void Print(Option_t *option="") const;	virtual void Print(Option_t *option="") const;
	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 Int_t ReadBufferNormal(char *buf, Long64_t pos, Int_t len)
		;
		virtual Int_t ReadBufferPrefetch(char *buf, Long64_t pos, Int_t le
		n);
	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);
	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
	};	};


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

	TTreeCloner.h	TTreeCloner.h

	// @(#)root/tree:$Id: TTreeCloner.h 37921 2011-01-31 22:20:01Z pcanal $	// @(#)root/tree:$Id: TTreeCloner.h 39059 2011-04-30 20:28:06Z pcanal $
	// Author: Philippe Canal 07/11/2005	// Author: Philippe Canal 07/11/2005

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


	skipping to change at line 88	skipping to change at line 88
	class CompareEntry {	class CompareEntry {
	TTreeCloner *fObject;	TTreeCloner *fObject;
	public:	public:
	CompareEntry(TTreeCloner *obj) : fObject(obj) {}	CompareEntry(TTreeCloner *obj) : fObject(obj) {}
	bool operator()(UInt_t i1, UInt_t i2);	bool operator()(UInt_t i1, UInt_t i2);
	};	};

	friend class CompareSeek;	friend class CompareSeek;
	friend class CompareEntry;	friend class CompareEntry;


		void ImportClusterRanges();

	public:	public:
	enum EClonerOptions {	enum EClonerOptions {
	kNone = 0,	kNone = 0,
	kNoWarnings = BIT(1),	kNoWarnings = BIT(1),
	kIgnoreMissingTopLevel = BIT(2)	kIgnoreMissingTopLevel = BIT(2)
	};	};

	TTreeCloner(TTree from, TTree to, Option_t *method, UInt_t options = k None);	TTreeCloner(TTree from, TTree to, Option_t *method, UInt_t options = k None);
	virtual ~TTreeCloner();	virtual ~TTreeCloner();


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

	TVectorT.h	TVectorT.h

	// @(#)root/matrix:$Id: TVectorT.h 30125 2009-09-14 05:03:58Z brun $	// @(#)root/matrix:$Id: TVectorT.h 39086 2011-05-04 09:36:17Z 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_TVectorT	#ifndef ROOT_TVectorT
	#define ROOT_TVectorT	#define ROOT_TVectorT

	skipping to change at line 57	skipping to change at line 57
	Int_t newSize,Int_t oldSize);	Int_t newSize,Int_t oldSize);

	void Allocate(Int_t nrows,Int_t row_lwb = 0,Int_t init = 0);	void Allocate(Int_t nrows,Int_t row_lwb = 0,Int_t init = 0);

	enum EVectorStatusBits {	enum EVectorStatusBits {
	kStatus = BIT(14) // set if vector object is valid	kStatus = BIT(14) // set if vector object is valid
	};	};

	public:	public:


	TVectorT() : fNrows(0), fRowLwb(0), fElements(0), fIsOwner(kTRUE) { }	TVectorT() : fNrows(0), fRowLwb(0), fElements(0), fDataStack (), fIsOwne r(kTRUE) { }
	explicit TVectorT(Int_t n);	explicit TVectorT(Int_t n);
	TVectorT(Int_t lwb,Int_t upb);	TVectorT(Int_t lwb,Int_t upb);
	TVectorT(Int_t n,const Element *elements);	TVectorT(Int_t n,const Element *elements);
	TVectorT(Int_t lwb,Int_t upb,const Element *elements);	TVectorT(Int_t lwb,Int_t upb,const Element *elements);
	TVectorT(const TVectorT <Element> &another);	TVectorT(const TVectorT <Element> &another);
	TVectorT(const TMatrixTRow_const <Element> &mr);	TVectorT(const TMatrixTRow_const <Element> &mr);
	TVectorT(const TMatrixTColumn_const<Element> &mc);	TVectorT(const TMatrixTColumn_const<Element> &mc);
	TVectorT(const TMatrixTDiag_const <Element> &md);	TVectorT(const TMatrixTDiag_const <Element> &md);
	template <class Element2> TVectorT(const TVectorT<Element2> &another)	template <class Element2> TVectorT(const TVectorT<Element2> &another)
	{	{

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

	TVirtualProofPlayer.h	TVirtualProofPlayer.h

	// @(#)root/proof:$Id: TVirtualProofPlayer.h 36592 2010-11-11 10:43:17Z gan is $	// @(#)root/proof:$Id: TVirtualProofPlayer.h 39171 2011-05-12 16:21:17Z gan is $
	// Author: Fons Rademakers 15/03/07	// Author: Fons Rademakers 15/03/07

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


	skipping to change at line 48	skipping to change at line 48
	class TMessage;	class TMessage;
	class TProof;	class TProof;
	class TSocket;	class TSocket;
	class TVirtualPacketizer;	class TVirtualPacketizer;
	class TProofProgressStatus;	class TProofProgressStatus;
	class TProofProgressInfo;	class TProofProgressInfo;

	class TVirtualProofPlayer : public TObject, public TQObject {	class TVirtualProofPlayer : public TObject, public TQObject {

	public:	public:

		enum EStatusBits { kIsSubmerger = BIT(16) };
	// TDSet status bits	// TDSet status bits
	enum EExitStatus { kFinished, kStopped, kAborted };	enum EExitStatus { kFinished, kStopped, kAborted };


	TVirtualProofPlayer() { }	TVirtualProofPlayer() { ResetBit(TVirtualProofPlayer::kIsSubmerger); }
	virtual ~TVirtualProofPlayer() { }	virtual ~TVirtualProofPlayer() { }

	virtual Long64_t Process(TDSet *set,	virtual Long64_t Process(TDSet *set,
	const char selector, Option_t option = "",	const char selector, Option_t option = "",
	Long64_t nentries = -1, Long64_t firstentry = 0) = 0;	Long64_t nentries = -1, Long64_t firstentry = 0) = 0;
	virtual Long64_t Finalize(Bool_t force = kFALSE, Bool_t sync = kFALSE) = 0;	virtual Long64_t Finalize(Bool_t force = kFALSE, Bool_t sync = kFALSE) = 0;
	virtual Long64_t Finalize(TQueryResult *qr) = 0;	virtual Long64_t Finalize(TQueryResult *qr) = 0;
	virtual Long64_t DrawSelect(TDSet set, const char varexp,	virtual Long64_t DrawSelect(TDSet set, const char varexp,
	const char selection, Option_t option = " ",	const char selection, Option_t option = " ",
	Long64_t nentries = -1, Long64_t firstentry = 0) = 0;	Long64_t nentries = -1, Long64_t firstentry = 0) = 0;

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

	TZIPFile.h	TZIPFile.h

	// @(#)root/io:$Id: TZIPFile.h 23916 2008-05-19 20:01:28Z brun $	// @(#)root/io:$Id: TZIPFile.h 39381 2011-05-25 20:36:50Z rdm $
	// Author: Fons Rademakers 30/6/04	// Author: Fons Rademakers 30/6/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. *
	*************************************************************************/	*************************************************************************/


	skipping to change at line 49	skipping to change at line 49
	class TZIPFile : public TArchiveFile {	class TZIPFile : public TArchiveFile {

	protected:	protected:
	Long64_t fDirPos; // Central directory position	Long64_t fDirPos; // Central directory position
	Long64_t fDirSize; // Central directory size	Long64_t fDirSize; // Central directory size
	Long64_t fDirOffset; // Central directory offset (from the beginning of the archive)	Long64_t fDirOffset; // Central directory offset (from the beginning of the archive)
	TString fComment; // Archive comment	TString fComment; // Archive comment

	Long64_t FindEndHeader();	Long64_t FindEndHeader();
	Int_t ReadEndHeader(Long64_t pos);	Int_t ReadEndHeader(Long64_t pos);

		Long64_t ReadZip64EndLocator(Long64_t pos);
		Int_t ReadZip64EndRecord(Long64_t pos);
	Int_t ReadDirectory();	Int_t ReadDirectory();
	Int_t ReadMemberHeader(TZIPMember *member);	Int_t ReadMemberHeader(TZIPMember *member);
	UInt_t Get(const void *buffer, Int_t bytes);	UInt_t Get(const void *buffer, Int_t bytes);

		ULong64_t Get64(const void *buffer, Int_t bytes);
		Int_t DecodeZip64ExtendedExtraField(TZIPMember *m, Bool_t global =
		kTRUE);

	// ZIP archive constants	// ZIP archive constants
	enum EZIPConstants {	enum EZIPConstants {
	// - Archive version required (and made)	// - Archive version required (and made)

	kARCHIVE_VERSION = 20,	kARCHIVE_VERSION = 45,

	// - Magic header constants	// - Magic header constants

	kDIR_HEADER_MAGIC = 0x02014b50,	kDIR_HEADER_MAGIC = 0x02014b50,
	kENTRY_HEADER_MAGIC = 0x04034b50,	kENTRY_HEADER_MAGIC = 0x04034b50,
	kEND_HEADER_MAGIC = 0x06054b50,	kEND_HEADER_MAGIC = 0x06054b50,
	kZIP_MAGIC_LEN = 4,	kZIP64_EDR_HEADER_MAGIC = 0x06064b50,
	kMAX_VAR_LEN = 0xffff, // Max variable-width field length	kZIP64_EDL_HEADER_MAGIC = 0x07064b50,
	kMAX_SIZE = 0xffffffff, // Max size of things	kZIP64_EXTENDED_MAGIC = 0x0001, // Zip64 Extended Information E
		xtra Field
		kZIP_MAGIC_LEN = 4, // Length of magic's
		kMAX_VAR_LEN = 0xffff, // Max variable-width field len
		gth
		kMAX_SIZE = 0xffffffff, // Max size of things

	// - Offsets into the central directory headers	// - Offsets into the central directory headers
	kDIR_MAGIC_OFF = 0,	kDIR_MAGIC_OFF = 0,
	kDIR_VMADE_OFF = 4, kDIR_VMADE_LEN = 2,	kDIR_VMADE_OFF = 4, kDIR_VMADE_LEN = 2,
	kDIR_VREQD_OFF = 6, kDIR_VREQD_LEN = 2,	kDIR_VREQD_OFF = 6, kDIR_VREQD_LEN = 2,
	kDIR_FLAG_OFF = 8, kDIR_FLAG_LEN = 2,	kDIR_FLAG_OFF = 8, kDIR_FLAG_LEN = 2,
	kDIR_METHOD_OFF = 10, kDIR_METHOD_LEN = 2,	kDIR_METHOD_OFF = 10, kDIR_METHOD_LEN = 2,
	kDIR_DATE_OFF = 12, kDIR_DATE_LEN = 4,	kDIR_DATE_OFF = 12, kDIR_DATE_LEN = 4,
	kDIR_CRC32_OFF = 16, kDIR_CRC32_LEN = 4,	kDIR_CRC32_OFF = 16, kDIR_CRC32_LEN = 4,
	kDIR_CSIZE_OFF = 20, kDIR_CSIZE_LEN = 4,	kDIR_CSIZE_OFF = 20, kDIR_CSIZE_LEN = 4,
	kDIR_USIZE_OFF = 24, kDIR_USIZE_LEN = 4,	kDIR_USIZE_OFF = 24, kDIR_USIZE_LEN = 4,
	kDIR_NAMELEN_OFF = 28, kDIR_NAMELEN_LEN = 2,	kDIR_NAMELEN_OFF = 28, kDIR_NAMELEN_LEN = 2,
	kDIR_EXTRALEN_OFF = 30, kDIR_EXTRALEN_LEN = 2,	kDIR_EXTRALEN_OFF = 30, kDIR_EXTRALEN_LEN = 2,
	kDIR_COMMENTLEN_OFF = 32, kDIR_COMMENTLEN_LEN = 2,	kDIR_COMMENTLEN_OFF = 32, kDIR_COMMENTLEN_LEN = 2,
	kDIR_DISK_START_OFF = 34, kDIR_DISK_START_LEN = 2,	kDIR_DISK_START_OFF = 34, kDIR_DISK_START_LEN = 2,
	kDIR_INT_ATTR_OFF = 36, kDIR_INT_ATTR_LEN = 2,	kDIR_INT_ATTR_OFF = 36, kDIR_INT_ATTR_LEN = 2,
	kDIR_EXT_ATTR_OFF = 38, kDIR_EXT_ATTR_LEN = 4,	kDIR_EXT_ATTR_OFF = 38, kDIR_EXT_ATTR_LEN = 4,
	kDIR_ENTRY_POS_OFF = 42, kDIR_ENTRY_POS_LEN = 4,	kDIR_ENTRY_POS_OFF = 42, kDIR_ENTRY_POS_LEN = 4,
	kDIR_HEADER_SIZE = 46,	kDIR_HEADER_SIZE = 46,


		// - Offsets into the Zip64 end of central directory record (EDR)
		kZIP64_EDR_MAGIC_OFF = 0,
		kZIP64_EDR_SIZE_OFF = 4, kZIP64_EDR_SIZE_LEN = 8,
		kZIP64_EDR_VERS_MADE_OFF = 12, kZIP64_EDR_VERS_MADE_LEN = 2,
		kZIP64_EDR_VERS_EXT_OFF = 14, kZIP64_EDR_VERS_EXT_LEN = 2,
		kZIP64_EDR_DISK_OFF = 16, kZIP64_EDR_DISK_LEN = 4,
		kZIP64_EDR_DIR_DISK_OFF = 20, kZIP64_EDR_DIR_DISK_LEN = 4,
		kZIP64_EDR_DISK_HDRS_OFF = 24, kZIP64_EDR_DISK_HDRS_LEN = 8,
		kZIP64_EDR_TOTAL_HDRS_OFF = 32, kZIP64_EDR_TOTAL_HDRS_LEN = 8,
		kZIP64_EDR_DIR_SIZE_OFF = 40, kZIP64_EDR_DIR_SIZE_LEN = 8,
		kZIP64_EDR_DIR_OFFSET_OFF = 48, kZIP64_EDR_DIR_OFFSET_LEN = 8,
		kZIP64_EDR_HEADER_SIZE = 56,

		// - Offsets into the Zip64 end of central directory locator (EDL)
		kZIP64_EDL_MAGIC_OFF = 0,
		kZIP64_EDL_DISK_OFF = 4, kZIP64_EDL_DISK_LEN = 4,
		kZIP64_EDL_REC_OFFSET_OFF = 8, kZIP64_EDL_REC_OFFSET_LEN = 8,
		kZIP64_EDL_TOTAL_DISK_OFF = 16, kZIP64_EDL_TOTAL_DISK_LEN = 4,
		kZIP64_EDL_HEADER_SIZE = 20,

	// - Offsets into the end-of-archive header	// - Offsets into the end-of-archive header
	kEND_MAGIC_OFF = 0,	kEND_MAGIC_OFF = 0,
	kEND_DISK_OFF = 4, kEND_DISK_LEN = 2,	kEND_DISK_OFF = 4, kEND_DISK_LEN = 2,
	kEND_DIR_DISK_OFF = 6, kEND_DIR_DISK_LEN = 2,	kEND_DIR_DISK_OFF = 6, kEND_DIR_DISK_LEN = 2,
	kEND_DISK_HDRS_OFF = 8, kEND_DISK_HDRS_LEN = 2,	kEND_DISK_HDRS_OFF = 8, kEND_DISK_HDRS_LEN = 2,
	kEND_TOTAL_HDRS_OFF = 10, kEND_TOTAL_HDRS_LEN = 2,	kEND_TOTAL_HDRS_OFF = 10, kEND_TOTAL_HDRS_LEN = 2,
	kEND_DIR_SIZE_OFF = 12, kEND_DIR_SIZE_LEN = 4,	kEND_DIR_SIZE_OFF = 12, kEND_DIR_SIZE_LEN = 4,
	kEND_DIR_OFFSET_OFF = 16, kEND_DIR_OFFSET_LEN = 4,	kEND_DIR_OFFSET_OFF = 16, kEND_DIR_OFFSET_LEN = 4,
	kEND_COMMENTLEN_OFF = 20, kEND_COMMENTLEN_LEN = 2,	kEND_COMMENTLEN_OFF = 20, kEND_COMMENTLEN_LEN = 2,
	kEND_HEADER_SIZE = 22,	kEND_HEADER_SIZE = 22,

	skipping to change at line 109	skipping to change at line 136
	kENTRY_FLAG_OFF = 6, kENTRY_FLAG_LEN = 2,	kENTRY_FLAG_OFF = 6, kENTRY_FLAG_LEN = 2,
	kENTRY_METHOD_OFF = 8, kENTRY_METHOD_LEN = 2,	kENTRY_METHOD_OFF = 8, kENTRY_METHOD_LEN = 2,
	kENTRY_DATE_OFF = 10, kENTRY_DATE_LEN = 4,	kENTRY_DATE_OFF = 10, kENTRY_DATE_LEN = 4,
	kENTRY_CRC32_OFF = 14, kENTRY_CRC32_LEN = 4,	kENTRY_CRC32_OFF = 14, kENTRY_CRC32_LEN = 4,
	kENTRY_CSIZE_OFF = 18, kENTRY_CSIZE_LEN = 4,	kENTRY_CSIZE_OFF = 18, kENTRY_CSIZE_LEN = 4,
	kENTRY_USIZE_OFF = 22, kENTRY_USIZE_LEN = 4,	kENTRY_USIZE_OFF = 22, kENTRY_USIZE_LEN = 4,
	kENTRY_NAMELEN_OFF = 26, kENTRY_NAMELEN_LEN = 2,	kENTRY_NAMELEN_OFF = 26, kENTRY_NAMELEN_LEN = 2,
	kENTRY_EXTRALEN_OFF = 28, kENTRY_EXTRALEN_LEN = 2,	kENTRY_EXTRALEN_OFF = 28, kENTRY_EXTRALEN_LEN = 2,
	kENTRY_HEADER_SIZE = 30,	kENTRY_HEADER_SIZE = 30,


		// - Offsets into the Zip64 Extended Information Extra Field
		kZIP64_EXTENDED_MAGIC_OFF = 0, kZIP64_EXTENDED_MAGIC_LEN =
		2,
		kZIP64_EXTENDED_SIZE_OFF = 2, kZIP64_EXTENDED_SIZE_LEN =
		2,
		kZIP64_EXTENDED_USIZE_OFF = 4, kZIP64_EXTENDED_USIZE_LEN =
		8,
		kZIP64_EXTENTED_CSIZE_OFF = 12, kZIP64_EXTENDED_CSIZE_LEN =
		8,
		kZIP64_EXTENDED_HDR_OFFSET_OFF = 20, kZIP64_EXTENDED_HDR_OFFSET_LEN =
		8,
		kZIP64_EXTENDED_DISK_OFF = 28, kZIP64_EXTENDED_DISK_LEN =
		4,
		kZIP64_EXTENDED_SIZE = 32,

	// - Compression method and strategy	// - Compression method and strategy
	kSTORED = 0, // Stored as is	kSTORED = 0, // Stored as is
	kDEFLATED = 8 // Stored using deflate	kDEFLATED = 8 // Stored using deflate
	};	};

	TZIPFile(const TZIPFile&); // Not implemented	TZIPFile(const TZIPFile&); // Not implemented
	TZIPFile& operator=(const TZIPFile&); // Not implemented	TZIPFile& operator=(const TZIPFile&); // Not implemented

	public:	public:
	TZIPFile();	TZIPFile();

	skipping to change at line 146	skipping to change at line 182
	// single archive member. //	// single archive member. //
	// //	// //
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////

	class TZIPMember : public TArchiveMember {	class TZIPMember : public TArchiveMember {

	friend class TZIPFile;	friend class TZIPFile;

	private:	private:
	void *fLocal; // Extra file header data	void *fLocal; // Extra file header data

	Long64_t fLocalLen; // Length of extra file header data	UInt_t fLocalLen; // Length of extra file header data
	void *fGlobal; // Extra directory data	void *fGlobal; // Extra directory data

	Long64_t fGlobalLen; // Length of extra directory data	UInt_t fGlobalLen; // Length of extra directory data
	UInt_t fCRC32; // CRC-32 for all decompressed data	UInt_t fCRC32; // CRC-32 for all decompressed data
	UInt_t fAttrInt; // Internal file attributes	UInt_t fAttrInt; // Internal file attributes
	UInt_t fAttrExt; // External file attributes	UInt_t fAttrExt; // External file attributes
	UInt_t fMethod; // Compression type	UInt_t fMethod; // Compression type
	UInt_t fLevel; // Compression level	UInt_t fLevel; // Compression level

	public:	public:
	TZIPMember();	TZIPMember();
	TZIPMember(const char *name);	TZIPMember(const char *name);
	TZIPMember(const TZIPMember &member);	TZIPMember(const TZIPMember &member);
	TZIPMember &operator=(const TZIPMember &rhs);	TZIPMember &operator=(const TZIPMember &rhs);
	virtual ~TZIPMember();	virtual ~TZIPMember();

	void *GetLocal() const { return fLocal; }	void *GetLocal() const { return fLocal; }

	Long64_t GetLocalLen() const { return fLocalLen; }	UInt_t GetLocalLen() const { return fLocalLen; }
	void *GetGlobal() const { return fGlobal; }	void *GetGlobal() const { return fGlobal; }

	Long64_t GetGlobalLen() const { return fGlobalLen; }	UInt_t GetGlobalLen() const { return fGlobalLen; }
	UInt_t GetCRC32() const { return fCRC32; }	UInt_t GetCRC32() const { return fCRC32; }
	UInt_t GetAttrInt() const { return fAttrInt; }	UInt_t GetAttrInt() const { return fAttrInt; }
	UInt_t GetAttrExt() const { return fAttrExt; }	UInt_t GetAttrExt() const { return fAttrExt; }
	UInt_t GetMethod() const { return fMethod; }	UInt_t GetMethod() const { return fMethod; }
	UInt_t GetLevel() const { return fLevel; }	UInt_t GetLevel() const { return fLevel; }

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


	ClassDef(TZIPMember,1) //A ZIP archive member file	ClassDef(TZIPMember,2) //A ZIP archive member file
	};	};

	#endif	#endif

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

	TestStatSampler.h	TestStatSampler.h

	// @(#)root/roostats:$Id: TestStatSampler.h 34109 2010-06-24 15:00:16Z mone ta $	// @(#)root/roostats:$Id: TestStatSampler.h 39391 2011-05-26 09:51:59Z 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 34109 2010-06-24 15:00:16Z moneta $	// @(#)root/roostats:$Id: TestStatistic.h 39391 2011-05-26 09:51:59Z 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

	Timer.h	Timer.h

	// @(#)root/tmva $Id: Timer.h 31458 2009-11-30 13:58:20Z stelzer $	// @(#)root/tmva $Id: Timer.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : Timer *	* Class : Timer *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Timing information for methods training *	* Timing information for methods training *

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

	Tools.h	Tools.h

	// @(#)root/tmva $Id: Tools.h 38943 2011-04-20 08:03:25Z evt $	// @(#)root/tmva $Id: Tools.h 40012 2011-06-27 16:03:11Z stelzer $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : Tools *	* Class : Tools *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Global auxiliary applications and data treatment routines *	* Global auxiliary applications and data treatment routines *

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

	ToyMCSampler.h	ToyMCSampler.h

	// @(#)root/roostats:$Id: ToyMCSampler.h 37084 2010-11-29 21:37:13Z moneta $	// @(#)root/roostats:$Id: ToyMCSampler.h 40023 2011-06-27 16:58:44Z 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. *
	*************************************************************************/	*************************************************************************/


	skipping to change at line 55	skipping to change at line 55

	#include "RooWorkspace.h"	#include "RooWorkspace.h"
	#include "RooMsgService.h"	#include "RooMsgService.h"
	#include "RooAbsPdf.h"	#include "RooAbsPdf.h"
	#include "RooRealVar.h"	#include "RooRealVar.h"

	#include "RooDataSet.h"	#include "RooDataSet.h"

	namespace RooStats {	namespace RooStats {


		// only used inside ToyMCSampler, ie "private" in the cxx file
		class NuisanceParametersSampler;

	class ToyMCSampler: public TestStatSampler {	class ToyMCSampler: public TestStatSampler {

	public:	public:
	ToyMCSampler() :	ToyMCSampler() :
	fTestStat(NULL), fSamplingDistName("temp"), fNToys(1)	fTestStat(NULL), fSamplingDistName("temp"), fNToys(1)
	{	{
	// Proof constructor. Do not use.	// Proof constructor. Do not use.

	fPdf = NULL;	fPdf = NULL;
	fPriorNuisance = NULL;	fPriorNuisance = NULL;

	skipping to change at line 85	skipping to change at line 88
	fToysInTails = 0.0;	fToysInTails = 0.0;
	fMaxToys = RooNumber::infinity();	fMaxToys = RooNumber::infinity();
	fAdaptiveLowLimit = -RooNumber::infinity();	fAdaptiveLowLimit = -RooNumber::infinity();
	fAdaptiveHighLimit = RooNumber::infinity();	fAdaptiveHighLimit = RooNumber::infinity();

	fImportanceDensity = NULL;	fImportanceDensity = NULL;
	fImportanceSnapshot = NULL;	fImportanceSnapshot = NULL;
	fProtoData = NULL;	fProtoData = NULL;

	fProofConfig = NULL;	fProofConfig = NULL;

		fNuisanceParametersSampler = NULL;

		_allVars = NULL ;
		_gs1 = NULL ;
		_gs2 = NULL ;
		_gs3 = NULL ;
		_gs4 = NULL ;

		fUseMultiGen = kFALSE ;
	}	}
	ToyMCSampler(TestStatistic &ts, Int_t ntoys) :	ToyMCSampler(TestStatistic &ts, Int_t ntoys) :
	fTestStat(&ts), fSamplingDistName(ts.GetVarName()), fNToys(ntoys)	fTestStat(&ts), fSamplingDistName(ts.GetVarName()), fNToys(ntoys)
	{	{
	fPdf = NULL;	fPdf = NULL;
	fPriorNuisance = NULL;	fPriorNuisance = NULL;
	fNullPOI = NULL;	fNullPOI = NULL;
	fNuisancePars = NULL;	fNuisancePars = NULL;
	fObservables = NULL;	fObservables = NULL;
	fGlobalObservables = NULL;	fGlobalObservables = NULL;

	skipping to change at line 111	skipping to change at line 123
	fToysInTails = 0.0;	fToysInTails = 0.0;
	fMaxToys = RooNumber::infinity();	fMaxToys = RooNumber::infinity();
	fAdaptiveLowLimit = -RooNumber::infinity();	fAdaptiveLowLimit = -RooNumber::infinity();
	fAdaptiveHighLimit = RooNumber::infinity();	fAdaptiveHighLimit = RooNumber::infinity();

	fImportanceDensity = NULL;	fImportanceDensity = NULL;
	fImportanceSnapshot = NULL;	fImportanceSnapshot = NULL;
	fProtoData = NULL;	fProtoData = NULL;

	fProofConfig = NULL;	fProofConfig = NULL;

	}	fNuisanceParametersSampler = NULL;


	virtual ~ToyMCSampler() {	_allVars = NULL ;
		_gs1 = NULL ;
		_gs2 = NULL ;
		_gs3 = NULL ;
		_gs4 = NULL ;

		fUseMultiGen = kFALSE ;
	}	}


		virtual ~ToyMCSampler();

		static void SetAlwaysUseMultiGen(Bool_t flag) { fgAlwaysUseMultiGen =
		flag ; }
		void SetUseMultiGen(Bool_t flag) { fUseMultiGen = flag ; }

	// main interface	// main interface
	virtual SamplingDistribution* GetSamplingDistribution(RooArgSet& para mPoint);	virtual SamplingDistribution* GetSamplingDistribution(RooArgSet& para mPoint);

	virtual SamplingDistribution* GetSamplingDistributionSingleWorker(Roo ArgSet& paramPoint);	virtual SamplingDistribution* GetSamplingDistributionSingleWorker(Roo ArgSet& paramPoint);

	// generates toy data	// generates toy data

	virtual RooAbsData* GenerateToyData(RooArgSet& /paramPoint/) const;	// without weight
		virtual RooAbsData* GenerateToyData(RooArgSet& paramPoint) const {
		if(fExpectedNuisancePar) oocoutE((TObject*)NULL,InputArguments) <<
		"ToyMCSampler: using expected nuisance parameters but ignoring weight. Use
		GetSamplingDistribution(paramPoint, weight) instead." << endl;
		double weight;
		return GenerateToyData(paramPoint, weight);
		}
		// importance sampling without weight does not make sense
		// so the equivalent function to the one above is omitted
		//
		// with weight
		virtual RooAbsData* GenerateToyData(RooArgSet& paramPoint, double& we
		ight) const;
		virtual RooAbsData* GenerateToyDataImportanceSampling(RooArgSet& para
		mPoint, double& weight) const;

		// generate global observables
		virtual void GenerateGlobalObservables(void) const;

	// Extended interface to append to sampling distribution more samples	// Extended interface to append to sampling distribution more samples
	virtual SamplingDistribution* AppendSamplingDistribution(RooArgSet& a llParameters,	virtual SamplingDistribution* AppendSamplingDistribution(RooArgSet& a llParameters,
	SamplingDistr ibution* last,	SamplingDistr ibution* last,
	Int_t additio nalMC) {	Int_t additio nalMC) {

	Int_t tmp = fNToys;	Int_t tmp = fNToys;
	fNToys = additionalMC;	fNToys = additionalMC;
	SamplingDistribution* newSamples = GetSamplingDistribution(allParame ters);	SamplingDistribution* newSamples = GetSamplingDistribution(allParame ters);
	fNToys = tmp;	fNToys = tmp;

	skipping to change at line 165	skipping to change at line 202

	virtual Int_t GetNToys(void) { return fNToys; }	virtual Int_t GetNToys(void) { return fNToys; }
	virtual void SetNToys(const Int_t ntoy) { fNToys = ntoy; }	virtual void SetNToys(const Int_t ntoy) { fNToys = ntoy; }
	virtual void SetNEventsPerToy(const Int_t nevents) {	virtual void SetNEventsPerToy(const Int_t nevents) {
	// Forces n events even for extended PDFs. Set NEvents=0 to	// Forces n events even for extended PDFs. Set NEvents=0 to
	// use the Poisson distributed events from the extended PDF.	// use the Poisson distributed events from the extended PDF.
	fNEvents = nevents;	fNEvents = nevents;
	}	}

	// specify the values of parameters used when evaluating test statist ic	// specify the values of parameters used when evaluating test statist ic

	virtual void SetParametersForTestStat(const RooArgSet& nullpoi) { fNu	virtual void SetParametersForTestStat(const RooArgSet& nullpoi) {
	llPOI = (RooArgSet*)nullpoi.snapshot(); }	if (fNullPOI) delete fNullPOI; fNullPOI = (RooArgSet*)nullpoi.snap
		shot();
		}
	// 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; }
	// How to randomize the prior. Set to NULL to deactivate randomizatio n.	// How to randomize the prior. Set to NULL to deactivate randomizatio n.
	virtual void SetPriorNuisance(RooAbsPdf* pdf) { fPriorNuisance = pdf; }	virtual void SetPriorNuisance(RooAbsPdf* pdf) { fPriorNuisance = pdf; }
	// 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& np) { fNuisancePa rs = &np; }	virtual void SetNuisanceParameters(const RooArgSet& np) { fNuisancePa rs = &np; }
	// specify the observables in the dataset (needed to evaluate the tes t statistic)	// specify the observables in the dataset (needed to evaluate the tes t statistic)
	virtual void SetObservables(const RooArgSet& o) { fObservables = &o; }	virtual void SetObservables(const RooArgSet& o) { fObservables = &o; }
	// specify the conditional observables	// specify the conditional observables
	virtual void SetGlobalObservables(const RooArgSet& o) { fGlobalObserv ables = &o; }	virtual void SetGlobalObservables(const RooArgSet& o) { fGlobalObserv ables = &o; }

	skipping to change at line 218	skipping to change at line 257
	fAdaptiveHighLimit = threshold;	fAdaptiveHighLimit = threshold;
	fAdaptiveLowLimit = -RooNumber::infinity();	fAdaptiveLowLimit = -RooNumber::infinity();
	}	}
	void SetToysBothTails(Double_t toys, Double_t low_threshold, Double_t high_threshold) {	void SetToysBothTails(Double_t toys, Double_t low_threshold, Double_t high_threshold) {
	fToysInTails = toys;	fToysInTails = toys;
	fAdaptiveHighLimit = high_threshold;	fAdaptiveHighLimit = high_threshold;
	fAdaptiveLowLimit = low_threshold;	fAdaptiveLowLimit = low_threshold;
	}	}

	// for importance sampling, specifies the pdf to sample from	// for importance sampling, specifies the pdf to sample from

	void SetImportanceDensity(RooAbsPdf *p) { fImportanceDensity = p; }	void SetImportanceDensity(RooAbsPdf *p) {
		if(p) oocoutW((TObject*)NULL,InputArguments) << "ToyMCSampler Impo
		rtance Sampling: This is in beta." << endl;
		fImportanceDensity = p;
		}
	// for importance sampling, a snapshot of the parameters used in impo rtance density	// for importance sampling, a snapshot of the parameters used in impo rtance density
	void SetImportanceSnapshot(const RooArgSet &s) { fImportanceSnapshot = &s; }	void SetImportanceSnapshot(const RooArgSet &s) { fImportanceSnapshot = &s; }

	// calling with argument or NULL deactivates proof	// calling with argument or NULL deactivates proof
	void SetProofConfig(ProofConfig *pc = NULL) { fProofConfig = pc; }	void SetProofConfig(ProofConfig *pc = NULL) { fProofConfig = pc; }

	void SetProtoData(const RooDataSet* d) { fProtoData = d; }	void SetProtoData(const RooDataSet* d) { fProtoData = d; }

	protected:	protected:


	skipping to change at line 264	skipping to change at line 306
	Double_t fAdaptiveLowLimit;	Double_t fAdaptiveLowLimit;
	Double_t fAdaptiveHighLimit;	Double_t fAdaptiveHighLimit;

	RooAbsPdf *fImportanceDensity; // in dev	RooAbsPdf *fImportanceDensity; // in dev
	const RooArgSet *fImportanceSnapshot; // in dev	const RooArgSet *fImportanceSnapshot; // in dev

	const RooDataSet *fProtoData; // in dev	const RooDataSet *fProtoData; // in dev

	ProofConfig *fProofConfig; //!	ProofConfig *fProofConfig; //!


		mutable NuisanceParametersSampler *fNuisanceParametersSampler; //!

		// objects below cache information and are mutable and non-persistent
		mutable RooArgSet* _allVars ; //!
		mutable list<RooAbsPdf*> _pdfList ; //!
		mutable list<RooArgSet*> _obsList ; //!
		mutable list<RooAbsPdf::GenSpec*> _gsList ; //!
		mutable RooAbsPdf::GenSpec* _gs1 ; //! GenSpec #1
		mutable RooAbsPdf::GenSpec* _gs2 ; //! GenSpec #2
		mutable RooAbsPdf::GenSpec* _gs3 ; //! GenSpec #3
		mutable RooAbsPdf::GenSpec* _gs4 ; //! GenSpec #4

		static Bool_t fgAlwaysUseMultiGen ; // Use PrepareMultiGen always
		Bool_t fUseMultiGen ; // Use PrepareMultiGen?

	protected:	protected:

	ClassDef(ToyMCSampler,1) // A simple implementation of the TestStatSampl er interface	ClassDef(ToyMCSampler,2) // A simple implementation of the TestStatSampl er interface
	};	};
	}	}

	#endif	#endif

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

	ToyMCSamplerOld.h	ToyMCSamplerOld.h

	// @(#)root/roostats:$Id: ToyMCSamplerOld.h 38947 2011-04-20 08:23:25Z mone ta $	// @(#)root/roostats:$Id: ToyMCSamplerOld.h 40059 2011-06-28 08:57:41Z mone ta $
	// 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

	ToyMCStudy.h	ToyMCStudy.h

	// @(#)root/roostats:$Id: ToyMCStudy.h 36602 2010-11-11 16:52:13Z moneta $	// @(#)root/roostats:$Id: ToyMCStudy.h 39934 2011-06-24 09:15:34Z moneta $
	/*************************************************************************	/*************************************************************************
	* 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_ToyMCStudy	#ifndef ROOSTATS_ToyMCStudy
	#define ROOSTATS_ToyMCStudy	#define ROOSTATS_ToyMCStudy

	skipping to change at line 57	skipping to change at line 57
	ToyMCStudy(const char name = "ToyMCStudy", const char title = "ToyM CStudy") :	ToyMCStudy(const char name = "ToyMCStudy", const char title = "ToyM CStudy") :
	RooAbsStudy(name, title),	RooAbsStudy(name, title),

	fToyMCSampler(NULL)	fToyMCSampler(NULL)
	{	{
	// In this case, this is the normal output. The SamplingDistributi on	// In this case, this is the normal output. The SamplingDistributi on
	// instances are stored as detailed output.	// instances are stored as detailed output.
	storeDetailedOutput(kTRUE);	storeDetailedOutput(kTRUE);
	}	}


		RooAbsStudy* clone(const char* /newname/="") const { return new To
		yMCStudy(*this) ; }

	virtual ~ToyMCStudy() {	virtual ~ToyMCStudy() {
	}	}

	// RooAbsStudy interfaces	// RooAbsStudy interfaces
	virtual Bool_t initialize(void);	virtual Bool_t initialize(void);
	virtual Bool_t execute(void);	virtual Bool_t execute(void);
	virtual Bool_t finalize(void);	virtual Bool_t finalize(void);

	Bool_t merge(SamplingDistribution& result);	Bool_t merge(SamplingDistribution& result);

	void SetToyMCSampler(ToyMCSampler& t) { fToyMCSampler = &t; }	void SetToyMCSampler(ToyMCSampler& t) { fToyMCSampler = &t; }

	void SetParamPointOfInterest(const RooArgSet& poi) { fParamPointOfInt erest.add(poi); }	void SetParamPoint(const RooArgSet& poi) { fParamPointOfInterest.add( poi); }

	protected:	protected:

	ToyMCSampler *fToyMCSampler;	ToyMCSampler *fToyMCSampler;
	RooArgSet fParamPointOfInterest;	RooArgSet fParamPointOfInterest;

	protected:	protected:
	ClassDef(ToyMCStudy,1) // toy MC study for parallel processing	ClassDef(ToyMCStudy,1) // toy MC study for parallel processing
	};	};
	}	}

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

	TransformationHandler.h	TransformationHandler.h

	// @(#)root/tmva $Id: TransformationHandler.h 38609 2011-03-24 16:06:32Z ev t $	// @(#)root/tmva $Id: TransformationHandler.h 39395 2011-05-26 10:05:54Z mo neta $
	// Author: Andreas Hoecker, Peter Speckmayer, Joerg Stelzer, Helge Voss, Ja n Therhaag, Eckhard von Toerne	// Author: Andreas Hoecker, Peter Speckmayer, Joerg Stelzer, Helge Voss, Ja n Therhaag, Eckhard von Toerne

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : TransformationHandler *	* Class : TransformationHandler *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Contains all the data information *	* Contains all the data information *

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

	Types.h	Types.h

	// @(#)root/tmva $Id: Types.h 38943 2011-04-20 08:03:25Z evt $	// @(#)root/tmva $Id: Types.h 40012 2011-06-27 16:03:11Z stelzer $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : Types *	* Class : Types *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* GLobal types (singleton class) *	* GLobal types (singleton class) *

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

	UniformProposal.h	UniformProposal.h

	// @(#)root/roostats:$Id: UniformProposal.h 31276 2009-11-18 15:06:42Z mone ta $	// @(#)root/roostats:$Id: UniformProposal.h 39391 2011-05-26 09:51:59Z 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: UpperLimitMCSModule.h 31276 2009-11-18 15:06:42Z moneta $	// @(#)root/roostats:$Id: UpperLimitMCSModule.h 39391 2011-05-26 09:51:59Z 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

	VariableDecorrTransform.h	VariableDecorrTransform.h

	// @(#)root/tmva $Id: VariableDecorrTransform.h 38943 2011-04-20 08:03:25Z evt $	// @(#)root/tmva $Id: VariableDecorrTransform.h 40012 2011-06-27 16:03:11Z stelzer $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : VariableDecorrTransform *	* Class : VariableDecorrTransform *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Decorrelation of input variables *	* Decorrelation of input variables *

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

	VariableGaussTransform.h	VariableGaussTransform.h

	// @(#)root/tmva $Id: VariableGaussTransform.h 38943 2011-04-20 08:03:25Z e vt $	// @(#)root/tmva $Id: VariableGaussTransform.h 40012 2011-06-27 16:03:11Z s telzer $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Eckhard v. Toerne	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Eckhard v. Toerne

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : VariableGaussTransform *	* Class : VariableGaussTransform *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Decorrelation of input variables *	* Decorrelation of input variables *

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

	VariableIdentityTransform.h	VariableIdentityTransform.h

	// @(#)root/tmva $Id: VariableIdentityTransform.h 31458 2009-11-30 13:58:20 Z stelzer $	// @(#)root/tmva $Id: VariableIdentityTransform.h 39395 2011-05-26 10:05:54 Z moneta $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : VariableIdentityTransform *	* Class : VariableIdentityTransform *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Identity transform *	* Identity transform *

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

	VariableInfo.h	VariableInfo.h

	// @(#)root/tmva $Id: VariableInfo.h 29122 2009-06-22 06:51:30Z brun $	// @(#)root/tmva $Id: VariableInfo.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : Option *	* Class : Option *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Variable type info *	* Variable type info *

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

	VariableNormalizeTransform.h	VariableNormalizeTransform.h

	// @(#)root/tmva $Id: VariableNormalizeTransform.h 38475 2011-03-17 10:46:0 0Z evt $	// @(#)root/tmva $Id: VariableNormalizeTransform.h 39395 2011-05-26 10:05:5 4Z moneta $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : VariableNormalizeTransform *	* Class : VariableNormalizeTransform *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Decorrelation of input variables *	* Decorrelation of input variables *

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

	VariablePCATransform.h	VariablePCATransform.h

	// @(#)root/tmva $Id: VariablePCATransform.h 38475 2011-03-17 10:46:00Z evt $	// @(#)root/tmva $Id: VariablePCATransform.h 39395 2011-05-26 10:05:54Z mon eta $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : VariablePCATransform *	* Class : VariablePCATransform *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Principal value composition of input variables *	* Principal value composition of input variables *

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

	VariableRearrangeTransform.h	VariableRearrangeTransform.h

	// @(#)root/tmva $Id: VariableRearrangeTransform.h 38475 2011-03-17 10:46:0 0Z evt $	// @(#)root/tmva $Id: VariableRearrangeTransform.h 39395 2011-05-26 10:05:5 4Z moneta $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : VariableRearrangeTransform *	* Class : VariableRearrangeTransform *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* rearrangement of input variables *	* rearrangement of input variables *

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

	VariableTransformBase.h	VariableTransformBase.h

	// @(#)root/tmva $Id: VariableTransformBase.h 38994 2011-04-21 09:45:51Z ev t $	// @(#)root/tmva $Id: VariableTransformBase.h 39395 2011-05-26 10:05:54Z mo neta $
	// Author: Andreas Hoecker, Peter Speckmayer,Joerg Stelzer, Helge Voss	// Author: Andreas Hoecker, Peter Speckmayer,Joerg Stelzer, Helge Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : VariableTransformBase *	* Class : VariableTransformBase *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Pre-transformation of input variables (base class) *	* Pre-transformation of input variables (base class) *

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

	Version.h	Version.h

	// @(#)root/tmva $Id: Version.h 38994 2011-04-21 09:45:51Z evt $	// @(#)root/tmva $Id: Version.h 40027 2011-06-27 17:12:07Z stelzer $
	// Author: Andreas Hoecker, Peter Speckmayer, Joerg Stelzer, Jan Therhaag, Eckhard von Toerne, Helge Voss	// Author: Andreas Hoecker, Peter Speckmayer, Joerg Stelzer, Jan Therhaag, Eckhard von Toerne, Helge Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : Version *	* Class : Version *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Current TMVA Version - filled automatically during cvs tagging *	* Current TMVA Version - filled automatically during cvs tagging *

	skipping to change at line 44	skipping to change at line 44
	#define ROOT_TMVA_Version	#define ROOT_TMVA_Version

	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////
	// //	// //
	// Version //	// Version //
	// //	// //
	// Automatically filled by cvs tagger: development/tmvaTag.py //	// Automatically filled by cvs tagger: development/tmvaTag.py //
	// //	// //
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////


	#define TMVA_RELEASE "4.1.1"	#define TMVA_RELEASE "4.1.2"
	#define TMVA_RELEASE_DATE "Apr 21, 2011"	#define TMVA_RELEASE_DATE "Jun 21, 2011"
	#define TMVA_RELEASE_TIME "12:00:00"	#define TMVA_RELEASE_TIME "11:02:58"
	#define TMVA_VERSION_CODE 262401	#define TMVA_VERSION_CODE 262402
	#define TMVA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))	#define TMVA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))

	#endif	#endif

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

	Volume.h	Volume.h

	// @(#)root/tmva $Id: Volume.h 29122 2009-06-22 06:51:30Z brun $	// @(#)root/tmva $Id: Volume.h 39395 2011-05-26 10:05:54Z moneta $
	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss	// Author: Andreas Hoecker, Joerg Stelzer, Helge Voss, Kai Voss

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : Volume *	* Class : Volume *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Volume for BinarySearchTree *	* Volume for BinarySearchTree *

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

	cintdictversion.h	cintdictversion.h

	skipping to change at line 18	skipping to change at line 18
	************************************************************************	************************************************************************
	* Copyright(c) 1995~2008 Masaharu Goto (cint@pcroot.cern.ch)	* Copyright(c) 1995~2008 Masaharu Goto (cint@pcroot.cern.ch)
	*	*
	* For the licensing terms see the file COPYING	* For the licensing terms see the file COPYING
	*	*
	************************************************************************/	************************************************************************/

	#ifndef INCLUDE_CINTDICTVERSION	#ifndef INCLUDE_CINTDICTVERSION
	#define INCLUDE_CINTDICTVERSION	#define INCLUDE_CINTDICTVERSION


	#define G__CINTDICTVERSION 20100916	#define G__CINTDICTVERSION 20110521

	#endif /* INCLUDE_CINTDICTVERSION */	#endif /* INCLUDE_CINTDICTVERSION */

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

	rpdconn.h	rpdconn.h

	// @(#)root/rpdutils:$Id: rpdconn.h 38921 2011-04-19 13:01:16Z ganis $	// @(#)root/rpdutils:$Id: rpdconn.h 39179 2011-05-13 11:09:21Z ganis $
	/*************************************************************************	/*************************************************************************
	* 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_rpdconn	#ifndef ROOT_rpdconn
	#define ROOT_rpdconn	#define ROOT_rpdconn

	skipping to change at line 128	skipping to change at line 128
	void setdescriptors(int r = -1, int w = -1) {	void setdescriptors(int r = -1, int w = -1) {
	{ rpdmtxhelper mh(&rdmtx); rdfd = r; }	{ rpdmtxhelper mh(&rdmtx); rdfd = r; }
	{ rpdmtxhelper mh(&wrmtx); wrfd = w; }	{ rpdmtxhelper mh(&wrmtx); wrfd = w; }
	}	}

	int pollrd(int to = -1);	int pollrd(int to = -1);

	int send(int i);	int send(int i);
	int send(int type, const char *msg);	int send(int type, const char *msg);
	int send(const rpdmsg &msg);	int send(const rpdmsg &msg);

		virtual int send(const void *buf, int len);
	int recv(int &i);	int recv(int &i);
	int recv(int &type, std::string &msg);	int recv(int &type, std::string &msg);
	int recv(rpdmsg &msg);	int recv(rpdmsg &msg);

		virtual int recv(void *buffer, int len);

	int senddesc(int desc);	int senddesc(int desc);
	int recvdesc(int &desc);	int recvdesc(int &desc);
	};	};

	//	//
	// Class describing a TCP connection	// Class describing a TCP connection
	//	//
	class rpdtcp : public rpdconn {	class rpdtcp : public rpdconn {

	private:	protected:
	std::string host; // Host name	std::string host; // Host name
	int port; // Port	int port; // Port

	protected:
	int fd; // Socket descriptor	int fd; // Socket descriptor
	struct sockaddr addr; // Structure describing the peer address	struct sockaddr addr; // Structure describing the peer address
	public:	public:
	rpdtcp(int d = -1) : rpdconn(), port(0), fd(d) { setdescriptors(d,d); } // Used by rpdtcpsrv	rpdtcp(int d = -1) : rpdconn(), port(0), fd(d) { setdescriptors(d,d); } // Used by rpdtcpsrv
	rpdtcp(const char *h, int p);	rpdtcp(const char *h, int p);
	virtual ~rpdtcp() { close(); }	virtual ~rpdtcp() { close(); }

	void close() { if (fd > 0) ::close(fd); fd = -1; setdescriptors(); }	void close() { if (fd > 0) ::close(fd); fd = -1; setdescriptors(); }
	int exportfd() { int d = fd; fd = -1; setdescriptors(); return d; }	int exportfd() { int d = fd; fd = -1; setdescriptors(); return d; }
	const struct sockaddr address() const { return (const struct sockaddr )&addr; }	const struct sockaddr address() const { return (const struct sockaddr )&addr; }

	skipping to change at line 168	skipping to change at line 169
	//	//
	class rpdtcpsrv : public rpdtcp {	class rpdtcpsrv : public rpdtcp {
	public:	public:
	rpdtcpsrv(int p, int backlog = 10);	rpdtcpsrv(int p, int backlog = 10);
	virtual ~rpdtcpsrv() { rpdtcp::close(); }	virtual ~rpdtcpsrv() { rpdtcp::close(); }

	rpdtcp accept(int to = -1, int err = 0);	rpdtcp accept(int to = -1, int err = 0);
	};	};

	//	//

	// Class describing a UNIX connection	// Class describing a UNIX TCP connection
	//	//
	class rpdunix : public rpdtcp {	class rpdunix : public rpdtcp {

	private:	protected:
	std::string sockpath; // Socket path	std::string sockpath; // Socket path
	public:	public:
	rpdunix(int d = -1) : rpdtcp(d) { }	rpdunix(int d = -1) : rpdtcp(d) { }

	rpdunix(const char *path);	rpdunix(const char *p);
	virtual ~rpdunix() { rpdtcp::close(); }	virtual ~rpdunix() { rpdtcp::close(); }

		const char *path() const { return sockpath.c_str(); }
	};	};

	//	//

	// Class describing a server UNIX connection	// Class describing a server UNIX TCP connection
	//	//
	class rpdunixsrv : public rpdunix {	class rpdunixsrv : public rpdunix {
	protected:	protected:
	int fd; // Socket descriptor	int fd; // Socket descriptor
	public:	public:

	rpdunixsrv(const char *path, int backlog = 10);	rpdunixsrv(const char *p, int backlog = 10);
	virtual ~rpdunixsrv() { rpdtcp::close(); }	virtual ~rpdunixsrv() { rpdtcp::close(); }

	rpdunix accept(int to = -1, int err = 0);	rpdunix accept(int to = -1, int err = 0);
	};	};


		//
		// Class describing a UDP connection
		//
		class rpdudp : public rpdtcp {
		public:
		rpdudp(int d = -1) : rpdtcp(d) { } // Used by rpdudpsrv
		rpdudp(const char *h, int p);
		virtual ~rpdudp() { }

		int send(const void *buf, int len);
		int recv(void *buffer, int len);
		};

		//
		// Class describing a server UDP connection
		//
		class rpdudpsrv : public rpdudp {
		public:
		rpdudpsrv(int p);
		virtual ~rpdudpsrv() { rpdudp::close(); }
		};

	#endif	#endif

End of changes. 12 change blocks.
	8 lines changed or deleted	32 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/

	FitResult.h	FitResult.h

	// @(#)root/mathcore:$Id: FitResult.h 37438 2010-12-09 14:14:30Z moneta $	// @(#)root/mathcore:$Id: FitResult.h 39474 2011-05-30 07:48:13Z 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 61	skipping to change at line 61
	public:	public:

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

	/**	/**
	Default constructor for an empty (non valid) fit result	Default constructor for an empty (non valid) fit result
	*/	*/
	FitResult ();	FitResult ();

	/**	/**

		Constructor from a fit-config for a dummy fit
		(e.g. when only one fcn evaluation is done)
		*/
		FitResult (const FitConfig & fconfig);

		/**
	Construct from a Minimizer instance after fitting	Construct from a Minimizer instance after fitting
	Run also Minos if requested from the configuration	Run also Minos if requested from the configuration
	*/	*/
	FitResult(ROOT::Math::Minimizer & min, const FitConfig & fconfig, const IModelFunction * f, bool isValid, unsigned int sizeOfData = 0, bool binFit = true, const ROOT::Math::IMultiGenFunction * chi2func = 0, unsigned int nc alls = 0);	FitResult(ROOT::Math::Minimizer & min, const FitConfig & fconfig, const IModelFunction * f, bool isValid, unsigned int sizeOfData = 0, bool binFit = true, const ROOT::Math::IMultiGenFunction * chi2func = 0, unsigned int nc alls = 0);

	/**	/**
	Copy constructor.	Copy constructor.
	*/	*/
	FitResult(const FitResult &);	FitResult(const FitResult &);


	skipping to change at line 174	skipping to change at line 180
	double ParError(unsigned int i) const {	double ParError(unsigned int i) const {
	return (i < fErrors.size() ) ? fErrors[i] : 0;	return (i < fErrors.size() ) ? fErrors[i] : 0;
	}	}

	/// name of the parameter	/// name of the parameter
	std::string ParName(unsigned int i) const;	std::string ParName(unsigned int i) const;

	/// 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)
	void SetMinosError(unsigned int i, double elow, double eup);	void SetMinosError(unsigned int i, double elow, double eup);


		/// query if parameter i has the Minos error
		bool HasMinosError(unsigned int i) const;

	/// lower Minos error. If Minos has not run for parameter i return the p arabolic error	/// lower Minos error. If Minos has not run for parameter i return the p arabolic error
	double LowerError(unsigned int i) const;	double LowerError(unsigned int i) const;

	/// upper Minos error. If Minos has not run for parameter i return the p arabolic error	/// upper Minos error. If Minos has not run for parameter i return the p arabolic error
	double UpperError(unsigned int i) const;	double UpperError(unsigned int i) const;

	/// parameter global correlation coefficient	/// parameter global correlation coefficient
	double GlobalCC(unsigned int i) const {	double GlobalCC(unsigned int i) const {
	return (i < fGlobalCC.size() ) ? fGlobalCC[i] : -1;	return (i < fGlobalCC.size() ) ? fGlobalCC[i] : -1;
	}	}

	skipping to change at line 260	skipping to change at line 269
	*/	*/
	void GetConfidenceIntervals(const BinData & data, double * ci, double cl =0.95, bool norm = true ) const;	void GetConfidenceIntervals(const BinData & data, double * ci, double cl =0.95, bool norm = true ) const;

	/// get index for parameter name (return -1 if not found)	/// get index for parameter name (return -1 if not found)
	int Index(const std::string & name) const;	int Index(const std::string & name) const;

	///normalize errors using chi2/ndf for chi2 fits	///normalize errors using chi2/ndf for chi2 fits
	void NormalizeErrors();	void NormalizeErrors();

	/// flag to chek if errors are normalized	/// flag to chek if errors are normalized

	bool NormalizedErrors() { return fNormalized; }	bool NormalizedErrors() const { return fNormalized; }

	/// print the result and optionaly covariance matrix and correlations	/// print the result and optionaly covariance matrix and correlations
	void Print(std::ostream & os, bool covmat = false) const;	void Print(std::ostream & os, bool covmat = false) const;

	///print error matrix and correlations	///print error matrix and correlations
	void PrintCovMatrix(std::ostream & os) const;	void PrintCovMatrix(std::ostream & os) const;

	/// query if a parameter is bound	/// query if a parameter is bound
	bool IsParameterBound(unsigned int ipar) const;	bool IsParameterBound(unsigned int ipar) const;


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

	FitUtil.h	FitUtil.h

	// @(#)root/mathcore:$Id: FitUtil.h 24477 2008-06-23 12:58:47Z moneta $	// @(#)root/mathcore:$Id: FitUtil.h 39382 2011-05-26 08:31:43Z moneta $
	// Author: L. Moneta Tue Nov 28 10:52:47 2006	// Author: L. Moneta Tue Nov 28 10:52: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 FitUtil	// Header file for class FitUtil

	skipping to change at line 76	skipping to change at line 76
	/**	/**
	evaluate the LogL gradient given a model function and the data at th e point x.	evaluate the LogL gradient given a model function and the data at th e point x.
	return also nPoints as the effective number of used points in the Lo gL evaluation	return also nPoints as the effective number of used points in the Lo gL evaluation
	*/	*/
	void EvaluateLogLGradient(const IModelFunction & func, const UnBinData & data, const double * x, double * grad, unsigned int & nPoints);	void EvaluateLogLGradient(const IModelFunction & func, const UnBinData & data, const double * x, double * grad, unsigned int & nPoints);

	/**	/**
	evaluate the Poisson LogL given a model function and the data at the point x.	evaluate the Poisson LogL given a model function and the data at the point x.
	return also nPoints as the effective number of used points in the Lo gL evaluation	return also nPoints as the effective number of used points in the Lo gL evaluation
	*/	*/

	double EvaluatePoissonLogL(const IModelFunction & func, const BinData & data, const double * x, unsigned int & nPoints);	double EvaluatePoissonLogL(const IModelFunction & func, const BinData & data, const double * x, int iWeight, unsigned int & nPoints);

	/**	/**
	evaluate the Poisson LogL given a model function and the data at the point x.	evaluate the Poisson LogL given a model function and the data at the point x.
	return also nPoints as the effective number of used points in the Lo gL evaluation	return also nPoints as the effective number of used points in the Lo gL evaluation
	*/	*/
	void EvaluatePoissonLogLGradient(const IModelFunction & func, const BinD ata & data, const double * x, double * grad);	void EvaluatePoissonLogLGradient(const IModelFunction & func, const BinD ata & data, const double * x, double * grad);

	// /**	// /**
	// Parallel evaluate the Chi2 given a model function and the data at the point x.	// Parallel evaluate the Chi2 given a model function and the data at the point x.
	// return also nPoints as the effective number of used points in the Chi2 evaluation	// return also nPoints as the effective number of used points in the Chi2 evaluation

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

	MethodBase.h	MethodBase.h

	// @(#)root/tmva $Id: MethodBase.h 38719 2011-04-04 12:22:28Z evt $	// @(#)root/tmva $Id: MethodBase.h 40024 2011-06-27 17:02:37Z stelzer $
	// Author: Andreas Hoecker, Peter Speckmayer, Joerg Stelzer, Helge Voss, Ka i Voss, Eckhard von Toerne, Jan Therhaag	// Author: Andreas Hoecker, Peter Speckmayer, Joerg Stelzer, Helge Voss, Ka i Voss, Eckhard von Toerne, Jan Therhaag

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Class : MethodBase *	* Class : MethodBase *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Virtual base class for all MVA method *	* Virtual base class for all MVA method *

	skipping to change at line 344	skipping to change at line 344
	// the TMVA version can be obtained and checked using	// the TMVA version can be obtained and checked using
	// if (GetTrainingTMVAVersionCode()>TMVA_VERSION(3,7,2)) {...}	// if (GetTrainingTMVAVersionCode()>TMVA_VERSION(3,7,2)) {...}
	// or	// or
	// if (GetTrainingROOTVersionCode()>ROOT_VERSION(5,15,5)) {...}	// if (GetTrainingROOTVersionCode()>ROOT_VERSION(5,15,5)) {...}
	UInt_t GetTrainingTMVAVersionCode() const { return fTMVAT rainingVersion; }	UInt_t GetTrainingTMVAVersionCode() const { return fTMVAT rainingVersion; }
	UInt_t GetTrainingROOTVersionCode() const { return fROOTT rainingVersion; }	UInt_t GetTrainingROOTVersionCode() const { return fROOTT rainingVersion; }
	TString GetTrainingTMVAVersionString() const;	TString GetTrainingTMVAVersionString() const;
	TString GetTrainingROOTVersionString() const;	TString GetTrainingROOTVersionString() const;

	TransformationHandler& GetTransformationHandler(Bool_t takeRer outedIfAvailable=true)	TransformationHandler& GetTransformationHandler(Bool_t takeRer outedIfAvailable=true)

	{	{
	if(fTransformationPointer && takeReroutedIfAvailable) return *f	if(fTransformationPointer && takeReroutedIfAvailable) return *fTra
	TransformationPointer; else return fTransformation;	nsformationPointer; else return fTransformation;
	}	}
	const TransformationHandler& GetTransformationHandler(Bool_t takeRer outedIfAvailable=true) const	const TransformationHandler& GetTransformationHandler(Bool_t takeRer outedIfAvailable=true) const

	{	{
	if(fTransformationPointer && takeReroutedIfAvailable) return *f	if(fTransformationPointer && takeReroutedIfAvailable) return *fTra
	TransformationPointer; else return fTransformation;	nsformationPointer; else return fTransformation;
	}	}

	void RerouteTransformationHandler (TransformationHandler* fTargetTransformation) { fTransformationPointer=fTargetTransformation; }	void RerouteTransformationHandler (TransformationHandler* fTargetTransformation) { fTransformationPointer=fTargetTransformation; }

	// ---------- event accessors --------------------------------------- ---------	// ---------- event accessors --------------------------------------- ---------

	// returns reference to data set	// returns reference to data set
	DataSetInfo& DataInfo() const { return fDataSetInfo; }	DataSetInfo& DataInfo() const { return fDataSetInfo; }

	mutable const Event* fTmpEvent; //! temporary event when testing on a different DataSet than the own one	mutable const Event* fTmpEvent; //! temporary event when testing on a different DataSet than the own one


	skipping to change at line 495	skipping to change at line 495
	Bool_t GetLine( std::istream& fin, char * buf );	Bool_t GetLine( std::istream& fin, char * buf );

	// fill test tree with classification or regression results	// fill test tree with classification or regression results
	virtual void AddClassifierOutput ( Types::ETreeType type );	virtual void AddClassifierOutput ( Types::ETreeType type );
	virtual void AddClassifierOutputProb( Types::ETreeType type );	virtual void AddClassifierOutputProb( Types::ETreeType type );
	virtual void AddRegressionOutput ( Types::ETreeType type );	virtual void AddRegressionOutput ( Types::ETreeType type );
	virtual void AddMulticlassOutput ( Types::ETreeType type );	virtual void AddMulticlassOutput ( Types::ETreeType type );

	private:	private:


	void AddInfoItem( void* gi, const TString& name, const TS	void AddInfoItem( void* gi, const TString& name,
	tring& value) const;	const TString& value) const;

	static void CreateVariableTransforms(const TString& trafoDefinit ion,	static void CreateVariableTransforms(const TString& trafoDefinit ion,

	TMVA::DataSetInfo& dataInfo,	TMVA::DataSetInfo& dataInfo
	TMVA::TransformationHandler&	,
	transformationHandler,	TMVA::TransformationHandler
	TMVA::MsgLogger& log );	& transformationHandler,
		TMVA::MsgLogger& log );

	// ========== class members ========================================= =========	// ========== class members ========================================= =========

	protected:	protected:

	// direct accessors	// direct accessors
	Ranking* fRanking; // pointer to ranking ob ject (created by derived classifiers)	Ranking* fRanking; // pointer to ranking ob ject (created by derived classifiers)
	std::vector<TString>* fInputVars; // vector of input varia bles used in MVA	std::vector<TString>* fInputVars; // vector of input varia bles used in MVA

	// histogram binning	// histogram binning

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

	MnUserParameterState.h	MnUserParameterState.h

	// @(#)root/minuit2:$Id: MnUserParameterState.h 34992 2010-08-25 10:36:11Z moneta $	// @(#)root/minuit2:$Id: MnUserParameterState.h 39383 2011-05-26 08:35:47Z 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_MnUserParameterState	#ifndef ROOT_Minuit2_MnUserParameterState
	#define ROOT_Minuit2_MnUserParameterState	#define ROOT_Minuit2_MnUserParameterState

	skipping to change at line 78	skipping to change at line 78
	fIntParameters = state.fIntParameters;	fIntParameters = state.fIntParameters;
	fIntCovariance = state.fIntCovariance;	fIntCovariance = state.fIntCovariance;
	return *this;	return *this;
	}	}

	//user external representation	//user external representation
	const MnUserParameters& Parameters() const {return fParameters;}	const MnUserParameters& Parameters() const {return fParameters;}
	const MnUserCovariance& Covariance() const {return fCovariance;}	const MnUserCovariance& Covariance() const {return fCovariance;}
	const MnGlobalCorrelationCoeff& GlobalCC() const {return fGlobalCC;}	const MnGlobalCorrelationCoeff& GlobalCC() const {return fGlobalCC;}


		// hessian (inverse of covariance matrix)
		MnUserCovariance Hessian() const;

	//Minuit internal representation	//Minuit internal representation
	const std::vector<double>& IntParameters() const {return fIntParameters; }	const std::vector<double>& IntParameters() const {return fIntParameters; }
	const MnUserCovariance& IntCovariance() const {return fIntCovariance;}	const MnUserCovariance& IntCovariance() const {return fIntCovariance;}

	//transformation internal <-> external	//transformation internal <-> external
	const MnUserTransformation& Trafo() const {return fParameters.Trafo();}	const MnUserTransformation& Trafo() const {return fParameters.Trafo();}

	bool IsValid() const {return fValid;}	bool IsValid() const {return fValid;}
	bool HasCovariance() const {return fCovarianceValid;}	bool HasCovariance() const {return fCovarianceValid;}
	bool HasGlobalCC() const {return fGCCValid;}	bool HasGlobalCC() const {return fGCCValid;}

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

	PDEFoam.h	PDEFoam.h

	// @(#)root/tmva $Id: PDEFoam.h 38943 2011-04-20 08:03:25Z evt $	// @(#)root/tmva $Id: PDEFoam.h 40024 2011-06-27 17:02:37Z stelzer $
	// Author: S. Jadach, Tancredi Carli, Dominik Dannheim, Alexander Voigt	// Author: S. Jadach, Tancredi Carli, Dominik Dannheim, Alexander Voigt

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Classes: PDEFoam *	* Classes: PDEFoam *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Class for PDEFoam object *	* Class for PDEFoam object *

	skipping to change at line 140	skipping to change at line 140
	Double_t *fXmin; // [fDim] minimum for variable transform	Double_t *fXmin; // [fDim] minimum for variable transform
	Double_t *fXmax; // [fDim] maximum for variable transform	Double_t *fXmax; // [fDim] maximum for variable transform
	UInt_t fNElements; // BACKWARDS COMPATIBILITY: number of variab les in every cell	UInt_t fNElements; // BACKWARDS COMPATIBILITY: number of variab les in every cell
	UInt_t fNmin; // minimal number of events in cell to split cell	UInt_t fNmin; // minimal number of events in cell to split cell
	UInt_t fMaxDepth; // maximum depth of cell tree	UInt_t fMaxDepth; // maximum depth of cell tree
	Float_t fVolFrac; // BACKWARDS COMPATIBILITY: volume fraction (with respect to total phase space	Float_t fVolFrac; // BACKWARDS COMPATIBILITY: volume fraction (with respect to total phase space
	Bool_t fFillFoamWithOrigWeights; // BACKWARDS COMPATIBILITY: fill the foam with boost or orig. weights	Bool_t fFillFoamWithOrigWeights; // BACKWARDS COMPATIBILITY: fill the foam with boost or orig. weights
	EDTSeparation fDTSeparation; // BACKWARDS COMPATIBILITY: split cells according to decision tree logic	EDTSeparation fDTSeparation; // BACKWARDS COMPATIBILITY: split cells according to decision tree logic
	Bool_t fPeekMax; // BACKWARDS COMPATIBILITY: peek up cell wit h max. driver integral for split	Bool_t fPeekMax; // BACKWARDS COMPATIBILITY: peek up cell wit h max. driver integral for split
	PDEFoamDensityBase *fDistr; //! distribution of training events	PDEFoamDensityBase *fDistr; //! distribution of training events

	Timer *fTimer; // timer for graphical output	Timer *fTimer; //! timer for graphical output
	TObjArray *fVariableNames;// collection of all variable names	TObjArray *fVariableNames;// collection of all variable names
	mutable MsgLogger* fLogger; //! message logger	mutable MsgLogger* fLogger; //! message logger

	/////////////////////////////////////////////////////////////////	/////////////////////////////////////////////////////////////////
	// METHODS //	// METHODS //
	/////////////////////////////////////////////////////////////////	/////////////////////////////////////////////////////////////////

	protected:	protected:
	// ---------- TMVA console output	// ---------- TMVA console output


	skipping to change at line 297	skipping to change at line 297
	// get cell value stored in a foam cell	// get cell value stored in a foam cell
	virtual Float_t GetCellValue( const PDEFoamCell* cell, ECellValue cv );	virtual Float_t GetCellValue( const PDEFoamCell* cell, ECellValue cv );

	// ---------- friend classes	// ---------- friend classes
	friend class PDEFoamKernelBase;	friend class PDEFoamKernelBase;
	friend class PDEFoamKernelTrivial;	friend class PDEFoamKernelTrivial;
	friend class PDEFoamKernelLinN;	friend class PDEFoamKernelLinN;
	friend class PDEFoamKernelGauss;	friend class PDEFoamKernelGauss;

	// ---------- ROOT class definition	// ---------- ROOT class definition

	ClassDef(PDEFoam,6) // Tree of PDEFoamCells	ClassDef(PDEFoam,7) // Tree of PDEFoamCells
	}; // end of PDEFoam	}; // end of PDEFoam

	} // namespace TMVA	} // namespace TMVA

	// ---------- Inline functions	// ---------- Inline functions

	//_____________________________________________________________________	//_____________________________________________________________________
	inline Float_t TMVA::PDEFoam::VarTransform(Int_t idim, Float_t x) const	inline Float_t TMVA::PDEFoam::VarTransform(Int_t idim, Float_t x) const
	{	{
	// transform variable x from [xmin, xmax] --> [0, 1]	// transform variable x from [xmin, xmax] --> [0, 1]

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

	PDEFoamDensityBase.h	PDEFoamDensityBase.h

	// @(#)root/tmva $Id: PDEFoamDensityBase.h 38475 2011-03-17 10:46:00Z evt $	// @(#)root/tmva $Id: PDEFoamDensityBase.h 40020 2011-06-27 16:46:42Z stelz er $
	// Author: Tancredi Carli, Dominik Dannheim, Alexander Voigt	// Author: Tancredi Carli, Dominik Dannheim, Alexander Voigt

	/************************************************************************ ******	/************************************************************************ ******
	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis *
	* Package: TMVA *	* Package: TMVA *
	* Classes: PDEFoamDensityBase *	* Classes: PDEFoamDensityBase *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Class PDEFoamDensityBase is an Abstract class representing *	* Class PDEFoamDensityBase is an Abstract class representing *

	skipping to change at line 88	skipping to change at line 88
	// set the range-searching box	// set the range-searching box
	void SetBox(std::vector<Double_t> box) { fBox = box; fBoxHasChanged = kTRUE; }	void SetBox(std::vector<Double_t> box) { fBox = box; fBoxHasChanged = kTRUE; }

	// get the range-searching box	// get the range-searching box
	const std::vector<Double_t>& GetBox() const { return fBox; }	const std::vector<Double_t>& GetBox() const { return fBox; }

	// main function used by PDEFoam	// main function used by PDEFoam
	// returns density at a given point by range searching in BST	// returns density at a given point by range searching in BST
	virtual Double_t Density(std::vector<Double_t> &Xarg, Double_t &event _density) = 0;	virtual Double_t Density(std::vector<Double_t> &Xarg, Double_t &event _density) = 0;


	ClassDef(PDEFoamDensityBase, 1) //Class for density	ClassDef(PDEFoamDensityBase, 1) // PDEFoam event density interface
	}; //end of PDEFoamDensityBase	}; //end of PDEFoamDensityBase

	} // namespace TMVA	} // namespace TMVA

	#endif	#endif

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

	RooAbsGenContext.h	RooAbsGenContext.h

	skipping to change at line 68	skipping to change at line 68
	virtual void printTitle(ostream& os) const ;	virtual void printTitle(ostream& os) const ;
	virtual void printClassName(ostream& os) const ;	virtual void printClassName(ostream& os) const ;
	virtual void printArgs(ostream& os) const ;	virtual void printArgs(ostream& os) const ;
	virtual void printMultiline(ostream& os, Int_t contents, Bool_t verbose=k FALSE, TString indent="") const;	virtual void printMultiline(ostream& os, Int_t contents, Bool_t verbose=k FALSE, TString indent="") const;

	virtual Int_t defaultPrintContents(Option_t* opt) const ;	virtual Int_t defaultPrintContents(Option_t* opt) const ;
	virtual StyleOption defaultPrintStyle(Option_t* opt) const ;	virtual StyleOption defaultPrintStyle(Option_t* opt) const ;

	protected:	protected:


		virtual RooDataSet* createDataSet(const char* name, const char* title, co
		nst RooArgSet& obs) ;

	friend class RooConvGenContext ;	friend class RooConvGenContext ;
	friend class RooProdGenContext ;	friend class RooProdGenContext ;
	friend class RooAddGenContext ;	friend class RooAddGenContext ;
	friend class RooSimGenContext ;	friend class RooSimGenContext ;
	friend class RooEffGenContext ;	friend class RooEffGenContext ;

	virtual void initGenerator(const RooArgSet &theEvent);	virtual void initGenerator(const RooArgSet &theEvent);
	virtual void generateEvent(RooArgSet &theEvent, Int_t remaining) = 0;	virtual void generateEvent(RooArgSet &theEvent, Int_t remaining) = 0;

	void resampleData(Double_t& ratio) ;	void resampleData(Double_t& ratio) ;

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

	RooAbsOptTestStatistic.h	RooAbsOptTestStatistic.h

	skipping to change at line 48	skipping to change at line 48
	RooAbsOptTestStatistic(const RooAbsOptTestStatistic& other, const char* n ame=0);	RooAbsOptTestStatistic(const RooAbsOptTestStatistic& other, const char* n ame=0);
	virtual ~RooAbsOptTestStatistic();	virtual ~RooAbsOptTestStatistic();

	virtual Double_t combinedValue(RooAbsReal** gofArray, Int_t nVal) const ;	virtual Double_t combinedValue(RooAbsReal** gofArray, Int_t nVal) const ;

	RooAbsReal& function() { return *_funcClone ; }	RooAbsReal& function() { return *_funcClone ; }
	const RooAbsReal& function() const { return *_funcClone ; }	const RooAbsReal& function() const { return *_funcClone ; }

	RooAbsData& data() ;	RooAbsData& data() ;
	const RooAbsData& data() const ;	const RooAbsData& data() const ;

	Bool_t setData(RooAbsData& data, Bool_t cloneData=kTRUE) ;

	virtual const char* cacheUniqueSuffix() const { return Form("_%lx", (ULon g_t)_dataClone) ; }	virtual const char* cacheUniqueSuffix() const { return Form("_%lx", (ULon g_t)_dataClone) ; }

	// Override this to be always true to force calculation of likelihood wit hout parameters	// Override this to be always true to force calculation of likelihood wit hout parameters
	virtual Bool_t isDerived() const { return kTRUE ; }	virtual Bool_t isDerived() const { return kTRUE ; }

	void seal(const char* notice="") { _sealed = kTRUE ; _sealNotice = notice ; }	void seal(const char* notice="") { _sealed = kTRUE ; _sealNotice = notice ; }
	Bool_t isSealed() const { return _sealed ; }	Bool_t isSealed() const { return _sealed ; }
	const char* sealNotice() const { return _sealNotice.Data() ; }	const char* sealNotice() const { return _sealNotice.Data() ; }

	protected:	protected:


		Bool_t setDataSlave(RooAbsData& data, Bool_t cloneData=kTRUE) ;

	friend class RooAbsReal ;	friend class RooAbsReal ;

	virtual Bool_t allowFunctionCache() { return kTRUE ; }	virtual Bool_t allowFunctionCache() { return kTRUE ; }
	void constOptimizeTestStatistic(ConstOpCode opcode) ;	void constOptimizeTestStatistic(ConstOpCode opcode) ;

	virtual Bool_t redirectServersHook(const RooAbsCollection& newServerList, Bool_t mustReplaceAll, Bool_t nameChange, Bool_t isRecursive) ;	virtual Bool_t redirectServersHook(const RooAbsCollection& newServerList, Bool_t mustReplaceAll, Bool_t nameChange, Bool_t isRecursive) ;
	virtual void printCompactTreeHook(ostream& os, const char* indent="") ;	virtual void printCompactTreeHook(ostream& os, const char* indent="") ;
	virtual RooArgSet requiredExtraObservables() const { return RooArgSet() ; }	virtual RooArgSet requiredExtraObservables() const { return RooArgSet() ; }
	void optimizeCaching() ;	void optimizeCaching() ;
	void optimizeConstantTerms(Bool_t) ;	void optimizeConstantTerms(Bool_t) ;

	RooArgSet* _normSet ; // Pointer to set with observables used for normal ization	RooArgSet* _normSet ; // Pointer to set with observables used for normal ization
	RooArgSet* _funcCloneSet ; // Set owning all components of internal clon e of input function	RooArgSet* _funcCloneSet ; // Set owning all components of internal clon e of input function
	RooAbsData* _dataClone ; // Pointer to internal clone if input data	RooAbsData* _dataClone ; // Pointer to internal clone if input data
	RooAbsReal* _funcClone ; // Pointer to internal clone of input function	RooAbsReal* _funcClone ; // Pointer to internal clone of input function
	RooArgSet* _projDeps ; // Set of projected observable	RooArgSet* _projDeps ; // Set of projected observable
	Bool_t _ownData ; // Do we own the dataset	Bool_t _ownData ; // Do we own the dataset
	Bool_t _sealed ; // Is test statistic sealed -- i.e. no access to da ta	Bool_t _sealed ; // Is test statistic sealed -- i.e. no access to da ta
	TString _sealNotice ; // User-defined notice shown when reading a sea led likelihood	TString _sealNotice ; // User-defined notice shown when reading a sea led likelihood

		RooArgSet _ownedDataObs ; //! Dataset observables we've agreed to own
	ClassDef(RooAbsOptTestStatistic,3) // Abstract base class for optimized t est statistics	ClassDef(RooAbsOptTestStatistic,3) // Abstract base class for optimized t est statistics
	};	};

	#endif	#endif

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

	RooAbsReal.h	RooAbsReal.h

	skipping to change at line 250	skipping to change at line 250
	char _srvval[1024] ;	char _srvval[1024] ;
	} ;	} ;

	enum ErrorLoggingMode { PrintErrors, CollectErrors, CountErrors } ;	enum ErrorLoggingMode { PrintErrors, CollectErrors, CountErrors } ;
	static ErrorLoggingMode evalErrorLoggingMode() ;	static ErrorLoggingMode evalErrorLoggingMode() ;
	static void setEvalErrorLoggingMode(ErrorLoggingMode m) ;	static void setEvalErrorLoggingMode(ErrorLoggingMode m) ;
	void logEvalError(const char* message, const char* serverValueString=0) c onst ;	void logEvalError(const char* message, const char* serverValueString=0) c onst ;
	static void logEvalError(const RooAbsReal* originator, const char* origNa me, const char* message, const char* serverValueString=0) ;	static void logEvalError(const RooAbsReal* originator, const char* origNa me, const char* message, const char* serverValueString=0) ;
	static void printEvalErrors(ostream&os=std::cout, Int_t maxPerNode=100000 00) ;	static void printEvalErrors(ostream&os=std::cout, Int_t maxPerNode=100000 00) ;
	static Int_t numEvalErrors() ;	static Int_t numEvalErrors() ;

	static Int_t numEvalErrorItems() { return _evalErrorList.size() ; }	static Int_t numEvalErrorItems() ;

	typedef std::map<const RooAbsArg*,std::pair<std::string,std::list<EvalErr or> > >::const_iterator EvalErrorIter ;	typedef std::map<const RooAbsArg*,std::pair<std::string,std::list<EvalErr or> > >::const_iterator EvalErrorIter ;

	static EvalErrorIter evalErrorIter() { return _evalErrorList.begin() ; }	static EvalErrorIter evalErrorIter() ;

	static void clearEvalErrorLog() ;	static void clearEvalErrorLog() ;

	virtual std::list<Double_t>* plotSamplingHint(RooAbsRealLValue& /obs/, Double_t /xlo/, Double_t /xhi/) const {	virtual std::list<Double_t>* plotSamplingHint(RooAbsRealLValue& /obs/, Double_t /xlo/, Double_t /xhi/) const {
	// Interface for returning an optional hint for initial sampling points when constructing a curve	// Interface for returning an optional hint for initial sampling points when constructing a curve
	// projected on observable.	// projected on observable.
	return 0 ;	return 0 ;
	}	}

	RooGenFunction* iGenFunction(RooRealVar& x, const RooArgSet& nset=RooArgS et()) ;	RooGenFunction* iGenFunction(RooRealVar& x, const RooArgSet& nset=RooArgS et()) ;

	skipping to change at line 282	skipping to change at line 282
	RooMoment* moment(RooRealVar& obs, Int_t order, Bool_t central, Bool_t ta keRoot) ;	RooMoment* moment(RooRealVar& obs, Int_t order, Bool_t central, Bool_t ta keRoot) ;
	RooMoment* moment(RooRealVar& obs, const RooArgSet& normObs, Int_t order, Bool_t central, Bool_t takeRoot, Bool_t intNormObs) ;	RooMoment* moment(RooRealVar& obs, const RooArgSet& normObs, Int_t order, Bool_t central, Bool_t takeRoot, Bool_t intNormObs) ;

	RooMoment* mean(RooRealVar& obs) { return moment(obs,1,kFALSE,kFALSE) ; }	RooMoment* mean(RooRealVar& obs) { return moment(obs,1,kFALSE,kFALSE) ; }
	RooMoment* mean(RooRealVar& obs, const RooArgSet& nset) { return moment(o bs,nset,1,kFALSE,kFALSE,kTRUE) ; }	RooMoment* mean(RooRealVar& obs, const RooArgSet& nset) { return moment(o bs,nset,1,kFALSE,kFALSE,kTRUE) ; }
	RooMoment* sigma(RooRealVar& obs) { return moment(obs,2,kTRUE,kTRUE) ; }	RooMoment* sigma(RooRealVar& obs) { return moment(obs,2,kTRUE,kTRUE) ; }
	RooMoment* sigma(RooRealVar& obs, const RooArgSet& nset) { return moment( obs,nset,2,kTRUE,kTRUE,kTRUE) ; }	RooMoment* sigma(RooRealVar& obs, const RooArgSet& nset) { return moment( obs,nset,2,kTRUE,kTRUE,kTRUE) ; }

	Double_t findRoot(RooRealVar& x, Double_t xmin, Double_t xmax, Double_t y val) ;	Double_t findRoot(RooRealVar& x, Double_t xmin, Double_t xmax, Double_t y val) ;


		virtual Bool_t setData(RooAbsData& /data/, Bool_t /cloneData/=kTRUE)
		{ return kTRUE ; }

	protected:	protected:

	// PlotOn with command list	// PlotOn with command list
	virtual RooPlot* plotOn(RooPlot* frame, RooLinkedList& cmdList) const ;	virtual RooPlot* plotOn(RooPlot* frame, RooLinkedList& cmdList) const ;

	// Hook for objects with normalization-dependent parameters interperetati on	// Hook for objects with normalization-dependent parameters interperetati on
	virtual void selectNormalization(const RooArgSet* depSet=0, Bool_t force= kFALSE) ;	virtual void selectNormalization(const RooArgSet* depSet=0, Bool_t force= kFALSE) ;
	virtual void selectNormalizationRange(const char* rangeName=0, Bool_t for ce=kFALSE) ;	virtual void selectNormalizationRange(const char* rangeName=0, Bool_t for ce=kFALSE) ;

	// Helper functions for plotting	// Helper functions for plotting

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

	RooAbsTestStatistic.h	RooAbsTestStatistic.h

	skipping to change at line 58	skipping to change at line 58
	Int_t nCPU=1, Bool_t interleave=kFALSE , Bool_t verbose=kTRUE, Bool_t splitCutRange=kFALSE) = 0 ;	Int_t nCPU=1, Bool_t interleave=kFALSE , Bool_t verbose=kTRUE, Bool_t splitCutRange=kFALSE) = 0 ;

	virtual void constOptimizeTestStatistic(ConstOpCode opcode) ;	virtual void constOptimizeTestStatistic(ConstOpCode opcode) ;

	virtual Double_t combinedValue(RooAbsReal** gofArray, Int_t nVal) const = 0 ;	virtual Double_t combinedValue(RooAbsReal** gofArray, Int_t nVal) const = 0 ;
	virtual Double_t globalNormalization() const {	virtual Double_t globalNormalization() const {
	// Default value of global normalization factor is 1.0	// Default value of global normalization factor is 1.0
	return 1.0 ;	return 1.0 ;
	}	}


		Bool_t setData(RooAbsData& data, Bool_t cloneData=kTRUE) ;

	protected:	protected:

	virtual void printCompactTreeHook(ostream& os, const char* indent="") ;	virtual void printCompactTreeHook(ostream& os, const char* indent="") ;

	virtual Bool_t redirectServersHook(const RooAbsCollection& newServerList, Bool_t mustReplaceAll, Bool_t nameChange, Bool_t isRecursive) ;	virtual Bool_t redirectServersHook(const RooAbsCollection& newServerList, Bool_t mustReplaceAll, Bool_t nameChange, Bool_t isRecursive) ;
	virtual Double_t evaluate() const ;	virtual Double_t evaluate() const ;

	virtual Double_t evaluatePartition(Int_t firstEvent, Int_t lastEvent, Int _t stepSize) const = 0 ;	virtual Double_t evaluatePartition(Int_t firstEvent, Int_t lastEvent, Int _t stepSize) const = 0 ;

	void setMPSet(Int_t setNum, Int_t numSets) ;	void setMPSet(Int_t setNum, Int_t numSets) ;

	skipping to change at line 105	skipping to change at line 107
	// Original arguments	// Original arguments
	RooAbsReal* _func ; // Pointer to original input function	RooAbsReal* _func ; // Pointer to original input function
	RooAbsData* _data ; // Pointer to original input dataset	RooAbsData* _data ; // Pointer to original input dataset
	const RooArgSet* _projDeps ; // Pointer to set with projected observa bles	const RooArgSet* _projDeps ; // Pointer to set with projected observa bles
	std::string _rangeName ; // Name of range in which to calculate t est statistic	std::string _rangeName ; // Name of range in which to calculate t est statistic
	std::string _addCoefRangeName ; // Name of reference to be used for RooA ddPdf components	std::string _addCoefRangeName ; // Name of reference to be used for RooA ddPdf components
	Bool_t _splitRange ; // Split rangeName in RooSimultaneous in dex labels if true	Bool_t _splitRange ; // Split rangeName in RooSimultaneous in dex labels if true
	Int_t _simCount ; // Total number of component p.d.f.s in RooSimultaneous (if any)	Int_t _simCount ; // Total number of component p.d.f.s in RooSimultaneous (if any)
	Bool_t _verbose ; // Verbose messaging if true	Bool_t _verbose ; // Verbose messaging if true


		virtual Bool_t setDataSlave(RooAbsData& /data/, Bool_t /cloneData/=kT
		RUE) { return kTRUE ; }

	private:	private:

	virtual Bool_t processEmptyDataSets() const { return kTRUE ; }	virtual Bool_t processEmptyDataSets() const { return kTRUE ; }

	Bool_t initialize() ;	Bool_t initialize() ;
	void initSimMode(RooSimultaneous* pdf, RooAbsData* data, const RooArgSet* projDeps, const char* rangeName, const char* addCoefRangeName) ;	void initSimMode(RooSimultaneous* pdf, RooAbsData* data, const RooArgSet* projDeps, const char* rangeName, const char* addCoefRangeName) ;
	void initMPMode(RooAbsReal* real, RooAbsData* data, const RooArgSet* proj Deps, const char* rangeName, const char* addCoefRangeName) ;	void initMPMode(RooAbsReal* real, RooAbsData* data, const RooArgSet* proj Deps, const char* rangeName, const char* addCoefRangeName) ;

	mutable Bool_t _init ; //! Is object initialized	mutable Bool_t _init ; //! Is object initialized
	GOFOpMode _gofOpMode ; // Operation mode of test statistic insta nce	GOFOpMode _gofOpMode ; // Operation mode of test statistic insta nce

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

	RooDataHist.h	RooDataHist.h

	skipping to change at line 96	skipping to change at line 96
	}	}
	virtual Bool_t isNonPoissonWeighted() const ;	virtual Bool_t isNonPoissonWeighted() const ;

	Double_t sum(Bool_t correctForBinSize) const ;	Double_t sum(Bool_t correctForBinSize) const ;
	Double_t sum(const RooArgSet& sumSet, const RooArgSet& sliceSet, Bool_t c orrectForBinSize) ;	Double_t sum(const RooArgSet& sumSet, const RooArgSet& sliceSet, Bool_t c orrectForBinSize) ;

	virtual Double_t weight() const {	virtual Double_t weight() const {
	// Return weight of current bin	// Return weight of current bin
	return _curWeight ;	return _curWeight ;
	}	}

	Double_t weight(const RooArgSet& bin, Int_t intOrder=1, Bool_t correctFor BinSize=kFALSE, Bool_t cdfBoundaries=kFALSE) ;	Double_t weight(const RooArgSet& bin, Int_t intOrder=1, Bool_t correctFor BinSize=kFALSE, Bool_t cdfBoundaries=kFALSE, Bool_t oneSafe=kFALSE) ;
	Double_t binVolume() const { return _curVolume ; }	Double_t binVolume() const { return _curVolume ; }
	Double_t binVolume(const RooArgSet& bin) ;	Double_t binVolume(const RooArgSet& bin) ;
	virtual Bool_t valid() const ;	virtual Bool_t valid() const ;

	TIterator* sliceIterator(RooAbsArg& sliceArg, const RooArgSet& otherArgs) ;	TIterator* sliceIterator(RooAbsArg& sliceArg, const RooArgSet& otherArgs) ;

	virtual void weightError(Double_t& lo, Double_t& hi, ErrorType etype=Pois son) const ;	virtual void weightError(Double_t& lo, Double_t& hi, ErrorType etype=Pois son) const ;
	virtual Double_t weightError(ErrorType etype=Poisson) const {	virtual Double_t weightError(ErrorType etype=Poisson) const {
	// Return symmetric error on current bin calculated either from Poisson statistics or from SumOfWeights	// Return symmetric error on current bin calculated either from Poisson statistics or from SumOfWeights
	Double_t lo,hi ;	Double_t lo,hi ;

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

	RooGlobalFunc.h	RooGlobalFunc.h

	skipping to change at line 133	skipping to change at line 133
	RooCmdArg WeightVar(const RooRealVar& arg) ;	RooCmdArg WeightVar(const RooRealVar& arg) ;
	RooCmdArg Import(const char* state, RooDataSet& data) ;	RooCmdArg Import(const char* state, RooDataSet& data) ;
	RooCmdArg Import(const std::map<std::string,RooDataSet*>& ) ;	RooCmdArg Import(const std::map<std::string,RooDataSet*>& ) ;
	RooCmdArg Link(const char* state, RooAbsData& data) ;	RooCmdArg Link(const char* state, RooAbsData& data) ;
	RooCmdArg Link(const std::map<std::string,RooAbsData*>&) ;	RooCmdArg Link(const std::map<std::string,RooAbsData*>&) ;
	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) ;

		RooCmdArg OwnLinked() ;

	// 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) ;

	// RooAbsPdf::printLatex arguments	// RooAbsPdf::printLatex arguments
	RooCmdArg Columns(Int_t ncol) ;	RooCmdArg Columns(Int_t ncol) ;
	RooCmdArg OutputFile(const char* fileName) ;	RooCmdArg OutputFile(const char* fileName) ;
	RooCmdArg Format(const char* format, Int_t sigDigit) ;	RooCmdArg Format(const char* format, Int_t sigDigit) ;

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

	RooMCStudy.h	RooMCStudy.h

	skipping to change at line 59	skipping to change at line 59
	// Run methods	// Run methods
	Bool_t generateAndFit(Int_t nSamples, Int_t nEvtPerSample=0, Bool_t keepG enData=kFALSE, const char* asciiFilePat=0) ;	Bool_t generateAndFit(Int_t nSamples, Int_t nEvtPerSample=0, Bool_t keepG enData=kFALSE, const char* asciiFilePat=0) ;
	Bool_t generate(Int_t nSamples, Int_t nEvtPerSample=0, Bool_t keepGenData =kFALSE, const char* asciiFilePat=0) ;	Bool_t generate(Int_t nSamples, Int_t nEvtPerSample=0, Bool_t keepGenData =kFALSE, const char* asciiFilePat=0) ;
	Bool_t fit(Int_t nSamples, const char* asciiFilePat) ;	Bool_t fit(Int_t nSamples, const char* asciiFilePat) ;
	Bool_t fit(Int_t nSamples, TList& dataSetList) ;	Bool_t fit(Int_t nSamples, TList& dataSetList) ;
	Bool_t addFitResult(const RooFitResult& fr) ;	Bool_t addFitResult(const RooFitResult& fr) ;

	// Result accessors	// Result accessors
	const RooArgSet* fitParams(Int_t sampleNum) const ;	const RooArgSet* fitParams(Int_t sampleNum) const ;
	const RooFitResult* fitResult(Int_t sampleNum) const ;	const RooFitResult* fitResult(Int_t sampleNum) const ;

	const RooDataSet* genData(Int_t sampleNum) const ;	const RooAbsData* genData(Int_t sampleNum) const ;
	const RooDataSet& fitParDataSet() ;	const RooDataSet& fitParDataSet() ;
	const RooDataSet* genParDataSet() const {	const RooDataSet* genParDataSet() const {
	// Return dataset with generator parameters for each toy. When constrai nts are used these	// Return dataset with generator parameters for each toy. When constrai nts are used these
	// may generally not be the same	// may generally not be the same
	return _genParData ;	return _genParData ;
	}	}

	// Plot methods	// Plot methods
	RooPlot* plotParamOn(RooPlot* frame, const RooCmdArg& arg1=RooCmdArg::non e(), const RooCmdArg& arg2=RooCmdArg::none(),	RooPlot* plotParamOn(RooPlot* frame, const RooCmdArg& arg1=RooCmdArg::non e(), const RooCmdArg& arg2=RooCmdArg::none(),
	const RooCmdArg& arg3=RooCmdArg::none(), const RooCm dArg& arg4=RooCmdArg::none(),	const RooCmdArg& arg3=RooCmdArg::none(), const RooCm dArg& arg4=RooCmdArg::none(),

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

	RooProdPdf.h	RooProdPdf.h

	skipping to change at line 90	skipping to change at line 90
	virtual std::list<Double_t>* plotSamplingHint(RooAbsRealLValue& obs, Doub le_t xlo, Double_t xhi) const ;	virtual std::list<Double_t>* plotSamplingHint(RooAbsRealLValue& obs, Doub le_t xlo, Double_t xhi) const ;

	void printMetaArgs(ostream& os) const ;	void printMetaArgs(ostream& os) const ;

	virtual void selectNormalizationRange(const char* rangeName=0, Bool_t for ce=kFALSE) ;	virtual void selectNormalizationRange(const char* rangeName=0, Bool_t for ce=kFALSE) ;
	void fixRefRange(const char* rangeName) ;	void fixRefRange(const char* rangeName) ;

	void setSelfNormalized(Bool_t flag) { _selfNorm = flag ; }	void setSelfNormalized(Bool_t flag) { _selfNorm = flag ; }
	void setDefNormSet(const RooArgSet& nset) { _defNormSet.removeAll() ; _de fNormSet.addClone(nset) ; }	void setDefNormSet(const RooArgSet& nset) { _defNormSet.removeAll() ; _de fNormSet.addClone(nset) ; }


		Bool_t redirectServersHook(const RooAbsCollection& /newServerList/, Boo
		l_t /mustReplaceAll/, Bool_t /nameChange/, Bool_t /isRecursive/) ;

	protected:	protected:

	RooAbsReal* makeCondPdfRatioCorr(RooAbsReal& term, const RooArgSet& termN set, const RooArgSet& termImpSet, const char* normRange, const char* refRan ge) const ;	RooAbsReal* makeCondPdfRatioCorr(RooAbsReal& term, const RooArgSet& termN set, const RooArgSet& termImpSet, const char* normRange, const char* refRan ge) const ;

	virtual void getParametersHook(const RooArgSet* /nset/, RooArgSet* /li st/, Bool_t stripDisconnected) const ;	virtual void getParametersHook(const RooArgSet* /nset/, RooArgSet* /li st/, Bool_t stripDisconnected) const ;

	void initializeFromCmdArgList(const RooArgSet& fullPdfSet, const RooLinke dList& l) ;	void initializeFromCmdArgList(const RooArgSet& fullPdfSet, const RooLinke dList& l) ;

	void factorizeProduct(const RooArgSet& normSet, const RooArgSet& intSet,	void factorizeProduct(const RooArgSet& normSet, const RooArgSet& intSet,
	RooLinkedList& termList, RooLinkedList& normList,	RooLinkedList& termList, RooLinkedList& normList,

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

	RooProfileLL.h	RooProfileLL.h

	skipping to change at line 46	skipping to change at line 46
	RooAbsReal& nll() { return const_cast<RooAbsReal&>(_nll.arg()) ; }	RooAbsReal& nll() { return const_cast<RooAbsReal&>(_nll.arg()) ; }
	const RooArgSet& bestFitParams() const ;	const RooArgSet& bestFitParams() const ;
	const RooArgSet& bestFitObs() const ;	const RooArgSet& bestFitObs() const ;

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

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

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


		Int_t numEval() const { return _neval ; }

	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
	TIterator* _oiter ; //! Iterator of profile likelihood output parameter(s )	TIterator* _oiter ; //! Iterator of profile likelihood output parameter(s )

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

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

		mutable Int_t _neval ; // Number evaluations used in last minimization
	Double_t evaluate() const ;	Double_t evaluate() const ;

	private:	private:

	ClassDef(RooProfileLL,0) // Real-valued function representing profile lik elihood of external (likelihood) function	ClassDef(RooProfileLL,0) // Real-valued function representing profile lik elihood of external (likelihood) function
	};	};

	#endif	#endif

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

	RooSimGenContext.h	RooSimGenContext.h

	skipping to change at line 43	skipping to change at line 43

	virtual void attach(const RooArgSet& params) ;	virtual void attach(const RooArgSet& params) ;

	virtual void printMultiline(ostream &os, Int_t content, Bool_t verbose=kF ALSE, TString indent="") const ;	virtual void printMultiline(ostream &os, Int_t content, Bool_t verbose=kF ALSE, TString indent="") const ;

	protected:	protected:

	virtual void initGenerator(const RooArgSet &theEvent);	virtual void initGenerator(const RooArgSet &theEvent);
	virtual void generateEvent(RooArgSet &theEvent, Int_t remaining);	virtual void generateEvent(RooArgSet &theEvent, Int_t remaining);


		RooDataSet* createDataSet(const char* name, const char* title, const RooA
		rgSet& obs) ;
		void updateFractions() ;

	RooSimGenContext(const RooSimGenContext& other) ;	RooSimGenContext(const RooSimGenContext& other) ;

	RooAbsCategoryLValue* _idxCat ; // Clone of index category	RooAbsCategoryLValue* _idxCat ; // Clone of index category
	RooArgSet* _idxCatSet ; // Owner of index category components	RooArgSet* _idxCatSet ; // Owner of index category components
	const RooDataSet *_prototype; // Prototype data set	const RooDataSet *_prototype; // Prototype data set
	const RooSimultaneous *_pdf ; // Original PDF	const RooSimultaneous *_pdf ; // Original PDF
	TList _gcList ; // List of component generator contexts	TList _gcList ; // List of component generator contexts
	Bool_t _haveIdxProto ; // Flag set if generation of index is req uested	Bool_t _haveIdxProto ; // Flag set if generation of index is req uested
	TString _idxCatName ; // Name of index category	TString _idxCatName ; // Name of index category
	Int_t _numPdf ; // Number of generated PDFs	Int_t _numPdf ; // Number of generated PDFs
	Double_t* _fracThresh ; //[_numPdf] Fraction threshold array	Double_t* _fracThresh ; //[_numPdf] Fraction threshold array


		RooArgSet _allVarsPdf ; // All pdf variables
		TIterator* _proxyIter ; // Iterator over pdf proxies

	ClassDef(RooSimGenContext,0) // Context for efficiently generating a data set from a RooSimultaneous PDF	ClassDef(RooSimGenContext,0) // Context for efficiently generating a data set from a RooSimultaneous PDF
	};	};

	#endif	#endif

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

	SequentialProposal.h	SequentialProposal.h

	// @(#)root/roostats:$Id: SequentialProposal.h 39004 2011-04-21 13:47:21Z m oneta $	// @(#)root/roostats:$Id: SequentialProposal.h 39455 2011-05-27 13:12:20Z m oneta $
	// Authors: Giovanni Petrucciani 4/21/2011	// Authors: Giovanni Petrucciani 4/21/2011
	/*************************************************************************	/*************************************************************************
	* 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_SequentialProposal	#ifndef RooStats_SequentialProposal

	skipping to change at line 29	skipping to change at line 29
	#endif	#endif
	#ifndef ROO_ARG_SET	#ifndef ROO_ARG_SET
	#include "RooArgSet.h"	#include "RooArgSet.h"
	#endif	#endif

	namespace RooStats {	namespace RooStats {

	class SequentialProposal : public ProposalFunction {	class SequentialProposal : public ProposalFunction {

	public:	public:

	SequentialProposal() : RooStats::ProposalFunction() {}	SequentialProposal() : RooStats::ProposalFunction(), fDivisor(0) {}
	SequentialProposal(double divisor) ;	SequentialProposal(double divisor) ;

	// Populate xPrime with a new proposed point	// Populate xPrime with a new proposed point
	virtual void Propose(RooArgSet& xPrime, RooArgSet& x);	virtual void Propose(RooArgSet& xPrime, RooArgSet& x);

	// Determine whether or not the proposal density is symmetric for	// Determine whether or not the proposal density is symmetric for
	// points x1 and x2 - that is, whether the probabilty of reaching x2	// points x1 and x2 - that is, whether the probabilty of reaching x2
	// from x1 is equal to the probability of reaching x1 from x2	// from x1 is equal to the probability of reaching x1 from x2
	virtual Bool_t IsSymmetric(RooArgSet& x1, RooArgSet& x2) ;	virtual Bool_t IsSymmetric(RooArgSet& x1, RooArgSet& x2) ;


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

	TApplication.h	TApplication.h

	// @(#)root/base:$Id: TApplication.h 35721 2010-09-24 19:47:24Z rdm $	// @(#)root/base:$Id: TApplication.h 39402 2011-05-26 12:56:31Z axel $
	// Author: Fons Rademakers 22/12/95	// Author: Fons Rademakers 22/12/95

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


	skipping to change at line 155	skipping to change at line 155
	TApplication *GetAppRemote() const { return fAppRemote; }	TApplication *GetAppRemote() const { return fAppRemote; }

	Bool_t IsRunning() const { return fIsRunning; }	Bool_t IsRunning() const { return fIsRunning; }
	Bool_t ReturnFromRun() const { return fReturnFromRun; }	Bool_t ReturnFromRun() const { return fReturnFromRun; }
	void SetReturnFromRun(Bool_t ret) { fReturnFromRun = ret; }	void SetReturnFromRun(Bool_t ret) { fReturnFromRun = ret; }

	virtual void LineProcessed(const char line); //SIGNAL*	virtual void LineProcessed(const char line); //SIGNAL*
	virtual void Terminate(Int_t status = 0); //SIGNAL	virtual void Terminate(Int_t status = 0); //SIGNAL
	virtual void KeyPressed(Int_t key); //SIGNAL	virtual void KeyPressed(Int_t key); //SIGNAL
	virtual void ReturnPressed(char text ); //SIGNAL*	virtual void ReturnPressed(char text ); //SIGNAL*

		virtual Int_t TabCompletionHook(char buf, int pLoc, ostream& out);

	static Long_t ExecuteFile(const char file, Int_t error = 0, Bool_t k eep = kFALSE);	static Long_t ExecuteFile(const char file, Int_t error = 0, Bool_t k eep = kFALSE);
	static TList *GetApplications();	static TList *GetApplications();
	static void CreateApplication();	static void CreateApplication();
	static void NeedGraphicsLibs();	static void NeedGraphicsLibs();

	ClassDef(TApplication,0) //GUI application singleton	ClassDef(TApplication,0) //GUI application singleton
	};	};

	R__EXTERN TApplication *gApplication;	R__EXTERN TApplication *gApplication;

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

	TBuffer.h	TBuffer.h

	// @(#)root/base:$Id: TBuffer.h 37809 2011-01-19 11:07:41Z rdm $	// @(#)root/base:$Id: TBuffer.h 39552 2011-06-03 18:38:52Z pcanal $
	// Author: Rene Brun, Philippe Canal, Fons Rademakers 04/05/96	// Author: Rene Brun, Philippe Canal, Fons Rademakers 04/05/96

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


	skipping to change at line 94	skipping to change at line 94
	void SetBuffer(void *buf, UInt_t bufsiz = 0, Bool_t adopt = kTRUE, R eAllocCharFun_t reallocfunc = 0);	void SetBuffer(void *buf, UInt_t bufsiz = 0, Bool_t adopt = kTRUE, R eAllocCharFun_t reallocfunc = 0);
	ReAllocCharFun_t GetReAllocFunc() const;	ReAllocCharFun_t GetReAllocFunc() const;
	void SetReAllocFunc(ReAllocCharFun_t reallocfunc = 0);	void SetReAllocFunc(ReAllocCharFun_t reallocfunc = 0);
	void SetBufferOffset(Int_t offset = 0) { fBufCur = fBuffer+offset; }	void SetBufferOffset(Int_t offset = 0) { fBufCur = fBuffer+offset; }
	void SetParent(TObject *parent);	void SetParent(TObject *parent);
	TObject *GetParent() const;	TObject *GetParent() const;
	char *Buffer() const { return fBuffer; }	char *Buffer() const { return fBuffer; }
	Int_t BufferSize() const { return fBufSize; }	Int_t BufferSize() const { return fBufSize; }
	void DetachBuffer() { fBuffer = 0; }	void DetachBuffer() { fBuffer = 0; }
	Int_t Length() const { return (Int_t)(fBufCur - fBuffer); }	Int_t Length() const { return (Int_t)(fBufCur - fBuffer); }

	void Expand(Int_t newsize); // expand buffer to newsize	void Expand(Int_t newsize, Bool_t copy = kTRUE); // expand buffer t
		o newsize
		void AutoExpand(Int_t size_needed); // expand buffer to newsize

	virtual Bool_t CheckObject(const TObject *obj) = 0;	virtual Bool_t CheckObject(const TObject *obj) = 0;
	virtual Bool_t CheckObject(const void obj, const TClass ptrClass) = 0;	virtual Bool_t CheckObject(const void obj, const TClass ptrClass) = 0;

	virtual Int_t ReadBuf(void *buf, Int_t max) = 0;	virtual Int_t ReadBuf(void *buf, Int_t max) = 0;
	virtual void WriteBuf(const void *buf, Int_t max) = 0;	virtual void WriteBuf(const void *buf, Int_t max) = 0;

	virtual char ReadString(char s, Int_t max) = 0;	virtual char ReadString(char s, Int_t max) = 0;
	virtual void WriteString(const char *s) = 0;	virtual void WriteString(const char *s) = 0;


	skipping to change at line 122	skipping to change at line 123
	virtual void ResetMap() = 0;	virtual void ResetMap() = 0;
	virtual void SetReadParam(Int_t mapsize) = 0;	virtual void SetReadParam(Int_t mapsize) = 0;
	virtual void SetWriteParam(Int_t mapsize) = 0;	virtual void SetWriteParam(Int_t mapsize) = 0;

	virtual Int_t CheckByteCount(UInt_t startpos, UInt_t bcnt, const TC lass *clss) = 0;	virtual Int_t CheckByteCount(UInt_t startpos, UInt_t bcnt, const TC lass *clss) = 0;
	virtual Int_t CheckByteCount(UInt_t startpos, UInt_t bcnt, const ch ar *classname) = 0;	virtual Int_t CheckByteCount(UInt_t startpos, UInt_t bcnt, const ch ar *classname) = 0;
	virtual void SetByteCount(UInt_t cntpos, Bool_t packInVersion = kF ALSE)= 0;	virtual void SetByteCount(UInt_t cntpos, Bool_t packInVersion = kF ALSE)= 0;

	virtual void SkipVersion(const TClass *cl = 0) = 0;	virtual void SkipVersion(const TClass *cl = 0) = 0;
	virtual Version_t ReadVersion(UInt_t start = 0, UInt_t bcnt = 0, cons t TClass *cl = 0) = 0;	virtual Version_t ReadVersion(UInt_t start = 0, UInt_t bcnt = 0, cons t TClass *cl = 0) = 0;

		virtual Version_t ReadVersionForMemberWise(const TClass *cl = 0) = 0;
	virtual UInt_t WriteVersion(const TClass *cl, Bool_t useBcnt = kFALS E) = 0;	virtual UInt_t WriteVersion(const TClass *cl, Bool_t useBcnt = kFALS E) = 0;
	virtual UInt_t WriteVersionMemberWise(const TClass *cl, Bool_t useBc nt = kFALSE) = 0;	virtual UInt_t WriteVersionMemberWise(const TClass *cl, Bool_t useBc nt = kFALSE) = 0;

	virtual void ReadObjectAny(const TClass cast) = 0;	virtual void ReadObjectAny(const TClass cast) = 0;
	virtual void SkipObjectAny() = 0;	virtual void SkipObjectAny() = 0;

	virtual void TagStreamerInfo(TVirtualStreamerInfo* info) = 0;	virtual void TagStreamerInfo(TVirtualStreamerInfo* info) = 0;
	virtual void IncrementLevel(TVirtualStreamerInfo* info) = 0;	virtual void IncrementLevel(TVirtualStreamerInfo* info) = 0;
	virtual void SetStreamerElementNumber(Int_t) = 0;	virtual void SetStreamerElementNumber(Int_t) = 0;
	virtual void DecrementLevel(TVirtualStreamerInfo*) = 0;	virtual void DecrementLevel(TVirtualStreamerInfo*) = 0;

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

	TBufferFile.h	TBufferFile.h

	// @(#)root/io:$Id: TBufferFile.h 36061 2010-10-04 16:05:51Z pcanal $	// @(#)root/io:$Id: TBufferFile.h 39549 2011-06-02 21:34:05Z pcanal $
	// Author: Rene Brun 17/01/2007	// Author: Rene Brun 17/01/2007

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


	skipping to change at line 113	skipping to change at line 113
	Bool_t CheckObject(const TObject *obj);	Bool_t CheckObject(const TObject *obj);
	Bool_t CheckObject(const void obj, const TClass ptrClass);	Bool_t CheckObject(const void obj, const TClass ptrClass);

	virtual Int_t GetVersionOwner() const;	virtual Int_t GetVersionOwner() const;
	virtual Int_t CheckByteCount(UInt_t startpos, UInt_t bcnt, const TC lass *clss);	virtual Int_t CheckByteCount(UInt_t startpos, UInt_t bcnt, const TC lass *clss);
	virtual Int_t CheckByteCount(UInt_t startpos, UInt_t bcnt, const ch ar *classname);	virtual Int_t CheckByteCount(UInt_t startpos, UInt_t bcnt, const ch ar *classname);
	virtual void SetByteCount(UInt_t cntpos, Bool_t packInVersion = kF ALSE);	virtual void SetByteCount(UInt_t cntpos, Bool_t packInVersion = kF ALSE);

	virtual void SkipVersion(const TClass *cl = 0);	virtual void SkipVersion(const TClass *cl = 0);
	virtual Version_t ReadVersion(UInt_t start = 0, UInt_t bcnt = 0, cons t TClass *cl = 0);	virtual Version_t ReadVersion(UInt_t start = 0, UInt_t bcnt = 0, cons t TClass *cl = 0);

		virtual Version_t ReadVersionForMemberWise(const TClass *cl = 0);
	virtual UInt_t WriteVersion(const TClass *cl, Bool_t useBcnt = kFALS E);	virtual UInt_t WriteVersion(const TClass *cl, Bool_t useBcnt = kFALS E);
	virtual UInt_t WriteVersionMemberWise(const TClass *cl, Bool_t useBc nt = kFALSE);	virtual UInt_t WriteVersionMemberWise(const TClass *cl, Bool_t useBc nt = kFALSE);

	virtual void ReadObjectAny(const TClass cast);	virtual void ReadObjectAny(const TClass cast);
	virtual void SkipObjectAny();	virtual void SkipObjectAny();

	virtual void TagStreamerInfo(TVirtualStreamerInfo* info);	virtual void TagStreamerInfo(TVirtualStreamerInfo* info);
	virtual void IncrementLevel(TVirtualStreamerInfo* info);	virtual void IncrementLevel(TVirtualStreamerInfo* info);
	virtual void SetStreamerElementNumber(Int_t) {}	virtual void SetStreamerElementNumber(Int_t) {}
	virtual void DecrementLevel(TVirtualStreamerInfo*);	virtual void DecrementLevel(TVirtualStreamerInfo*);

	skipping to change at line 321	skipping to change at line 322
	static Int_t GetGlobalWriteParam();	static Int_t GetGlobalWriteParam();

	ClassDef(TBufferFile,0) //concrete implementation of TBuffer for writin g/reading to/from a ROOT file or socket.	ClassDef(TBufferFile,0) //concrete implementation of TBuffer for writin g/reading to/from a ROOT file or socket.
	};	};

	//---------------------- TBufferFile inlines ------------------------------ ---------	//---------------------- TBufferFile inlines ------------------------------ ---------

	//_________________________________________________________________________ _____	//_________________________________________________________________________ _____
	inline void TBufferFile::WriteBool(Bool_t b)	inline void TBufferFile::WriteBool(Bool_t b)
	{	{

	if (fBufCur + sizeof(UChar_t) > fBufMax) Expand(2*fBufSize);	if (fBufCur + sizeof(UChar_t) > fBufMax) AutoExpand(fBufSize+sizeof(UCha r_t));
	tobuf(fBufCur, b);	tobuf(fBufCur, b);
	}	}

	//_________________________________________________________________________ _____	//_________________________________________________________________________ _____
	inline void TBufferFile::WriteChar(Char_t c)	inline void TBufferFile::WriteChar(Char_t c)
	{	{

	if (fBufCur + sizeof(Char_t) > fBufMax) Expand(2*fBufSize);	if (fBufCur + sizeof(Char_t) > fBufMax) AutoExpand(fBufSize+sizeof(Char_ t));
	tobuf(fBufCur, c);	tobuf(fBufCur, c);
	}	}

	//_________________________________________________________________________ _____	//_________________________________________________________________________ _____
	inline void TBufferFile::WriteUChar(UChar_t c)	inline void TBufferFile::WriteUChar(UChar_t c)
	{	{

	if (fBufCur + sizeof(UChar_t) > fBufMax) Expand(2*fBufSize);	if (fBufCur + sizeof(UChar_t) > fBufMax) AutoExpand(fBufSize+sizeof(UCha r_t));
	tobuf(fBufCur, (Char_t)c);	tobuf(fBufCur, (Char_t)c);
	}	}

	//_________________________________________________________________________ _____	//_________________________________________________________________________ _____
	inline void TBufferFile::WriteShort(Short_t h)	inline void TBufferFile::WriteShort(Short_t h)
	{	{

	if (fBufCur + sizeof(Short_t) > fBufMax) Expand(2*fBufSize);	if (fBufCur + sizeof(Short_t) > fBufMax) AutoExpand(fBufSize+sizeof(Shor t_t));
	tobuf(fBufCur, h);	tobuf(fBufCur, h);
	}	}

	//_________________________________________________________________________ _____	//_________________________________________________________________________ _____
	inline void TBufferFile::WriteUShort(UShort_t h)	inline void TBufferFile::WriteUShort(UShort_t h)
	{	{

	if (fBufCur + sizeof(UShort_t) > fBufMax) Expand(2*fBufSize);	if (fBufCur + sizeof(UShort_t) > fBufMax) AutoExpand(fBufSize+sizeof(USh ort_t));
	tobuf(fBufCur, (Short_t)h);	tobuf(fBufCur, (Short_t)h);
	}	}

	//_________________________________________________________________________ _____	//_________________________________________________________________________ _____
	inline void TBufferFile::WriteInt(Int_t i)	inline void TBufferFile::WriteInt(Int_t i)
	{	{

	if (fBufCur + sizeof(Int_t) > fBufMax) Expand(2*fBufSize);	if (fBufCur + sizeof(Int_t) > fBufMax) AutoExpand(fBufSize+sizeof(Int_t) );
	tobuf(fBufCur, i);	tobuf(fBufCur, i);
	}	}

	//_________________________________________________________________________ _____	//_________________________________________________________________________ _____
	inline void TBufferFile::WriteUInt(UInt_t i)	inline void TBufferFile::WriteUInt(UInt_t i)
	{	{

	if (fBufCur + sizeof(UInt_t) > fBufMax) Expand(2*fBufSize);	if (fBufCur + sizeof(UInt_t) > fBufMax) AutoExpand(fBufSize+sizeof(UInt_ t));
	tobuf(fBufCur, (Int_t)i);	tobuf(fBufCur, (Int_t)i);
	}	}

	//_________________________________________________________________________ _____	//_________________________________________________________________________ _____
	inline void TBufferFile::WriteLong(Long_t l)	inline void TBufferFile::WriteLong(Long_t l)
	{	{

	if (fBufCur + sizeof(Long_t) > fBufMax) Expand(2*fBufSize);	if (fBufCur + sizeof(Long_t) > fBufMax) AutoExpand(fBufSize+sizeof(Long_ t));
	tobuf(fBufCur, l);	tobuf(fBufCur, l);
	}	}

	//_________________________________________________________________________ _____	//_________________________________________________________________________ _____
	inline void TBufferFile::WriteULong(ULong_t l)	inline void TBufferFile::WriteULong(ULong_t l)
	{	{

	if (fBufCur + sizeof(ULong_t) > fBufMax) Expand(2*fBufSize);	if (fBufCur + sizeof(ULong_t) > fBufMax) AutoExpand(fBufSize+sizeof(ULon g_t));
	tobuf(fBufCur, (Long_t)l);	tobuf(fBufCur, (Long_t)l);
	}	}

	//_________________________________________________________________________ _____	//_________________________________________________________________________ _____
	inline void TBufferFile::WriteLong64(Long64_t ll)	inline void TBufferFile::WriteLong64(Long64_t ll)
	{	{

	if (fBufCur + sizeof(Long64_t) > fBufMax) Expand(2*fBufSize);	if (fBufCur + sizeof(Long64_t) > fBufMax) AutoExpand(fBufSize+sizeof(Lon g64_t));
	tobuf(fBufCur, ll);	tobuf(fBufCur, ll);
	}	}

	//_________________________________________________________________________ _____	//_________________________________________________________________________ _____
	inline void TBufferFile::WriteULong64(ULong64_t ll)	inline void TBufferFile::WriteULong64(ULong64_t ll)
	{	{

	if (fBufCur + sizeof(ULong64_t) > fBufMax) Expand(2*fBufSize);	if (fBufCur + sizeof(ULong64_t) > fBufMax) AutoExpand(fBufSize+sizeof(UL ong64_t));
	tobuf(fBufCur, (Long64_t)ll);	tobuf(fBufCur, (Long64_t)ll);
	}	}

	//_________________________________________________________________________ _____	//_________________________________________________________________________ _____
	inline void TBufferFile::WriteFloat(Float_t f)	inline void TBufferFile::WriteFloat(Float_t f)
	{	{

	if (fBufCur + sizeof(Float_t) > fBufMax) Expand(2*fBufSize);	if (fBufCur + sizeof(Float_t) > fBufMax) AutoExpand(fBufSize+sizeof(Floa t_t));
	tobuf(fBufCur, f);	tobuf(fBufCur, f);
	}	}

	//_________________________________________________________________________ _____	//_________________________________________________________________________ _____
	inline void TBufferFile::WriteDouble(Double_t d)	inline void TBufferFile::WriteDouble(Double_t d)
	{	{

	if (fBufCur + sizeof(Double_t) > fBufMax) Expand(2*fBufSize);	if (fBufCur + sizeof(Double_t) > fBufMax) AutoExpand(fBufSize+sizeof(Dou ble_t));
	tobuf(fBufCur, d);	tobuf(fBufCur, d);
	}	}

	//_________________________________________________________________________ _____	//_________________________________________________________________________ _____
	inline void TBufferFile::WriteCharP(const Char_t *c)	inline void TBufferFile::WriteCharP(const Char_t *c)
	{	{
	WriteString(c);	WriteString(c);
	}	}

	//_________________________________________________________________________ _____	//_________________________________________________________________________ _____

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

	TChain.h	TChain.h

	// @(#)root/tree:$Id: TChain.h 37957 2011-02-02 21:17:37Z pcanal $	// @(#)root/tree:$Id: TChain.h 39635 2011-06-09 15:37:27Z pcanal $
	// Author: Rene Brun 03/02/97	// Author: Rene Brun 03/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 90	skipping to change at line 90
	virtual void DirectoryAutoAdd(TDirectory *);	virtual void DirectoryAutoAdd(TDirectory *);
	virtual Long64_t Draw(const char* varexp, const TCut& selection, Option _t* option = "", Long64_t nentries = kBigNumber, Long64_t firstentry = 0);	virtual Long64_t Draw(const char* varexp, const TCut& selection, Option _t* option = "", Long64_t nentries = kBigNumber, Long64_t firstentry = 0);
	virtual Long64_t Draw(const char* varexp, const char* selection, Option _t* option = "", Long64_t nentries = kBigNumber, Long64_t firstentry = 0); // MENU	virtual Long64_t Draw(const char* varexp, const char* selection, Option _t* option = "", Long64_t nentries = kBigNumber, Long64_t firstentry = 0); // MENU
	virtual void Draw(Option_t* opt) { Draw(opt, "", "", 1000000000, 0) ; }	virtual void Draw(Option_t* opt) { Draw(opt, "", "", 1000000000, 0) ; }
	virtual Int_t Fill() { MayNotUse("Fill()"); return -1; }	virtual Int_t Fill() { MayNotUse("Fill()"); return -1; }
	virtual TBranch FindBranch(const char name);	virtual TBranch FindBranch(const char name);
	virtual TLeaf FindLeaf(const char name);	virtual TLeaf FindLeaf(const char name);
	virtual TBranch GetBranch(const char name);	virtual TBranch GetBranch(const char name);
	virtual Bool_t GetBranchStatus(const char* branchname) const;	virtual Bool_t GetBranchStatus(const char* branchname) const;
	virtual Long64_t GetChainEntryNumber(Long64_t entry) const;	virtual Long64_t GetChainEntryNumber(Long64_t entry) const;

		virtual TClusterIterator GetClusterIterator(Long64_t firstentry);
	Int_t GetNtrees() const { return fNtrees; }	Int_t GetNtrees() const { return fNtrees; }
	virtual Long64_t GetEntries() const;	virtual Long64_t GetEntries() const;
	virtual Long64_t GetEntries(const char *sel) { return TTree::GetEntries (sel); }	virtual Long64_t GetEntries(const char *sel) { return TTree::GetEntries (sel); }
	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 Long64_t GetEntryNumber(Long64_t entry) const;	virtual Long64_t GetEntryNumber(Long64_t entry) const;
	virtual Int_t GetEntryWithIndex(Int_t major, Int_t minor=0);	virtual Int_t GetEntryWithIndex(Int_t major, Int_t minor=0);
	TFile *GetFile() const;	TFile *GetFile() const;
	virtual TLeaf GetLeaf(const char name);	virtual TLeaf GetLeaf(const char name);
	virtual TObjArray *GetListOfBranches();	virtual TObjArray *GetListOfBranches();
	// Warning, GetListOfFiles returns the list of TChainElem ents (not the list of files)	// Warning, GetListOfFiles returns the list of TChainElem ents (not the list of files)

	skipping to change at line 121	skipping to change at line 122
	Long64_t *GetTreeOffset() const { return fTreeOffset; }	Long64_t *GetTreeOffset() const { return fTreeOffset; }
	Int_t GetTreeOffsetLen() const { return fTreeOffsetLen; }	Int_t GetTreeOffsetLen() const { return fTreeOffsetLen; }
	virtual Double_t GetWeight() const;	virtual Double_t GetWeight() const;
	virtual Int_t LoadBaskets(Long64_t maxmemory);	virtual Int_t LoadBaskets(Long64_t maxmemory);
	virtual Long64_t LoadTree(Long64_t entry);	virtual Long64_t LoadTree(Long64_t entry);
	void Lookup(Bool_t force = kFALSE);	void Lookup(Bool_t force = kFALSE);
	virtual void Loop(Option_t option="", Long64_t nentries=kBigNumber , Long64_t firstentry=0); // MENU*	virtual void Loop(Option_t option="", Long64_t nentries=kBigNumber , Long64_t firstentry=0); // MENU*
	virtual void ls(Option_t *option="") const;	virtual void ls(Option_t *option="") const;
	virtual Long64_t Merge(const char name, Option_t option = "");	virtual Long64_t Merge(const char name, Option_t option = "");
	virtual Long64_t Merge(TCollection list, Option_t option = "");	virtual Long64_t Merge(TCollection list, Option_t option = "");

		virtual Long64_t Merge(TCollection list, TFileMergeInfo info);
	virtual Long64_t Merge(TFile file, Int_t basketsize, Option_t option= "");	virtual Long64_t Merge(TFile file, Int_t basketsize, Option_t option= "");
	virtual void Print(Option_t *option="") const;	virtual void Print(Option_t *option="") const;
	virtual Long64_t Process(const char filename, Option_t option="", Lon g64_t nentries=kBigNumber, Long64_t firstentry=0); // MENU	virtual Long64_t Process(const char filename, Option_t option="", Lon g64_t nentries=kBigNumber, Long64_t firstentry=0); // MENU
	#if defined(__CINT__)	#if defined(__CINT__)
	#if defined(R__MANUAL_DICT)	#if defined(R__MANUAL_DICT)
	virtual Long64_t Process(void* selector, Option_t* option = "", Long64_ t nentries = kBigNumber, Long64_t firstentry = 0);	virtual Long64_t Process(void* selector, Option_t* option = "", Long64_ t nentries = kBigNumber, Long64_t firstentry = 0);
	#endif	#endif
	#else	#else
	virtual Long64_t Process(TSelector* selector, Option_t* option = "", Lo ng64_t nentries = kBigNumber, Long64_t firstentry = 0);	virtual Long64_t Process(TSelector* selector, Option_t* option = "", Lo ng64_t nentries = kBigNumber, Long64_t firstentry = 0);
	#endif	#endif

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

	TClass.h	TClass.h

	// @(#)root/meta:$Id: TClass.h 37702 2011-01-04 17:07:52Z pcanal $	// @(#)root/meta:$Id: TClass.h 39695 2011-06-13 21:17:59Z pcanal $
	// Author: Rene Brun 07/01/95	// Author: Rene Brun 07/01/95

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


	skipping to change at line 114	skipping to change at line 114
	const type_info *fTypeInfo; //pointer to the C++ type informati on.	const type_info *fTypeInfo; //pointer to the C++ type informati on.
	ShowMembersFunc_t fShowMembers; //pointer to the class's ShowMember s function	ShowMembersFunc_t fShowMembers; //pointer to the class's ShowMember s function
	mutable void *fInterShowMembers;//Interpreter call setup for ShowMe mbers	mutable void *fInterShowMembers;//Interpreter call setup for ShowMe mbers
	TClassStreamer *fStreamer; //pointer to streamer function	TClassStreamer *fStreamer; //pointer to streamer function
	TString fSharedLibs; //shared libraries containing class code	TString fSharedLibs; //shared libraries containing class code

	TVirtualIsAProxy *fIsA; //!pointer to the class's IsA proxy .	TVirtualIsAProxy *fIsA; //!pointer to the class's IsA proxy .
	IsAGlobalFunc_t fGlobalIsA; //pointer to a global IsA function.	IsAGlobalFunc_t fGlobalIsA; //pointer to a global IsA function.
	mutable TMethodCall *fIsAMethod; //!saved info to call a IsA membe r function	mutable TMethodCall *fIsAMethod; //!saved info to call a IsA membe r function


		ROOT::MergeFunc_t fMerge; //pointer to a function implementin g Merging objects of this class.
	ROOT::NewFunc_t fNew; //pointer to a function newing one object.	ROOT::NewFunc_t fNew; //pointer to a function newing one object.
	ROOT::NewArrFunc_t fNewArray; //pointer to a function newing an a rray of objects.	ROOT::NewArrFunc_t fNewArray; //pointer to a function newing an a rray of objects.
	ROOT::DelFunc_t fDelete; //pointer to a function deleting on e object.	ROOT::DelFunc_t fDelete; //pointer to a function deleting on e object.
	ROOT::DelArrFunc_t fDeleteArray; //pointer to a function deleting an array of objects.	ROOT::DelArrFunc_t fDeleteArray; //pointer to a function deleting an array of objects.
	ROOT::DesFunc_t fDestructor; //pointer to a function call an obj ect's destructor.	ROOT::DesFunc_t fDestructor; //pointer to a function call an obj ect's destructor.
	ROOT::DirAutoAdd_t fDirAutoAdd; //pointer which implements the Dire ctory Auto Add feature for this class.']'	ROOT::DirAutoAdd_t fDirAutoAdd; //pointer which implements the Dire ctory Auto Add feature for this class.']'
	ClassStreamerFunc_t fStreamerFunc; //Wrapper around this class custom Streamer member function.	ClassStreamerFunc_t fStreamerFunc; //Wrapper around this class custom Streamer member function.
	Int_t fSizeof; //Sizeof the class.	Int_t fSizeof; //Sizeof the class.


		mutable Int_t fCanSplit; //!Indicates whether this class can be split or not.
	mutable Long_t fProperty; //!Property	mutable Long_t fProperty; //!Property
	mutable Bool_t fVersionUsed; //!Indicates whether GetClassVersio n has been called	mutable Bool_t fVersionUsed; //!Indicates whether GetClassVersio n has been called

	mutable Bool_t fIsOffsetStreamerSet; //!saved remember if fOffsetStr eamer has been set.	mutable Bool_t fIsOffsetStreamerSet; //!saved remember if fOffsetStr eamer has been set.
	mutable Long_t fOffsetStreamer; //!saved info to call Streamer	mutable Long_t fOffsetStreamer; //!saved info to call Streamer
	Int_t fStreamerType; //!cached of the streaming method t o use	Int_t fStreamerType; //!cached of the streaming method t o use
	mutable TVirtualStreamerInfo *fCurrentInfo; //!cached current st reamer info.	mutable TVirtualStreamerInfo *fCurrentInfo; //!cached current st reamer info.
	TClassRef *fRefStart; //!List of references to this objec t	TClassRef *fRefStart; //!List of references to this objec t
	TVirtualRefProxy *fRefProxy; //!Pointer to reference proxy if th is class represents a reference	TVirtualRefProxy *fRefProxy; //!Pointer to reference proxy if th is class represents a reference
	ROOT::TSchemaRuleSet *fSchemaRules; //! Schema evolution rules	ROOT::TSchemaRuleSet *fSchemaRules; //! Schema evolution rules

	skipping to change at line 285	skipping to change at line 287
	ROOT::DirAutoAdd_t GetDirectoryAutoAdd() const;	ROOT::DirAutoAdd_t GetDirectoryAutoAdd() const;
	UInt_t GetInstanceCount() const { return fInstanceCount; }	UInt_t GetInstanceCount() const { return fInstanceCount; }
	UInt_t GetHeapInstanceCount() const { return fOnHeap; }	UInt_t GetHeapInstanceCount() const { return fOnHeap; }
	void GetMenuItems(TList *listitems);	void GetMenuItems(TList *listitems);
	TList *GetMenuList() const;	TList *GetMenuList() const;
	TMethod GetMethod(const char method, const char *params);	TMethod GetMethod(const char method, const char *params);
	TMethod GetMethodWithPrototype(const char method, const char *proto);	TMethod GetMethodWithPrototype(const char method, const char *proto);
	TMethod GetMethodAny(const char method);	TMethod GetMethodAny(const char method);
	TMethod GetMethodAllAny(const char method);	TMethod GetMethodAllAny(const char method);
	Int_t GetNdata();	Int_t GetNdata();

		ROOT::MergeFunc_t GetMerge() const;
	ROOT::NewFunc_t GetNew() const;	ROOT::NewFunc_t GetNew() const;
	ROOT::NewArrFunc_t GetNewArray() const;	ROOT::NewArrFunc_t GetNewArray() const;
	Int_t GetNmethods();	Int_t GetNmethods();
	TRealData GetRealData(const char name) const;	TRealData GetRealData(const char name) const;
	TVirtualRefProxy *GetReferenceProxy() const { return fRefProxy; }	TVirtualRefProxy *GetReferenceProxy() const { return fRefProxy; }
	const ROOT::TSchemaRuleSet *GetSchemaRules() const;	const ROOT::TSchemaRuleSet *GetSchemaRules() const;
	ROOT::TSchemaRuleSet *GetSchemaRules(Bool_t create = kFALSE);	ROOT::TSchemaRuleSet *GetSchemaRules(Bool_t create = kFALSE);
	const char *GetSharedLibs();	const char *GetSharedLibs();
	ShowMembersFunc_t GetShowMembersWrapper() const { return fShowMembers; }	ShowMembersFunc_t GetShowMembersWrapper() const { return fShowMembers; }
	TClassStreamer *GetStreamer() const;	TClassStreamer *GetStreamer() const;

	skipping to change at line 325	skipping to change at line 328
	virtual void PostLoadCheck();	virtual void PostLoadCheck();
	Long_t Property() const;	Long_t Property() const;
	Int_t ReadBuffer(TBuffer &b, void *pointer, Int_t version, UInt_t start, UInt_t count);	Int_t ReadBuffer(TBuffer &b, void *pointer, Int_t version, UInt_t start, UInt_t count);
	Int_t ReadBuffer(TBuffer &b, void *pointer);	Int_t ReadBuffer(TBuffer &b, void *pointer);
	void RemoveRef(TClassRef *ref);	void RemoveRef(TClassRef *ref);
	void ReplaceWith(TClass *newcl, Bool_t recurse = kTRUE) co nst;	void ReplaceWith(TClass *newcl, Bool_t recurse = kTRUE) co nst;
	void ResetClassInfo(Long_t tagnum);	void ResetClassInfo(Long_t tagnum);
	void ResetInstanceCount() { fInstanceCount = fOnHeap = 0; }	void ResetInstanceCount() { fInstanceCount = fOnHeap = 0; }
	void ResetMenuList();	void ResetMenuList();
	Int_t Size() const;	Int_t Size() const;

		void SetCanSplit(Int_t splitmode);
	void SetCollectionProxy(const ROOT::TCollectionProxyInfo&) ;	void SetCollectionProxy(const ROOT::TCollectionProxyInfo&) ;
	void SetContextMenuTitle(const char *title);	void SetContextMenuTitle(const char *title);
	void SetCurrentStreamerInfo(TVirtualStreamerInfo *info);	void SetCurrentStreamerInfo(TVirtualStreamerInfo *info);
	void SetGlobalIsA(IsAGlobalFunc_t);	void SetGlobalIsA(IsAGlobalFunc_t);
	void SetDeclFile(const char *name, int line) { fDeclFileNa me = name; fDeclFileLine = line; }	void SetDeclFile(const char *name, int line) { fDeclFileNa me = name; fDeclFileLine = line; }
	void SetDelete(ROOT::DelFunc_t deleteFunc);	void SetDelete(ROOT::DelFunc_t deleteFunc);
	void SetDeleteArray(ROOT::DelArrFunc_t deleteArrayFunc);	void SetDeleteArray(ROOT::DelArrFunc_t deleteArrayFunc);
	void SetDirectoryAutoAdd(ROOT::DirAutoAdd_t dirAutoAddFunc );	void SetDirectoryAutoAdd(ROOT::DirAutoAdd_t dirAutoAddFunc );
	void SetDestructor(ROOT::DesFunc_t destructorFunc);	void SetDestructor(ROOT::DesFunc_t destructorFunc);
	void SetImplFileName(const char *implFileName) { fImplFile Name = implFileName; }	void SetImplFileName(const char *implFileName) { fImplFile Name = implFileName; }

		void SetMerge(ROOT::MergeFunc_t mergeFunc);
	void SetNew(ROOT::NewFunc_t newFunc);	void SetNew(ROOT::NewFunc_t newFunc);
	void SetNewArray(ROOT::NewArrFunc_t newArrayFunc);	void SetNewArray(ROOT::NewArrFunc_t newArrayFunc);
	TVirtualStreamerInfo SetStreamerInfo(Int_t version, const char inf o="");	TVirtualStreamerInfo SetStreamerInfo(Int_t version, const char inf o="");
	void SetUnloaded();	void SetUnloaded();
	Int_t WriteBuffer(TBuffer &b, void pointer, const char in fo="");	Int_t WriteBuffer(TBuffer &b, void pointer, const char in fo="");

	void AdoptReferenceProxy(TVirtualRefProxy* proxy);	void AdoptReferenceProxy(TVirtualRefProxy* proxy);
	void AdoptStreamer(TClassStreamer *strm);	void AdoptStreamer(TClassStreamer *strm);
	void AdoptMemberStreamer(const char name, TMemberStreamer strm);	void AdoptMemberStreamer(const char name, TMemberStreamer strm);
	void SetMemberStreamer(const char *name, MemberStreamerFun c_t strm);	void SetMemberStreamer(const char *name, MemberStreamerFun c_t strm);

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

	TEfficiency.h	TEfficiency.h

	skipping to change at line 124	skipping to change at line 124
	Double_t GetEfficiencyErrorLow(Int_t bin) const;	Double_t GetEfficiencyErrorLow(Int_t bin) const;
	Double_t GetEfficiencyErrorUp(Int_t bin) const;	Double_t GetEfficiencyErrorUp(Int_t bin) const;
	Int_t GetGlobalBin(Int_t binx,Int_t biny=0,Int_t binz=0) cons t;	Int_t GetGlobalBin(Int_t binx,Int_t biny=0,Int_t binz=0) cons t;
	TGraphAsymmErrors* GetPaintedGraph() const { return fPaintGraph; }	TGraphAsymmErrors* GetPaintedGraph() const { return fPaintGraph; }
	TH2* GetPaintedHistogram() const { return fPaintHisto; }	TH2* GetPaintedHistogram() const { return fPaintHisto; }
	TList* GetListOfFunctions() const {return fFunctions;}	TList* GetListOfFunctions() const {return fFunctions;}
	const TH1* GetPassedHistogram() const {return fPassedHistogram;}	const TH1* GetPassedHistogram() const {return fPassedHistogram;}
	EStatOption GetStatisticOption() const {return fStatisticOption;}	EStatOption GetStatisticOption() const {return fStatisticOption;}
	const TH1* GetTotalHistogram() const {return fTotalHistogram;}	const TH1* GetTotalHistogram() const {return fTotalHistogram;}
	Double_t GetWeight() const {return fWeight;}	Double_t GetWeight() const {return fWeight;}

	void Merge(TCollection* list);	Long64_t Merge(TCollection* list);
	TEfficiency& operator+=(const TEfficiency& rhs);	TEfficiency& operator+=(const TEfficiency& rhs);
	TEfficiency& operator=(const TEfficiency& rhs);	TEfficiency& operator=(const TEfficiency& rhs);
	void Paint(Option_t* opt);	void Paint(Option_t* opt);
	void SavePrimitive(ostream& out,Option_t* opt="");	void SavePrimitive(ostream& out,Option_t* opt="");
	void SetBetaAlpha(Double_t alpha);	void SetBetaAlpha(Double_t alpha);
	void SetBetaBeta(Double_t beta);	void SetBetaBeta(Double_t beta);
	void SetBetaBinParameters(Int_t bin, Double_t alpha, Double_ t beta);	void SetBetaBinParameters(Int_t bin, Double_t alpha, Double_ t beta);
	void SetConfidenceLevel(Double_t level);	void SetConfidenceLevel(Double_t level);
	void SetDirectory(TDirectory* dir);	void SetDirectory(TDirectory* dir);
	void SetName(const char* name);	void SetName(const char* name);

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

	TEveProjections.h	TEveProjections.h

	// @(#)root/eve:$Id: TEveProjections.h 38721 2011-04-04 13:37:12Z matevz $	// @(#)root/eve:$Id: TEveProjections.h 39682 2011-06-11 05:37:08Z 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 135	skipping to change at line 135
	Float_t GetPastFixZFac() const { return fPastFixZFac; }	Float_t GetPastFixZFac() const { return fPastFixZFac; }
	void SetPastFixRFac(Float_t x);	void SetPastFixRFac(Float_t x);
	void SetPastFixZFac(Float_t x);	void SetPastFixZFac(Float_t x);
	Float_t GetMaxTrackStep() const { return fMaxTrackStep; }	Float_t GetMaxTrackStep() const { return fMaxTrackStep; }
	void SetMaxTrackStep(Float_t x) { fMaxTrackStep = TMath::Max(x, 1.0f ); }	void SetMaxTrackStep(Float_t x) { fMaxTrackStep = TMath::Max(x, 1.0f ); }

	virtual Bool_t HasSeveralSubSpaces() const { return kFALSE; }	virtual Bool_t HasSeveralSubSpaces() const { return kFALSE; }
	virtual Bool_t AcceptSegment(TEveVector&, TEveVector&, Float_t /to lerance/) const { return kTRUE; }	virtual Bool_t AcceptSegment(TEveVector&, TEveVector&, Float_t /to lerance/) const { return kTRUE; }
	virtual Int_t SubSpaceId(const TEveVector&) const { return 0; }	virtual Int_t SubSpaceId(const TEveVector&) const { return 0; }
	virtual Bool_t IsOnSubSpaceBoundrary(const TEveVector&) const { ret urn kFALSE; }	virtual Bool_t IsOnSubSpaceBoundrary(const TEveVector&) const { ret urn kFALSE; }

	virtual void BisectBreakPoint(TEveVector& vL, TEveVector& vR, Flo	virtual void BisectBreakPoint(TEveVector& vL, TEveVector& vR, Flo
	at_t eps_sqr=1e-10f);	at_t eps_sqr);
		virtual void BisectBreakPoint(TEveVector& vL, TEveVector& vR, Boo
		l_t project_result=kFALSE, Float_t depth=0);
	virtual void SetDirectionalVector(Int_t screenAxis, TEveVector& v ec);	virtual void SetDirectionalVector(Int_t screenAxis, TEveVector& v ec);

	// utils to draw axis	// utils to draw axis
	TEveVector GetOrthogonalCenter(int idx, TEveVector& out);	TEveVector GetOrthogonalCenter(int idx, TEveVector& out);
	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 GetScreenVal(Int_t i, Float_t x, TEveVector& dirVec, TEveVector& oCenter);	Float_t GetScreenVal(Int_t i, Float_t x, TEveVector& dirVec, TEveVector& oCenter);
	Float_t GetLimit(Int_t i, Bool_t pos);	Float_t GetLimit(Int_t i, Bool_t pos);

	static Float_t fgEps; // resolution of projected points	static Float_t fgEps; // resolution of projected points

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

	TEveTrackProjected.h	TEveTrackProjected.h

	// @(#)root/eve:$Id: TEveTrackProjected.h 35074 2010-08-30 15:18:02Z matevz $	// @(#)root/eve:$Id: TEveTrackProjected.h 39682 2011-06-11 05:37:08Z 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 28	skipping to change at line 28
	class TEveTrackProjected : public TEveTrack,	class TEveTrackProjected : public TEveTrack,
	public TEveProjected	public TEveProjected
	{	{
	friend class TEveTrackProjectedGL;	friend class TEveTrackProjectedGL;

	private:	private:
	TEveTrackProjected(const TEveTrackProjected&); // Not impleme nted	TEveTrackProjected(const TEveTrackProjected&); // Not impleme nted
	TEveTrackProjected& operator=(const TEveTrackProjected&); // Not impleme nted	TEveTrackProjected& operator=(const TEveTrackProjected&); // Not impleme nted

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

	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

	virtual void SetDepthLocal(Float_t d);	virtual void SetDepthLocal(Float_t d);

	public:	public:
	TEveTrackProjected();	TEveTrackProjected();

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

	TFitEditor.h	TFitEditor.h

	// @(#)root/fitpanel:$Id: TFitEditor.h 31212 2009-11-16 17:30:21Z moneta $	// @(#)root/fitpanel:$Id: TFitEditor.h 39109 2011-05-05 13:06:38Z 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 111	skipping to change at line 111
	TGDoubleHSlider *fSliderX; // slider to set fit range along x-axis	TGDoubleHSlider *fSliderX; // slider to set fit range along x-axis
	TGNumberEntry *fSliderXMax; // entry to set the maximum in t he range	TGNumberEntry *fSliderXMax; // entry to set the maximum in t he range
	TGNumberEntry *fSliderXMin; // entry to set the minumum in t he range	TGNumberEntry *fSliderXMin; // entry to set the minumum in t he range
	TGDoubleHSlider *fSliderY; // slider to set fit range along y-axis	TGDoubleHSlider *fSliderY; // slider to set fit range along y-axis
	TGNumberEntry *fSliderYMax; // entry to set the maximum in t he range	TGNumberEntry *fSliderYMax; // entry to set the maximum in t he range
	TGNumberEntry *fSliderYMin; // entry to set the minumum in t he range	TGNumberEntry *fSliderYMin; // entry to set the minumum in t he range
	TGDoubleHSlider *fSliderZ; // slider to set fit range along z-axis	TGDoubleHSlider *fSliderZ; // slider to set fit range along z-axis
	TGHorizontalFrame *fSliderXParent; // parent of fSliderX	TGHorizontalFrame *fSliderXParent; // parent of fSliderX
	TGHorizontalFrame *fSliderYParent; // parent of fSliderY	TGHorizontalFrame *fSliderYParent; // parent of fSliderY
	TGHorizontalFrame *fSliderZParent; // parent of fSliderZ	TGHorizontalFrame *fSliderZParent; // parent of fSliderZ

		TGCheckButton *fEnableRobust; // switch on/off robust option
	TGNumberEntry *fRobustValue; // contains robust value for lin ear fit	TGNumberEntry *fRobustValue; // contains robust value for lin ear fit
	TGRadioButton *fOptDefault; // set default printing mode	TGRadioButton *fOptDefault; // set default printing mode
	TGRadioButton *fOptVerbose; // set printing mode to 'Verbose '	TGRadioButton *fOptVerbose; // set printing mode to 'Verbose '
	TGRadioButton *fOptQuiet; // set printing mode to 'Quiet'	TGRadioButton *fOptQuiet; // set printing mode to 'Quiet'
	TVirtualPad *fParentPad; // pad containing the object	TVirtualPad *fParentPad; // pad containing the object
	TObject *fFitObject; // selected object to fit	TObject *fFitObject; // selected object to fit
	EObjectType fType; // object type info	EObjectType fType; // object type info
	Int_t fDim; // object dimension	Int_t fDim; // object dimension
	TAxis *fXaxis; // x-axis	TAxis *fXaxis; // x-axis
	TAxis *fYaxis; // y-axis	TAxis *fYaxis; // y-axis

	skipping to change at line 222	skipping to change at line 223
	virtual void DoUpdate();	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 DoRobustFit();
	virtual void DoSetParameters();	virtual void DoSetParameters();
	virtual void DoSliderXMoved();	virtual void DoSliderXMoved();
	virtual void DoNumericSliderXChanged();	virtual void DoNumericSliderXChanged();
	virtual void DoSliderYMoved();	virtual void DoSliderYMoved();
	virtual void DoNumericSliderYChanged();	virtual void DoNumericSliderYChanged();
	virtual void DoSliderZMoved();	virtual void DoSliderZMoved();
	virtual void DoUserDialog();	virtual void DoUserDialog();
	virtual void DoUseFuncRange();	virtual void DoUseFuncRange();

	// slot methods 'Minimization' tab	// slot methods 'Minimization' tab

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

	TGeoArb8.h	TGeoArb8.h

	// @(#)root/geom:$Id: TGeoArb8.h 34058 2010-06-22 12:59:51Z agheata $	// @(#)root/geom:$Id: TGeoArb8.h 39108 2011-05-05 12:04:21Z agheata $
	// Author: Andrei Gheata 24/10/01	// Author: Andrei Gheata 24/10/01

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


	skipping to change at line 213	skipping to change at line 213
	Double_t bl1, Double_t tl1, Double_t alpha1, Double_t h2, Doubl e_t bl2,	Double_t bl1, Double_t tl1, Double_t alpha1, Double_t h2, Doubl e_t bl2,
	Double_t tl2, Double_t alpha2);	Double_t tl2, Double_t alpha2);
	// destructor	// destructor
	virtual ~TGeoGtra();	virtual ~TGeoGtra();
	virtual Double_t DistFromInside(Double_t point, Double_t dir, Int _t iact=1,	virtual Double_t DistFromInside(Double_t point, Double_t dir, Int _t iact=1,
	Double_t step=TGeoShape::Big(), Double_t *safe=0) const;	Double_t step=TGeoShape::Big(), Double_t *safe=0) const;
	virtual Double_t DistFromOutside(Double_t point, Double_t dir, In t_t iact=1,	virtual Double_t DistFromOutside(Double_t point, Double_t dir, In t_t iact=1,
	Double_t step=TGeoShape::Big(), Double_t *safe=0) const;	Double_t step=TGeoShape::Big(), Double_t *safe=0) const;
	virtual TGeoShape GetMakeRuntimeShape(TGeoShape mother, TGeoMatrix *mat) const;	virtual TGeoShape GetMakeRuntimeShape(TGeoShape mother, TGeoMatrix *mat) const;
	Double_t GetTwistAngle() const {return fTwistAngle;}	Double_t GetTwistAngle() const {return fTwistAngle;}

		virtual Double_t Safety(Double_t *point, Bool_t in=kTRUE) const;
	virtual void SetDimensions(Double_t *param);	virtual void SetDimensions(Double_t *param);
	virtual void SavePrimitive(ostream &out, Option_t *option = "") ;	virtual void SavePrimitive(ostream &out, Option_t *option = "") ;

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

	#endif	#endif

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

	TGeoHype.h	TGeoHype.h

	// @(#)root/geom:$Id: TGeoHype.h 24879 2008-07-18 08:04:40Z brun $	// @(#)root/geom:$Id: TGeoHype.h 39036 2011-04-27 09:48:12Z agheata $
	// Author: Mihaela Gheata 20/11/04	// Author: Mihaela Gheata 20/11/04

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


	skipping to change at line 81	skipping to change at line 81
	// methods	// methods

	virtual Double_t Capacity() const;	virtual Double_t Capacity() const;
	virtual void ComputeBBox();	virtual void ComputeBBox();
	virtual void ComputeNormal(Double_t point, Double_t dir, Doub le_t *norm);	virtual void ComputeNormal(Double_t point, Double_t dir, Doub le_t *norm);
	virtual Bool_t Contains(Double_t *point) const;	virtual Bool_t Contains(Double_t *point) const;
	virtual Double_t DistFromInside(Double_t point, Double_t dir, Int _t iact=1,	virtual Double_t DistFromInside(Double_t point, Double_t dir, Int _t iact=1,
	Double_t step=TGeoShape::Big(), Double_t *safe=0) const;	Double_t step=TGeoShape::Big(), Double_t *safe=0) const;
	virtual Double_t DistFromOutside(Double_t point, Double_t dir, In t_t iact=1,	virtual Double_t DistFromOutside(Double_t point, Double_t dir, In t_t iact=1,
	Double_t step=TGeoShape::Big(), Double_t *safe=0) const;	Double_t step=TGeoShape::Big(), Double_t *safe=0) const;

	Int_t DistToHype(Double_t point, Double_t dir, Double_ t *s, Bool_t inner) const;	Int_t DistToHype(Double_t point, Double_t dir, Double_ t *s, Bool_t inner, Bool_t in) const;
	virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);	virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);
	virtual TGeoVolume Divide(TGeoVolume voldiv, const char *divname, In t_t iaxis, Int_t ndiv,	virtual TGeoVolume Divide(TGeoVolume voldiv, const char *divname, In t_t iaxis, Int_t ndiv,
	Double_t start, Double_t step);	Double_t start, Double_t step);
	virtual Double_t GetAxisRange(Int_t iaxis, Double_t &xlo, Double_t &xhi) const;	virtual Double_t GetAxisRange(Int_t iaxis, Double_t &xlo, Double_t &xhi) const;
	virtual void GetBoundingCylinder(Double_t *param) const;	virtual void GetBoundingCylinder(Double_t *param) const;
	virtual const TBuffer3D &GetBuffer3D(Int_t reqSections, Bool_t localFram e) const;	virtual const TBuffer3D &GetBuffer3D(Int_t reqSections, Bool_t localFram e) const;
	virtual Int_t GetByteCount() const {return 64;}	virtual Int_t GetByteCount() const {return 64;}
	virtual Bool_t GetPointsOnSegments(Int_t /npoints/, Double_t * /array/) const {return kFALSE;}	virtual Bool_t GetPointsOnSegments(Int_t /npoints/, Double_t * /array/) const {return kFALSE;}
	virtual TGeoShape GetMakeRuntimeShape(TGeoShape mother, TGeoMatrix *mat) const;	virtual TGeoShape GetMakeRuntimeShape(TGeoShape mother, TGeoMatrix *mat) const;
	virtual void GetMeshNumbers(Int_t &nvert, Int_t &nsegs, Int_t & npols) const;	virtual void GetMeshNumbers(Int_t &nvert, Int_t &nsegs, Int_t & npols) const;

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

	TGeoManager.h	TGeoManager.h

	// @(#)root/geom:$Id: TGeoManager.h 35047 2010-08-27 14:38:41Z agheata $	// @(#)root/geom:$Id: TGeoManager.h 39018 2011-04-25 09:38:31Z agheata $
	// Author: Andrei Gheata 25/10/01	// Author: Andrei Gheata 25/10/01

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


	skipping to change at line 222	skipping to change at line 222
	void RestoreMasterVolume(); // MENU	void RestoreMasterVolume(); // MENU
	void SetMaxVisNodes(Int_t maxnodes=10000); // MENU	void SetMaxVisNodes(Int_t maxnodes=10000); // MENU
	//--- geometry checking	//--- geometry checking
	void AnimateTracks(Double_t tmin=0, Double_t tmax=5E-8 , Int_t nframes=200, Option_t option="/"); // MENU	void AnimateTracks(Double_t tmin=0, Double_t tmax=5E-8 , Int_t nframes=200, Option_t option="/"); // MENU
	void CheckBoundaryErrors(Int_t ntracks=1000000, Double _t radius=-1.); // MENU	void CheckBoundaryErrors(Int_t ntracks=1000000, Double _t radius=-1.); // MENU
	void CheckBoundaryReference(Int_t icheck=-1);	void CheckBoundaryReference(Int_t icheck=-1);
	void CheckGeometryFull(Int_t ntracks=1000000, Double_t vx=0., Double_t vy=0., Double_t vz=0., Option_t option="ob"); // MENU*	void CheckGeometryFull(Int_t ntracks=1000000, Double_t vx=0., Double_t vy=0., Double_t vz=0., Option_t option="ob"); // MENU*
	void CheckGeometry(Option_t *option="");	void CheckGeometry(Option_t *option="");
	void CheckOverlaps(Double_t ovlp=0.1, Option_t option =""); // MENU*	void CheckOverlaps(Double_t ovlp=0.1, Option_t option =""); // MENU*
	void CheckPoint(Double_t x=0,Double_t y=0, Double_t z= 0, Option_t option=""); // MENU*	void CheckPoint(Double_t x=0,Double_t y=0, Double_t z= 0, Option_t option=""); // MENU*

		void CheckShape(TGeoShape shape, Int_t testNo, Int_t nsamples, Option_t option);
	void ConvertReflections();	void ConvertReflections();
	void DrawCurrentPoint(Int_t color=2); // MENU	void DrawCurrentPoint(Int_t color=2); // MENU
	void DrawTracks(Option_t option=""); // MENU*	void DrawTracks(Option_t option=""); // MENU*
	void SetParticleName(const char *pname) {fParticleName =pname;}	void SetParticleName(const char *pname) {fParticleName =pname;}
	const char *GetParticleName() const {return fParticleName.Dat a();}	const char *GetParticleName() const {return fParticleName.Dat a();}
	void DrawPath(const char *path);	void DrawPath(const char *path);
	void PrintOverlaps() const; // MENU	void PrintOverlaps() const; // MENU
	void RandomPoints(const TGeoVolume vol, Int_t npoints =10000, Option_t option="");	void RandomPoints(const TGeoVolume vol, Int_t npoints =10000, Option_t option="");
	void RandomRays(Int_t nrays=1000, Double_t startx=0, D ouble_t starty=0, Double_t startz=0);	void RandomRays(Int_t nrays=1000, Double_t startx=0, D ouble_t starty=0, Double_t startz=0);
	TGeoNode *SamplePoints(Int_t npoints, Double_t &dist, Doubl e_t epsil=1E-5,	TGeoNode *SamplePoints(Int_t npoints, Double_t &dist, Doubl e_t epsil=1E-5,

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

	TGeoPainter.h	TGeoPainter.h

	skipping to change at line 95	skipping to change at line 95
	virtual void AddSize3D(Int_t numpoints, Int_t numsegs, Int_t numpo lys);	virtual void AddSize3D(Int_t numpoints, Int_t numsegs, Int_t numpo lys);
	virtual TVirtualGeoTrack AddTrack(Int_t id, Int_t pdgcode, TObject par t);	virtual TVirtualGeoTrack AddTrack(Int_t id, Int_t pdgcode, TObject par t);
	virtual void AddTrackPoint(Double_t point, Double_t box, Bool_t reset=kFALSE);	virtual void AddTrackPoint(Double_t point, Double_t box, Bool_t reset=kFALSE);
	virtual void BombTranslation(const Double_t tr, Double_t bombtr) ;	virtual void BombTranslation(const Double_t tr, Double_t bombtr) ;
	virtual void CheckBoundaryErrors(Int_t ntracks=1000000, Double_t r adius=-1.);	virtual void CheckBoundaryErrors(Int_t ntracks=1000000, Double_t r adius=-1.);
	virtual void CheckBoundaryReference(Int_t icheck=-1);	virtual void CheckBoundaryReference(Int_t icheck=-1);
	virtual void CheckGeometryFull(Bool_t checkoverlaps=kTRUE, Bool_t checkcrossings=kTRUE, Int_t nrays=10000, const Double_t *vertex=NULL);	virtual void CheckGeometryFull(Bool_t checkoverlaps=kTRUE, Bool_t checkcrossings=kTRUE, Int_t nrays=10000, const Double_t *vertex=NULL);
	virtual void CheckGeometry(Int_t nrays, Double_t startx, Double_t starty, Double_t startz) const;	virtual void CheckGeometry(Int_t nrays, Double_t startx, Double_t starty, Double_t startz) const;
	void CheckEdit();	void CheckEdit();
	virtual void CheckPoint(Double_t x=0, Double_t y=0, Double_t z=0, Option_t *option="");	virtual void CheckPoint(Double_t x=0, Double_t y=0, Double_t z=0, Option_t *option="");

		virtual void CheckShape(TGeoShape shape, Int_t testNo, Int_t nsam ples, Option_t option);
	virtual void CheckOverlaps(const TGeoVolume vol, Double_t ovlp=0. 1, Option_t option="") const;	virtual void CheckOverlaps(const TGeoVolume vol, Double_t ovlp=0. 1, Option_t option="") const;
	Int_t CountNodes(TGeoVolume *vol, Int_t level) const;	Int_t CountNodes(TGeoVolume *vol, Int_t level) const;
	virtual Int_t CountVisibleNodes();	virtual Int_t CountVisibleNodes();
	virtual void DefaultAngles();	virtual void DefaultAngles();
	virtual void DefaultColors();	virtual void DefaultColors();
	virtual Int_t DistanceToPrimitiveVol(TGeoVolume *vol, Int_t px, Int _t py);	virtual Int_t DistanceToPrimitiveVol(TGeoVolume *vol, Int_t px, Int _t py);
	virtual void Draw(Option_t *option="");	virtual void Draw(Option_t *option="");
	virtual void DrawBatemanSol(TGeoBatemanSol sol, Option_t option= "");	virtual void DrawBatemanSol(TGeoBatemanSol sol, Option_t option= "");
	virtual void DrawOverlap(void ovlp, Option_t option="");	virtual void DrawOverlap(void ovlp, Option_t option="");
	virtual void DrawCurrentPoint(Int_t color);	virtual void DrawCurrentPoint(Int_t color);

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