ROOT: headers diff between 5.30.06 and 5.32.00 versions

	BayesianCalculator.h	BayesianCalculator.h

	// @(#)root/roostats:$Id: BayesianCalculator.h 39977 2011-06-26 22:57:52Z m oneta $	// @(#)root/roostats:$Id: BayesianCalculator.h 39975 2011-06-26 22:49:46Z 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

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 40012 2011-06-27 16:03:11Z stelzer $	// @(#)root/tmva $Id: BinarySearchTree.h 40005 2011-06-27 15:29:10Z 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 39395 2011-05-26 10:05:54Z mon eta $	// @(#)root/tmva $Id: BinarySearchTreeNode.h 40005 2011-06-27 15:29:10Z ste lzer $
	// 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 40012 2011-06-27 16:03:11Z stelzer $	// @(#)root/tmva $Id: BinaryTree.h 40005 2011-06-27 15:29:10Z 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 42194 2011-11-23 14:02:02Z axel $ */	/* @(#)root/zip:$Id: Bits.h 39885 2011-06-22 14:09:49Z 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

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

	BrentMinimizer1D.h	BrentMinimizer1D.h

	// @(#)root/mathcore:$Id: BrentMinimizer1D.h 36905 2010-11-24 15:44:34Z mon eta $	// @(#)root/mathcore:$Id: BrentMinimizer1D.h 41847 2011-11-09 18:03:47Z rdm $
	// Author: David Gonzalez Maline 2/2008	// Author: David Gonzalez Maline 2/2008
	/**********************************************************************	/**********************************************************************
	* *	* *
	* Copyright (c) 2004 Maline, CERN/PH-SFT *	* Copyright (c) 2004 Maline, CERN/PH-SFT *
	* *	* *
	* This library is free software; you can redistribute it and/or *	* This library is free software; you can redistribute it and/or *
	* modify it under the terms of the GNU General Public License *	* modify it under the terms of the GNU General Public License *
	* as published by the Free Software Foundation; either version 2 *	* as published by the Free Software Foundation; either version 2 *
	* of the License, or (at your option) any later version. *	* of the License, or (at your option) any later version. *
	* *	* *

	skipping to change at line 73	skipping to change at line 73
	1. Create the class.	1. Create the class.
	2. Set a function within an interval to look for the minimum.	2. Set a function within an interval to look for the minimum.
	3. Call the Minimize function with the error parameters.	3. Call the Minimize function with the error parameters.

	If another minimization is to be performed, repeat the last two steps.	If another minimization is to be performed, repeat the last two steps.

	@ingroup Min1D	@ingroup Min1D

	*/	*/


	class BrentMinimizer1D: ROOT::Math::IMinimizer1D {	class BrentMinimizer1D: private ROOT::Math::IMinimizer1D {

	public:	public:

	/** Default Constructor. */	/** Default Constructor. */
	BrentMinimizer1D();	BrentMinimizer1D();

	/** Default Destructor. */	/** Default Destructor. */
	virtual ~BrentMinimizer1D() {}	virtual ~BrentMinimizer1D() {}

	public:	public:

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

	Chi2FCN.h	Chi2FCN.h

	// @(#)root/mathcore:$Id: Chi2FCN.h 40626 2011-08-18 08:34:03Z moneta $	// @(#)root/mathcore:$Id: Chi2FCN.h 40577 2011-08-12 10:43:12Z moneta $
	// Author: L. Moneta Tue Sep 5 09:13:32 2006	// Author: L. Moneta Tue Sep 5 09:13:32 2006

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

	// Header file for class Chi2FCN	// Header file for class Chi2FCN

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

	ClassInfo.h	ClassInfo.h

	// @(#)root/tmva $Id: ClassInfo.h 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: ClassInfo.h 40005 2011-06-27 15:29:10Z 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 : 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)Root/tmva $Id: ClassifierFactory.h 40005 2011-06-27 15:29:10Z stelze r $
	// 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

	Compression.h	Compression.h

	// @(#)root/zip:$Id: Compression.h 39887 2011-06-22 14:12:05Z rdm $	// @(#)root/zip:$Id: Compression.h 39885 2011-06-22 14:09:49Z rdm $
	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2011, 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_Compression	#ifndef ROOT_Compression
	#define ROOT_Compression	#define ROOT_Compression

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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: Config.h 40005 2011-06-27 15:29:10Z stelzer $
	// 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: Configurable.h 40005 2011-06-27 15:29:10Z 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 : 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: ConvergenceTest.h 40005 2011-06-27 15:29:10Z 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 : 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 40012 2011-06-27 16:03:11Z stelzer $	// @(#)root/tmva $Id: CrossEntropy.h 40005 2011-06-27 15:29:10Z 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: DataInputHandler.h 40005 2011-06-27 15:29:10Z 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 : 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

	DataMbr.h	DataMbr.h

	skipping to change at line 69	skipping to change at line 69
	int SetFilePos(const char* fname);	int SetFilePos(const char* fname);
	int Next();	int Next();
	int Prev();	int Prev();

	enum error_code { VALID, NOT_INT, NOT_DEF, IS_PRIVATE, UNKNOWN };	enum error_code { VALID, NOT_INT, NOT_DEF, IS_PRIVATE, UNKNOWN };
	const char ValidArrayIndex(int errnum = 0, char **errstr = 0);	const char ValidArrayIndex(int errnum = 0, char **errstr = 0);

	const char *FileName();	const char *FileName();
	int LineNumber();	int LineNumber();


		static int SerialNumber();

	private:	private:
	long handle;	long handle;
	long index;	long index;
	G__ClassInfo *belongingclass;	G__ClassInfo *belongingclass;
	G__TypeInfo type;	G__TypeInfo type;
	};	};

	}	}

	using namespace Cint;	using namespace Cint;

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

	DataSet.h	DataSet.h

	// @(#)root/tmva $Id: DataSet.h 40012 2011-06-27 16:03:11Z stelzer $	// @(#)root/tmva $Id: DataSet.h 40005 2011-06-27 15:29:10Z 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 40024 2011-06-27 17:02:37Z stelzer $	// @(#)root/tmva $Id: DataSetFactory.h 40005 2011-06-27 15:29:10Z 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 *

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

	DataSetInfo.h	DataSetInfo.h

	// // @(#)root/tmva $Id: DataSetInfo.h 40024 2011-06-27 17:02:37Z stelzer $	// // @(#)root/tmva $Id: DataSetInfo.h 40005 2011-06-27 15:29:10Z 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 *

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

	DataSetManager.h	DataSetManager.h

	// @(#)root/tmva $Id: DataSetManager.h 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: DataSetManager.h 40005 2011-06-27 15:29:10Z 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 : 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

	DecisionTree.h	DecisionTree.h

	// @(#)root/tmva $Id: DecisionTree.h 40012 2011-06-27 16:03:11Z stelzer $	// @(#)root/tmva $Id: DecisionTree.h 40005 2011-06-27 15:29:10Z 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 40012 2011-06-27 16:03:11Z stelzer $	// @(#)root/tmva $Id: DecisionTreeNode.h 40005 2011-06-27 15:29:10Z 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

	EstimateSummary.h	EstimateSummary.h

	skipping to change at line 14	skipping to change at line 14
	* 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_ESTIMATESUMMARY_h	#ifndef ROOSTATS_ESTIMATESUMMARY_h
	#define ROOSTATS_ESTIMATESUMMARY_h	#define ROOSTATS_ESTIMATESUMMARY_h


	#include "TH1F.h"	#include "TH1.h"
	#include <string>	#include <string>
	#include <vector>	#include <vector>
	#include <map>	#include <map>
	#include <iostream>	#include <iostream>
	#include "TObject.h"	#include "TObject.h"

	namespace RooStats{	namespace RooStats{
	namespace HistFactory{	namespace HistFactory{

	struct EstimateSummary : public TObject {	struct EstimateSummary : public TObject {


		enum ConstraintType{ Gaussian, Poisson };

	struct NormFactor{	struct NormFactor{
	std::string name;	std::string name;
	double val, high, low;	double val, high, low;
	bool constant;	bool constant;
	};	};


		class ShapeSys{
		public:
		ShapeSys() : name(""), hist(NULL) {;}
		std::string name;
		TH1* hist;
		ConstraintType constraint;
		};

	typedef std::vector<std::string> vecstring;	typedef std::vector<std::string> vecstring;

	typedef std::vector<TH1F*> vechist;	typedef std::vector<TH1*> vechist;
	typedef std::pair<double, double> pairdouble;	typedef std::pair<double, double> pairdouble;
	typedef std::map<std::string, std::pair<double, double> > mappair;	typedef std::map<std::string, std::pair<double, double> > mappair;

	// simple structure to hold necessary information about each channel	// simple structure to hold necessary information about each channel
	EstimateSummary();	EstimateSummary();
	virtual ~EstimateSummary();	virtual ~EstimateSummary();
	void Print(const char *opt = 0) const ;	void Print(const char *opt = 0) const ;

	void AddSyst( const std::string & sname, TH1F* low, TH1F* high);	void AddSyst( const std::string & sname, TH1* low, TH1* high);
	bool operator==(const EstimateSummary &other) const ;	bool operator==(const EstimateSummary &other) const ;
	bool CompareHisto( const TH1 * one, const TH1 * two) const ;	bool CompareHisto( const TH1 * one, const TH1 * two) const ;

	//data members .	//data members .
	std::string name;	std::string name;
	std::string channel;	std::string channel;
	std::string normName;	std::string normName;

	TH1F* nominal; // x pb per jet bin. all histograms need index of binni ng to be consistent	TH1* nominal; // x pb per jet bin. all histograms need index of binnin g to be consistent
	std::vector<std::string> systSourceForHist;	std::vector<std::string> systSourceForHist;

	std::vector<TH1F*> lowHists; // x pb per jet bin for - variations over l	std::vector<TH1*> lowHists; // x pb per jet bin for - variations over li
	ist of systematics	st of systematics
	std::vector<TH1F*> highHists; // x pb per jet bin for + variations over	std::vector<TH1*> highHists; // x pb per jet bin for + variations over l
	list of systematics	ist of systematics
	std::map<std::string, std::pair<double, double> > overallSyst; // "accep tance"->(0.8,1.2)	std::map<std::string, std::pair<double, double> > overallSyst; // "accep tance"->(0.8,1.2)
	std::pair<double, double> dummyForRoot;	std::pair<double, double> dummyForRoot;
	std::vector<NormFactor> normFactor;	std::vector<NormFactor> normFactor;


		bool IncludeStatError; // Flag to implement Statistical errors for this s
		ample
		ConstraintType StatConstraintType; // The type of constraint binwise sta
		t errors
		Double_t RelErrorThreshold; // The minimum relative uncertainty for a bin
		to use stat errors
		TH1* relStatError; // An (optional) externally provided shape for this er
		ror

		// bool doShapeFactor; // A flag to include a ShapeFactor ParamatarizedH
		istogram
		std::string shapeFactorName; //
		std::vector<ShapeSys> shapeSysts; //

	ClassDef(RooStats::HistFactory::EstimateSummary,1)	ClassDef(RooStats::HistFactory::EstimateSummary,1)
	};	};

	}	}
	}	}

	#endif	#endif

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

	Event.h	Event.h

	// @(#)root/tmva $Id: Event.h 40012 2011-06-27 16:03:11Z stelzer $	// @(#)root/tmva $Id: Event.h 40005 2011-06-27 15:29:10Z 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/mathcore:$Id: Factory.h 37448 2010-12-09 20:20:56Z moneta $	// @(#)root/tmva $Id: Factory.h 40005 2011-06-27 15:29:10Z stelzer $
	// Author: L. Moneta Fri Dec 22 14:43:33 2006	// Author: Andreas Hoecker, Peter Speckmayer, Joerg Stelzer, Helge Voss, Ka
		i Voss, Eckhard von Toerne, Jan Therhaag


	/**********************************************************************	/**************************************************************************
	* *	********
	* Copyright (c) 2006 LCG ROOT Math Team, CERN/PH-SFT *	* Project: TMVA - a Root-integrated toolkit for multivariate data analysis
	* *	*
	* *	* 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


	namespace ROOT {	protected:

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

	};


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


	} // end namespace ROOT	} // namespace TMVA


	#endif /* ROOT_Fit_MinimizerFactory */	#endif

End of changes. 7 change blocks.
	53 lines changed or deleted	360 lines changed or added

	FitMethodFunction.h	FitMethodFunction.h

	// @(#)root/mathcore:$Id: FitMethodFunction.h 40626 2011-08-18 08:34:03Z mo neta $	// @(#)root/mathcore:$Id: FitMethodFunction.h 40577 2011-08-12 10:43:12Z mo neta $
	// Author: L. Moneta Thu Aug 16 15:40:28 2007	// Author: L. Moneta Thu Aug 16 15:40:28 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 FitMethodFunction	// Header file for class FitMethodFunction

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

	Fitter.h	Fitter.h

	// @(#)root/mathcore:$Id: Fitter.h 39382 2011-05-26 08:31:43Z moneta $	// @(#)root/mathcore:$Id: Fitter.h 42202 2011-11-23 17:07:20Z 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 120	skipping to change at line 120

	/**	/**
	Assignment operator (disabled, class is not copyable)	Assignment operator (disabled, class is not copyable)
	*/	*/
	Fitter & operator = (const Fitter & rhs);	Fitter & operator = (const Fitter & rhs);

	public:	public:

	/**	/**
	fit a data set using any generic model function	fit a data set using any generic model function

		If data set is binned a least square fit is performed
		If data set is unbinned a maximum likelihood fit (not extended) is d
		one
	Pre-requisite on the function:	Pre-requisite on the function:

		it must implement the 1D or multidimensional parametric function int erface
	*/	*/
	template < class Data , class Function>	template < class Data , class Function>

	bool Fit( const Data & data, const Function & func) {	bool Fit( const Data & data, const Function & func ) {
	SetFunction(func);	SetFunction(func);
	return Fit(data);	return Fit(data);
	}	}

	/**	/**

	fit a binned data set (default method: use chi2)	Fit a binned data set using a least square fit (default method)
	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 a binned data set using a least square fit
		*/
		bool LeastSquareFit(const BinData & data) {
		return DoLeastSquareFit(data);
		}

	/**	/**

	fit an binned data set using loglikelihood method	fit an unbinned data set using loglikelihood method
	*/	*/

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

	/**	/**

	Likelihood fit	Likelihood fit (unbinned or unbinned) depending on the type of data
		If Binned default is extended
		If Unbinned defult is NOT extended (for backward compatibility)
	*/	*/
	template <class Data>	template <class Data>

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

		/**
		Likelihood fit using extended or not extended method
		*/
		template <class Data>
		bool LikelihoodFit(const Data & data, bool extended ) {
		return DoLikelihoodFit(data, extended);
	}	}

	/**	/**
	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 useWe ight = false) {	bool LikelihoodFit( const Data & data, const Function & func, bool exten ded) {
	SetFunction(func);	SetFunction(func);

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

	/**	/**
	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);

	skipping to change at line 272	skipping to change at line 292
	bool EvalFCN();	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, bool useGradient = false) ;
	/**	/**
	Set the fitted function from a parametric 1D function interface	Set the fitted function from a parametric 1D function interface
	*/	*/

	void SetFunction(const IModel1DFunction & func);	void SetFunction(const IModel1DFunction & func, bool useGradient = fals e);

	/**	/**
	Set the fitted function (model function) from a parametric gradient function interface	Set the fitted function (model function) from a parametric gradient function interface
	*/	*/

	void SetFunction(const IGradModelFunction & func);	void SetFunction(const IGradModelFunction & func, bool useGradient = tr ue);
	/**	/**
	Set the fitted function from 1D gradient parametric function interfac e	Set the fitted function from 1D gradient parametric function interfac e
	*/	*/

	void SetFunction(const IGradModel1DFunction & func);	void SetFunction(const IGradModel1DFunction & func, bool useGradient = true);

	/**	/**
	get fit result	get fit result
	*/	*/
	const FitResult & Result() const {	const FitResult & Result() const {
	assert( fResult.get() );	assert( fResult.get() );
	return *fResult;	return *fResult;
	}	}

	/**	/**

	skipping to change at line 355	skipping to change at line 375
	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	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	This method can be called only after a fit. The
	passed function (loglw2) is a log-likelihood function impelemented us ing the	passed function (loglw2) is a log-likelihood function impelemented us ing the
	sum of weight squared	sum of weight squared

		When using FitConfig.SetWeightCorrection() this correction is applied
		automatically when doing a likelihood fit (binned or unbinned)
	*/	*/

	bool ApplyWeightCorrection(const ROOT::Math::IMultiGenFunction & loglw2) ;	bool ApplyWeightCorrection(const ROOT::Math::IMultiGenFunction & loglw2, bool minimizeW2L=false);

	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 useWeight);	bool DoLikelihoodFit(const BinData & data, bool extended = true);
	/// un-binned likelihood fit	/// un-binned likelihood fit

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

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


		// set 1D function
		void DoSetFunction(const IModel1DFunction & func, bool useGrad);
		// set generic N-d function
		void DoSetFunction(const IModelFunction & func, bool useGrad);

	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	bool fBinFit; // flag to indicate if fit is binned
	// in case of false the fit is unbinned or unde fined)	// in case of false the fit is unbinned or unde fined)
	// flag it is used to compute chi2 for binned l ikelihood fit	// 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 fFitType; // type of fit (0 undefined, 1 least square, 2 likelih ood)


End of changes. 22 change blocks.
	20 lines changed or deleted	48 lines changed or added

	FitterBase.h	FitterBase.h

	// @(#)root/tmva $Id: FitterBase.h 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: FitterBase.h 40005 2011-06-27 15:29:10Z 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 : 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

	FrequentistCalculator.h	FrequentistCalculator.h

	skipping to change at line 47	skipping to change at line 47
	const RooAbsData &data,	const RooAbsData &data,
	const ModelConfig &altModel,	const ModelConfig &altModel,
	const ModelConfig &nullModel,	const ModelConfig &nullModel,
	TestStatSampler* sampler=0	TestStatSampler* sampler=0
	) :	) :
	HypoTestCalculatorGeneric(data, altModel, nullModel, sampler),	HypoTestCalculatorGeneric(data, altModel, nullModel, sampler),
	fNullImportanceDensity(NULL),	fNullImportanceDensity(NULL),
	fNullImportanceSnapshot(NULL),	fNullImportanceSnapshot(NULL),
	fAltImportanceDensity(NULL),	fAltImportanceDensity(NULL),
	fAltImportanceSnapshot(NULL),	fAltImportanceSnapshot(NULL),

	fNToysNull(0),	fNToysNull(-1),
	fNToysAlt(0),	fNToysAlt(-1),
	fNToysNullTail(0),	fNToysNullTail(0),
	fNToysAltTail(0)	fNToysAltTail(0)
	{	{
	}	}

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


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

	G__ci.h	G__ci.h

	skipping to change at line 1486	skipping to change at line 1486
	#define G__VAARG_PASS_BY_REFERENCE 8	#define G__VAARG_PASS_BY_REFERENCE 8

	#elif (defined(__PPC__)\|\|defined(__ppc__))&&(defined(_AIX)\|\|defined(__APPLE __))	#elif (defined(__PPC__)\|\|defined(__ppc__))&&(defined(_AIX)\|\|defined(__APPLE __))
	/**********************************************	/**********************************************
	* PowerPC, AIX and Apple Mac	* PowerPC, AIX and Apple Mac
	* It turned out it is quite difficult if not impossible to support PowerPC .	* It turned out it is quite difficult if not impossible to support PowerPC .
	* PPC uses registers for passing arguments (general purpose 3-10, floating 1)	* PPC uses registers for passing arguments (general purpose 3-10, floating 1)
	**********************************************/	**********************************************/
	#if !defined(__GNUC__)	#if !defined(__GNUC__)
	/* Looks like gcc3.3 doesn't use registers. */	/* Looks like gcc3.3 doesn't use registers. */

	#define G__VAARG_NOSUPPORT	/#define G__VAARG_NOSUPPORT/
		#define G__VAARG_INC_COPY_N 4
		#define G__VAARG_PASS_BY_REFERENCE 8
	#endif	#endif
	#define G__VAARG_INC_COPY_N 4	#define G__VAARG_INC_COPY_N 4
	#define G__VAARG_PASS_BY_REFERENCE 8	#define G__VAARG_PASS_BY_REFERENCE 8

	#elif (defined(__PPC__)\|\|defined(__ppc__))&&(defined(__linux)\|\|defined(__li nux__))	#elif (defined(__PPC__)\|\|defined(__ppc__))&&(defined(__linux)\|\|defined(__li nux__))
	/**********************************************	/**********************************************
	* PowerPC, Linux	* PowerPC, Linux
	**********************************************/	**********************************************/
	#define G__VAARG_INC_COPY_N 4	#define G__VAARG_INC_COPY_N 4
	#define G__VAARG_PASS_BY_REFERENCE 8	#define G__VAARG_PASS_BY_REFERENCE 8

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

	GeneticAlgorithm.h	GeneticAlgorithm.h

	// @(#)root/tmva $Id: GeneticAlgorithm.h 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: GeneticAlgorithm.h 40005 2011-06-27 15:29:10Z 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 : 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: GeneticFitter.h 40005 2011-06-27 15:29:10Z 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 : 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: GeneticGenes.h 40005 2011-06-27 15:29:10Z 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 : 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: GeneticPopulation.h 40005 2011-06-27 15:29:10Z stelze r $
	// 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: GeneticRange.h 40005 2011-06-27 15:29:10Z 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 : 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

	GiniIndex.h	GiniIndex.h

	// @(#)root/tmva $Id: GiniIndex.h 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: GiniIndex.h 40005 2011-06-27 15:29:10Z 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 : 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 39395 2011-05-26 10:05:54Z mon eta $	// @(#)root/tmva $Id: GiniIndexWithLaplace.h 40005 2011-06-27 15:29:10Z ste lzer $
	// 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

	HelperOps.h	HelperOps.h

	// @(#)root/smatrix:$Id: HelperOps.h 38791 2011-04-11 09:32:49Z moneta $	// @(#)root/smatrix:$Id: HelperOps.h 42294 2011-11-29 07:44:25Z moneta $
	// Authors: J. Palacios 2006	// Authors: J. Palacios 2006

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

	// Include files	// Include files

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

	skipping to change at line 551	skipping to change at line 551
	Optionally a check is done that iterator size	Optionally a check is done that iterator size
	is the same as the matrix size	is the same as the matrix size
	*/	*/
	template <class T, unsigned int D1, unsigned int D2>	template <class T, unsigned int D1, unsigned int D2>
	struct AssignItr<T, D1, D2, MatRepSym<T,D1> > {	struct AssignItr<T, D1, D2, MatRepSym<T,D1> > {
	template<class Iterator>	template<class Iterator>
	static void Evaluate(SMatrix<T,D1,D2,MatRepSym<T,D1> >& lhs, Iterator begin, Iterator end, bool , bool lower, bool check = true) {	static void Evaluate(SMatrix<T,D1,D2,MatRepSym<T,D1> >& lhs, Iterator begin, Iterator end, bool , bool lower, bool check = true) {

	if (lower) {	if (lower) {
	if (check) {	if (check) {

	assert(begin+ static_cast<const int>( MatRepSym<T,D1>::kSize ) == end);	assert(begin+ static_cast< int>( MatRepSym<T,D1>::kSize) == end);
	}	}
	std::copy(begin, end, lhs.fRep.Array() );	std::copy(begin, end, lhs.fRep.Array() );
	}	}
	else {	else {
	Iterator itr = begin;	Iterator itr = begin;
	for (unsigned int i = 0; i < D1; ++i)	for (unsigned int i = 0; i < D1; ++i)
	for (unsigned int j = i; j <D2; ++j) {	for (unsigned int j = i; j <D2; ++j) {
	if (itr != end)	if (itr != end)
	lhs(i,j) = *itr++;	lhs(i,j) = *itr++;
	else	else

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

	HistoToWorkspaceFactory.h	HistoToWorkspaceFactory.h

	skipping to change at line 27	skipping to change at line 27
	#include <iostream>	#include <iostream>
	#include <sstream>	#include <sstream>

	#include <RooPlot.h>	#include <RooPlot.h>
	#include <RooArgSet.h>	#include <RooArgSet.h>
	#include <RooFitResult.h>	#include <RooFitResult.h>
	#include <RooAbsReal.h>	#include <RooAbsReal.h>
	#include <RooRealVar.h>	#include <RooRealVar.h>
	#include <RooWorkspace.h>	#include <RooWorkspace.h>
	#include <TObject.h>	#include <TObject.h>

	#include <TH1F.h>	#include <TH1.h>
	#include <TDirectory.h>	#include <TDirectory.h>

	namespace RooStats{	namespace RooStats{
	namespace HistFactory{	namespace HistFactory{

	struct EstimateSummary;	struct EstimateSummary;

	class HistoToWorkspaceFactory: public TObject {	class HistoToWorkspaceFactory: public TObject {

	public:	public:

	skipping to change at line 66	skipping to change at line 66
	RooWorkspace * MakeCombinedModel(vector<string>, vector<RooWorkspace *>);	RooWorkspace * MakeCombinedModel(vector<string>, vector<RooWorkspace *>);

	//void Combine_ratio(vector<string> , vector<RooWorkspace*>);	//void Combine_ratio(vector<string> , vector<RooWorkspace*>);

	void Customize(RooWorkspace* proto, const char* pdfNameChar, map<stri ng,string> renameMap);	void Customize(RooWorkspace* proto, const char* pdfNameChar, map<stri ng,string> renameMap);

	void EditSyst(RooWorkspace* proto, const char* pdfNameChar, map<strin g,double> gammaSyst, map<string,double> uniformSyst, map<string,double> log NormSyst);	void EditSyst(RooWorkspace* proto, const char* pdfNameChar, map<strin g,double> gammaSyst, map<string,double> uniformSyst, map<string,double> log NormSyst);

	void FormatFrameForLikelihood(RooPlot* frame, string XTitle=string("# sigma / #sigma_{SM}"), string YTitle=string("-log likelihood"));	void FormatFrameForLikelihood(RooPlot* frame, string XTitle=string("# sigma / #sigma_{SM}"), string YTitle=string("-log likelihood"));


	void LinInterpWithConstraint(RooWorkspace* proto, TH1F* nominal, vect or<TH1F> lowHist, vector<TH1F> highHist,	void LinInterpWithConstraint(RooWorkspace* proto, TH1* nominal, vecto r<TH1> lowHist, vector<TH1> highHist,
	vector<string> sourceName, string prefix, string productPr efix, string systTerm,	vector<string> sourceName, string prefix, string productPr efix, string systTerm,
	int lowBin, int highBin, vector<string>& likelihoodTermNam es);	int lowBin, int highBin, vector<string>& likelihoodTermNam es);

	TDirectory* Makedirs( TDirectory* file, vector<string> names );	TDirectory* Makedirs( TDirectory* file, vector<string> names );

	RooWorkspace* MakeSingleChannelModel(vector<RooStats::HistFactory::Es timateSummary> summary, vector<string> systToFix, bool doRatio=false);	RooWorkspace* MakeSingleChannelModel(vector<RooStats::HistFactory::Es timateSummary> summary, vector<string> systToFix, bool doRatio=false);

	void MakeTotalExpected(RooWorkspace* proto, string totName, string / /, string //,	void MakeTotalExpected(RooWorkspace* proto, string totName, string / /, string //,
	int lowBin, int highBin, vector<string>& syst_x_expectedPrefixN ames,	int lowBin, int highBin, vector<string>& syst_x_expectedPrefixN ames,
	vector<string>& normByNames);	vector<string>& normByNames);

	TDirectory* Mkdir( TDirectory * file, string name );	TDirectory* Mkdir( TDirectory * file, string name );

	void PrintCovarianceMatrix(RooFitResult* result, RooArgSet* params, s tring filename);	void PrintCovarianceMatrix(RooFitResult* result, RooArgSet* params, s tring filename);

	void ProcessExpectedHisto(TH1F* hist,RooWorkspace* proto, string pref ix, string productPrefix, string systTerm, double low, double high, int low Bin, int highBin);	void ProcessExpectedHisto(TH1* hist,RooWorkspace* proto, string prefi x, string productPrefix, string systTerm, double low, double high, int lowB in, int highBin);
	void SetObsToExpected(RooWorkspace* proto, string obsPrefix, string e xpPrefix, int lowBin, int highBin);	void SetObsToExpected(RooWorkspace* proto, string obsPrefix, string e xpPrefix, int lowBin, int highBin);
	void FitModel(RooWorkspace *, string, string, string, bool=false );	void FitModel(RooWorkspace *, string, string, string, bool=false );
	std::string FilePrefixStr(std::string);	std::string FilePrefixStr(std::string);

	string fFileNamePrefix;	string fFileNamePrefix;
	string fRowTitle;	string fRowTitle;
	vector<string> fSystToFix;	vector<string> fSystToFix;
	double fNomLumi, fLumiError;	double fNomLumi, fLumiError;
	int fLowBin, fHighBin;	int fLowBin, fHighBin;
	std::stringstream fResultsPrefixStr;	std::stringstream fResultsPrefixStr;

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

	HistoToWorkspaceFactoryFast.h	HistoToWorkspaceFactoryFast.h

	skipping to change at line 27	skipping to change at line 27
	#include <iostream>	#include <iostream>
	#include <sstream>	#include <sstream>

	#include <RooPlot.h>	#include <RooPlot.h>
	#include <RooArgSet.h>	#include <RooArgSet.h>
	#include <RooFitResult.h>	#include <RooFitResult.h>
	#include <RooAbsReal.h>	#include <RooAbsReal.h>
	#include <RooRealVar.h>	#include <RooRealVar.h>
	#include <RooWorkspace.h>	#include <RooWorkspace.h>
	#include <TObject.h>	#include <TObject.h>

	#include <TH1F.h>	#include <TH1.h>
	#include <TDirectory.h>	#include <TDirectory.h>

	#include "RooStats/HistFactory/EstimateSummary.h"	#include "RooStats/HistFactory/EstimateSummary.h"


		class ParamHistFunc;

	namespace RooStats{	namespace RooStats{
	namespace HistFactory{	namespace HistFactory{
	class HistoToWorkspaceFactoryFast: public TObject {	class HistoToWorkspaceFactoryFast: public TObject {

	public:	public:

	HistoToWorkspaceFactoryFast( string, string , vector<string> , double =200, double =20, int =0, int =6, TFile * =0);	HistoToWorkspaceFactoryFast( string, string , vector<string> , double =200, double =20, int =0, int =6, TFile * =0);
	HistoToWorkspaceFactoryFast();	HistoToWorkspaceFactoryFast();
	virtual ~HistoToWorkspaceFactoryFast();	virtual ~HistoToWorkspaceFactoryFast();


		void SetFunctionsToPreprocess(vector<string> lines){ fPreprocessFunct
		ions = lines;}

	void AddEfficiencyTerms(RooWorkspace* proto, string prefix, string in terpName,	void AddEfficiencyTerms(RooWorkspace* proto, string prefix, string in terpName,
	map<string,pair<double,double> > systMap,	map<string,pair<double,double> > systMap,
	vector<string>& likelihoodTermNames, vector<string>& totSystTer mNames);	vector<string>& likelihoodTermNames, vector<string>& totSystTer mNames);

	string AddNormFactor(RooWorkspace *, string & , string & , EstimateSu mmary & , bool );	string AddNormFactor(RooWorkspace *, string & , string & , EstimateSu mmary & , bool );

	void AddMultiVarGaussConstraint(RooWorkspace* proto, string prefix,in t lowBin, int highBin, vector<string>& likelihoodTermNames);	void AddMultiVarGaussConstraint(RooWorkspace* proto, string prefix,in t lowBin, int highBin, vector<string>& likelihoodTermNames);

	void AddPoissonTerms(RooWorkspace* proto, string prefix, string obsPr efix, string expPrefix, int lowBin, int highBin,	void AddPoissonTerms(RooWorkspace* proto, string prefix, string obsPr efix, string expPrefix, int lowBin, int highBin,
	vector<string>& likelihoodTermNames);	vector<string>& likelihoodTermNames);

	//void Combine_old();	//void Combine_old();

	RooWorkspace * MakeCombinedModel(vector<string>, vector<RooWorkspace *>);	RooWorkspace * MakeCombinedModel(vector<string>, vector<RooWorkspace *>);

	//void Combine_ratio(vector<string> , vector<RooWorkspace*>);	//void Combine_ratio(vector<string> , vector<RooWorkspace*>);

	void Customize(RooWorkspace* proto, const char* pdfNameChar, map<stri ng,string> renameMap);	void Customize(RooWorkspace* proto, const char* pdfNameChar, map<stri ng,string> renameMap);


	void EditSyst(RooWorkspace* proto, const char* pdfNameChar, map<strin	void EditSyst(RooWorkspace* proto, const char* pdfNameChar,
	g,double> gammaSyst, map<string,double> uniformSyst, map<string,double> log	map<string,double> gammaSyst, map<string,double> uniform
	NormSyst);	Syst, map<string,double> logNormSyst, map<string,double> noSyst);

	void FormatFrameForLikelihood(RooPlot* frame, string XTitle=string("# sigma / #sigma_{SM}"), string YTitle=string("-log likelihood"));	void FormatFrameForLikelihood(RooPlot* frame, string XTitle=string("# sigma / #sigma_{SM}"), string YTitle=string("-log likelihood"));


	void LinInterpWithConstraint(RooWorkspace* proto, TH1F* nominal, vect or<TH1F> lowHist, vector<TH1F> highHist,	void LinInterpWithConstraint(RooWorkspace* proto, TH1* nominal, vecto r<TH1> lowHist, vector<TH1> highHist,
	vector<string> sourceName, string prefix, string productPr efix, string systTerm,	vector<string> sourceName, string prefix, string productPr efix, string systTerm,
	int lowBin, int highBin, vector<string>& likelihoodTermNam es);	int lowBin, int highBin, vector<string>& likelihoodTermNam es);

	TDirectory* Makedirs( TDirectory* file, vector<string> names );	TDirectory* Makedirs( TDirectory* file, vector<string> names );

	RooWorkspace* MakeSingleChannelModel(vector<RooStats::HistFactory::Es timateSummary> summary, vector<string> systToFix, bool doRatio=false);	RooWorkspace* MakeSingleChannelModel(vector<RooStats::HistFactory::Es timateSummary> summary, vector<string> systToFix, bool doRatio=false);

	void MakeTotalExpected(RooWorkspace* proto, string totName, string / /, string //,	void MakeTotalExpected(RooWorkspace* proto, string totName, string / /, string //,
	int lowBin, int highBin, vector<string>& syst_x_expectedPrefixN ames,	int lowBin, int highBin, vector<string>& syst_x_expectedPrefixN ames,
	vector<string>& normByNames);	vector<string>& normByNames);

	TDirectory* Mkdir( TDirectory * file, string name );	TDirectory* Mkdir( TDirectory * file, string name );

	void PrintCovarianceMatrix(RooFitResult* result, RooArgSet* params, s tring filename);	void PrintCovarianceMatrix(RooFitResult* result, RooArgSet* params, s tring filename);

	void ProcessExpectedHisto(TH1F* hist,RooWorkspace* proto, string pref ix, string productPrefix, string systTerm, double low, double high, int low Bin, int highBin);	void ProcessExpectedHisto(TH1* hist,RooWorkspace* proto, string prefi x, string productPrefix, string systTerm, double low, double high, int lowB in, int highBin);
	void SetObsToExpected(RooWorkspace* proto, string obsPrefix, string e xpPrefix, int lowBin, int highBin);	void SetObsToExpected(RooWorkspace* proto, string obsPrefix, string e xpPrefix, int lowBin, int highBin);
	void FitModel(RooWorkspace *, string, string, string, bool=false );	void FitModel(RooWorkspace *, string, string, string, bool=false );
	std::string FilePrefixStr(std::string);	std::string FilePrefixStr(std::string);


		TH1* MakeScaledUncertaintyHist( const std::string& Name, std::vector< s
		td::pair<TH1,TH1> > HistVec );
		TH1* MakeAbsolUncertaintyHist( const std::string& Name, const TH1* Hist
		);
		RooArgList createStatConstraintTerms( RooWorkspace* proto, vector<strin
		g>& constraintTerms, ParamHistFunc& paramHist, TH1* uncertHist,
		EstimateSummary::ConstraintType ty
		pe, Double_t minSigma );

		inline void SetObsNameVec(const std::vector<std::string>& obsNameVec)
		{ fObsNameVec = obsNameVec; }
		inline void SetObsName(const std::string& obsName) { fObsNameVec.clea
		r(); fObsNameVec.push_back(obsName); fObsName = obsName; }
		inline void AddObsName(const std::string& obsName) { fObsNameVec.push
		_back(obsName); }

	string fFileNamePrefix;	string fFileNamePrefix;
	string fRowTitle;	string fRowTitle;
	vector<string> fSystToFix;	vector<string> fSystToFix;
	double fNomLumi, fLumiError;	double fNomLumi, fLumiError;
	int fLowBin, fHighBin;	int fLowBin, fHighBin;
	std::stringstream fResultsPrefixStr;	std::stringstream fResultsPrefixStr;
	TFile * fOut_f;	TFile * fOut_f;
	FILE * pFile;	FILE * pFile;

	string fObsName;


	ClassDef(RooStats::HistFactory::HistoToWorkspaceFactoryFast,2)	private:

		void GuessObsNameVec(TH1* hist);

		std::vector<std::string> fObsNameVec;
		std::string fObsName;
		vector<string> fPreprocessFunctions;

		ClassDef(RooStats::HistFactory::HistoToWorkspaceFactoryFast,3)
	};	};

	}	}
	}	}

	#endif	#endif

End of changes. 9 change blocks.
	8 lines changed or deleted	36 lines changed or added

	HybridCalculator.h	HybridCalculator.h

	// @(#)root/roostats:$Id: HybridCalculator.h 39513 2011-05-31 17:49:43Z mon eta $	// @(#)root/roostats:$Id: HybridCalculator.h 41998 2011-11-15 10:34:40Z 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 50	skipping to change at line 50
	const ModelConfig &nullModel,	const ModelConfig &nullModel,
	TestStatSampler* sampler=0	TestStatSampler* sampler=0
	) :	) :
	HypoTestCalculatorGeneric(data, altModel, nullModel, sampler),	HypoTestCalculatorGeneric(data, altModel, nullModel, sampler),
	fPriorNuisanceNull(0),	fPriorNuisanceNull(0),
	fPriorNuisanceAlt(0),	fPriorNuisanceAlt(0),
	fNullImportanceDensity(NULL),	fNullImportanceDensity(NULL),
	fNullImportanceSnapshot(NULL),	fNullImportanceSnapshot(NULL),
	fAltImportanceDensity(NULL),	fAltImportanceDensity(NULL),
	fAltImportanceSnapshot(NULL),	fAltImportanceSnapshot(NULL),

	fNToysNull(0),	fNToysNull(-1),
	fNToysAlt(0),	fNToysAlt(-1),
	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;
	}	}


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

	HypoTestInverter.h	HypoTestInverter.h

	// @(#)root/roostats:$Id: HypoTestInverter.h 40096 2011-07-01 10:08:17Z mon eta $	// @(#)root/roostats:$Id: HypoTestInverter.h 41455 2011-10-18 13:23:21Z 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

	skipping to change at line 32	skipping to change at line 32
	class RooRealVar;	class RooRealVar;
	class TGraphErrors;	class TGraphErrors;

	#include <memory>	#include <memory>

	namespace RooStats {	namespace RooStats {

	//class HypoTestCalculator;	//class HypoTestCalculator;
	class HybridCalculator;	class HybridCalculator;
	class FrequentistCalculator;	class FrequentistCalculator;

		class AsymptoticCalculator;
	class HypoTestCalculatorGeneric;	class HypoTestCalculatorGeneric;
	class TestStatistic;	class TestStatistic;

	class HypoTestInverter : public IntervalCalculator {	class HypoTestInverter : public IntervalCalculator {

	public:	public:


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

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

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

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

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


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

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

	virtual HypoTestInverterResult* GetInterval() const;	virtual HypoTestInverterResult* GetInterval() const;

	void Clear();	void Clear();

	// set for a fixed scan in nbins	// set for a fixed scan in nbins

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

	HypoTestInverterPlot.h	HypoTestInverterPlot.h

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

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

	HypoTestPlot.h	HypoTestPlot.h

	// @(#)root/roostats:$Id: HypoTestPlot.h 39391 2011-05-26 09:51:59Z moneta $	// @(#)root/roostats:$Id: HypoTestPlot.h 41251 2011-10-07 09:07:46Z 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

	skipping to change at line 30	skipping to change at line 30

	#ifndef ROOSTATS_HypoTestResult	#ifndef ROOSTATS_HypoTestResult
	#include "RooStats/HypoTestResult.h"	#include "RooStats/HypoTestResult.h"
	#endif	#endif

	namespace RooStats {	namespace RooStats {

	class HypoTestPlot: public SamplingDistPlot {	class HypoTestPlot: public SamplingDistPlot {
	public:	public:
	/// Constructor	/// Constructor

		HypoTestPlot() : SamplingDistPlot() , fHypoTestResult(0) {} // needed for IO
	HypoTestPlot(HypoTestResult& result, Int_t bins=100);	HypoTestPlot(HypoTestResult& result, Int_t bins=100);
	~HypoTestPlot(void) {}	~HypoTestPlot(void) {}

	// Applies a HypoTestResult.	// Applies a HypoTestResult.
	void ApplyResult(HypoTestResult& result);	void ApplyResult(HypoTestResult& result);
	// Set default style options (also called in the constructor that tak es a HypoTestResult).	// Set default style options (also called in the constructor that tak es a HypoTestResult).
	void ApplyDefaultStyle(void);	void ApplyDefaultStyle(void);

	private:	private:
	HypoTestResult *fHypoTestResult;	HypoTestResult *fHypoTestResult;

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

	HypoTestResult.h	HypoTestResult.h

	// @(#)root/roostats:$Id: HypoTestResult.h 39934 2011-06-24 09:15:34Z monet a $	// @(#)root/roostats:$Id: HypoTestResult.h 39928 2011-06-24 08:18:59Z 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. *
	*************************************************************************/	*************************************************************************/

	//_________________________________________________	//_________________________________________________

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

	IFitterTarget.h	IFitterTarget.h

	// @(#)root/tmva $Id: IFitterTarget.h 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: IFitterTarget.h 40005 2011-06-27 15:29:10Z stelzer $
	// 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

	IFunctionfwd.h	IFunctionfwd.h

	// @(#)root/mathcore:$Id: IFunctionfwd.h 40626 2011-08-18 08:34:03Z moneta $	// @(#)root/mathcore:$Id: IFunctionfwd.h 40577 2011-08-12 10:43:12Z moneta $
	// Author: L. Moneta Tue Nov 14 14:38:48 2006	// Author: L. Moneta Tue Nov 14 14:38:48 2006

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

	// Defines Forward declaration for template IFunction class and useful type defs	// Defines Forward declaration for template IFunction class and useful type defs

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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: IMethod.h 40005 2011-06-27 15:29:10Z 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 : 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

	IParamFunctionfwd.h	IParamFunctionfwd.h

	// @(#)root/mathcore:$Id: IParamFunctionfwd.h 40626 2011-08-18 08:34:03Z mo neta $	// @(#)root/mathcore:$Id: IParamFunctionfwd.h 40577 2011-08-12 10:43:12Z mo neta $
	// Author: L. Moneta Tue Nov 14 14:38:52 2006	// Author: L. Moneta Tue Nov 14 14:38:52 2006

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

	// Forward declarations for template class IParamFunction class	// Forward declarations for template class IParamFunction class

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 40012 2011-06-27 16:03:11Z stelzer $	// @(#)root/tmva $Id: Interval.h 40005 2011-06-27 15:29:10Z 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

	KDEKernel.h	KDEKernel.h

	// @(#)root/tmva $Id: KDEKernel.h 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: KDEKernel.h 40005 2011-06-27 15:29:10Z stelzer $
	// 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 39395 2011-05-26 10:05:54Z moneta $	// $Id: LDA.h 40005 2011-06-27 15:29:10Z stelzer $
	/************************************************************************ ******	/************************************************************************ ******
	* 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

	LogLikelihoodFCN.h	LogLikelihoodFCN.h

	// @(#)root/mathcore:$Id: LogLikelihoodFCN.h 37232 2010-12-03 18:09:43Z mon eta $	// @(#)root/mathcore:$Id: LogLikelihoodFCN.h 42007 2011-11-15 13:23:17Z mon eta $
	// Author: L. Moneta Fri Aug 17 14:29:24 2007	// Author: L. Moneta Fri Aug 17 14:29:24 2007

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

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

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

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

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

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

	LogLikelihoodFCN (const UnBinData & data, const IModelFunction & func) :	LogLikelihoodFCN (const UnBinData & data, const IModelFunction & func, i nt weight = 0, bool extended = false) :
	BaseObjFunction(func.NPar(), data.Size() ),	BaseObjFunction(func.NPar(), data.Size() ),

		fIsExtended(extended),
		fWeight(weight),
	fData(data),	fData(data),
	fFunc(func),	fFunc(func),
	fNEffPoints(0),	fNEffPoints(0),
	fGrad ( std::vector<double> ( func.NPar() ) )	fGrad ( std::vector<double> ( func.NPar() ) )
	{}	{}

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

	skipping to change at line 93	skipping to change at line 95
	LogLikelihoodFCN(const LogLikelihoodFCN &);	LogLikelihoodFCN(const LogLikelihoodFCN &);

	/**	/**
	Dummy Assignment operator (private)	Dummy Assignment operator (private)
	*/	*/
	LogLikelihoodFCN & operator = (const LogLikelihoodFCN &);	LogLikelihoodFCN & operator = (const LogLikelihoodFCN &);

	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 LogLikelihoodFCN(fDat a,fFunc); }	virtual BaseFunction * Clone() const { return new LogLikelihoodFCN(fDat a,fFunc,fWeight,fIsExtended); }

	//using BaseObjFunction::operator();	//using BaseObjFunction::operator();

	// 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 contribution and its gradient	/// i-th likelihood contribution 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::EvaluatePdf(fFunc, fData, x, i, g);	return FitUtil::EvaluatePdf(fFunc, fData, x, i, g);

	skipping to change at line 121	skipping to change at line 123

	/// 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 UnBinData & Data() const { return fData; }	virtual const UnBinData & 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; }


		// 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();

	#ifdef ROOT_FIT_PARALLEL	#ifdef ROOT_FIT_PARALLEL
	return FitUtilParallel::EvaluateLogL(fFunc, fData, x, fNEffPoints);	return FitUtilParallel::EvaluateLogL(fFunc, fData, x, fNEffPoints);
	#else	#else

	return FitUtil::EvaluateLogL(fFunc, fData, x, fNEffPoints);	return FitUtil::EvaluateLogL(fFunc, fData, x, fWeight, fIsExtended, f NEffPoints);
	#endif	#endif
	}	}

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

	//data member	//data member

		bool fIsExtended; // flag for indicating if likelihood is extended
		int fWeight; // flag to indicate if needs to evaluate using weight or
		weight squared (default weight = 0)

	const UnBinData & fData;	const UnBinData & 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

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

	};	};


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

	MCFitter.h	MCFitter.h

	// @(#)root/tmva $Id: MCFitter.h 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: MCFitter.h 40005 2011-06-27 15:29:10Z 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 : 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 40961 2011-09-20 17:08:56Z monet a $	// @(#)root/roostats:$Id: MCMCCalculator.h 40959 2011-09-20 16:33:21Z 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

	MaxLikelihoodEstimateTestStat.h	MaxLikelihoodEstimateTestStat.h

	skipping to change at line 52	skipping to change at line 52
	public:	public:

	//__________________________________	//__________________________________
	MaxLikelihoodEstimateTestStat() :	MaxLikelihoodEstimateTestStat() :
	fPdf(NULL),fParameter(NULL), fUpperLimit(true)	fPdf(NULL),fParameter(NULL), fUpperLimit(true)
	{	{
	// constructor	// constructor
	// fPdf = pdf;	// fPdf = pdf;
	// fParameter = parameter;	// fParameter = parameter;


	fMinimizer=ROOT::Math::MinimizerOptions::DefaultMinimizerType().c_st	fMinimizer=::ROOT::Math::MinimizerOptions::DefaultMinimizerType().c_
	r();	str();
	fStrategy=ROOT::Math::MinimizerOptions::DefaultStrategy();	fStrategy=::ROOT::Math::MinimizerOptions::DefaultStrategy();
	fPrintLevel=ROOT::Math::MinimizerOptions::DefaultPrintLevel();	fPrintLevel=::ROOT::Math::MinimizerOptions::DefaultPrintLevel();

	}	}
	//__________________________________	//__________________________________
	MaxLikelihoodEstimateTestStat(RooAbsPdf& pdf, RooRealVar& parameter) :	MaxLikelihoodEstimateTestStat(RooAbsPdf& pdf, RooRealVar& parameter) :
	fPdf(&pdf),fParameter(&parameter), fUpperLimit(true)	fPdf(&pdf),fParameter(&parameter), fUpperLimit(true)
	{	{
	// constructor	// constructor
	// fPdf = pdf;	// fPdf = pdf;
	// fParameter = parameter;	// fParameter = parameter;

	fMinimizer=ROOT::Math::MinimizerOptions::DefaultMinimizerType().c_st	fMinimizer=::ROOT::Math::MinimizerOptions::DefaultMinimizerType().c_
	r();	str();
	fStrategy=ROOT::Math::MinimizerOptions::DefaultStrategy();	fStrategy=::ROOT::Math::MinimizerOptions::DefaultStrategy();
	fPrintLevel=ROOT::Math::MinimizerOptions::DefaultPrintLevel();	fPrintLevel=::ROOT::Math::MinimizerOptions::DefaultPrintLevel();

	}	}

	//______________________________	//______________________________
	virtual Double_t Evaluate(RooAbsData& data, RooArgSet& /nullPOI/) {	virtual Double_t Evaluate(RooAbsData& data, RooArgSet& /nullPOI/) {

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

	/*	/*

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

	MethodANNBase.h	MethodANNBase.h

	// @(#)root/tmva $Id: MethodANNBase.h 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: MethodANNBase.h 40005 2011-06-27 15:29:10Z stelzer $
	// 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 40012 2011-06-27 16:03:11Z stelzer $	// @(#)root/tmva $Id: MethodBDT.h 40005 2011-06-27 15:29:10Z 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

	MethodBase.h	MethodBase.h

	// @(#)root/tmva $Id: MethodBase.h 40024 2011-06-27 17:02:37Z stelzer $	// @(#)root/tmva $Id: MethodBase.h 40005 2011-06-27 15:29:10Z 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 *

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 39395 2011-05-26 10:05:54Z mo neta $	// @(#)root/tmva $Id: MethodBayesClassifier.h 40005 2011-06-27 15:29:10Z st elzer $
	// 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: MethodBoost.h 40005 2011-06-27 15:29:10Z stelzer $
	// 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: MethodCFMlpANN.h 40005 2011-06-27 15:29:10Z 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 : 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 39395 2011-05-26 10:05:54Z mon eta $	// @(#)root/tmva $Id: MethodCFMlpANN_Utils.h 40005 2011-06-27 15:29:10Z ste lzer $
	// 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 39395 2011-05-26 10:05:54Z monet a $	// @(#)root/tmva $Id: MethodCFMlpANN_def.h 40005 2011-06-27 15:29:10Z stelz er $
	// 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: MethodCategory.h 40005 2011-06-27 15:29:10Z stelzer $
	// 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: MethodCommittee.h 40005 2011-06-27 15:29:10Z 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 : 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 39395 2011-05-26 10:05:54Z mone ta $	// @(#)root/tmva $Id: MethodCompositeBase.h 40005 2011-06-27 15:29:10Z stel zer $
	// 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: MethodCuts.h 40005 2011-06-27 15:29:10Z stelzer $
	// 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: MethodDT.h 40005 2011-06-27 15:29:10Z 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 : 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: MethodFDA.h 40005 2011-06-27 15:29:10Z stelzer $
	// 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: MethodFisher.h 40005 2011-06-27 15:29:10Z stelzer $
	// 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: MethodHMatrix.h 40005 2011-06-27 15:29:10Z 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 : 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: MethodKNN.h 40005 2011-06-27 15:29:10Z stelzer $
	// 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: MethodLikelihood.h 40005 2011-06-27 15:29:10Z stelzer $
	// 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: MethodMLP.h 40005 2011-06-27 15:29:10Z stelzer $
	// 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 40027 2011-06-27 17:12:07Z stelzer $	// @(#)root/tmva $Id: MethodPDEFoam.h 40005 2011-06-27 15:29:10Z 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 *

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

	MethodPDERS.h	MethodPDERS.h

	// @(#)root/tmva $Id: MethodPDERS.h 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: MethodPDERS.h 40005 2011-06-27 15:29:10Z stelzer $
	// 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: MethodRuleFit.h 40005 2011-06-27 15:29:10Z stelzer $
	// 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: MethodSVM.h 40005 2011-06-27 15:29:10Z stelzer $
	// 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: MethodTMlpANN.h 40005 2011-06-27 15:29:10Z 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 : 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 40961 2011-09-20 17:08:56Z m oneta $	// @(#)root/roostats:$Id: MetropolisHastings.h 40959 2011-09-20 16:33:21Z 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

	MinuitFitter.h	MinuitFitter.h

	// @(#)root/tmva $Id: MinuitFitter.h 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: MinuitFitter.h 40005 2011-06-27 15:29:10Z stelzer $
	// 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: MinuitWrapper.h 40005 2011-06-27 15:29:10Z 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 : 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 39395 2011-05-26 10:05:54Z m oneta $	// @(#)root/tmva $Id: MisClassificationError.h 40005 2011-06-27 15:29:10Z s telzer $
	// 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

	MnUserParameterState.h	MnUserParameterState.h

	// @(#)root/minuit2:$Id: MnUserParameterState.h 39383 2011-05-26 08:35:47Z moneta $	// @(#)root/minuit2:$Id: MnUserParameterState.h 42202 2011-11-23 17:07:20Z 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 35	skipping to change at line 35
	class which holds the external user and/or internal Minuit representati on	class which holds the external user and/or internal Minuit representati on
	of the parameters and errors;	of the parameters and errors;
	transformation internal <-> external on demand;	transformation internal <-> external on demand;
	*/	*/

	class MnUserParameterState {	class MnUserParameterState {

	public:	public:

	/// default constructor (invalid state)	/// default constructor (invalid state)

	MnUserParameterState() : fValid(false), fCovarianceValid(false), fGCCVal id(false), fFVal(0), fEDM(0), fNFcn(0),	MnUserParameterState() : fValid(false), fCovarianceValid(false), fGCCVal id(false), fCovStatus(-1), fFVal(0), fEDM(0), fNFcn(0),
	fParameters(MnUserParameters()), fCovariance(Mn UserCovariance()),	fParameters(MnUserParameters()), fCovariance(Mn UserCovariance()),
	fIntParameters(std::vector<double>()), fIntCova riance(MnUserCovariance()) {}	fIntParameters(std::vector<double>()), fIntCova riance(MnUserCovariance()) {}

	/// construct from user parameters (before minimization)	/// construct from user parameters (before minimization)
	MnUserParameterState(const std::vector<double>&, const std::vector<doubl e>&);	MnUserParameterState(const std::vector<double>&, const std::vector<doubl e>&);

	MnUserParameterState(const MnUserParameters&);	MnUserParameterState(const MnUserParameters&);

	/// construct from user parameters + covariance (before minimization)	/// construct from user parameters + covariance (before minimization)
	MnUserParameterState(const std::vector<double>&, const std::vector<doubl e>&, unsigned int);	MnUserParameterState(const std::vector<double>&, const std::vector<doubl e>&, unsigned int);

	MnUserParameterState(const std::vector<double>&, const MnUserCovariance& );	MnUserParameterState(const std::vector<double>&, const MnUserCovariance& );

	MnUserParameterState(const MnUserParameters&, const MnUserCovariance&);	MnUserParameterState(const MnUserParameters&, const MnUserCovariance&);

	/// construct from internal parameters (after minimization)	/// construct from internal parameters (after minimization)
	MnUserParameterState(const MinimumState&, double, const MnUserTransforma tion&);	MnUserParameterState(const MinimumState&, double, const MnUserTransforma tion&);

	~MnUserParameterState() {}	~MnUserParameterState() {}


	MnUserParameterState(const MnUserParameterState& state) : fValid(state.f	MnUserParameterState(const MnUserParameterState& state) : fValid(state.f
	Valid), fCovarianceValid(state.fCovarianceValid), fGCCValid(state.fGCCValid	Valid),
	), fFVal(state.fFVal), fEDM(state.fEDM), fNFcn(state.fNFcn), fParameters(st	fCovarianceVal
	ate.fParameters), fCovariance(state.fCovariance), fGlobalCC(state.fGlobalCC	id(state.fCovarianceValid), fGCCValid(state.fGCCValid), fCovStatus(state.fC
	), fIntParameters(state.fIntParameters), fIntCovariance(state.fIntCovarianc	ovStatus),
	e) {}	fFVal(state.fF
		Val), fEDM(state.fEDM), fNFcn(state.fNFcn),
		fParameters(st
		ate.fParameters),
		fCovariance(st
		ate.fCovariance),
		fGlobalCC(stat
		e.fGlobalCC), fIntParameters(state.fIntParameters), fIntCovariance(state.fI
		ntCovariance) {}

	MnUserParameterState& operator=(const MnUserParameterState& state) {	MnUserParameterState& operator=(const MnUserParameterState& state) {
	fValid = state.fValid;	fValid = state.fValid;
	fCovarianceValid = state.fCovarianceValid;	fCovarianceValid = state.fCovarianceValid;
	fGCCValid = state.fGCCValid;	fGCCValid = state.fGCCValid;

		fCovStatus = state.fCovStatus;
	fFVal = state.fFVal;	fFVal = state.fFVal;
	fEDM = state.fEDM;	fEDM = state.fEDM;
	fNFcn = state.fNFcn;	fNFcn = state.fNFcn;
	fParameters = state.fParameters;	fParameters = state.fParameters;
	fCovariance = state.fCovariance;	fCovariance = state.fCovariance;
	fGlobalCC = state.fGlobalCC;	fGlobalCC = state.fGlobalCC;
	fIntParameters = state.fIntParameters;	fIntParameters = state.fIntParameters;
	fIntCovariance = state.fIntCovariance;	fIntCovariance = state.fIntCovariance;
	return *this;	return *this;
	}	}

	skipping to change at line 85	skipping to change at line 91
	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)	// hessian (inverse of covariance matrix)
	MnUserCovariance Hessian() const;	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;}


		// covariance matrix status (0 = not valid, 1 approximate, 2, full but m
		ade pos def, 3 accurate and not pos def
		int CovarianceStatus() const { return fCovStatus; }

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

	double Fval() const {return fFVal;}	double Fval() const {return fFVal;}
	double Edm() const {return fEDM;}	double Edm() const {return fEDM;}
	unsigned int NFcn() const {return fNFcn;}	unsigned int NFcn() const {return fNFcn;}

	skipping to change at line 163	skipping to change at line 172
	unsigned int ExtOfInt(unsigned int) const;	unsigned int ExtOfInt(unsigned int) const;
	unsigned int VariableParameters() const;	unsigned int VariableParameters() const;
	const MnMachinePrecision& Precision() const;	const MnMachinePrecision& Precision() const;
	void SetPrecision(double eps);	void SetPrecision(double eps);

	private:	private:

	bool fValid;	bool fValid;
	bool fCovarianceValid;	bool fCovarianceValid;
	bool fGCCValid;	bool fGCCValid;

		int fCovStatus; // covariance matrix status
	double fFVal;	double fFVal;
	double fEDM;	double fEDM;
	unsigned int fNFcn;	unsigned int fNFcn;

	MnUserParameters fParameters;	MnUserParameters fParameters;
	MnUserCovariance fCovariance;	MnUserCovariance fCovariance;
	MnGlobalCorrelationCoeff fGlobalCC;	MnGlobalCorrelationCoeff fGlobalCC;

	std::vector<double> fIntParameters;	std::vector<double> fIntParameters;
	MnUserCovariance fIntCovariance;	MnUserCovariance fIntCovariance;

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

	ModulekNN.h	ModulekNN.h

	// @(#)root/tmva $Id: ModulekNN.h 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: ModulekNN.h 40005 2011-06-27 15:29:10Z stelzer $
	// 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: MsgLogger.h 40005 2011-06-27 15:29:10Z stelzer $
	// 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

	Node.h	Node.h

	// @(#)root/tmva $Id: Node.h 40012 2011-06-27 16:03:11Z stelzer $	// @(#)root/tmva $Id: Node.h 40005 2011-06-27 15:29:10Z 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: NodekNN.h 40005 2011-06-27 15:29:10Z stelzer $
	// 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

	Option.h	Option.h

	// @(#)root/tmva $Id: Option.h 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: Option.h 40005 2011-06-27 15:29:10Z 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 : 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

	PDEFoam.h	PDEFoam.h

	// @(#)root/tmva $Id: PDEFoam.h 40024 2011-06-27 17:02:37Z stelzer $	// @(#)root/tmva $Id: PDEFoam.h 40005 2011-06-27 15:29:10Z 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 *

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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: PDEFoamCell.h 40005 2011-06-27 15:29:10Z 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: 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 39395 2011-05-26 10:05:54Z mone ta $	// @(#)root/tmva $Id: PDEFoamDecisionTree.h 40005 2011-06-27 15:29:10Z stel zer $
	// 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 39395 2011-05-26 10:05:5 4Z moneta $	// @(#)root/tmva $Id: PDEFoamDecisionTreeDensity.h 40005 2011-06-27 15:29:1 0Z stelzer $
	// 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

	PDEFoamDensityBase.h	PDEFoamDensityBase.h

	// @(#)root/tmva $Id: PDEFoamDensityBase.h 40020 2011-06-27 16:46:42Z stelz er $	// @(#)root/tmva $Id: PDEFoamDensityBase.h 40005 2011-06-27 15:29:10Z 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 *

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 39395 2011-05-26 10:05:54Z mone ta $	// @(#)root/tmva $Id: PDEFoamDiscriminant.h 40005 2011-06-27 15:29:10Z stel zer $
	// 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 39395 2011-05-26 10:05:5 4Z moneta $	// @(#)root/tmva $Id: PDEFoamDiscriminantDensity.h 40005 2011-06-27 15:29:1 0Z 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 *
	* 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: PDEFoamEvent.h 40005 2011-06-27 15:29:10Z 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 *
	* 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 39395 2011-05-26 10:05:54Z mone ta $	// @(#)root/tmva $Id: PDEFoamEventDensity.h 40005 2011-06-27 15:29:10Z stel zer $
	// 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 40020 2011-06-27 16:46:42Z stelze r $	// @(#)root/tmva $Id: PDEFoamKernelBase.h 40005 2011-06-27 15:29:10Z 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 *

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

	PDEFoamKernelGauss.h	PDEFoamKernelGauss.h

	// @(#)root/tmva $Id: PDEFoamKernelGauss.h 40020 2011-06-27 16:46:42Z stelz er $	// @(#)root/tmva $Id: PDEFoamKernelGauss.h 40005 2011-06-27 15:29:10Z 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. *

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

	PDEFoamKernelLinN.h	PDEFoamKernelLinN.h

	// @(#)root/tmva $Id: PDEFoamKernelLinN.h 40020 2011-06-27 16:46:42Z stelze r $	// @(#)root/tmva $Id: PDEFoamKernelLinN.h 40005 2011-06-27 15:29:10Z 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. *

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

	PDEFoamKernelTrivial.h	PDEFoamKernelTrivial.h

	// @(#)root/tmva $Id: PDEFoamKernelTrivial.h 40020 2011-06-27 16:46:42Z ste lzer $	// @(#)root/tmva $Id: PDEFoamKernelTrivial.h 40005 2011-06-27 15:29:10Z 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 *

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

	PDEFoamMultiTarget.h	PDEFoamMultiTarget.h

	// @(#)root/tmva $Id: PDEFoamMultiTarget.h 39395 2011-05-26 10:05:54Z monet a $	// @(#)root/tmva $Id: PDEFoamMultiTarget.h 40005 2011-06-27 15:29:10Z 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: 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: PDEFoamTarget.h 40005 2011-06-27 15:29:10Z 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 *
	* 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 39395 2011-05-26 10:05:54Z mon eta $	// @(#)root/tmva $Id: PDEFoamTargetDensity.h 40005 2011-06-27 15:29:10Z ste lzer $
	// 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: PDEFoamVect.h 40005 2011-06-27 15:29:10Z 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: 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: PDF.h 40005 2011-06-27 15:29:10Z stelzer $
	// 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

	PiecewiseInterpolation.h	PiecewiseInterpolation.h

	skipping to change at line 47	skipping to change at line 47

	// virtual Double_t defaultErrorLevel() const ;	// virtual Double_t defaultErrorLevel() const ;

	// void printMetaArgs(ostream& os) const ;	// void printMetaArgs(ostream& os) const ;

	const RooArgList& lowList() const { return _lowSet ; }	const RooArgList& lowList() const { return _lowSet ; }
	const RooArgList& highList() const { return _highSet ; }	const RooArgList& highList() const { return _highSet ; }
	const RooArgList& paramList() const { return _paramSet ; }	const RooArgList& paramList() const { return _paramSet ; }

	virtual Bool_t forceAnalyticalInt(const RooAbsArg&) const { return kTRUE ; }	virtual Bool_t forceAnalyticalInt(const RooAbsArg&) const { return kTRUE ; }

		Bool_t setBinIntegrator(RooArgSet& allVars) ;

	Int_t getAnalyticalIntegralWN(RooArgSet& allVars, RooArgSet& analVars, co nst RooArgSet* normSet,const char* rangeName=0) const ;	Int_t getAnalyticalIntegralWN(RooArgSet& allVars, RooArgSet& analVars, co nst RooArgSet* normSet,const char* rangeName=0) const ;
	Double_t analyticalIntegralWN(Int_t code, const RooArgSet* normSet, const char* rangeName=0) const ;	Double_t analyticalIntegralWN(Int_t code, const RooArgSet* normSet, const char* rangeName=0) const ;

	void setPositiveDefinite(bool flag=true){_positiveDefinite=flag;}	void setPositiveDefinite(bool flag=true){_positiveDefinite=flag;}


		void setInterpCode(RooAbsReal& param, int code);
		void setAllInterpCodes(int code);
		void printAllInterpCodes();

		virtual std::list<Double_t>* binBoundaries(RooAbsRealLValue& /obs/, Dou
		ble_t /xlo/, Double_t /xhi/) const ;
		virtual std::list<Double_t>* plotSamplingHint(RooAbsRealLValue& obs, Doub
		le_t xlo, Double_t xhi) const ;
		virtual Bool_t isBinnedDistribution(const RooArgSet& obs) const ;

	protected:	protected:

	class CacheElem : public RooAbsCacheElement {	class CacheElem : public RooAbsCacheElement {
	public:	public:
	CacheElem() {} ;	CacheElem() {} ;
	virtual ~CacheElem() {} ;	virtual ~CacheElem() {} ;
	virtual RooArgList containedArgs(Action) {	virtual RooArgList containedArgs(Action) {
	RooArgList ret(_funcIntList) ;	RooArgList ret(_funcIntList) ;
	ret.add(_lowIntList);	ret.add(_lowIntList);
	ret.add(_highIntList);	ret.add(_highIntList);

	skipping to change at line 76	skipping to change at line 86
	RooArgList _highIntList ;	RooArgList _highIntList ;
	// will want vector<RooRealVar*> for low and high also	// will want vector<RooRealVar*> for low and high also
	} ;	} ;
	mutable RooObjCacheManager _normIntMgr ; // The integration cache manager	mutable RooObjCacheManager _normIntMgr ; // The integration cache manager

	RooRealProxy _nominal; // The nominal value	RooRealProxy _nominal; // The nominal value
	RooArgList _ownedList ; // List of owned components	RooArgList _ownedList ; // List of owned components
	RooListProxy _lowSet ; // Low-side variation	RooListProxy _lowSet ; // Low-side variation
	RooListProxy _highSet ; // High-side varaition	RooListProxy _highSet ; // High-side varaition
	RooListProxy _paramSet ; // interpolation parameters	RooListProxy _paramSet ; // interpolation parameters

	mutable TIterator* _paramIter ; //! Iterator over paramSet	RooListProxy _normSet ; // interpolation parameters
	mutable TIterator* _lowIter ; //! Iterator over lowSet
	mutable TIterator* _highIter ; //! Iterator over highSet
	Bool_t _positiveDefinite; // protect against negative and 0 bins.	Bool_t _positiveDefinite; // protect against negative and 0 bins.


		std::vector<int> _interpCode;

	Double_t evaluate() const;	Double_t evaluate() const;


	ClassDef(PiecewiseInterpolation,2) // Sum of RooAbsReal objects	ClassDef(PiecewiseInterpolation,3) // Sum of RooAbsReal objects
	};	};

	#endif	#endif

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

	PoissonLikelihoodFCN.h	PoissonLikelihoodFCN.h

	// @(#)root/mathcore:$Id: PoissonLikelihoodFCN.h 39382 2011-05-26 08:31:43Z moneta $	// @(#)root/mathcore:$Id: PoissonLikelihoodFCN.h 42007 2011-11-15 13:23:17Z 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, int weight = 0) :	PoissonLikelihoodFCN (const BinData & data, const IModelFunction & func, int weight = 0, bool extended = true ) :
	BaseObjFunction(func.NPar(), data.Size() ),	BaseObjFunction(func.NPar(), data.Size() ),

		fIsExtended(extended),
		fWeight(weight),
	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 94	skipping to change at line 95
	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,fWeight); }	virtual BaseFunction * Clone() const { return new PoissonLikelihoodFCN( fData,fFunc,fWeight,fIsExtended); }

	// 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 144	skipping to change at line 145

	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, fWeight, fNEffPo ints);	return FitUtil::EvaluatePoissonLogL(fFunc, fData, x, fWeight, fIsExte nded, fNEffPoints);
	}	}

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


		bool fIsExtended; // flag to indicate if is extended (when false is a Mu
		ltinomial lieklihood), default is true
		int fWeight; // flag to indicate if needs to evaluate using weight or w
		eight squared (default weight = 0)

	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. 8 change blocks.
	8 lines changed or deleted	11 lines changed or added

	ProfileLikelihoodTestStat.h	ProfileLikelihoodTestStat.h

	// @(#)root/roostats:$Id: ProfileLikelihoodTestStat.h 40937 2011-09-19 16:1 6:56Z moneta $	// @(#)root/roostats:$Id: ProfileLikelihoodTestStat.h 42325 2011-11-30 16:4 7:16Z moneta $
	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke	// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke
	// Additional Contributions: Giovanni Petrucciani	// Additional Contributions: Giovanni Petrucciani
	/*************************************************************************	/*************************************************************************
	* 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 49	skipping to change at line 49

	//#include "RooStats/DistributionCreator.h"	//#include "RooStats/DistributionCreator.h"
	#include "RooStats/SamplingDistribution.h"	#include "RooStats/SamplingDistribution.h"
	#include "RooStats/TestStatistic.h"	#include "RooStats/TestStatistic.h"

	#include "RooStats/RooStatsUtils.h"	#include "RooStats/RooStatsUtils.h"

	#include "RooRealVar.h"	#include "RooRealVar.h"
	#include "RooProfileLL.h"	#include "RooProfileLL.h"
	#include "RooNLLVar.h"	#include "RooNLLVar.h"

		#include "RooMsgService.h"

	#include "RooMinuit.h"	#include "RooMinuit.h"
	#include "RooMinimizer.h"	#include "RooMinimizer.h"
	#include "Math/MinimizerOptions.h"	#include "Math/MinimizerOptions.h"

		#include "TStopwatch.h"

	namespace RooStats {	namespace RooStats {

	class ProfileLikelihoodTestStat : public TestStatistic{	class ProfileLikelihoodTestStat : public TestStatistic{

	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;	fReuseNll = false;

	fMinimizer=ROOT::Math::MinimizerOptions::DefaultMinimizerType().c_st	fMinimizer=::ROOT::Math::MinimizerOptions::DefaultMinimizerType().c_
	r();	str();
	fStrategy=ROOT::Math::MinimizerOptions::DefaultStrategy();	fStrategy=::ROOT::Math::MinimizerOptions::DefaultStrategy();
	fPrintLevel=ROOT::Math::MinimizerOptions::DefaultPrintLevel();	fTolerance=TMath::Max(1.,::ROOT::Math::MinimizerOptions::DefaultTol
		erance());
		fPrintLevel=::ROOT::Math::MinimizerOptions::DefaultPrintLevel();

	}	}
	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;	fReuseNll = false;

	fMinimizer=ROOT::Math::MinimizerOptions::DefaultMinimizerType();	fMinimizer=::ROOT::Math::MinimizerOptions::DefaultMinimizerType().c_
	fStrategy=ROOT::Math::MinimizerOptions::DefaultStrategy();	str();
	fPrintLevel=ROOT::Math::MinimizerOptions::DefaultPrintLevel();	fStrategy=::ROOT::Math::MinimizerOptions::DefaultStrategy();
		// avoid default tolerance to be too small (1. is default in RooMini
		mizer)
		fTolerance=TMath::Max(1.,::ROOT::Math::MinimizerOptions::DefaultTole
		rance());
		fPrintLevel=::ROOT::Math::MinimizerOptions::DefaultPrintLevel();
	}	}
	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 ; }	static void SetAlwaysReuseNLL(Bool_t flag) { fgAlwaysReuseNll = flag ; }
	void SetReuseNLL(Bool_t flag) { fReuseNll = flag ; }	void SetReuseNLL(Bool_t flag) { fReuseNll = flag ; }

	void SetMinimizer(const char* minimizer){ fMinimizer=minimizer;}	void SetMinimizer(const char* minimizer){ fMinimizer=minimizer;}
	void SetStrategy(Int_t strategy){fStrategy=strategy;}	void SetStrategy(Int_t strategy){fStrategy=strategy;}

		void SetTolerance(double tol){fTolerance=tol;}
	void SetPrintLevel(Int_t printlevel){fPrintLevel=printlevel;}	void SetPrintLevel(Int_t printlevel){fPrintLevel=printlevel;}

	// 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) {	return EvaluateProfileLikelihood(0, data, paramsOfInterest);
	cout << "problem with data" << endl;
	return 0 ;
	}

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

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

	// simple
	Bool_t reuse=(fReuseNll \|\| fgAlwaysReuseNll) ;

	Bool_t created(kFALSE) ;
	if (!reuse \|\| fNll==0) {
	RooArgSet* allParams = fPdf->getParameters(data);
	RooStats::RemoveConstantParameters(allParams);

	// need to call constrain for RooSimultaneous until stripDisconne
	cted problem fixed
	fNll = (RooNLLVar*) fPdf->createNLL(data, RooFit::CloneData(kFALS
	E),RooFit::Constrain(*allParams));

	// fNll = (RooNLLVar*) fPdf->createNLL(data, RooFit::CloneData
	(kFALSE));
	// fProfile = (RooProfileLL*) fNll->createProfile(paramsOfInte
	rest);
	created = kTRUE ;
	delete allParams;
	//cout << "creating profile LL " << fNll << " " << fProfile << "
	data = " << &data << endl ;
	}
	if (reuse && !created) {
	//cout << "reusing profile LL " << fNll << " new data = " << &dat
	a << endl ;
	fNll->setData(data,kFALSE) ;
	// if (fProfile) delete fProfile ;
	// fProfile = (RooProfileLL*) fNll->createProfile(paramsOfInte
	rest) ;
	//fProfile->clearAbsMin() ;
	}

	// make sure we set the variables attached to this nll
	RooArgSet* attachedSet = fNll->getVariables();

	*attachedSet = paramsOfInterest;
	RooArgSet* origAttachedSet = (RooArgSet*) attachedSet->snapshot();

	////////////////////////////////////////////////////////////////////
	///
	// Main profiling version as of 5.30
	// fPdf->setEvalErrorLoggingMode(RooAbsReal::CountErrors);
	// profile->setEvalErrorLoggingMode(RooAbsReal::CountErrors);
	// ((RooProfileLL*)profile)->nll().setEvalErrorLoggingMode(Roo
	AbsReal::CountErrors);
	// nll->setEvalErrorLoggingMode(RooAbsReal::CountErrors);
	//cout << "evaluating profile LL" << endl ;

	// double ret = fProfile->getVal(); // previous main evaluatio
	n

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

	////////////////////////////////////////////////////////////////////
	///
	// New profiling based on RooMinimizer (allows for Minuit2)
	// based on major speed increases seen by CMS for complex problems

	/*
	// set the parameters of interest to be fixed for the conditional ML
	E
	TIterator* it = paramsOfInterest.createIterator();
	RooRealVar* tmpPar = NULL, *tmpParA=NULL;
	while((tmpPar = (RooRealVar*)it->Next())){
	tmpParA = ((RooRealVar*)attachedSet->find(tmpPar->GetName()));
	tmpParA->setConstant();
	}

	// cout <<"using Minimizer: "<< fMinimizer<< " with strategy =
	" << fStrategy << endl;

	// get the numerator
	int statusN;
	double condML = GetMinNLL(statusN);

	// set the parameters of interest back to floating
	it->Reset();
	while((tmpPar = (RooRealVar*)it->Next())){
	tmpParA = ((RooRealVar*)attachedSet->find(tmpPar->GetName()));
	tmpParA->setConstant(false);
	}
	delete it;

	// get the denominator
	int statusD;
	double uncondML = GetMinNLL(statusD);
	*/

	// other order
	// get the numerator
	RooArgSet* snap = (RooArgSet*)paramsOfInterest.snapshot();
	// get the denominator
	int statusD;
	double uncondML = GetMinNLL(statusD);

	// get best fit value for one-sided interval
	double fit_favored_mu = attachedSet->getRealValue(firstPOI->GetName(
	)) ;

	double ret = 0;
	int statusN = 0;

	// do the conditional ML (the numerator) only when fit value is smal
	ler than test value
	if (!fOneSided \|\| fit_favored_mu <= initial_mu_value) {

	// cout <<" reestablish snapshot"<<endl;
	attachedSet = snap;

	// in case no nuisance parameters are present
	// no need to minimize just evaluate the nll
	double condML = 0;

	// set the POI to constant
	RooLinkedListIter it = paramsOfInterest.iterator();
	RooRealVar* tmpPar = NULL, *tmpParA=NULL;
	while((tmpPar = (RooRealVar*)it.Next())){
	tmpParA = ((RooRealVar*)attachedSet->find(tmpPar->GetName()))
	;
	tmpParA->setConstant();
	}

	// check if there are non-const parameters so it is worth to do t
	he minimization
	RooArgSet allParams(*attachedSet);
	RooStats::RemoveConstantParameters(&allParams);

	if (allParams.getSize() == 0 ) {
	condML = fNll->getVal();
	}
	else {
	condML = GetMinNLL(statusN);
	}

	ret=condML-uncondML;
	}

	// need to restore the values ?
	attachedSet = origAttachedSet;

	delete attachedSet;
	delete origAttachedSet;
	delete snap;

	if (!reuse) {
	delete fNll;
	fNll = 0;
	// delete fProfile;
	fProfile = 0 ;
	}

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

	if(statusN!=0 \|\| statusD!=0)
	ret= -1; // indicate failed fit

	return ret;

	}	}


		// evaluate the profile likelihood ratio (type = 0) or the minimum of
		likelihood (type=1) or the conditional LL (type = 2)
		virtual Double_t EvaluateProfileLikelihood(int type, RooAbsData &data,
		RooArgSet & paramsOfInterest);

	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:

	double GetMinNLL(int& status) {


	RooMinimizer minim(*fNll);	double GetMinNLL(int& status);
	minim.setStrategy(fStrategy);
	//LM: RooMinimizer.setPrintLevel has +1 offset - so subtruct here
	-1
	minim.setPrintLevel(fPrintLevel-1);
	// minim.optimizeConst(true);
	for (int tries = 0, maxtries = 4; tries <= maxtries; ++tries) {
	// status = minim.minimize(fMinimizer, ROOT::Math::MinimizerOp
	tions::DefaultMinimizerAlgo().c_str());
	status = minim.minimize(fMinimizer, "Minimize");
	if (status == 0) {
	break;
	} else {
	if (tries > 1) {
	printf(" ----> Doing a re-scan first\n");
	minim.minimize(fMinimizer,"Scan");
	}
	if (tries > 2) {
	printf(" ----> trying with strategy = 1\n");
	minim.setStrategy(1);
	}
	}
	}
	// cout <<"fNll = " << fNll->getVal()<<endl;
	return fNll->getVal();
	}

	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 ;	static Bool_t fgAlwaysReuseNll ;
	Bool_t fReuseNll ;	Bool_t fReuseNll ;
	TString fMinimizer;	TString fMinimizer;
	Int_t fStrategy;	Int_t fStrategy;

		Double_t fTolerance;
	Int_t fPrintLevel;	Int_t fPrintLevel;

	protected:	protected:

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

	#endif	#endif

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

	ProofConfig.h	ProofConfig.h

	// @(#)root/roostats:$Id: ProofConfig.h 39934 2011-06-24 09:15:34Z moneta $	// @(#)root/roostats:$Id: ProofConfig.h 39928 2011-06-24 08:18: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_ProofConfig	#ifndef ROOSTATS_ProofConfig
	#define ROOSTATS_ProofConfig	#define ROOSTATS_ProofConfig

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.30/06"	#define ROOT_RELEASE "5.32/00"
	#define ROOT_RELEASE_DATE "Jan 10 2012"	#define ROOT_RELEASE_DATE "Dec 2 2011"
	#define ROOT_RELEASE_TIME "15:46:02"	#define ROOT_RELEASE_TIME "12:17:48"
	#define ROOT_SVN_REVISION 42572	#define ROOT_SVN_REVISION 42372
	#define ROOT_SVN_BRANCH "branches/v5-30-00-patches"	#define ROOT_SVN_BRANCH "branches/v5-32-00-patches"
	#define ROOT_VERSION_CODE 335366	#define ROOT_VERSION_CODE 335872
	#define ROOT_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))	#define ROOT_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))

	#endif	#endif

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

	Ranking.h	Ranking.h

	// @(#)root/tmva $Id: Ranking.h 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: Ranking.h 40005 2011-06-27 15:29:10Z 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 : 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 39391 2011-0 5-26 09:51:59Z moneta $	// @(#)root/roostats:$Id: RatioOfProfiledLikelihoodsTestStat.h 42325 2011-1 1-30 16:47:16Z 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

	skipping to change at line 35	skipping to change at line 35
	#endif	#endif

	#ifndef ROO_NLL_VAR	#ifndef ROO_NLL_VAR
	#include "RooNLLVar.h"	#include "RooNLLVar.h"
	#endif	#endif

	#ifndef ROOSTATS_TestStatistic	#ifndef ROOSTATS_TestStatistic
	#include "RooStats/TestStatistic.h"	#include "RooStats/TestStatistic.h"
	#endif	#endif


		#ifndef ROOSTATS_ProfileLikelihoodTestStat
		#include "RooStats/ProfileLikelihoodTestStat.h"
		#endif

	namespace RooStats {	namespace RooStats {

	class RatioOfProfiledLikelihoodsTestStat: public TestStatistic {	class RatioOfProfiledLikelihoodsTestStat: public TestStatistic {

	public:	public:

	RatioOfProfiledLikelihoodsTestStat() :	RatioOfProfiledLikelihoodsTestStat() :

	fNullPdf(NULL),	fNullProfile(),
	fAltPdf(NULL),	fAltProfile(),
	fAltPOI(NULL),	fAltPOI(NULL),
	fSubtractMLE(true)	fSubtractMLE(true)
	{	{
	// Proof constructor. Don't use.	// Proof constructor. Don't use.
	}	}

	RatioOfProfiledLikelihoodsTestStat(RooAbsPdf& nullPdf, RooAbsPdf& altPdf,	RatioOfProfiledLikelihoodsTestStat(RooAbsPdf& nullPdf, RooAbsPdf& altPdf,
	const RooArgSet* altPOI=0) :	const RooArgSet* altPOI=0) :

	fNullPdf(&nullPdf), fAltPdf(&altPdf), fSubtractMLE(true)	fNullProfile(nullPdf),
		fAltProfile(altPdf),
		fSubtractMLE(true)
	{	{
	/*	/*
	Calculates the ratio of profiled likelihoods.	Calculates the ratio of profiled likelihoods.

	By default the calculation is:	By default the calculation is:

	Lambda(mu_alt , conditional MLE for alt nuisance)	Lambda(mu_alt , conditional MLE for alt nuisance)
	log --------------------------------------------	log --------------------------------------------
	Lambda(mu_null , conditional MLE for null nuisance)	Lambda(mu_null , conditional MLE for null nuisance)


	skipping to change at line 116	skipping to change at line 122

	delete attachedSet;	delete attachedSet;
	delete profile;	delete profile;
	delete nll;	delete nll;

	return nllVal;	return nllVal;
	}	}

	//__________________________________________	//__________________________________________
	virtual Double_t Evaluate(RooAbsData& data, RooArgSet& nullParamsOfInte rest) {	virtual Double_t Evaluate(RooAbsData& data, RooArgSet& nullParamsOfInte rest) {

	RooFit::MsgLevel msglevel = RooMsgService::instance().globalKillBelow	// evaluate the ratio of profile likelihood
	();
	RooMsgService::instance().setGlobalKillBelow(RooFit::FATAL);


	/*	int type = (fSubtractMLE) ? 0 : 2;
	// construct allVars
	RooArgSet *allVars = fNullPdf->getVariables();
	RooArgSet *altVars = fAltPdf->getVariables();
	allVars->add(*altVars);
	delete altVars;


	RooArgSet saveNullPOI = (RooArgSet)nullParamsOfInterest.snapshot();	// null
	RooArgSet saveAll = (RooArgSet)allVars->snapshot();	double nullNLL = fNullProfile.EvaluateProfileLikelihood(type, data,
	*/	nullParamsOfInterest);

	// null
	double nullNLL = ProfiledLikelihood(data, nullParamsOfInterest, *fNul
	lPdf);

	// alt	// alt

	double altNLL = ProfiledLikelihood(data, fAltPOI, fAltPdf);	double altNLL = fAltProfile.EvaluateProfileLikelihood(type, data, *f AltPOI);

	/*	/*
	// set variables back to where they were	// set variables back to where they were
	nullParamsOfInterest = *saveNullPOI;	nullParamsOfInterest = *saveNullPOI;
	allVars = saveAll;	allVars = saveAll;
	delete saveAll;	delete saveAll;
	delete allVars;	delete allVars;
	*/	*/


	RooMsgService::instance().setGlobalKillBelow(msglevel);
	return nullNLL -altNLL;	return nullNLL -altNLL;
	}	}


	virtual const TString GetVarName() const { return "log(L(#mu_{1},#hat{#	static void SetAlwaysReuseNLL(Bool_t flag) { fgAlwaysReuseNll = flag ; }
	nu}_{1}) / L(#mu_{0},#hat{#nu}_{0}))"; }
		void SetReuseNLL(Bool_t flag) {
		fNullProfile.SetReuseNLL(flag);
		fAltProfile.SetReuseNLL(flag);
		}

		void SetMinimizer(const char* minimizer){
		fNullProfile.SetMinimizer(minimizer);
		fAltProfile.SetMinimizer(minimizer);
		}
		void SetStrategy(Int_t strategy){
		fNullProfile.SetStrategy(strategy);
		fAltProfile.SetStrategy(strategy);
		}
		void SetTolerance(Double_t tol){
		fNullProfile.SetTolerance(tol);
		fAltProfile.SetTolerance(tol);
		}
		void SetPrintLevel(Int_t printLevel){
		fNullProfile.SetPrintLevel(printLevel);
		fAltProfile.SetPrintLevel(printLevel);
		}

		virtual const TString GetVarName() const { return "log(L(#mu_{1},#hat{#n
		u}_{1}) / L(#mu_{0},#hat{#nu}_{0}))"; }

	// const bool PValueIsRightTail(void) { return false; } // overwrite s default	// const bool PValueIsRightTail(void) { return false; } // overwrite s default

	void SetSubtractMLE(bool subtract){fSubtractMLE = subtract;}	void SetSubtractMLE(bool subtract){fSubtractMLE = subtract;}

	private:	private:

	RooAbsPdf* fNullPdf;	ProfileLikelihoodTestStat fNullProfile;
	RooAbsPdf* fAltPdf;	ProfileLikelihoodTestStat fAltProfile;
	RooArgSet* fAltPOI;	RooArgSet* fAltPOI;
	Bool_t fSubtractMLE;	Bool_t fSubtractMLE;

		static Bool_t fgAlwaysReuseNll ;

	protected:	protected:

	ClassDef(RatioOfProfiledLikelihoodsTestStat,2)	ClassDef(RatioOfProfiledLikelihoodsTestStat,3)
	};	};

	}	}

	#endif	#endif

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

	Reader.h	Reader.h

	// @(#)root/tmva $Id: Reader.h 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: Reader.h 40005 2011-06-27 15:29:10Z 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 : 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 39395 2011-05-26 10:05:54Z monet a $	// @(#)root/tmva $Id: RegressionVariance.h 40005 2011-06-27 15:29:10Z stelz er $
	// 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: Results.h 40005 2011-06-27 15:29:10Z 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 : 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 39395 2011-05-26 10:05:54Z mo neta $	// @(#)root/tmva $Id: ResultsClassification.h 40005 2011-06-27 15:29:10Z st elzer $
	// 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: ResultsMulticlass.h 40005 2011-06-27 15:29:10Z stelze r $
	// 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: ResultsRegression.h 40005 2011-06-27 15:29:10Z stelze r $
	// 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 26	skipping to change at line 26
	#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 "TRefArray.h"
	#include "RooPrintable.h"	#include "RooPrintable.h"
	#include "RooRefCountList.h"	#include "RooRefCountList.h"
	#include "RooAbsCache.h"	#include "RooAbsCache.h"

		#include "RooLinkedListIter.h"
		#include "RooNameReg.h"
	#include <map>	#include <map>
	#include <set>	#include <set>
	#include <deque>	#include <deque>


		#include <iostream>
		using namespace std ;
		#include "TClass.h"

	class TTree ;	class TTree ;
	class RooArgSet ;	class RooArgSet ;
	class RooAbsCollection ;	class RooAbsCollection ;
	class RooTreeData ;	class RooTreeData ;
	class RooTreeDataStore ;	class RooTreeDataStore ;

		class RooVectorDataStore ;
	class RooAbsData ;	class RooAbsData ;
	class RooAbsDataStore ;	class RooAbsDataStore ;
	class RooAbsProxy ;	class RooAbsProxy ;
	class RooArgProxy ;	class RooArgProxy ;
	class RooSetProxy ;	class RooSetProxy ;
	class RooListProxy ;	class RooListProxy ;
	class RooExpensiveObjectCache ;	class RooExpensiveObjectCache ;
	class RooWorkspace ;	class RooWorkspace ;

		class RooRealProxy ;
	/* class TGraphStruct ; */	/* class TGraphStruct ; */

	class RooAbsArg : public TNamed, public RooPrintable {	class RooAbsArg : public TNamed, public RooPrintable {
	public:	public:

	// Constructors, cloning and assignment	// Constructors, cloning and assignment
	RooAbsArg() ;	RooAbsArg() ;
	virtual ~RooAbsArg();	virtual ~RooAbsArg();
	RooAbsArg(const char name, const char title);	RooAbsArg(const char name, const char title);
	RooAbsArg(const RooAbsArg& other, const char* name=0) ;	RooAbsArg(const RooAbsArg& other, const char* name=0) ;
	virtual TObject* clone(const char* newname) const = 0 ;	virtual TObject* clone(const char* newname) const = 0 ;
	virtual TObject* Clone(const char* newname=0) const {	virtual TObject* Clone(const char* newname=0) const {
	return clone(newname?newname:GetName()) ;	return clone(newname?newname:GetName()) ;
	}	}
	virtual RooAbsArg* cloneTree(const char* newname=0) const ;	virtual RooAbsArg* cloneTree(const char* newname=0) const ;

	// Accessors to client-server relation information	// Accessors to client-server relation information
	virtual Bool_t isDerived() const {	virtual Bool_t isDerived() const {
	// Does value or shape of this arg depend on any other arg?	// Does value or shape of this arg depend on any other arg?

	return (_serverList.GetSize()>0 \|\| _proxyList.GetSize()>0)?kTRUE:kFALSE	return kTRUE ;
	;	//cout << IsA()->GetName() << "::isDerived(" << GetName() << ") = " <<
		(_serverList.GetSize()>0 \|\| _proxyList.GetSize()>0) << endl ;
		//return (_serverList.GetSize()>0 \|\| _proxyList.GetSize()>0)?kTRUE:kFAL
		SE;
	}	}
	Bool_t isCloneOf(const RooAbsArg& other) const ;	Bool_t isCloneOf(const RooAbsArg& other) const ;
	Bool_t dependsOnValue(const RooAbsCollection& serverList, const RooAbsArg * ignoreArg=0) const {	Bool_t dependsOnValue(const RooAbsCollection& serverList, const RooAbsArg * ignoreArg=0) const {
	// Does this arg depend on the value of any of of the values in serverL ist?	// Does this arg depend on the value of any of of the values in serverL ist?
	return dependsOn(serverList,ignoreArg,kTRUE) ;	return dependsOn(serverList,ignoreArg,kTRUE) ;
	}	}
	Bool_t dependsOnValue(const RooAbsArg& server, const RooAbsArg* ignoreArg =0) const {	Bool_t dependsOnValue(const RooAbsArg& server, const RooAbsArg* ignoreArg =0) const {
	// Does this arg depend on the value of server?	// Does this arg depend on the value of server?
	return dependsOn(server,ignoreArg,kTRUE) ;	return dependsOn(server,ignoreArg,kTRUE) ;
	}	}

	skipping to change at line 94	skipping to change at line 104
	}	}
	inline TIterator* shapeClientIterator() const {	inline TIterator* shapeClientIterator() const {
	// Return iterator over all shape client RooAbsArgs	// Return iterator over all shape client RooAbsArgs
	return _clientListShape.MakeIterator() ;	return _clientListShape.MakeIterator() ;
	}	}
	inline TIterator* serverIterator() const {	inline TIterator* serverIterator() const {
	// Return iterator over all server RooAbsArgs	// Return iterator over all server RooAbsArgs
	return _serverList.MakeIterator() ;	return _serverList.MakeIterator() ;
	}	}


		inline RooFIter valueClientMIterator() const { return _clientListValue.fw
		dIterator() ; }
		inline RooFIter shapeClientMIterator() const { return _clientListShape.fw
		dIterator() ; }
		inline RooFIter serverMIterator() const { return _serverList.fwdIterator(
		) ; }

	inline RooAbsArg* findServer(const char *name) const {	inline RooAbsArg* findServer(const char *name) const {
	// Return server of this arg with given name. Returns null if not found	// Return server of this arg with given name. Returns null if not found
	return (RooAbsArg*)_serverList.FindObject(name);	return (RooAbsArg*)_serverList.FindObject(name);
	}	}
	inline RooAbsArg* findServer(const RooAbsArg& arg) const {	inline RooAbsArg* findServer(const RooAbsArg& arg) const {
	// Return server of this arg with name of given input arg. Returns null if not found	// Return server of this arg with name of given input arg. Returns null if not found

	return (RooAbsArg*)_serverList.FindObject(&arg);	return (RooAbsArg*)_serverList.findArg(&arg);
	}	}
	inline RooAbsArg* findServer(Int_t index) const {	inline RooAbsArg* findServer(Int_t index) const {
	// Return i-th server from server list	// Return i-th server from server list
	return (RooAbsArg*)_serverList.At(index);	return (RooAbsArg*)_serverList.At(index);
	}	}
	inline Bool_t isValueServer(const RooAbsArg& arg) const {	inline Bool_t isValueServer(const RooAbsArg& arg) const {
	// If true, arg is a value server of self	// If true, arg is a value server of self

	return _clientListValue.FindObject(&arg)?kTRUE:kFALSE ;	return _clientListValue.findArg(&arg)?kTRUE:kFALSE ;
	}	}
	inline Bool_t isValueServer(const char* name) const {	inline Bool_t isValueServer(const char* name) const {
	// If true, we have a server with given name	// If true, we have a server with given name
	return _clientListValue.FindObject(name)?kTRUE:kFALSE ;	return _clientListValue.FindObject(name)?kTRUE:kFALSE ;
	}	}
	inline Bool_t isShapeServer(const RooAbsArg& arg) const {	inline Bool_t isShapeServer(const RooAbsArg& arg) const {
	// If true arg is a shape server of self	// If true arg is a shape server of self

	return _clientListShape.FindObject(&arg)?kTRUE:kFALSE ;	return _clientListShape.findArg(&arg)?kTRUE:kFALSE ;
	}	}
	inline Bool_t isShapeServer(const char* name) const {	inline Bool_t isShapeServer(const char* name) const {
	// If true, we have a shape server with given name	// If true, we have a shape server with given name
	return _clientListShape.FindObject(name)?kTRUE:kFALSE ;	return _clientListShape.FindObject(name)?kTRUE:kFALSE ;
	}	}
	void leafNodeServerList(RooAbsCollection* list, const RooAbsArg* arg=0, B ool_t recurseNonDerived=kFALSE) const ;	void leafNodeServerList(RooAbsCollection* list, const RooAbsArg* arg=0, B ool_t recurseNonDerived=kFALSE) const ;
	void branchNodeServerList(RooAbsCollection* list, const RooAbsArg* arg=0, Bool_t recurseNonDerived=kFALSE) const ;	void branchNodeServerList(RooAbsCollection* list, const RooAbsArg* arg=0, Bool_t recurseNonDerived=kFALSE) const ;
	void treeNodeServerList(RooAbsCollection* list, const RooAbsArg* arg=0,	void treeNodeServerList(RooAbsCollection* list, const RooAbsArg* arg=0,
	Bool_t doBranch=kTRUE, Bool_t doLeaf=kTRUE,	Bool_t doBranch=kTRUE, Bool_t doLeaf=kTRUE,
	Bool_t valueOnly=kFALSE, Bool_t recurseNonDerived= kFALSE) const ;	Bool_t valueOnly=kFALSE, Bool_t recurseNonDerived= kFALSE) const ;

	skipping to change at line 252	skipping to change at line 266

	// Sorting	// Sorting
	Int_t Compare(const TObject* other) const ;	Int_t Compare(const TObject* other) const ;
	virtual Bool_t IsSortable() const {	virtual Bool_t IsSortable() const {
	// Object is sortable in ROOT container class	// Object is sortable in ROOT container class
	return kTRUE ;	return kTRUE ;
	}	}

	//Debug hooks	//Debug hooks
	static void verboseDirty(Bool_t flag) ;	static void verboseDirty(Bool_t flag) ;

	static void copyList(TList& dest, const TList& source) ;
	void printDirty(Bool_t depth=kTRUE) const ;	void printDirty(Bool_t depth=kTRUE) const ;

	static void setDirtyInhibit(Bool_t flag) ;	static void setDirtyInhibit(Bool_t flag) ;

	static void setACleanADirty(Bool_t flag) ;

	virtual Bool_t operator==(const RooAbsArg& other) = 0 ;	virtual Bool_t operator==(const RooAbsArg& other) = 0 ;

	// Range management	// Range management
	virtual Bool_t inRange(const char*) const {	virtual Bool_t inRange(const char*) const {
	// Is value in range (dummy interface always returns true)	// Is value in range (dummy interface always returns true)
	return kTRUE ;	return kTRUE ;
	}	}
	virtual Bool_t hasRange(const char*) const {	virtual Bool_t hasRange(const char*) const {
	// Has this argument a defined range (dummy interface always returns fl ase)	// Has this argument a defined range (dummy interface always returns fl ase)

	skipping to change at line 283	skipping to change at line 295

	// Cache mode optimization (tracks changes & do lazy evaluation vs evalua te always)	// Cache mode optimization (tracks changes & do lazy evaluation vs evalua te always)
	virtual void optimizeCacheMode(const RooArgSet& observables) ;	virtual void optimizeCacheMode(const RooArgSet& observables) ;
	virtual void optimizeCacheMode(const RooArgSet& observables, RooArgSet& o ptNodes, RooLinkedList& processedNodes) ;	virtual void optimizeCacheMode(const RooArgSet& observables, RooArgSet& o ptNodes, RooLinkedList& processedNodes) ;

	// Find constant terms in expression	// Find constant terms in expression
	Bool_t findConstantNodes(const RooArgSet& observables, RooArgSet& cacheLi st) ;	Bool_t findConstantNodes(const RooArgSet& observables, RooArgSet& cacheLi st) ;
	Bool_t findConstantNodes(const RooArgSet& observables, RooArgSet& cacheLi st, RooLinkedList& processedNodes) ;	Bool_t findConstantNodes(const RooArgSet& observables, RooArgSet& cacheLi st, RooLinkedList& processedNodes) ;

	// constant term optimization	// constant term optimization

	virtual void constOptimizeTestStatistic(ConstOpCode opcode) ;	virtual void constOptimizeTestStatistic(ConstOpCode opcode, Bool_t doAlso TrackingOpt=kTRUE) ;

	void graphVizTree(const char* fileName, const char* delimiter="\n", bool useTitle=false, bool useLatex=false) ;	void graphVizTree(const char* fileName, const char* delimiter="\n", bool useTitle=false, bool useLatex=false) ;
	void graphVizTree(ostream& os, const char* delimiter="\n", bool useTitle= false, bool useLatex=false) ;	void graphVizTree(ostream& os, const char* delimiter="\n", bool useTitle= false, bool useLatex=false) ;

	/* TGraphStruct* graph(Bool_t useFactoryTag=kFALSE, Double_t textSize=0.0 3) ; */	/* TGraphStruct* graph(Bool_t useFactoryTag=kFALSE, Double_t textSize=0.0 3) ; */

	void printComponentTree(const char* indent="",const char* namePat=0, Int_ t nLevel=999) ;	void printComponentTree(const char* indent="",const char* namePat=0, Int_ t nLevel=999) ;
	void printCompactTree(const char* indent="",const char* fileName=0, const char* namePat=0, RooAbsArg* client=0) ;	void printCompactTree(const char* indent="",const char* fileName=0, const char* namePat=0, RooAbsArg* client=0) ;
	void printCompactTree(ostream& os, const char* indent="", const char* nam ePat=0, RooAbsArg* client=0) ;	void printCompactTree(ostream& os, const char* indent="", const char* nam ePat=0, RooAbsArg* client=0) ;
	virtual void printCompactTreeHook(ostream& os, const char *ind="") ;	virtual void printCompactTreeHook(ostream& os, const char *ind="") ;

	// Dirty state accessor	// Dirty state accessor
	inline Bool_t isShapeDirty() const {	inline Bool_t isShapeDirty() const {
	// Return true is shape has been invalidated by server value change	// Return true is shape has been invalidated by server value change
	return isDerived()?_shapeDirty:kFALSE ;	return isDerived()?_shapeDirty:kFALSE ;
	}	}


	inline Bool_t isValueDirty() const {	inline Bool_t isValueDirty() const {
	// Returns true of value has been invalidated by server value change	// Returns true of value has been invalidated by server value change
	if (inhibitDirty()) return kTRUE ;	if (inhibitDirty()) return kTRUE ;
	switch(_operMode) {	switch(_operMode) {

	case AClean: return flipAClean() ;	case AClean:
	case ADirty: return kTRUE ;	return kFALSE ;
	case Auto: return (isDerived()?_valueDirty:kFALSE) ;	case ADirty:
		return kTRUE ;
		case Auto:
		if (_valueDirty) return isDerived() ;
		return kFALSE ;
	}	}
	return kTRUE ; // we should never get here	return kTRUE ; // we should never get here
	}	}


		inline Bool_t isValueDirtyAndClear() const {
		// Returns true of value has been invalidated by server value change
		if (inhibitDirty()) return kTRUE ;
		switch(_operMode) {
		case AClean:
		return kFALSE ;
		case ADirty:
		return kTRUE ;
		case Auto:
		if (_valueDirty) {
		_valueDirty = kFALSE ;
		return isDerived();
		}
		return kFALSE ;
		}
		return kTRUE ; // But we should never get here
		}

		inline Bool_t isValueOrShapeDirtyAndClear() const {
		// Returns true of value has been invalidated by server value change

		if (inhibitDirty()) return kTRUE ;
		switch(_operMode) {
		case AClean:
		return kFALSE ;
		case ADirty:
		return kTRUE ;
		case Auto:
		if (_valueDirty \|\| _shapeDirty) {
		_shapeDirty = kFALSE ;
		_valueDirty = kFALSE ;
		return isDerived();
		}
		_shapeDirty = kFALSE ;
		_valueDirty = kFALSE ;
		return kFALSE ;
		}
		return kTRUE ; // But we should never get here
		}

	// Cache management	// Cache management
	void registerCache(RooAbsCache& cache) ;	void registerCache(RooAbsCache& cache) ;
	void unRegisterCache(RooAbsCache& cache) ;	void unRegisterCache(RooAbsCache& cache) ;
	Int_t numCaches() const ;	Int_t numCaches() const ;
	RooAbsCache* getCache(Int_t index) const ;	RooAbsCache* getCache(Int_t index) const ;

	enum OperMode { Auto=0, AClean=1, ADirty=2 } ;	enum OperMode { Auto=0, AClean=1, ADirty=2 } ;

	inline OperMode operMode() const { return _operMode==AClean ? (flipAClean () ? ADirty : AClean ) : _operMode ; }	inline OperMode operMode() const { return _operMode ; }
	void setOperMode(OperMode mode, Bool_t recurseADirty=kTRUE) ;	void setOperMode(OperMode mode, Bool_t recurseADirty=kTRUE) ;

	static UInt_t crc32(const char* data) ;	static UInt_t crc32(const char* data) ;

	Bool_t addOwnedComponents(const RooArgSet& comps) ;	Bool_t addOwnedComponents(const RooArgSet& comps) ;
	const RooArgSet* ownedComponents() const { return _ownedComponents ; }	const RooArgSet* ownedComponents() const { return _ownedComponents ; }

	void setProhibitServerRedirect(Bool_t flag) { _prohibitServerRedirect = f lag ; }	void setProhibitServerRedirect(Bool_t flag) { _prohibitServerRedirect = f lag ; }

	protected:	protected:

	skipping to change at line 349	skipping to change at line 406

	virtual void optimizeDirtyHook(const RooArgSet* /obs/) {} ;	virtual void optimizeDirtyHook(const RooArgSet* /obs/) {} ;

	virtual Bool_t isValid() const ;	virtual Bool_t isValid() 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 {} ;
	virtual void getObservablesHook(const RooArgSet* /nset/, RooArgSet* /l ist/) const {} ;	virtual void getObservablesHook(const RooArgSet* /nset/, RooArgSet* /l ist/) const {} ;

	// Dirty state modifiers	// Dirty state modifiers
	public:	public:

	inline void setValueDirty() const { setValueDirty(0) ; }	inline void setValueDirty() const { if (_operMode==Auto && !inhibitDirt y()) setValueDirty(0) ; }
	inline void setShapeDirty() const { setShapeDirty(0) ; }	inline void setShapeDirty() const { setShapeDirty(0) ; }


		inline void clearValueAndShapeDirty() const {
		_valueDirty=kFALSE ;
		_shapeDirty=kFALSE ;
		}

	inline void clearValueDirty() const {	inline void clearValueDirty() const {
	_valueDirty=kFALSE ;	_valueDirty=kFALSE ;
	}	}
	inline void clearShapeDirty() const {	inline void clearShapeDirty() const {
	_shapeDirty=kFALSE ;	_shapeDirty=kFALSE ;
	}	}

	const char* aggregateCacheUniqueSuffix() const ;	const char* aggregateCacheUniqueSuffix() const ;
	virtual const char* cacheUniqueSuffix() const { return 0 ; }	virtual const char* cacheUniqueSuffix() const { return 0 ; }


		void wireAllCaches() ;

		inline const TNamed* namePtr() const {
		return _namePtr ;
		}

		void SetName(const char* name) ;
		void SetNameTitle(const char name, const char title) ;

	protected:	protected:

	// Client-Server relatation and Proxy management	// Client-Server relatation and Proxy management
	friend class RooArgSet ;	friend class RooArgSet ;
	friend class RooAbsCollection ;	friend class RooAbsCollection ;
	friend class RooCustomizer ;	friend class RooCustomizer ;
	friend class RooWorkspace ;	friend class RooWorkspace ;
	RooRefCountList _serverList ; // list of server objects	RooRefCountList _serverList ; // list of server objects
	RooRefCountList _clientList ; // list of client objects	RooRefCountList _clientList ; // list of client objects
	RooRefCountList _clientListShape ; // subset of clients that requested s hape dirty flag propagation	RooRefCountList _clientListShape ; // subset of clients that requested s hape dirty flag propagation
	RooRefCountList _clientListValue ; // subset of clients that requested v alue dirty flag propagation	RooRefCountList _clientListValue ; // subset of clients that requested v alue dirty flag propagation

	TList _proxyList ; // list of proxies	TRefArray _proxyList ; // list of proxies
	std::deque<RooAbsCache*> _cacheList ; // list of caches	std::deque<RooAbsCache*> _cacheList ; // list of caches
	TIterator* _clientShapeIter ; //! Iterator over _clientListShape	TIterator* _clientShapeIter ; //! Iterator over _clientListShape
	TIterator* _clientValueIter ; //! Iterator over _clientListValue	TIterator* _clientValueIter ; //! Iterator over _clientListValue

	// Server redirection interface	// Server redirection interface
	public:	public:
	Bool_t redirectServers(const RooAbsCollection& newServerList, Bool_t must ReplaceAll=kFALSE, Bool_t nameChange=kFALSE, Bool_t isRecursionStep=kFALSE) ;	Bool_t redirectServers(const RooAbsCollection& newServerList, Bool_t must ReplaceAll=kFALSE, Bool_t nameChange=kFALSE, Bool_t isRecursionStep=kFALSE) ;
	Bool_t recursiveRedirectServers(const RooAbsCollection& newServerList, Bo ol_t mustReplaceAll=kFALSE, Bool_t nameChange=kFALSE, Bool_t recurseInNewSe t=kTRUE) ;	Bool_t recursiveRedirectServers(const RooAbsCollection& newServerList, Bo ol_t mustReplaceAll=kFALSE, Bool_t nameChange=kFALSE, Bool_t recurseInNewSe t=kTRUE) ;
	virtual Bool_t redirectServersHook(const RooAbsCollection& /newServerLis t/, Bool_t /mustReplaceAll/, Bool_t /nameChange/, Bool_t /isRecursive /) { return kFALSE ; } ;	virtual Bool_t redirectServersHook(const RooAbsCollection& /newServerLis t/, Bool_t /mustReplaceAll/, Bool_t /nameChange/, Bool_t /isRecursive /) { return kFALSE ; } ;
	virtual void serverNameChangeHook(const RooAbsArg* /oldServer/, const R ooAbsArg* /newServer/) { } ;	virtual void serverNameChangeHook(const RooAbsArg* /oldServer/, const R ooAbsArg* /newServer/) { } ;

	skipping to change at line 426	skipping to change at line 498
	// Attribute list	// Attribute list
	std::set<std::string> _boolAttrib ; // Boolean attributes	std::set<std::string> _boolAttrib ; // Boolean attributes
	std::map<std::string,std::string> _stringAttrib ; // String attributes	std::map<std::string,std::string> _stringAttrib ; // String attributes
	std::set<std::string> _boolAttribTransient ; //! Transient boolean attrib utes (not copied in ctor)	std::set<std::string> _boolAttribTransient ; //! Transient boolean attrib utes (not copied in ctor)

	void printAttribList(ostream& os) const;	void printAttribList(ostream& os) const;

	// Hooks for RooTreeData interface	// Hooks for RooTreeData interface
	friend class RooCompositeDataStore ;	friend class RooCompositeDataStore ;
	friend class RooTreeDataStore ;	friend class RooTreeDataStore ;

		friend class RooVectorDataStore ;
	friend class RooTreeData ;	friend class RooTreeData ;
	friend class RooDataSet ;	friend class RooDataSet ;
	friend class RooRealMPFE ;	friend class RooRealMPFE ;
	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)	virtual void copyCache(const RooAbsArg* source, Bool_t valueOnly=kFALSE,
	= 0 ;	Bool_t setValDirty=kTRUE) = 0 ;

	virtual void attachToTree(TTree& t, Int_t bufSize=32000) = 0 ;	virtual void attachToTree(TTree& t, Int_t bufSize=32000) = 0 ;

		virtual void attachToVStore(RooVectorDataStore& vstore) = 0 ;
		void attachToStore(RooAbsDataStore& store) ;

	virtual void setTreeBranchStatus(TTree& t, Bool_t active) = 0 ;	virtual void setTreeBranchStatus(TTree& t, Bool_t active) = 0 ;
	virtual void fillTreeBranch(TTree& t) = 0 ;	virtual void fillTreeBranch(TTree& t) = 0 ;
	TString cleanBranchName() const ;	TString cleanBranchName() const ;

	// Global	// Global
	friend ostream& operator<<(ostream& os, const RooAbsArg &arg);	friend ostream& operator<<(ostream& os, const RooAbsArg &arg);
	friend istream& operator>>(istream& is, RooAbsArg &arg) ;	friend istream& operator>>(istream& is, RooAbsArg &arg) ;

	// Debug stuff	// Debug stuff
	static Bool_t _verboseDirty ; // Static flag controlling verbose messagin g for dirty state changes	static Bool_t _verboseDirty ; // Static flag controlling verbose messagin g for dirty state changes
	static Bool_t _inhibitDirty ; // Static flag controlling global inhibit o f dirty state propagation	static Bool_t _inhibitDirty ; // Static flag controlling global inhibit o f dirty state propagation

	static Bool_t _flipAClean ; // Static flag controlling flipping status of all AClean nodes to ADirty ;
	Bool_t _deleteWatch ; //! Delete watch flag	Bool_t _deleteWatch ; //! Delete watch flag

	static Bool_t flipAClean() ;

	static Bool_t inhibitDirty() ;	static Bool_t inhibitDirty() ;

	// Value and Shape dirty state bits	// Value and Shape dirty state bits
	void setValueDirty(const RooAbsArg* source) const ;	void setValueDirty(const RooAbsArg* source) const ;
	void setShapeDirty(const RooAbsArg* source) const ;	void setShapeDirty(const RooAbsArg* source) const ;
	mutable Bool_t _valueDirty ; // Flag set if value needs recalculating be cause input values modified	mutable Bool_t _valueDirty ; // Flag set if value needs recalculating be cause input values modified
	mutable Bool_t _shapeDirty ; // Flag set if value needs recalculating be cause input shapes modified	mutable Bool_t _shapeDirty ; // Flag set if value needs recalculating be cause input shapes modified


		friend class RooRealProxy ;
	mutable OperMode _operMode ; // Dirty state propagation mode	mutable OperMode _operMode ; // Dirty state propagation mode

		mutable Bool_t _fast ; // Allow fast access mode in getVal() and proxies

	// Owned components	// Owned components
	RooArgSet* _ownedComponents ; //! Set of owned component	RooArgSet* _ownedComponents ; //! Set of owned component

	mutable Bool_t _prohibitServerRedirect ; //! Prohibit server redirects -- Debugging tool	mutable Bool_t _prohibitServerRedirect ; //! Prohibit server redirects -- Debugging tool

	mutable RooExpensiveObjectCache* _eocache ; // Pointer to global cache ma nager for any expensive components created by this object	mutable RooExpensiveObjectCache* _eocache ; // Pointer to global cache ma nager for any expensive components created by this object


	ClassDef(RooAbsArg,4) // Abstract variable	mutable TNamed* _namePtr ; //! Do not persist. Pointer to global instance
		of string that matches object named

		ClassDef(RooAbsArg,5) // Abstract variable
	};	};

	ostream& operator<<(ostream& os, const RooAbsArg &arg);	ostream& operator<<(ostream& os, const RooAbsArg &arg);
	istream& operator>>(istream& is, RooAbsArg &arg) ;	istream& operator>>(istream& is, RooAbsArg &arg) ;

	#endif	#endif

End of changes. 28 change blocks.
	19 lines changed or deleted	103 lines changed or added

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

	* File: $Id: RooAbsCache.h 24247 2008-06-12 14:54:32Z wouter $	* File: $Id: RooAbsCache.h 41998 2011-11-15 10:34:40Z 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 39	skipping to change at line 39

	public:	public:

	RooAbsCache(RooAbsArg* owner=0) ;	RooAbsCache(RooAbsArg* owner=0) ;
	RooAbsCache(const RooAbsCache&, RooAbsArg* owner=0 ) ;	RooAbsCache(const RooAbsCache&, RooAbsArg* owner=0 ) ;
	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&, RooArgSet&, RooLinkedLis t& ) ;	virtual void optimizeCacheMode(const RooArgSet&, RooArgSet&, RooLinkedLis t& ) ;
	virtual void findConstantNodes(const RooArgSet&, RooArgSet& , RooLinkedLi st&) ;	virtual void findConstantNodes(const RooArgSet&, RooArgSet& , RooLinkedLi st&) ;
	virtual void printCompactTreeHook(ostream&, const char *) ;	virtual void printCompactTreeHook(ostream&, const char *) ;

		virtual void wireCache() {} ;

	virtual ~RooAbsCache() ;	virtual ~RooAbsCache() ;

	protected:	protected:

	RooAbsArg* _owner ; // Pointer to owning RooAbsArg	RooAbsArg* _owner ; // Pointer to owning RooAbsArg

	ClassDef(RooAbsCache,1) // Base class for cache managers	ClassDef(RooAbsCache,1) // Base class for cache managers

	} ;	} ;

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

	RooAbsCachedPdf.h	RooAbsCachedPdf.h

	skipping to change at line 35	skipping to change at line 35
	class RooAbsCachedPdf : public RooAbsPdf {	class RooAbsCachedPdf : public RooAbsPdf {
	public:	public:

	RooAbsCachedPdf() {	RooAbsCachedPdf() {
	// Default constructor	// Default constructor
	} ;	} ;
	RooAbsCachedPdf(const char name, const char title, Int_t ipOrder=0);	RooAbsCachedPdf(const char name, const char title, Int_t ipOrder=0);
	RooAbsCachedPdf(const RooAbsCachedPdf& other, const char* name=0) ;	RooAbsCachedPdf(const RooAbsCachedPdf& other, const char* name=0) ;
	virtual ~RooAbsCachedPdf() ;	virtual ~RooAbsCachedPdf() ;


	virtual Double_t getVal(const RooArgSet* set=0) const ;	virtual Double_t getValV(const RooArgSet* set=0) const ;
	virtual Bool_t selfNormalized() const {	virtual Bool_t selfNormalized() const {
	// Declare p.d.f self normalized	// Declare p.d.f self normalized
	return kTRUE ;	return kTRUE ;
	}	}

	RooAbsPdf* getCachePdf(const RooArgSet& nset) const {	RooAbsPdf* getCachePdf(const RooArgSet& nset) const {
	// Return RooHistPdf that represents cache histogram	// Return RooHistPdf that represents cache histogram
	return getCachePdf(&nset) ;	return getCachePdf(&nset) ;
	}	}
	RooDataHist* getCacheHist(const RooArgSet& nset) const {	RooDataHist* getCacheHist(const RooArgSet& nset) const {

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

	RooAbsCachedReal.h	RooAbsCachedReal.h

	skipping to change at line 32	skipping to change at line 32
	class RooArgSet ;	class RooArgSet ;

	class RooAbsCachedReal : public RooAbsReal {	class RooAbsCachedReal : public RooAbsReal {
	public:	public:

	RooAbsCachedReal() {} ;	RooAbsCachedReal() {} ;
	RooAbsCachedReal(const char name, const char title, Int_t ipOrder=0);	RooAbsCachedReal(const char name, const char title, Int_t ipOrder=0);
	RooAbsCachedReal(const RooAbsCachedReal& other, const char* name=0) ;	RooAbsCachedReal(const RooAbsCachedReal& other, const char* name=0) ;
	virtual ~RooAbsCachedReal() ;	virtual ~RooAbsCachedReal() ;


	virtual Double_t getVal(const RooArgSet* set=0) const ;	virtual Double_t getValV(const RooArgSet* set=0) const ;
	virtual Bool_t selfNormalized() const {	virtual Bool_t selfNormalized() const {
	// Declares function self normalized	// Declares function self normalized
	return kTRUE ;	return kTRUE ;
	}	}

	void setInterpolationOrder(Int_t order) ;	void setInterpolationOrder(Int_t order) ;
	Int_t getInterpolationOrder() const {	Int_t getInterpolationOrder() const {
	// Set interpolation order in RooHistFuncs that represent cache histogr ams	// Set interpolation order in RooHistFuncs that represent cache histogr ams
	return _ipOrder ;	return _ipOrder ;
	}	}

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

	RooAbsCategory.h	RooAbsCategory.h

	skipping to change at line 28	skipping to change at line 28

	#include "Riosfwd.h"	#include "Riosfwd.h"
	#include "TObjArray.h"	#include "TObjArray.h"
	#include "RooAbsArg.h"	#include "RooAbsArg.h"
	#include "RooCatType.h"	#include "RooCatType.h"

	class TTree ;	class TTree ;
	class RooArgSet ;	class RooArgSet ;
	class RooDataSet ;	class RooDataSet ;
	class Roo1DTable ;	class Roo1DTable ;

		class RooVectorDataStore ;

	class RooAbsCategory : public RooAbsArg {	class RooAbsCategory : public RooAbsArg {
	public:	public:
	// Constructors, assignment etc.	// Constructors, assignment etc.
	RooAbsCategory() {	RooAbsCategory() {
	// Default constructor	// Default constructor
	_treeVar = kFALSE ;	_treeVar = kFALSE ;
	_typeIter = _types.MakeIterator() ;	_typeIter = _types.MakeIterator() ;
	} ;	} ;
	RooAbsCategory(const char name, const char title);	RooAbsCategory(const char name, const char title);

	skipping to change at line 100	skipping to change at line 101
	// Type definition management	// Type definition management
	const RooCatType* defineType(const char* label) ;	const RooCatType* defineType(const char* label) ;
	const RooCatType* defineType(const char* label, Int_t index) ;	const RooCatType* defineType(const char* label, Int_t index) ;
	const RooCatType* defineTypeUnchecked(const char* label, Int_t index) ;	const RooCatType* defineTypeUnchecked(const char* label, Int_t index) ;
	const RooCatType* getOrdinal(UInt_t n, const char* rangeName=0) const;	const RooCatType* getOrdinal(UInt_t n, const char* rangeName=0) const;
	void clearTypes() ;	void clearTypes() ;

	virtual Bool_t isValid() const ;	virtual Bool_t isValid() const ;
	virtual Bool_t isValid(const RooCatType& value) const ;	virtual Bool_t isValid(const RooCatType& value) const ;


		friend class RooVectorDataStore ;
	virtual void syncCache(const RooArgSet* set=0) ;	virtual void syncCache(const RooArgSet* set=0) ;

	virtual void copyCache(const RooAbsArg* source, Bool_t valueOnly=kFALSE) ;	virtual void copyCache(const RooAbsArg* source, Bool_t valueOnly=kFALSE, Bool_t setValueDirty=kTRUE) ;
	virtual void attachToTree(TTree& t, Int_t bufSize=32000) ;	virtual void attachToTree(TTree& t, Int_t bufSize=32000) ;

		virtual void attachToVStore(RooVectorDataStore& vstore) ;
	virtual void setTreeBranchStatus(TTree& t, Bool_t active) ;	virtual void setTreeBranchStatus(TTree& t, Bool_t active) ;
	virtual void fillTreeBranch(TTree& t) ;	virtual void fillTreeBranch(TTree& t) ;

	mutable UChar_t _byteValue ; //! Transient cache for byte values from tree branches	mutable UChar_t _byteValue ; //! Transient cache for byte values from tree branches
	mutable RooCatType _value ; // Current value	mutable RooCatType _value ; // Current value
	TObjArray _types ; // Array of allowed values	TObjArray _types ; // Array of allowed values
	TIterator* _typeIter ; //!	TIterator* _typeIter ; //!

	Bool_t _treeVar ; //! do not persist	Bool_t _treeVar ; //! do not persist


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

	RooAbsCategoryLValue.h	RooAbsCategoryLValue.h

	skipping to change at line 73	skipping to change at line 73
	// Object is an l-value	// Object is an l-value
	return kTRUE;	return kTRUE;
	}	}

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

	protected:	protected:


		friend class RooSimGenContext ;
		friend class RooSimSplitGenContext ;
		virtual void setIndexFast(Int_t index) { _value._value = index ; _value._
		label[0]=0 ; }

	Bool_t setOrdinal(UInt_t index, const char* rangeName);	Bool_t setOrdinal(UInt_t index, const char* rangeName);

	void copyCache(const RooAbsArg* source, Bool_t valueOnly=kFALSE) ;	void copyCache(const RooAbsArg* source, Bool_t valueOnly=kFALSE, Bool_t s etValDirty=kTRUE) ;

	ClassDef(RooAbsCategoryLValue,1) // Abstract modifiable index variable	ClassDef(RooAbsCategoryLValue,1) // Abstract modifiable index variable
	};	};

	#endif	#endif

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

	RooAbsCollection.h	RooAbsCollection.h

	skipping to change at line 46	skipping to change at line 46
	return clone(newname?newname:GetName()) ;	return clone(newname?newname:GetName()) ;
	}	}
	virtual ~RooAbsCollection();	virtual ~RooAbsCollection();

	// Create a copy of an existing list. New variables cannot be added	// Create a copy of an existing list. New variables cannot be added
	// to a copied list. The variables in the copied list are independent	// to a copied list. The variables in the copied list are independent
	// of the original variables.	// of the original variables.
	RooAbsCollection(const RooAbsCollection& other, const char *name="");	RooAbsCollection(const RooAbsCollection& other, const char *name="");
	RooAbsCollection& operator=(const RooAbsCollection& other);	RooAbsCollection& operator=(const RooAbsCollection& other);
	RooAbsCollection& assignValueOnly(const RooAbsCollection& other, Bool_t o neSafe=kFALSE) ;	RooAbsCollection& assignValueOnly(const RooAbsCollection& other, Bool_t o neSafe=kFALSE) ;

	RooAbsCollection& assignFast(const RooAbsCollection& other) ;	void assignFast(const RooAbsCollection& other, Bool_t setValDirty=kTRUE) ;

	// Copy list and contents (and optionally 'deep' servers)	// Copy list and contents (and optionally 'deep' servers)
	RooAbsCollection *snapshot(Bool_t deepCopy=kTRUE) const ;	RooAbsCollection *snapshot(Bool_t deepCopy=kTRUE) const ;
	Bool_t snapshot(RooAbsCollection& output, Bool_t deepCopy=kTRUE) const ;	Bool_t snapshot(RooAbsCollection& output, Bool_t deepCopy=kTRUE) const ;

	// Hash table control	// Hash table control
	void setHashTableSize(Int_t i) {	void setHashTableSize(Int_t i) {
	// Set size of internal hash table to i (should be a prime number)	// Set size of internal hash table to i (should be a prime number)
	_list.setHashTableSize(i) ;	_list.setHashTableSize(i) ;
	}	}

	skipping to change at line 81	skipping to change at line 81
	virtual Bool_t addOwned(const RooAbsCollection& list, Bool_t silent=kFALS E);	virtual Bool_t addOwned(const RooAbsCollection& list, Bool_t silent=kFALS E);
	virtual void addClone(const RooAbsCollection& list, Bool_t silent=kFALS E);	virtual void addClone(const RooAbsCollection& list, Bool_t silent=kFALS E);
	Bool_t replace(const RooAbsCollection &other);	Bool_t replace(const RooAbsCollection &other);
	Bool_t remove(const RooAbsCollection& list, Bool_t silent=kFALSE, Bool_t matchByNameOnly=kFALSE) ;	Bool_t remove(const RooAbsCollection& list, Bool_t silent=kFALSE, Bool_t matchByNameOnly=kFALSE) ;

	// Group operations on AbsArgs	// Group operations on AbsArgs
	void setAttribAll(const Text_t* name, Bool_t value=kTRUE) ;	void setAttribAll(const Text_t* name, Bool_t value=kTRUE) ;

	// List search methods	// List search methods
	RooAbsArg find(const char name) const ;	RooAbsArg find(const char name) const ;

		RooAbsArg *find(const RooAbsArg&) const ;

	Bool_t contains(const RooAbsArg& var) const {	Bool_t contains(const RooAbsArg& var) const {
	// Returns true if object with same name as var is contained in this co llection	// Returns true if object with same name as var is contained in this co llection

	return (0 == find(var.GetName())) ? kFALSE:kTRUE;	return (0 == find(var)) ? kFALSE:kTRUE;
	}	}
	Bool_t containsInstance(const RooAbsArg& var) const {	Bool_t containsInstance(const RooAbsArg& var) const {
	// Returns true if var is contained in this collection	// Returns true if var is contained in this collection
	return (0 == _list.FindObject(&var)) ? kFALSE:kTRUE;	return (0 == _list.FindObject(&var)) ? kFALSE:kTRUE;
	}	}
	RooAbsCollection* selectByAttrib(const char* name, Bool_t value) const ;	RooAbsCollection* selectByAttrib(const char* name, Bool_t value) const ;
	RooAbsCollection* selectCommon(const RooAbsCollection& refColl) const ;	RooAbsCollection* selectCommon(const RooAbsCollection& refColl) const ;
	RooAbsCollection* selectByName(const char* nameList, Bool_t verbose=kFALS E) const ;	RooAbsCollection* selectByName(const char* nameList, Bool_t verbose=kFALS E) const ;
	Bool_t equals(const RooAbsCollection& otherColl) const ;	Bool_t equals(const RooAbsCollection& otherColl) const ;
	Bool_t overlaps(const RooAbsCollection& otherColl) const ;	Bool_t overlaps(const RooAbsCollection& otherColl) const ;

	// export subset of THashList interface	// export subset of THashList interface
	inline TIterator* createIterator(Bool_t dir = kIterForward) const {	inline TIterator* createIterator(Bool_t dir = kIterForward) const {
	// Create and return an iterator over the elements in this collection	// Create and return an iterator over the elements in this collection
	return _list.MakeIterator(dir);	return _list.MakeIterator(dir);
	}	}

	RooLinkedListIter iterator(Bool_t dir = kIterForward) const ;	RooLinkedListIter iterator(Bool_t dir = kIterForward) const ;

		RooFIter fwdIterator() const ;

	inline Int_t getSize() const {	inline Int_t getSize() const {
	// Return the number of elements in the collection	// Return the number of elements in the collection
	return _list.GetSize();	return _list.GetSize();
	}	}
	inline RooAbsArg *first() const {	inline RooAbsArg *first() const {
	// Return the first element in this collection	// Return the first element in this collection
	return (RooAbsArg*)_list.First();	return (RooAbsArg*)_list.First();
	}	}


	skipping to change at line 164	skipping to change at line 167
	void sort(Bool_t ascend=kTRUE) { _list.Sort(ascend) ; }	void sort(Bool_t ascend=kTRUE) { _list.Sort(ascend) ; }

	protected:	protected:

	friend class RooMultiCatIter ;	friend class RooMultiCatIter ;

	RooLinkedList _list ; // Actual object store	RooLinkedList _list ; // Actual object store

	Bool_t _ownCont; // Flag to identify a list that owns its contents.	Bool_t _ownCont; // Flag to identify a list that owns its contents.
	TString _name; // Our name.	TString _name; // Our name.

		Bool_t _allRRV ; // All contents are RRV

	void safeDeleteList() ;	void safeDeleteList() ;

	// Support for snapshot method	// Support for snapshot method
	Bool_t addServerClonesToList(const RooAbsArg& var) ;	Bool_t addServerClonesToList(const RooAbsArg& var) ;


		inline TNamed* structureTag() { if (_structureTag==0) makeStructureTag()
		; return _structureTag ; }
		inline TNamed* typedStructureTag() { if (_typedStructureTag==0) makeTyped
		StructureTag() ; return _typedStructureTag ; }

		mutable TNamed* _structureTag ; //! Structure tag
		mutable TNamed* _typedStructureTag ; //! Typed structure tag

		inline void clearStructureTags() { _structureTag=0 ; _typedStructureTag =
		0 ; }

		void makeStructureTag() ;
		void makeTypedStructureTag() ;

	private:	private:


	ClassDef(RooAbsCollection,1) // Collection of RooAbsArg objects	ClassDef(RooAbsCollection,2) // Collection of RooAbsArg objects
	};	};

	#endif	#endif

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

	RooAbsData.h	RooAbsData.h

	skipping to change at line 59	skipping to change at line 59
	const RooCmdArg& arg5=RooCmdArg(),const RooCmdArg& arg 6=RooCmdArg(),const RooCmdArg& arg7=RooCmdArg(),const RooCmdArg& arg8=RooCm dArg()) ;	const RooCmdArg& arg5=RooCmdArg(),const RooCmdArg& arg 6=RooCmdArg(),const RooCmdArg& arg7=RooCmdArg(),const RooCmdArg& arg8=RooCm dArg()) ;
	RooAbsData* reduce(const char* cut) ;	RooAbsData* reduce(const char* cut) ;
	RooAbsData* reduce(const RooFormulaVar& cutVar) ;	RooAbsData* reduce(const RooFormulaVar& cutVar) ;
	RooAbsData* reduce(const RooArgSet& varSubset, const char* cut=0) ;	RooAbsData* reduce(const RooArgSet& varSubset, const char* cut=0) ;
	RooAbsData* reduce(const RooArgSet& varSubset, const RooFormulaVar& cutVa r) ;	RooAbsData* reduce(const RooArgSet& varSubset, const RooFormulaVar& cutVa r) ;

	RooAbsDataStore* store() { return _dstore ; }	RooAbsDataStore* store() { return _dstore ; }
	const RooAbsDataStore* store() const { return _dstore ; }	const RooAbsDataStore* store() const { return _dstore ; }
	const TTree* tree() const ;	const TTree* tree() const ;


		void convertToVectorStore() ;

		void attachBuffers(const RooArgSet& extObs) ;
		void resetBuffers() ;

	virtual void Draw(Option_t* option = "") ;	virtual void Draw(Option_t* option = "") ;

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

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

	// Add one ore more rows of data	// Add one ore more rows of data
	virtual void add(const RooArgSet& row, Double_t weight=1, Double_t weight Error=0) = 0 ; // DERIVED	virtual void add(const RooArgSet& row, Double_t weight=1, Double_t weight Error=0) = 0 ; // DERIVED
	virtual void fill() ;	virtual void fill() ;

	skipping to change at line 83	skipping to change at line 88
	return &_vars ;	return &_vars ;
	}	}
	virtual Double_t weight() const = 0 ; // DERIVED	virtual Double_t weight() const = 0 ; // DERIVED
	virtual Bool_t valid() const { return kTRUE ; }	virtual Bool_t valid() const { return kTRUE ; }
	enum ErrorType { Poisson, SumW2, None, Auto } ;	enum ErrorType { Poisson, SumW2, None, Auto } ;
	virtual Double_t weightError(ErrorType etype=Poisson) const ;	virtual Double_t weightError(ErrorType etype=Poisson) const ;
	virtual void weightError(Double_t& lo, Double_t& hi, ErrorType etype=Pois son) const ;	virtual void weightError(Double_t& lo, Double_t& hi, ErrorType etype=Pois son) const ;
	virtual const RooArgSet* get(Int_t index) const ;	virtual const RooArgSet* get(Int_t index) const ;

	virtual Int_t numEntries() const ;	virtual Int_t numEntries() const ;

	virtual Double_t sumEntries(const char* cutSpec=0, const char* cutRange=0	virtual Double_t sumEntries() const = 0 ;
	) const = 0 ; // DERIVED	virtual Double_t sumEntries(const char* cutSpec, const char* cutRange=0)
		const = 0 ; // DERIVED
	virtual Bool_t isWeighted() const {	virtual Bool_t isWeighted() const {
	// Do events in dataset have weights?	// Do events in dataset have weights?
	return kFALSE ;	return kFALSE ;
	}	}
	virtual Bool_t isNonPoissonWeighted() const {	virtual Bool_t isNonPoissonWeighted() const {
	// Do events in dataset have non-integer weights?	// Do events in dataset have non-integer weights?
	return kFALSE ;	return kFALSE ;
	}	}
	virtual void reset() ;	virtual void reset() ;


	skipping to change at line 201	skipping to change at line 207
	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) ;	void addOwnedComponent(const char* idxlabel, RooAbsData& data) ;
	static void claimVars(RooAbsData*) ;	static void claimVars(RooAbsData*) ;
	static Bool_t releaseVars(RooAbsData*) ;	static Bool_t releaseVars(RooAbsData*) ;


		enum StorageType { Tree, Vector} ;
		static StorageType defaultStorageType ;

		static void setDefaultStorageType(StorageType s) ;

	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 ;

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

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

	* File: $Id: RooAbsDataStore.h 31258 2009-11-17 22:41:06Z wouter $	* File: $Id: RooAbsDataStore.h 41998 2011-11-15 10:34:40Z 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 37	skipping to change at line 37
	class TIterator ;	class TIterator ;
	class TTree ;	class TTree ;

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

	RooAbsDataStore() ;	RooAbsDataStore() ;
	RooAbsDataStore(const char* name, const char* title, const RooArgSet& var s) ;	RooAbsDataStore(const char* name, const char* title, const RooArgSet& var s) ;
	RooAbsDataStore(const RooAbsDataStore& other, const char* newname=0) ;	RooAbsDataStore(const RooAbsDataStore& other, const char* newname=0) ;
	RooAbsDataStore(const RooAbsDataStore& other, const RooArgSet& vars, cons t char* newname=0) ;	RooAbsDataStore(const RooAbsDataStore& other, const RooArgSet& vars, cons t char* newname=0) ;

		virtual RooAbsDataStore* clone(const char* newname=0) const = 0 ;
	virtual RooAbsDataStore* clone(const RooArgSet& vars, const char* newname =0) const = 0 ;	virtual RooAbsDataStore* clone(const RooArgSet& vars, const char* newname =0) const = 0 ;
	virtual ~RooAbsDataStore() ;	virtual ~RooAbsDataStore() ;

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

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

	skipping to change at line 71	skipping to change at line 72

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

	// Add rows	// Add rows
	virtual void append(RooAbsDataStore& other)= 0 ;	virtual void append(RooAbsDataStore& other)= 0 ;

	// General & bookkeeping methods	// General & bookkeeping methods
	virtual Bool_t valid() const = 0 ;	virtual Bool_t valid() const = 0 ;
	virtual Int_t numEntries() const = 0 ;	virtual Int_t numEntries() const = 0 ;

		virtual Double_t sumEntries() const { return 0 ; } ;
	virtual void reset() = 0 ;	virtual void reset() = 0 ;


		// Buffer redirection routines used in inside RooAbsOptTestStatistics
		virtual void attachBuffers(const RooArgSet& extObs) = 0 ;
		virtual void resetBuffers() = 0 ;

		virtual void setExternalWeightArray(Double_t* /arrayWgt/, Double_t* /*a
		rrayWgtErrLo/, Double_t /arrayWgtErrHi/, Double_t* /arraySumW2/) {} ;

	// Printing interface (human readable)	// Printing interface (human readable)
	inline virtual void Print(Option_t *options= 0) const {	inline virtual void Print(Option_t *options= 0) const {
	// Print contents on stdout	// Print contents on stdout
	printStream(defaultPrintStream(),defaultPrintContents(options),defaultP rintStyle(options));	printStream(defaultPrintStream(),defaultPrintContents(options),defaultP rintStyle(options));
	}	}

	virtual void printName(ostream& os) const ;	virtual void printName(ostream& os) const ;
	virtual void printTitle(ostream& os) const ;	virtual void printTitle(ostream& os) const ;
	virtual void printClassName(ostream& os) const ;	virtual void printClassName(ostream& os) const ;
	virtual void printArgs(ostream& os) const ;	virtual void printArgs(ostream& os) const ;

	skipping to change at line 95	skipping to change at line 103

	virtual Int_t defaultPrintContents(Option_t* opt) const ;	virtual Int_t defaultPrintContents(Option_t* opt) const ;

	// Constant term optimizer interface	// Constant term optimizer interface
	virtual void cacheArgs(const RooAbsArg* cacheOwner, RooArgSet& varSet, co nst RooArgSet* nset=0) = 0 ;	virtual void cacheArgs(const RooAbsArg* cacheOwner, RooArgSet& varSet, co nst RooArgSet* nset=0) = 0 ;
	virtual const RooAbsArg* cacheOwner() = 0 ;	virtual const RooAbsArg* cacheOwner() = 0 ;
	virtual void attachCache(const RooAbsArg* newOwner, const RooArgSet& cach edVars) = 0 ;	virtual void attachCache(const RooAbsArg* newOwner, const RooArgSet& cach edVars) = 0 ;
	virtual void setArgStatus(const RooArgSet& set, Bool_t active) = 0 ;	virtual void setArgStatus(const RooArgSet& set, Bool_t active) = 0 ;
	const RooArgSet& cachedVars() const { return _cachedVars ; }	const RooArgSet& cachedVars() const { return _cachedVars ; }
	virtual void resetCache() = 0 ;	virtual void resetCache() = 0 ;

		virtual void recalculateCache() {} ;

	virtual void setDirtyProp(Bool_t flag) { _doDirtyProp = flag ; }	virtual void setDirtyProp(Bool_t flag) { _doDirtyProp = flag ; }

		Bool_t dirtyProp() const { return _doDirtyProp ; }

	virtual void checkInit() const {} ;	virtual void checkInit() const {} ;

	Bool_t hasFilledCache() const { return _cachedVars.getSize()>0 ; }	Bool_t hasFilledCache() const { return _cachedVars.getSize()>0 ; }

	virtual const TTree* tree() const { return 0 ; }	virtual const TTree* tree() const { return 0 ; }

		virtual void dump() {}

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

	protected:	protected:

	RooArgSet _vars ;	RooArgSet _vars ;
	RooArgSet _cachedVars ;	RooArgSet _cachedVars ;
	TIterator *_iterator; //! Iterator over dimension variables	TIterator *_iterator; //! Iterator over dimension variables
	TIterator *_cacheIter ; //! Iterator over cached variables	TIterator *_cacheIter ; //! Iterator over cached variables

	Bool_t _doDirtyProp ; // Switch do (de)activate dirty state propagatio n when loading a data point	Bool_t _doDirtyProp ; // Switch do (de)activate dirty state propagatio n when loading a data point


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

	RooAbsFunc.h	RooAbsFunc.h

	skipping to change at line 64	skipping to change at line 64
	virtual void restoreXVec() const {	virtual void restoreXVec() const {
	// Interface to restore observables to saved values (if supported	// Interface to restore observables to saved values (if supported
	// by binding implementation)	// by binding implementation)
	} ;	} ;

	virtual const char* getName() const {	virtual const char* getName() const {
	// Name of function binding	// Name of function binding
	return "(unnamed)" ;	return "(unnamed)" ;
	}	}


		virtual std::list<Double_t>* binBoundaries(Int_t) const { return 0 ; }

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

	protected:	protected:
	mutable Int_t _ncall ; // Function call counter	mutable Int_t _ncall ; // Function call counter
	UInt_t _dimension; // Number of observables	UInt_t _dimension; // Number of observables
	Bool_t _valid; // Is binding in valid state?	Bool_t _valid; // Is binding in valid state?

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

	RooAbsHiddenReal.h	RooAbsHiddenReal.h

	skipping to change at line 58	skipping to change at line 58
	Double_t getHiddenVal(const RooArgSet* nset=0) const {	Double_t getHiddenVal(const RooArgSet* nset=0) const {
	// Bypass accessor to function value that also works in hidden mode	// Bypass accessor to function value that also works in hidden mode
	return RooAbsReal::getVal(nset) ;	return RooAbsReal::getVal(nset) ;
	}	}

	protected:	protected:

	// This is dubious from a C++ point of view, but it blocks the interactiv e user	// This is dubious from a C++ point of view, but it blocks the interactiv e user
	// from accidentally calling getVal() without explicit cast, which is the whole	// from accidentally calling getVal() without explicit cast, which is the whole
	// point of this class	// point of this class

	virtual Double_t getVal(const RooArgSet* nset=0) const {	virtual Double_t getValV(const RooArgSet* nset=0) const {
	// Forward call to RooAbsReal	// Forward call to RooAbsReal
	return RooAbsReal::getVal(nset) ;	return RooAbsReal::getVal(nset) ;
	}	}

	static RooCategory* _dummyBlindState ;	static RooCategory* _dummyBlindState ;
	RooAbsCategory& dummyBlindState() const ;	RooAbsCategory& dummyBlindState() const ;

	RooCategoryProxy _state ; // Proxy to hiding state category	RooCategoryProxy _state ; // Proxy to hiding state category

	ClassDef(RooAbsHiddenReal,1) // Abstract hidden real-valued variable	ClassDef(RooAbsHiddenReal,1) // Abstract hidden real-valued variable

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

	RooAbsOptTestStatistic.h	RooAbsOptTestStatistic.h

	skipping to change at line 60	skipping to change at line 60

	// 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) ;	Bool_t setDataSlave(RooAbsData& data, Bool_t cloneData=kTRUE, Bool_t ownN
		ewDataAnyway=kFALSE) ;
		void initSlave(RooAbsReal& real, RooAbsData& indata, const RooArgSet& pro
		jDeps, const char* rangeName,
		const char* addCoefRangeName) ;

	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, Bool_t doAlsoTracking Opt=kTRUE) ;

	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,Bool_t=kTRUE) ;

	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	RooArgSet* _funcObsSet ; // List of observables in the pdf expression
	ClassDef(RooAbsOptTestStatistic,3) // Abstract base class for optimized t	RooArgSet _cachedNodes ; //! List of nodes that are cached as constant
	est statistics	expressions

		RooAbsReal* _origFunc ; // Original function
		RooAbsData* _origData ; // Original data
		Bool_t _optimized ; //!

		ClassDef(RooAbsOptTestStatistic,4) // Abstract base class for optimized t
		est statistics
	};	};

	#endif	#endif

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

	RooAbsReal.h	RooAbsReal.h

	skipping to change at line 42	skipping to change at line 42
	class RooCategory ;	class RooCategory ;
	class RooLinkedList ;	class RooLinkedList ;
	class RooNumIntConfig ;	class RooNumIntConfig ;
	class RooDataHist ;	class RooDataHist ;
	class RooFunctor ;	class RooFunctor ;
	class RooGenFunction ;	class RooGenFunction ;
	class RooMultiGenFunction ;	class RooMultiGenFunction ;
	class RooFitResult ;	class RooFitResult ;
	class RooMoment ;	class RooMoment ;
	class RooDerivative ;	class RooDerivative ;

		class RooVectorDataStore ;

	class TH1;	class TH1;
	class TH1F;	class TH1F;
	class TH2F;	class TH2F;
	class TH3F;	class TH3F;

	#include <list>	#include <list>
	#include <string>	#include <string>
	#include <iostream>	#include <iostream>

		using namespace std ;

	class RooAbsReal : public RooAbsArg {	class RooAbsReal : public RooAbsArg {
	public:	public:
	// Constructors, assignment etc	// Constructors, assignment etc
	RooAbsReal() ;	RooAbsReal() ;
	RooAbsReal(const char name, const char title, const char *unit= "") ;	RooAbsReal(const char name, const char title, const char *unit= "") ;
	RooAbsReal(const char name, const char title, Double_t minVal, Double_t maxVal,	RooAbsReal(const char name, const char title, Double_t minVal, Double_t maxVal,
	const char *unit= "") ;	const char *unit= "") ;
	RooAbsReal(const RooAbsReal& other, const char* name=0);	RooAbsReal(const RooAbsReal& other, const char* name=0);
	virtual ~RooAbsReal();	virtual ~RooAbsReal();

	// Return value and unit accessors	// Return value and unit accessors

	virtual Double_t getVal(const RooArgSet* set=0) const ;	inline Double_t getVal(const RooArgSet* set=0) const {
	inline Double_t getVal(const RooArgSet& set) const {	/* if (_fast && !_inhibitDirty) cout << "RooAbsReal::getVal(" << GetName
	// Return value with given choice of observables	() << ") CLEAN value = " << _value << endl ; */
	return getVal(&set) ;	#ifndef _WIN32
		return (_fast && !_inhibitDirty) ? _value : getValV(set) ;
		#else
		return (_fast && !inhibitDirty()) ? _value : getValV(set) ;
		#endif
	}	}

		inline Double_t getVal(const RooArgSet& set) const { return _fast ? _val
		ue : getValV(&set) ; }

		virtual Double_t getValV(const RooArgSet* set=0) const ;

	Double_t getPropagatedError(const RooFitResult& fr) ;	Double_t getPropagatedError(const RooFitResult& fr) ;

	Bool_t operator==(Double_t value) const ;	Bool_t operator==(Double_t value) const ;
	virtual Bool_t operator==(const RooAbsArg& other) ;	virtual Bool_t operator==(const RooAbsArg& other) ;
	inline const Text_t *getUnit() const {	inline const Text_t *getUnit() const {
	// Return string with unit description	// Return string with unit description
	return _unit.Data();	return _unit.Data();
	}	}
	inline void setUnit(const char *unit) {	inline void setUnit(const char *unit) {

	skipping to change at line 243	skipping to change at line 251
	class EvalError {	class EvalError {
	public:	public:
	EvalError() { _msg[0] = 0 ; _srvval[0] = 0 ; }	EvalError() { _msg[0] = 0 ; _srvval[0] = 0 ; }
	EvalError(const EvalError& other) { strlcpy(_msg,other._msg,1024) ; str lcpy(_srvval,other._srvval,1024) ; } ;	EvalError(const EvalError& other) { strlcpy(_msg,other._msg,1024) ; str lcpy(_srvval,other._srvval,1024) ; } ;
	void setMessage(const char* tmp) ;	void setMessage(const char* tmp) ;
	void setServerValues(const char* tmp) ;	void setServerValues(const char* tmp) ;
	char _msg[1024] ;	char _msg[1024] ;
	char _srvval[1024] ;	char _srvval[1024] ;
	} ;	} ;


	enum ErrorLoggingMode { PrintErrors, CollectErrors, CountErrors } ;	enum ErrorLoggingMode { PrintErrors, CollectErrors, CountErrors, Ignore } ;
	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() ;	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() ;	static EvalErrorIter evalErrorIter() ;

	static void clearEvalErrorLog() ;	static void clearEvalErrorLog() ;


		virtual Bool_t isBinnedDistribution(const RooArgSet& /obs/) const { ret
		urn kFALSE ; }
		virtual std::list<Double_t>* binBoundaries(RooAbsRealLValue& /obs/, Dou
		ble_t /xlo/, Double_t /xhi/) const { return 0 ; }
	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()) ;
	RooMultiGenFunction* iGenFunction(const RooArgSet& observables, const Roo ArgSet& nset=RooArgSet()) ;	RooMultiGenFunction* iGenFunction(const RooArgSet& observables, const Roo ArgSet& nset=RooArgSet()) ;

	RooFunctor* functor(const RooArgList& obs, const RooArgList& pars=RooArgL ist(), const RooArgSet& nset=RooArgSet()) const ;	RooFunctor* functor(const RooArgList& obs, const RooArgList& pars=RooArgL ist(), const RooArgSet& nset=RooArgSet()) const ;

	skipping to change at line 346	skipping to change at line 356
	// Function evaluation and error tracing	// Function evaluation and error tracing
	Double_t traceEval(const RooArgSet* set) const ;	Double_t traceEval(const RooArgSet* set) const ;
	virtual Bool_t traceEvalHook(Double_t /value/) const {	virtual Bool_t traceEvalHook(Double_t /value/) const {
	// Hook function to add functionality to evaluation tracing in derived classes	// Hook function to add functionality to evaluation tracing in derived classes
	return kFALSE ;	return kFALSE ;
	}	}
	virtual Double_t evaluate() const = 0 ;	virtual Double_t evaluate() const = 0 ;

	// Hooks for RooDataSet interface	// Hooks for RooDataSet interface
	friend class RooRealIntegral ;	friend class RooRealIntegral ;

		friend class RooVectorDataStore ;
	virtual void syncCache(const RooArgSet* set=0) { getVal(set) ; }	virtual void syncCache(const RooArgSet* set=0) { getVal(set) ; }

	virtual void copyCache(const RooAbsArg* source, Bool_t valueOnly=kFALSE) ;	virtual void copyCache(const RooAbsArg* source, Bool_t valueOnly=kFALSE, Bool_t setValDirty=kTRUE) ;
	virtual void attachToTree(TTree& t, Int_t bufSize=32000) ;	virtual void attachToTree(TTree& t, Int_t bufSize=32000) ;

		virtual void attachToVStore(RooVectorDataStore& vstore) ;
	virtual void setTreeBranchStatus(TTree& t, Bool_t active) ;	virtual void setTreeBranchStatus(TTree& t, Bool_t active) ;
	virtual void fillTreeBranch(TTree& t) ;	virtual void fillTreeBranch(TTree& t) ;

	Double_t _plotMin ; // Minimum of plot range	Double_t _plotMin ; // Minimum of plot range
	Double_t _plotMax ; // Maximum of plot range	Double_t _plotMax ; // Maximum of plot range
	Int_t _plotBins ; // Number of plot bins	Int_t _plotBins ; // Number of plot bins
	mutable Double_t _value ; // Cache for current value of object	mutable Double_t _value ; // Cache for current value of object
	TString _unit ; // Unit for objects value	TString _unit ; // Unit for objects value
	TString _label ; // Plot label for objects value	TString _label ; // Plot label for objects value
	Bool_t _forceNumInt ; // Force numerical integration if flag set	Bool_t _forceNumInt ; // Force numerical integration if flag set

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

	RooAbsRealLValue.h	RooAbsRealLValue.h

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

	friend class RooRealBinding ;	friend class RooRealBinding ;

	virtual void setValFast(Double_t value) { setVal(value) ; }	virtual void setValFast(Double_t value) { setVal(value) ; }

	virtual void setVal(Double_t value, const char* /rangeName/) {	virtual void setVal(Double_t value, const char* /rangeName/) {
	// Set object value to 'value'	// Set object value to 'value'
	return setVal(value) ;	return setVal(value) ;
	}	}
	Bool_t fitRangeOKForPlotting() const ;	Bool_t fitRangeOKForPlotting() const ;

	void copyCache(const RooAbsArg* source, Bool_t valueOnly=kFALSE) ;	void copyCache(const RooAbsArg* source, Bool_t valueOnly=kFALSE, Bool_t s etValDirty=kTRUE) ;

	ClassDef(RooAbsRealLValue,1) // Abstract modifiable real-valued object	ClassDef(RooAbsRealLValue,1) // Abstract modifiable real-valued object
	};	};

	#endif	#endif

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

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

	* File: $Id: RooAbsStudy.h 39912 2011-06-23 16:40:11Z moneta $	* File: $Id: RooAbsStudy.h 39817 2011-06-18 12:49:41Z wouter $
	* Authors: *	* Authors: *
	* WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu *	* WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu *
	* DK, David Kirkby, UC Irvine, dkirkby@uci.edu *	* DK, David Kirkby, UC Irvine, dkirkby@uci.edu *
	* *	* *
	* Copyright (c) 2000-2005, Regents of the University of California *	* Copyright (c) 2000-2005, Regents of the University of California *
	* and Stanford University. All rights reserved. *	* and Stanford University. All rights reserved. *
	* *	* *
	* Redistribution and use in source and binary forms, *	* Redistribution and use in source and binary forms, *
	* with or without modification, are permitted according to the terms *	* with or without modification, are permitted according to the terms *
	* listed in LICENSE (http://roofit.sourceforge.net/license.txt) *	* listed in LICENSE (http://roofit.sourceforge.net/license.txt) *

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

	RooAddGenContext.h	RooAddGenContext.h

	skipping to change at line 21	skipping to change at line 21
	* *	* *
	* 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_ADD_GEN_CONTEXT	#ifndef ROO_ADD_GEN_CONTEXT
	#define ROO_ADD_GEN_CONTEXT	#define ROO_ADD_GEN_CONTEXT

	#include "RooAbsGenContext.h"	#include "RooAbsGenContext.h"
	#include "RooArgSet.h"	#include "RooArgSet.h"

		#include <vector>
		#include "RooAddPdf.h"
		#include "RooAddModel.h"

	class RooAddPdf;	class RooAddPdf;
	class RooAddModel;	class RooAddModel;
	class RooDataSet;	class RooDataSet;
	class RooRealIntegral;	class RooRealIntegral;
	class RooAcceptReject;	class RooAcceptReject;
	class TRandom;	class TRandom;
	class TIterator;	class TIterator;

	class RooAddGenContext : public RooAbsGenContext {	class RooAddGenContext : public RooAbsGenContext {

	skipping to change at line 55	skipping to change at line 58

	virtual void initGenerator(const RooArgSet &theEvent);	virtual void initGenerator(const RooArgSet &theEvent);
	virtual void generateEvent(RooArgSet &theEvent, Int_t remaining);	virtual void generateEvent(RooArgSet &theEvent, Int_t remaining);
	void updateThresholds() ;	void updateThresholds() ;

	RooAddGenContext(const RooAddGenContext& other) ;	RooAddGenContext(const RooAddGenContext& other) ;

	const RooArgSet* _vars ;	const RooArgSet* _vars ;
	RooArgSet* _pdfSet ; // Set owned all nodes of internal clone of p.d.f	RooArgSet* _pdfSet ; // Set owned all nodes of internal clone of p.d.f
	RooAbsPdf *_pdf ; // Pointer to cloned p.d.f	RooAbsPdf *_pdf ; // Pointer to cloned p.d.f

	TList _gcList ; // List of component generator contexts	std::vector<RooAbsGenContext*> _gcList ; // List of component generator contexts
	Int_t _nComp ; // Number of PDF components	Int_t _nComp ; // Number of PDF components
	Double_t* _coefThresh ; //[_nComp] Array of coefficient thresholds	Double_t* _coefThresh ; //[_nComp] Array of coefficient thresholds
	Bool_t _isModel ; // Are we generating from a RooAddPdf or a RooAddModel	Bool_t _isModel ; // Are we generating from a RooAddPdf or a RooAddModel

		RooAddModel::CacheElem* _mcache ; //! RooAddModel cache element
		RooAddPdf::CacheElem* _pcache ; //! RooAddPdf cache element

	ClassDef(RooAddGenContext,0) // Specialized context for generating a data set from a RooAddPdf	ClassDef(RooAddGenContext,0) // Specialized context for generating a data set from a RooAddPdf
	};	};

	#endif	#endif

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

	RooAddition.h	RooAddition.h

	skipping to change at line 53	skipping to change at line 53

	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) ;	Bool_t setData(RooAbsData& data, Bool_t cloneData=kTRUE) ;


		virtual std::list<Double_t>* binBoundaries(RooAbsRealLValue& /obs/, Dou
		ble_t /xlo/, Double_t /xhi/) const ;
		virtual std::list<Double_t>* plotSamplingHint(RooAbsRealLValue& /obs/,
		Double_t /xlo/, Double_t /xhi/) const ;
		Bool_t isBinnedDistribution(const RooArgSet& obs) const ;

	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	6 lines changed or added

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

	* File: $Id: RooBinIntegrator.h 42085 2011-11-17 12:56:12Z moneta $	* File: $Id: RooBinIntegrator.h 42153 2011-11-21 21:33:20Z wouter $
	* Authors: *	* Authors: *
	* WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu *	* WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu *
	* DK, David Kirkby, UC Irvine, dkirkby@uci.edu *	* DK, David Kirkby, UC Irvine, dkirkby@uci.edu *
	* *	* *
	* Copyright (c) 2000-2005, Regents of the University of California *	* Copyright (c) 2000-2005, Regents of the University of California *
	* and Stanford University. All rights reserved. *	* and Stanford University. All rights reserved. *
	* *	* *
	* Redistribution and use in source and binary forms, *	* Redistribution and use in source and binary forms, *
	* with or without modification, are permitted according to the terms *	* with or without modification, are permitted according to the terms *
	* listed in LICENSE (http://roofit.sourceforge.net/license.txt) *	* listed in LICENSE (http://roofit.sourceforge.net/license.txt) *
	************************************************************************ */	************************************************************************ */
	#ifndef ROO_BIN_INTEGRATOR	#ifndef ROO_BIN_INTEGRATOR
	#define ROO_BIN_INTEGRATOR	#define ROO_BIN_INTEGRATOR

	#include "RooAbsIntegrator.h"	#include "RooAbsIntegrator.h"
	#include "RooNumIntConfig.h"	#include "RooNumIntConfig.h"

		#include <vector>

	class RooBinIntegrator : public RooAbsIntegrator {	class RooBinIntegrator : public RooAbsIntegrator {
	public:	public:

	// Constructors, assignment etc	// Constructors, assignment etc
	RooBinIntegrator() ;	RooBinIntegrator() ;

	RooBinIntegrator(const RooAbsFunc& function) ;	RooBinIntegrator(const RooAbsFunc& function) ;
	RooBinIntegrator(const RooAbsFunc& function, const RooNumIntConfig& confi g) ;	RooBinIntegrator(const RooAbsFunc& function, const RooNumIntConfig& confi g) ;


	skipping to change at line 42	skipping to change at line 43
	virtual ~RooBinIntegrator();	virtual ~RooBinIntegrator();

	virtual Bool_t checkLimits() const;	virtual Bool_t checkLimits() const;
	virtual Double_t integral(const Double_t *yvec=0) ;	virtual Double_t integral(const Double_t *yvec=0) ;

	using RooAbsIntegrator::setLimits ;	using RooAbsIntegrator::setLimits ;
	Bool_t setLimits(Double_t* xmin, Double_t* xmax);	Bool_t setLimits(Double_t* xmin, Double_t* xmax);
	virtual Bool_t setUseIntegrandLimits(Bool_t flag) {_useIntegrandLimits = flag ; return kTRUE ; }	virtual Bool_t setUseIntegrandLimits(Bool_t flag) {_useIntegrandLimits = flag ; return kTRUE ; }

	virtual Bool_t canIntegrate1D() const { return kTRUE ; }	virtual Bool_t canIntegrate1D() const { return kTRUE ; }

	virtual Bool_t canIntegrate2D() const { return kFALSE ; }	virtual Bool_t canIntegrate2D() const { return kTRUE ; }
	virtual Bool_t canIntegrateND() const { return kFALSE ; }	virtual Bool_t canIntegrateND() const { return kTRUE ; }
	virtual Bool_t canIntegrateOpenEnded() const { return kFALSE ; }	virtual Bool_t canIntegrateOpenEnded() const { return kFALSE ; }

	protected:	protected:

	friend class RooNumIntFactory ;	friend class RooNumIntFactory ;
	static void registerIntegrator(RooNumIntFactory& fact) ;	static void registerIntegrator(RooNumIntFactory& fact) ;

	// Numerical integrator workspace	// Numerical integrator workspace

	mutable Double_t _xmin; //! Lower integration bound	mutable std::vector<Double_t> _xmin; //! Lower integration bound
	mutable Double_t _xmax; //! Upper integration bound	mutable std::vector<Double_t> _xmax; //! Upper integration bound
	mutable Double_t _range; //! Size of integration range	std::vector<std::list<Double_t>*> _binb ; //! list of bin boundaries
	mutable Double_t _binWidth; //! Size of integration range	mutable Int_t _numBins; //! Size of integration range
	mutable Int_t _numBins; //! Size of integration range

	Bool_t _useIntegrandLimits; // If true limits of function binding are ue d	Bool_t _useIntegrandLimits; // If true limits of function binding are ue d

	Double_t* xvec(Double_t& xx) { _x[0] = xx ; return _x ; }	Double_t* xvec(Double_t& xx) { _x[0] = xx ; return _x ; }

		Double_t* xvec(Double_t& xx, Double_t &yy) { _x[0] = xx ; _x[1] = yy ; re
		turn _x ; }
		Double_t* xvec(Double_t& xx, Double_t &yy, Double_t &zz) { _x[0] = xx ; _
		x[1] = yy ; _x[2] = zz ; return _x ; }

	Double_t *_x ; //! do not persist	Double_t *_x ; //! do not persist

	ClassDef(RooBinIntegrator,0) // 1-dimensional numerical integration engin e	ClassDef(RooBinIntegrator,0) // 1-dimensional numerical integration engin e
	};	};

	#endif	#endif

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

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

	* File: $Id: RooCacheManager.h 39912 2011-06-23 16:40:11Z moneta $	* File: $Id: RooCacheManager.h 42241 2011-11-25 13:55:30Z wouter $
	* Authors: *	* Authors: *
	* WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu *	* WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu *
	* DK, David Kirkby, UC Irvine, dkirkby@uci.edu *	* DK, David Kirkby, UC Irvine, dkirkby@uci.edu *
	* *	* *
	* Copyright (c) 2000-2005, Regents of the University of California *	* Copyright (c) 2000-2005, Regents of the University of California *
	* and Stanford University. All rights reserved. *	* and Stanford University. All rights reserved. *
	* *	* *
	* Redistribution and use in source and binary forms, *	* Redistribution and use in source and binary forms, *
	* with or without modification, are permitted according to the terms *	* with or without modification, are permitted according to the terms *
	* listed in LICENSE (http://roofit.sourceforge.net/license.txt) *	* listed in LICENSE (http://roofit.sourceforge.net/license.txt) *

	skipping to change at line 29	skipping to change at line 29
	#include "Rtypes.h"	#include "Rtypes.h"

	#include "Riostream.h"	#include "Riostream.h"
	#include "RooMsgService.h"	#include "RooMsgService.h"
	#include "RooNormSetCache.h"	#include "RooNormSetCache.h"
	#include "RooAbsReal.h"	#include "RooAbsReal.h"
	#include "RooArgSet.h"	#include "RooArgSet.h"
	#include "RooArgList.h"	#include "RooArgList.h"
	#include "RooAbsCache.h"	#include "RooAbsCache.h"
	#include "RooAbsCacheElement.h"	#include "RooAbsCacheElement.h"

		#include "RooNameReg.h"
	#include <vector>	#include <vector>

	class RooNameSet ;	class RooNameSet ;

	template<class T>	template<class T>
	class RooCacheManager : public RooAbsCache {	class RooCacheManager : public RooAbsCache {

	public:	public:

	RooCacheManager(Int_t maxSize=10) ;	RooCacheManager(Int_t maxSize=10) ;

	skipping to change at line 53	skipping to change at line 54
	T* getObj(const RooArgSet* nset, Int_t* sterileIndex=0, const TNamed* ise tRangeName=0) {	T* getObj(const RooArgSet* nset, Int_t* sterileIndex=0, const TNamed* ise tRangeName=0) {
	// Getter function without integration set	// Getter function without integration set
	return getObj(nset,0,sterileIndex,isetRangeName) ;	return getObj(nset,0,sterileIndex,isetRangeName) ;
	}	}

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


		inline T* getObj(const RooArgSet* nset, const RooArgSet* iset, Int_t* ste
		rileIdx, const char* isetRangeName) {
		if (_wired) return *_object ;
		return getObj(nset,iset,sterileIdx,RooNameReg::ptr(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() ;
	virtual 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 ;
	}	}

	skipping to change at line 88	skipping to change at line 94
	}	}

	T* getObjByIndex(Int_t index) const ;	T* getObjByIndex(Int_t index) const ;
	const RooNameSet* nameSet1ByIndex(Int_t index) const ;	const RooNameSet* nameSet1ByIndex(Int_t index) const ;
	const RooNameSet* nameSet2ByIndex(Int_t index) const ;	const RooNameSet* nameSet2ByIndex(Int_t index) const ;

	virtual void insertObjectHook(T&) {	virtual void insertObjectHook(T&) {
	// Interface function to perform post-insert operations on cached objec t	// Interface function to perform post-insert operations on cached objec t
	}	}


		void wireCache() {
		if (_size==0) {
		oocoutI(_owner,Optimization) << "RooCacheManager::wireCache(" << _own
		er->GetName() << ") no cached elements!" << endl ;
		} else if (_size==1) {
		oocoutI(_owner,Optimization) << "RooCacheManager::wireCache(" << _own
		er->GetName() << ") now wiring cache" << endl ;
		_wired=kTRUE ;
		} else if (_size>1) {
		oocoutI(_owner,Optimization) << "RooCacheManager::wireCache(" << _own
		er->GetName() << ") cache cannot be wired because it contains more than one
		element" << endl ;
		}
		}

	protected:	protected:

	Int_t _maxSize ; // Maximum size	Int_t _maxSize ; // Maximum size
	Int_t _size ; // Actual use	Int_t _size ; // Actual use
	Int_t _lastIndex ; // Last slot accessed	Int_t _lastIndex ; // Last slot accessed

	RooNormSetCache* _nsetCache ; //! Normalization/Integration set manager	RooNormSetCache* _nsetCache ; //! Normalization/Integration set manager
	T** _object ; //! Payload	T** _object ; //! Payload

		Bool_t _wired ; //! In wired mode, there is a single payloa d which is returned always

	ClassDef(RooCacheManager,1) // Cache Manager class generic objects	ClassDef(RooCacheManager,1) // Cache Manager class generic objects
	} ;	} ;

	template<class T>	template<class T>
	RooCacheManager<T>::RooCacheManager(Int_t maxSize) : RooAbsCache(0)	RooCacheManager<T>::RooCacheManager(Int_t maxSize) : RooAbsCache(0)
	{	{
	// Constructor for simple caches without RooAbsArg payload. A cache	// Constructor for simple caches without RooAbsArg payload. A cache
	// made with this constructor is not registered with its owner	// made with this constructor is not registered with its owner
	// and will not receive information on server redirects and	// and will not receive information on server redirects and
	// cache operation mode changes	// cache operation mode changes

	_maxSize = maxSize ;	_maxSize = maxSize ;
	_nsetCache = new RooNormSetCache[maxSize] ;	_nsetCache = new RooNormSetCache[maxSize] ;
	_object = new T*[maxSize] ;	_object = new T*[maxSize] ;

		_wired = kFALSE ;
	}	}

	template<class T>	template<class T>
	RooCacheManager<T>::RooCacheManager(RooAbsArg* owner, Int_t maxSize) : RooA bsCache(owner)	RooCacheManager<T>::RooCacheManager(RooAbsArg* owner, Int_t maxSize) : RooA bsCache(owner)
	{	{
	// Constructor for simple caches with RooAbsArg derived payload. A cache	// Constructor for simple caches with RooAbsArg derived payload. A cache
	// made with this constructor is registered with its owner	// made with this constructor is registered with its owner
	// and will receive information on server redirects and	// and will receive information on server redirects and
	// cache operation mode changes	// cache operation mode changes

	_maxSize = maxSize ;	_maxSize = maxSize ;
	_size = 0 ;	_size = 0 ;

	_nsetCache = new RooNormSetCache[maxSize] ;	_nsetCache = new RooNormSetCache[maxSize] ;
	_object = new T*[maxSize] ;	_object = new T*[maxSize] ;

		_wired = kFALSE ;
	_lastIndex = -1 ;	_lastIndex = -1 ;

	Int_t i ;	Int_t i ;
	for (i=0 ; i<_maxSize ; i++) {	for (i=0 ; i<_maxSize ; i++) {
	_object[i]=0 ;	_object[i]=0 ;
	}	}

	}	}

	template<class T>	template<class T>
	RooCacheManager<T>::RooCacheManager(const RooCacheManager& other, RooAbsArg * owner) : RooAbsCache(other,owner)	RooCacheManager<T>::RooCacheManager(const RooCacheManager& other, RooAbsArg * owner) : RooAbsCache(other,owner)
	{	{
	// Copy constructor	// Copy constructor

	_maxSize = other._maxSize ;	_maxSize = other._maxSize ;
	_size = other._size ;	_size = other._size ;

	_nsetCache = new RooNormSetCache[_maxSize] ;	_nsetCache = new RooNormSetCache[_maxSize] ;
	_object = new T*[_maxSize] ;	_object = new T*[_maxSize] ;

		_wired = kFALSE ;
	_lastIndex = -1 ;	_lastIndex = -1 ;

	// cout << "RooCacheManager:cctor(" << this << ")" << endl ;	// cout << "RooCacheManager:cctor(" << this << ")" << endl ;

	Int_t i ;	Int_t i ;
	for (i=0 ; i<other._size ; i++) {	for (i=0 ; i<other._size ; i++) {
	_nsetCache[i].initialize(other._nsetCache[i]) ;	_nsetCache[i].initialize(other._nsetCache[i]) ;
	_object[i] = 0 ;	_object[i] = 0 ;
	}	}


	skipping to change at line 237	skipping to change at line 258
	if (_object[_size]) {	if (_object[_size]) {
	delete _object[_size] ;	delete _object[_size] ;
	}	}

	_object[_size] = obj ;	_object[_size] = obj ;
	_size++ ;	_size++ ;

	// Allow optional post-processing of object inserted in cache	// Allow optional post-processing of object inserted in cache
	insertObjectHook(*obj) ;	insertObjectHook(*obj) ;


		// Unwire cache in case it was wired
		_wired = kFALSE ;

	return _size-1 ;	return _size-1 ;
	}	}

	template<class T>	template<class T>
	T* RooCacheManager<T>::getObj(const RooArgSet* nset, const RooArgSet* iset, Int_t* sterileIdx, const TNamed* isetRangeName)	T* RooCacheManager<T>::getObj(const RooArgSet* nset, const RooArgSet* iset, Int_t* sterileIdx, const TNamed* isetRangeName)
	{	{
	// Retrieve payload object indexed on nset,uset amd isetRangeName	// Retrieve payload object indexed on nset,uset amd isetRangeName
	// If sterileIdx is not null, it is set to the index of the sterile	// If sterileIdx is not null, it is set to the index of the sterile
	// slot in cacse such a slot is recycled	// slot in cacse such a slot is recycled


		// Fast-track for wired mode
		if (_wired) {
		if(_object==0 && sterileIdx) sterileIdx=0 ;
		return *_object ;
		}

	Int_t i ;	Int_t i ;
	for (i=0 ; i<_size ; i++) {	for (i=0 ; i<_size ; i++) {
	if (_nsetCache[i].contains(nset,iset,isetRangeName)==kTRUE) {	if (_nsetCache[i].contains(nset,iset,isetRangeName)==kTRUE) {
	_lastIndex = i ;	_lastIndex = i ;
	if(_object[i]==0 && sterileIdx) *sterileIdx=i ;	if(_object[i]==0 && sterileIdx) *sterileIdx=i ;
	return _object[i] ;	return _object[i] ;
	}	}
	}	}

	for (i=0 ; i<_size ; i++) {	for (i=0 ; i<_size ; i++) {
	if (_nsetCache[i].autoCache(_owner,nset,iset,isetRangeName,kFALSE)==kFA LSE) {	if (_nsetCache[i].autoCache(_owner,nset,iset,isetRangeName,kFALSE)==kFA LSE) {
	_lastIndex = i ;	_lastIndex = i ;
	if(_object[i]==0 && sterileIdx) *sterileIdx=i ;	if(_object[i]==0 && sterileIdx) *sterileIdx=i ;
	return _object[i] ;	return _object[i] ;
	}	}
	}	}


	return 0 ;	return 0 ;
	}	}

	template<class T>	template<class T>
	T* RooCacheManager<T>::getObjByIndex(Int_t index) const	T* RooCacheManager<T>::getObjByIndex(Int_t index) const
	{	{
	// Retrieve payload object by slot index	// Retrieve payload object by slot index

	if (index<0\|\|index>=_size) {	if (index<0\|\|index>=_size) {
	oocoutE(_owner,ObjectHandling) << "RooCacheManager::getNormListByIndex: ERROR index ("	oocoutE(_owner,ObjectHandling) << "RooCacheManager::getNormListByIndex: ERROR index ("

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

	RooCatType.h	RooCatType.h

	skipping to change at line 47	skipping to change at line 47
	strlcpy(_label,other._label,256) ;	strlcpy(_label,other._label,256) ;
	} ;	} ;

	virtual ~RooCatType() {	virtual ~RooCatType() {
	// Destructor	// Destructor
	} ;	} ;
	virtual TObject* Clone(const char) const { return new RooCatType(this); }	virtual TObject* Clone(const char) const { return new RooCatType(this); }

	virtual const Text_t* GetName() const {	virtual const Text_t* GetName() const {
	// Return state name	// Return state name

	return _label ;	return _label[0] ? _label : 0 ;
	}	}
	virtual void SetName(const Text_t* name) ;	virtual void SetName(const Text_t* name) ;

	inline RooCatType& operator=(const RooCatType& other) {	inline RooCatType& operator=(const RooCatType& other) {
	// Assignment operator from other RooCatType	// Assignment operator from other RooCatType
	if (&other==this) return *this ;	if (&other==this) return *this ;

	SetName(other.GetName()) ;	//SetName(other.GetName()) ;
		_label[0] = 0 ;
	_value = other._value ;	_value = other._value ;
	return *this ; }	return *this ; }


		inline void assignFast(const RooCatType& other) {
		// Fast assignment operator from other RooCatType
		_label[0] = 0 ;
		_value = other._value ;
		}

	inline Bool_t operator==(const RooCatType& other) {	inline Bool_t operator==(const RooCatType& other) {
	// Equality operator with other RooCatType	// Equality operator with other RooCatType

	return ( _value==other._value && !strcmp(_label,other._label)) ;	return (_value==other._value) ;
	}	}

	inline Bool_t operator==(Int_t index) {	inline Bool_t operator==(Int_t index) {
	// Return true if index value matches integer	// Return true if index value matches integer
	return (_value==index) ;	return (_value==index) ;
	}	}

	Bool_t operator==(const char* label) {	Bool_t operator==(const char* label) {
	// Return true if state name matchins string	// Return true if state name matchins string
	return !strcmp(_label,label) ;	return !strcmp(_label,label) ;

	skipping to change at line 93	skipping to change at line 100
	virtual void printTitle(ostream& os) const ;	virtual void printTitle(ostream& os) const ;
	virtual void printClassName(ostream& os) const ;	virtual void printClassName(ostream& os) const ;
	virtual void printValue(ostream& os) const ;	virtual void printValue(ostream& os) const ;

	inline virtual void Print(Option_t *options= 0) const {	inline virtual void Print(Option_t *options= 0) const {
	// Printing interface	// Printing interface
	printStream(defaultPrintStream(),defaultPrintContents(options),defaultP rintStyle(options));	printStream(defaultPrintStream(),defaultPrintContents(options),defaultP rintStyle(options));
	}	}

	protected:	protected:


		friend class RooAbsCategoryLValue ;
	friend class RooAbsCategory ;	friend class RooAbsCategory ;
	Int_t _value ; // Index value	Int_t _value ; // Index value
	char _label[256] ; // State name	char _label[256] ; // State name

	ClassDef(RooCatType,1) // Category state, (name,index) pair	ClassDef(RooCatType,1) // Category state, (name,index) pair
	} ;	} ;

	#endif	#endif

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

	RooCategory.h	RooCategory.h

	skipping to change at line 39	skipping to change at line 39
	RooCategory(const char name, const char title);	RooCategory(const char name, const char title);
	RooCategory(const RooCategory& other, const char* name=0) ;	RooCategory(const RooCategory& other, const char* name=0) ;
	virtual ~RooCategory();	virtual ~RooCategory();
	virtual TObject* clone(const char* newname) const { return new RooCategor y(*this,newname); }	virtual TObject* clone(const char* newname) const { return new RooCategor y(*this,newname); }

	// Value modifiers	// Value modifiers
	virtual Int_t getIndex() const {	virtual Int_t getIndex() const {
	return _value.getVal() ;	return _value.getVal() ;
	// Return index value	// Return index value
	}	}


	virtual const char* getLabel() const {	virtual const char* getLabel() const {

		const char* ret = _value.GetName() ;
		if (ret==0) {
		_value.SetName(lookupType(_value.getVal())->GetName()) ;
		}
	return _value.GetName() ;	return _value.GetName() ;

	// Return state name
	}	}


	virtual Bool_t setIndex(Int_t index, Bool_t printError=kTRUE) ;	virtual Bool_t setIndex(Int_t index, Bool_t printError=kTRUE) ;
	virtual Bool_t setLabel(const char* label, Bool_t printError=kTRUE) ;	virtual Bool_t setLabel(const char* label, Bool_t printError=kTRUE) ;

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

	// We implement a fundamental type of AbsArg that can be stored in a data set	// We implement a fundamental type of AbsArg that can be stored in a data set
	inline virtual Bool_t isFundamental() const {	inline virtual Bool_t isFundamental() const {
	// Return true as a RooCategory is a fundamental (non-derived) type	// Return true as a RooCategory is a fundamental (non-derived) type
	return kTRUE;	return kTRUE;
	}	}


		virtual Bool_t isDerived() const {
		// Does value or shape of this arg depend on any other arg?
		return kFALSE ;
		}

	Bool_t defineType(const char* label) ;	Bool_t defineType(const char* label) ;
	Bool_t defineType(const char* label, Int_t index) ;	Bool_t defineType(const char* label, Int_t index) ;
	void clearTypes() { RooAbsCategory::clearTypes() ; }	void clearTypes() { RooAbsCategory::clearTypes() ; }

	void clearRange(const char* name, Bool_t silent) ;	void clearRange(const char* name, Bool_t silent) ;
	void setRange(const char* rangeName, const char* stateNameList) ;	void setRange(const char* rangeName, const char* stateNameList) ;
	void addToRange(const char* rangeName, const char* stateNameList) ;	void addToRange(const char* rangeName, const char* stateNameList) ;
	Bool_t isStateInRange(const char* rangeName, const char* stateName) const ;	Bool_t isStateInRange(const char* rangeName, const char* stateName) const ;
	virtual Bool_t inRange(const char* rangeName) const {	virtual Bool_t inRange(const char* rangeName) const {
	// Returns true of current value of category is inside given range	// Returns true of current value of category is inside given range

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

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

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

	skipping to change at line 39	skipping to change at line 39

	class RooCompositeDataStore : public RooAbsDataStore {	class RooCompositeDataStore : public RooAbsDataStore {
	public:	public:

	RooCompositeDataStore() ;	RooCompositeDataStore() ;

	// Ctors from DataStore	// Ctors from DataStore
	RooCompositeDataStore(const char* name, const char* title, const RooArgSe t& vars, RooCategory& indexCat, std::map<std::string,RooAbsDataStore*> inpu tData) ;	RooCompositeDataStore(const char* name, const char* title, const RooArgSe t& vars, RooCategory& indexCat, std::map<std::string,RooAbsDataStore*> inpu tData) ;

	// Empty ctor	// Empty ctor

		virtual RooAbsDataStore* clone(const char* newname=0) const { return new RooCompositeDataStore(*this,newname) ; }
	virtual RooAbsDataStore* clone(const RooArgSet& vars, const char* newname =0) const { return new RooCompositeDataStore(*this,vars,newname) ; }	virtual RooAbsDataStore* clone(const RooArgSet& vars, const char* newname =0) const { return new RooCompositeDataStore(*this,vars,newname) ; }

	RooCompositeDataStore(const RooCompositeDataStore& other, const char* new name=0) ;	RooCompositeDataStore(const RooCompositeDataStore& other, const char* new name=0) ;
	RooCompositeDataStore(const RooCompositeDataStore& other, const RooArgSet & vars, const char* newname=0) ;	RooCompositeDataStore(const RooCompositeDataStore& other, const RooArgSet & vars, const char* newname=0) ;
	virtual ~RooCompositeDataStore() ;	virtual ~RooCompositeDataStore() ;


		virtual void dump() ;

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


		virtual Double_t sumEntries() const ;

	// Retrieve a row	// Retrieve a row
	using RooAbsDataStore::get ;	using RooAbsDataStore::get ;
	virtual const RooArgSet* get(Int_t index) const ;	virtual const RooArgSet* get(Int_t index) const ;
	virtual Double_t weight() const ;	virtual Double_t weight() const ;
	virtual Double_t weight(Int_t index) const ;	virtual Double_t weight(Int_t index) const ;
	virtual Double_t weightError(RooAbsData::ErrorType etype=RooAbsData::Pois son) const ;	virtual Double_t weightError(RooAbsData::ErrorType etype=RooAbsData::Pois son) const ;
	virtual void weightError(Double_t& lo, Double_t& hi, RooAbsData::ErrorTyp e etype=RooAbsData::Poisson) const ;	virtual void weightError(Double_t& lo, Double_t& hi, RooAbsData::ErrorTyp e etype=RooAbsData::Poisson) const ;
	virtual Bool_t isWeighted() const ;	virtual Bool_t isWeighted() const ;

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

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

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


		RooCategory* index() { return _indexCat ; }

	// Add rows	// Add rows
	virtual void append(RooAbsDataStore& other) ;	virtual void append(RooAbsDataStore& other) ;

	// General & bookkeeping methods	// General & bookkeeping methods
	virtual Bool_t valid() const ;	virtual Bool_t valid() const ;
	virtual Int_t numEntries() const ;	virtual Int_t numEntries() const ;
	virtual void reset() ;	virtual void reset() ;


		// Buffer redirection routines used in inside RooAbsOptTestStatistics
		virtual void attachBuffers(const RooArgSet& extObs) ;
		virtual void resetBuffers() ;

	// Constant term optimizer interface	// Constant term optimizer interface
	virtual void cacheArgs(const RooAbsArg* owner, RooArgSet& varSet, const R ooArgSet* nset=0) ;	virtual void cacheArgs(const RooAbsArg* owner, RooArgSet& varSet, const R ooArgSet* nset=0) ;
	virtual const RooAbsArg* cacheOwner() { return 0 ; }	virtual const RooAbsArg* cacheOwner() { return 0 ; }
	virtual void setArgStatus(const RooArgSet& set, Bool_t active) ;	virtual void setArgStatus(const RooArgSet& set, Bool_t active) ;
	virtual void resetCache() ;	virtual void resetCache() ;


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

	protected:	protected:

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


	std::map<std::string,RooAbsDataStore*> _dataMap ;	std::map<Int_t,RooAbsDataStore*> _dataMap ;
	RooCategory* _indexCat ;	RooCategory* _indexCat ;
	mutable RooAbsDataStore* _curStore ; //! Datastore associated with curren t event	mutable RooAbsDataStore* _curStore ; //! Datastore associated with curren t event
	mutable Int_t _curIndex ; //! Index associated with current event	mutable Int_t _curIndex ; //! Index associated with current event

		Bool_t _ownComps ; //!

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

	#endif	#endif

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

	RooConstVar.h	RooConstVar.h

	skipping to change at line 36	skipping to change at line 36
	public:	public:
	// Constructors, assignment etc	// Constructors, assignment etc
	inline RooConstVar() {	inline RooConstVar() {
	// Default constructor	// Default constructor
	}	}
	RooConstVar(const char name, const char title, Double_t value);	RooConstVar(const char name, const char title, Double_t value);
	RooConstVar(const RooConstVar& other, const char* name=0);	RooConstVar(const RooConstVar& other, const char* name=0);
	virtual TObject* clone(const char* newname) const { return new RooConstVa r(*this,newname); }	virtual TObject* clone(const char* newname) const { return new RooConstVa r(*this,newname); }
	virtual ~RooConstVar();	virtual ~RooConstVar();


	virtual Double_t getVal(const RooArgSet* set=0) const ;	virtual Double_t getValV(const RooArgSet* set=0) const ;
	void writeToStream(ostream& os, Bool_t compact) const ;	void writeToStream(ostream& os, Bool_t compact) const ;


		virtual Bool_t isDerived() const {
		// Does value or shape of this arg depend on any other arg?
		return kFALSE ;
		}

	protected:	protected:

	virtual Double_t evaluate() const {	virtual Double_t evaluate() const {
	// Return value	// Return value
	return _value ;	return _value ;
	} ;	} ;

	Double_t _value ; // Constant value of self	Double_t _value ; // Constant value of self

	ClassDef(RooConstVar,1) // Constant RooAbsReal value object	ClassDef(RooConstVar,1) // Constant RooAbsReal value object

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

	RooConvCoefVar.h	RooConvCoefVar.h

	skipping to change at line 42	skipping to change at line 42
	inline RooConvCoefVar() {	inline RooConvCoefVar() {
	// Default constructor	// Default constructor
	}	}
	RooConvCoefVar(const char name, const char title, const RooAbsAnaConvPd f& input, Int_t coefIdx, const RooArgSet* varList=0) ;	RooConvCoefVar(const char name, const char title, const RooAbsAnaConvPd f& input, Int_t coefIdx, const RooArgSet* varList=0) ;
	RooConvCoefVar(const RooConvCoefVar& other, const char* name=0);	RooConvCoefVar(const RooConvCoefVar& other, const char* name=0);
	virtual TObject* clone(const char* newname) const { return new RooConvCoe fVar(*this,newname); }	virtual TObject* clone(const char* newname) const { return new RooConvCoe fVar(*this,newname); }
	virtual ~RooConvCoefVar() {	virtual ~RooConvCoefVar() {
	// Destructor	// Destructor
	} ;	} ;


	virtual Double_t getVal(const RooArgSet* nset=0) const ;	virtual Double_t getValV(const RooArgSet* nset=0) const ;

	virtual Double_t evaluate() const ;	virtual Double_t evaluate() const ;
	virtual Int_t getAnalyticalIntegral(RooArgSet& allVars, RooArgSet& analVa rs, const char* rangeName=0) const ;	virtual Int_t getAnalyticalIntegral(RooArgSet& allVars, RooArgSet& analVa rs, const char* rangeName=0) const ;
	virtual Double_t analyticalIntegral(Int_t code, const char* rangeName=0) const ;	virtual Double_t analyticalIntegral(Int_t code, const char* rangeName=0) const ;

	protected:	protected:

	RooSetProxy _varSet ; // Not used anymore?	RooSetProxy _varSet ; // Not used anymore?
	RooRealProxy _convPdf ; // RooAbsAnaConv object implementing our coeffici ent	RooRealProxy _convPdf ; // RooAbsAnaConv object implementing our coeffici ent
	Int_t _coefIdx ; // Index code of the coefficient	Int_t _coefIdx ; // Index code of the coefficient

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

	RooEffProd.h	RooEffProd.h

	skipping to change at line 33	skipping to change at line 33
	inline RooEffProd() : _nset(0), _fixedNset(0) { };	inline RooEffProd() : _nset(0), _fixedNset(0) { };
	virtual ~RooEffProd();	virtual ~RooEffProd();
	RooEffProd(const char name, const char title, RooAbsPdf& pdf, RooAbsRea l& efficiency);	RooEffProd(const char name, const char title, RooAbsPdf& pdf, RooAbsRea l& efficiency);
	RooEffProd(const RooEffProd& other, const char* name=0);	RooEffProd(const RooEffProd& other, const char* name=0);

	virtual TObject* clone(const char* newname) const { return new RooEffProd (*this,newname); }	virtual TObject* clone(const char* newname) const { return new RooEffProd (*this,newname); }

	virtual RooAbsGenContext* genContext(const RooArgSet &vars, const RooData Set *prototype,	virtual RooAbsGenContext* genContext(const RooArgSet &vars, const RooData Set *prototype,
	const RooArgSet* auxProto, Bool_t ve rbose) const;	const RooArgSet* auxProto, Bool_t ve rbose) const;


	virtual Double_t getVal(const RooArgSet* set=0) const ;	virtual Double_t getValV(const RooArgSet* set=0) const ;

	virtual Bool_t forceAnalyticalInt(const RooAbsArg& /dep/) const {	virtual Bool_t forceAnalyticalInt(const RooAbsArg& /dep/) const {
	// Return kTRUE to force RooRealIntegral to offer all observables for i nternal integration	// Return kTRUE to force RooRealIntegral to offer all observables for i nternal integration
	return kTRUE ;	return kTRUE ;
	}	}
	Int_t getAnalyticalIntegralWN(RooArgSet& allVars, RooArgSet& numVars, con st RooArgSet* normSet, const char* rangeName=0) const ;	Int_t getAnalyticalIntegralWN(RooArgSet& allVars, RooArgSet& numVars, con st RooArgSet* normSet, const char* rangeName=0) const ;
	Double_t analyticalIntegralWN(Int_t code, const RooArgSet* normSet, const char* rangeName=0) const ;	Double_t analyticalIntegralWN(Int_t code, const RooArgSet* normSet, const char* rangeName=0) const ;

	protected:	protected:


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

	RooErrorVar.h	RooErrorVar.h

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

	#include "Riosfwd.h"	#include "Riosfwd.h"
	#include <math.h>	#include <math.h>
	#include <float.h>	#include <float.h>

	#include "RooNumber.h"	#include "RooNumber.h"
	#include "RooAbsReal.h"	#include "RooAbsReal.h"
	#include "RooRealVar.h"	#include "RooRealVar.h"
	#include "RooRealProxy.h"	#include "RooRealProxy.h"

		class RooVectorDataStore ;

	class RooErrorVar : public RooAbsRealLValue {	class RooErrorVar : public RooAbsRealLValue {
	public:	public:
	// Constructors, assignment etc.	// Constructors, assignment etc.
	inline RooErrorVar() {	inline RooErrorVar() {
	// Default constructor	// Default constructor
	}	}
	RooErrorVar(const char name, const char title, const RooRealVar& input) ;	RooErrorVar(const char name, const char title, const RooRealVar& input) ;
	RooErrorVar(const RooErrorVar& other, const char* name=0);	RooErrorVar(const RooErrorVar& other, const char* name=0);
	virtual TObject* clone(const char* newname) const { return new RooErrorVa r(*this,newname); }	virtual TObject* clone(const char* newname) const { return new RooErrorVa r(*this,newname); }
	virtual ~RooErrorVar() ;	virtual ~RooErrorVar() ;


	virtual Double_t getVal(const RooArgSet* set=0) const ;	virtual Double_t getValV(const RooArgSet* set=0) const ;

	virtual Double_t evaluate() const {	virtual Double_t evaluate() const {
	// return error of input RooRealVar	// return error of input RooRealVar
	return ((RooRealVar&)_realVar.arg()).getError() ;	return ((RooRealVar&)_realVar.arg()).getError() ;
	}	}

	virtual void setVal(Double_t value) {	virtual void setVal(Double_t value) {
	// Set error of input RooRealVar to value	// Set error of input RooRealVar to value
	((RooRealVar&)_realVar.arg()).setVal(value) ;	((RooRealVar&)_realVar.arg()).setVal(value) ;
	}	}

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

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

	* File: $Id: RooFactoryWSTool.h 39955 2011-06-24 20:52:32Z wouter $	* File: $Id: RooFactoryWSTool.h 39949 2011-06-24 15:13:35Z wouter $
	* Authors: *	* Authors: *
	* WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu *	* WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu *
	* DK, David Kirkby, UC Irvine, dkirkby@uci.edu *	* DK, David Kirkby, UC Irvine, dkirkby@uci.edu *
	* *	* *
	* Copyright (c) 2000-2005, Regents of the University of California *	* Copyright (c) 2000-2005, Regents of the University of California *
	* and Stanford University. All rights reserved. *	* and Stanford University. All rights reserved. *
	* *	* *
	* Redistribution and use in source and binary forms, *	* Redistribution and use in source and binary forms, *
	* with or without modification, are permitted according to the terms *	* with or without modification, are permitted according to the terms *
	* listed in LICENSE (http://roofit.sourceforge.net/license.txt) *	* listed in LICENSE (http://roofit.sourceforge.net/license.txt) *

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

	RooFitResult.h	RooFitResult.h

	skipping to change at line 30	skipping to change at line 30
	#include "RooAbsArg.h"	#include "RooAbsArg.h"
	#include "RooPrintable.h"	#include "RooPrintable.h"
	#include "RooDirItem.h"	#include "RooDirItem.h"
	#include "RooArgList.h"	#include "RooArgList.h"

	#include "RVersion.h"	#include "RVersion.h"
	#include "TMatrixFfwd.h"	#include "TMatrixFfwd.h"
	#include "TMatrixDSym.h"	#include "TMatrixDSym.h"
	#include "TRootIOCtor.h"	#include "TRootIOCtor.h"


		#include <vector>
		#include <string>
		#include <map>

	class RooArgSet ;	class RooArgSet ;
	class RooAbsPdf ;	class RooAbsPdf ;
	class RooPlot;	class RooPlot;
	class TObject ;	class TObject ;
	class TH2 ;	class TH2 ;
	typedef RooArgSet* pRooArgSet ;	typedef RooArgSet* pRooArgSet ;

	class RooFitResult : public TNamed, public RooPrintable, public RooDirItem {	class RooFitResult : public TNamed, public RooPrintable, public RooDirItem {
	public:	public:


	skipping to change at line 76	skipping to change at line 80
	virtual Int_t defaultPrintContents(Option_t* opt) const ;	virtual Int_t defaultPrintContents(Option_t* opt) const ;
	virtual StyleOption defaultPrintStyle(Option_t* opt) const ;	virtual StyleOption defaultPrintStyle(Option_t* opt) const ;

	RooAbsPdf* createHessePdf(const RooArgSet& params) const ;	RooAbsPdf* createHessePdf(const RooArgSet& params) const ;

	// Accessors	// Accessors
	inline Int_t status() const {	inline Int_t status() const {
	// Return MINUIT status code	// Return MINUIT status code
	return _status ;	return _status ;
	}	}


		inline UInt_t numStatusHistory() const { return _statusHistory.size() ; }
		Int_t statusCodeHistory(UInt_t icycle) ;
		const char* statusLabelHistory(UInt_t icycle) ;

	inline Int_t covQual() const {	inline Int_t covQual() const {
	// Return MINUIT quality code of covariance matrix	// Return MINUIT quality code of covariance matrix
	return _covQual ;	return _covQual ;
	}	}
	inline Int_t numInvalidNLL() const {	inline Int_t numInvalidNLL() const {
	// Return number of NLL evaluations with problems	// Return number of NLL evaluations with problems
	return _numBadNLL ;	return _numBadNLL ;
	}	}
	inline Double_t edm() const {	inline Double_t edm() const {
	// Return estimated distance to minimum	// Return estimated distance to minimum

	skipping to change at line 120	skipping to change at line 129
	}	}
	const RooArgList* correlation(const RooAbsArg& par) const {	const RooArgList* correlation(const RooAbsArg& par) const {
	// Return pointer to list of correlations of all parameters with par	// Return pointer to list of correlations of all parameters with par
	return correlation(par.GetName()) ;	return correlation(par.GetName()) ;
	}	}

	Double_t correlation(const char* parname1, const char* parname2) const ;	Double_t correlation(const char* parname1, const char* parname2) const ;
	const RooArgList* correlation(const char* parname) const ;	const RooArgList* correlation(const char* parname) const ;

	const TMatrixDSym& covarianceMatrix() const ;	const TMatrixDSym& covarianceMatrix() const ;

	TMatrixDSym reducedCovarianceMatrix(const RooArgList& params) const ;
	const TMatrixDSym& correlationMatrix() const ;	const TMatrixDSym& correlationMatrix() const ;

		TMatrixDSym reducedCovarianceMatrix(const RooArgList& params) const ;
		TMatrixDSym conditionalCovarianceMatrix(const RooArgList& params) const ;

	// Global correlation accessors	// Global correlation accessors
	Double_t globalCorr(const RooAbsArg& par) { return globalCorr(par.GetName ()) ; }	Double_t globalCorr(const RooAbsArg& par) { return globalCorr(par.GetName ()) ; }
	Double_t globalCorr(const char* parname) ;	Double_t globalCorr(const char* parname) ;
	const RooArgList* globalCorr() ;	const RooArgList* globalCorr() ;

	// Add objects to a 2D plot	// Add objects to a 2D plot
	inline RooPlot plotOn(RooPlot frame, const RooAbsArg &par1, const RooAb sArg &par2,	inline RooPlot plotOn(RooPlot frame, const RooAbsArg &par1, const RooAb sArg &par2,
	const char *options= "ME") const {	const char *options= "ME") const {
	// Plot error ellipse in par1 and par2 on frame	// Plot error ellipse in par1 and par2 on frame

	skipping to change at line 162	skipping to change at line 172
	void setInitParList(const RooArgList& list) ;	void setInitParList(const RooArgList& list) ;
	void setFinalParList(const RooArgList& list) ;	void setFinalParList(const RooArgList& list) ;
	inline void setMinNLL(Double_t val) { _minNLL = val ; }	inline void setMinNLL(Double_t val) { _minNLL = val ; }
	inline void setEDM(Double_t val) { _edm = val ; }	inline void setEDM(Double_t val) { _edm = val ; }
	inline void setStatus(Int_t val) { _status = val ; }	inline void setStatus(Int_t val) { _status = val ; }
	inline void setCovQual(Int_t val) { _covQual = val ; }	inline void setCovQual(Int_t val) { _covQual = val ; }
	inline void setNumInvalidNLL(Int_t val) { _numBadNLL=val ; }	inline void setNumInvalidNLL(Int_t val) { _numBadNLL=val ; }
	void fillCorrMatrix() ;	void fillCorrMatrix() ;
	void fillCorrMatrix(const std::vector<double>& globalCC, const TMatrixDSy m& corrs, const TMatrixDSym& covs) ;	void fillCorrMatrix(const std::vector<double>& globalCC, const TMatrixDSy m& corrs, const TMatrixDSym& covs) ;
	void fillLegacyCorrMatrix() const ;	void fillLegacyCorrMatrix() const ;

		void setStatusHistory(std::vector<std::pair<std::string,int> >& hist) { _ statusHistory = hist ; }

	Double_t correlation(Int_t row, Int_t col) const;	Double_t correlation(Int_t row, Int_t col) const;
	Double_t covariance(Int_t row, Int_t col) const;	Double_t covariance(Int_t row, Int_t col) const;

	Int_t _status ; // MINUIT status code	Int_t _status ; // MINUIT status code
	Int_t _covQual ; // MINUIT quality code of covariance matrix	Int_t _covQual ; // MINUIT quality code of covariance matrix
	Int_t _numBadNLL ; // Number calls with bad (zero,negative) like lihood	Int_t _numBadNLL ; // Number calls with bad (zero,negative) like lihood
	Double_t _minNLL ; // NLL at minimum	Double_t _minNLL ; // NLL at minimum
	Double_t _edm ; // Estimated distance to minimum	Double_t _edm ; // Estimated distance to minimum
	RooArgList* _constPars ; // List of constant parameters	RooArgList* _constPars ; // List of constant parameters

	skipping to change at line 185	skipping to change at line 196
	mutable RooArgList* _globalCorr ; //! List of global correlation coeffi cients	mutable RooArgList* _globalCorr ; //! List of global correlation coeffi cients
	mutable TList _corrMatrix ; //! Correlation matrix (list of RooAr gLists)	mutable TList _corrMatrix ; //! Correlation matrix (list of RooAr gLists)

	mutable RooArgList *_randomPars; //! List of floating parameters with mos t recent random perturbation applied	mutable RooArgList *_randomPars; //! List of floating parameters with mos t recent random perturbation applied
	mutable TMatrixF* _Lt; //! triangular matrix used for generate random perturbations	mutable TMatrixF* _Lt; //! triangular matrix used for generate random perturbations

	TMatrixDSym* _CM ; // Correlation matrix	TMatrixDSym* _CM ; // Correlation matrix
	TMatrixDSym* _VM ; // Covariance matrix	TMatrixDSym* _VM ; // Covariance matrix
	TVectorD* _GC ; // Global correlation coefficients	TVectorD* _GC ; // Global correlation coefficients


	ClassDef(RooFitResult,4) // Container class for fit result	std::vector<std::pair<std::string,int> > _statusHistory ; // History of s
		tatus codes

		ClassDef(RooFitResult,5) // Container class for fit result
	};	};

	#endif	#endif

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

	RooFormula.h	RooFormula.h

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

	#include "Rtypes.h"	#include "Rtypes.h"
	#include "TFormula.h"	#include "TFormula.h"
	#include "RooAbsReal.h"	#include "RooAbsReal.h"
	#include "RooArgSet.h"	#include "RooArgSet.h"
	#include "RooPrintable.h"	#include "RooPrintable.h"
	#include "RooLinkedList.h"	#include "RooLinkedList.h"

		#include <vector>

	class RooFormula : public TFormula, public RooPrintable {	class RooFormula : public TFormula, public RooPrintable {
	public:	public:
	// Constructors etc.	// Constructors etc.
	RooFormula() ;	RooFormula() ;
	RooFormula(const char* name, const char* formula, const RooArgList& varLi st);	RooFormula(const char* name, const char* formula, const RooArgList& varLi st);
	RooFormula(const RooFormula& other, const char* name=0) ;	RooFormula(const RooFormula& other, const char* name=0) ;
	virtual TObject* Clone(const char* newName=0) const { return new RooFormu la(*this,newName) ; }	virtual TObject* Clone(const char* newName=0) const { return new RooFormu la(*this,newName) ; }
	virtual ~RooFormula();	virtual ~RooFormula();


	skipping to change at line 81	skipping to change at line 82
	void initCopy(const RooFormula& other) ;	void initCopy(const RooFormula& other) ;

	// Interface to TFormula engine	// Interface to TFormula engine
	Int_t DefinedVariable(TString &name, int& action) ; // ROOT 4	Int_t DefinedVariable(TString &name, int& action) ; // ROOT 4
	Int_t DefinedVariable(TString &name) ; // ROOT 3	Int_t DefinedVariable(TString &name) ; // ROOT 3
	Double_t DefinedValue(Int_t code) ;	Double_t DefinedValue(Int_t code) ;

	RooArgSet* _nset ;	RooArgSet* _nset ;
	mutable Bool_t _isOK ; // Is internal state OK?	mutable Bool_t _isOK ; // Is internal state OK?
	RooLinkedList _origList ; //! Original list of dependents	RooLinkedList _origList ; //! Original list of dependents

		std::vector<Bool_t> _useIsCat;//! Is given slot in _useList a category?
	RooLinkedList _useList ; //! List of actual dependents	RooLinkedList _useList ; //! List of actual dependents
	mutable RooArgSet _actual; //! Set of actual dependents	mutable RooArgSet _actual; //! Set of actual dependents
	RooLinkedList _labelList ; // List of label names for category object s	RooLinkedList _labelList ; // List of label names for category object s
	mutable Bool_t _compiled ; // Flag set if formula is compiled	mutable Bool_t _compiled ; // Flag set if formula is compiled

	ClassDef(RooFormula,1) // TFormula derived class interfacing with Roo AbsArg objects	ClassDef(RooFormula,1) // TFormula derived class interfacing with Roo AbsArg objects
	};	};

	#endif	#endif

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

	RooFormulaVar.h	RooFormulaVar.h

	skipping to change at line 58	skipping to change at line 58
	virtual Bool_t readFromStream(istream& is, Bool_t compact, Bool_t verbose =kFALSE) ;	virtual Bool_t readFromStream(istream& is, Bool_t compact, Bool_t verbose =kFALSE) ;
	virtual void writeToStream(ostream& os, Bool_t compact) const ;	virtual void writeToStream(ostream& os, Bool_t compact) const ;

	// Printing interface (human readable)	// Printing interface (human readable)
	virtual void printMultiline(ostream& os, Int_t contents, Bool_t verbose=k FALSE, TString indent= "") const ;	virtual void printMultiline(ostream& os, Int_t contents, Bool_t verbose=k FALSE, TString indent= "") const ;
	void printMetaArgs(ostream& os) const ;	void printMetaArgs(ostream& os) const ;

	// Debugging	// Debugging
	void dumpFormula() { formula().dump() ; }	void dumpFormula() { formula().dump() ; }


	virtual Double_t getVal(const RooArgSet* set=0) const ;

	virtual Double_t defaultErrorLevel() const ;	virtual Double_t defaultErrorLevel() const ;

	protected:	protected:

	// Function evaluation	// Function evaluation
	virtual Double_t evaluate() const ;	virtual Double_t evaluate() const ;
	RooFormula& formula() const ;	RooFormula& formula() const ;

	// Post-processing of server redirection	// Post-processing of server redirection
	virtual Bool_t redirectServersHook(const RooAbsCollection& newServerList, Bool_t mustReplaceAll, Bool_t nameChange, Bool_t isRecursive) ;	virtual Bool_t redirectServersHook(const RooAbsCollection& newServerList, Bool_t mustReplaceAll, Bool_t nameChange, Bool_t isRecursive) ;

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

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

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

	skipping to change at line 40	skipping to change at line 40
	#include "RooArgSet.h"	#include "RooArgSet.h"
	#include "RooLinkedList.h"	#include "RooLinkedList.h"
	#include "RooAbsPdf.h"	#include "RooAbsPdf.h"

	class RooGenFitStudy : public RooAbsStudy {	class RooGenFitStudy : public RooAbsStudy {
	public:	public:

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

		virtual RooAbsStudy* clone(const char* newname="") const { return new Roo GenFitStudy(newname?newname:GetName(),GetTitle()) ; }

	void setGenConfig(const char* pdfName, const char* obsName, const RooCmdA rg& arg1=RooCmdArg(),const RooCmdArg& arg2=RooCmdArg(),const RooCmdArg& arg 3=RooCmdArg()) ;	void setGenConfig(const char* pdfName, const char* obsName, const RooCmdA rg& arg1=RooCmdArg(),const RooCmdArg& arg2=RooCmdArg(),const RooCmdArg& arg 3=RooCmdArg()) ;
	void setFitConfig(const char* pdfName, const char* obsName, const RooCmdA rg& arg1=RooCmdArg(),const RooCmdArg& arg2=RooCmdArg(),const RooCmdArg& arg 3=RooCmdArg()) ;	void setFitConfig(const char* pdfName, const char* obsName, const RooCmdA rg& arg1=RooCmdArg(),const RooCmdArg& arg2=RooCmdArg(),const RooCmdArg& arg 3=RooCmdArg()) ;

	virtual Bool_t attach(RooWorkspace& w) ;	virtual Bool_t attach(RooWorkspace& w) ;
	virtual Bool_t initialize() ;	virtual Bool_t initialize() ;
	virtual Bool_t execute() ;	virtual Bool_t execute() ;
	virtual Bool_t finalize() ;	virtual Bool_t finalize() ;

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

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

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

	* File: $Id: RooHistFunc.h 25209 2008-08-22 13:08:40Z wouter $	* File: $Id: RooHistFunc.h 42232 2011-11-24 23:23:30Z wouter $
	* Authors: *	* Authors: *
	* WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu *	* WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu *
	* DK, David Kirkby, UC Irvine, dkirkby@uci.edu *	* DK, David Kirkby, UC Irvine, dkirkby@uci.edu *
	* *	* *
	* Copyright (c) 2000-2005, Regents of the University of California *	* Copyright (c) 2000-2005, Regents of the University of California *
	* and Stanford University. All rights reserved. *	* and Stanford University. All rights reserved. *
	* *	* *
	* Redistribution and use in source and binary forms, *	* Redistribution and use in source and binary forms, *
	* with or without modification, are permitted according to the terms *	* with or without modification, are permitted according to the terms *
	* listed in LICENSE (http://roofit.sourceforge.net/license.txt) *	* listed in LICENSE (http://roofit.sourceforge.net/license.txt) *

	skipping to change at line 68	skipping to change at line 68
	void setCdfBoundaries(Bool_t flag) {	void setCdfBoundaries(Bool_t flag) {
	// Set use of special boundary conditions for c.d.f.s	// Set use of special boundary conditions for c.d.f.s
	_cdfBoundaries = flag ;	_cdfBoundaries = flag ;
	}	}

	Bool_t getCdfBoundaries() const {	Bool_t getCdfBoundaries() const {
	// If true, special boundary conditions for c.d.f.s are used	// If true, special boundary conditions for c.d.f.s are used
	return _cdfBoundaries ;	return _cdfBoundaries ;
	}	}


		virtual std::list<Double_t>* binBoundaries(RooAbsRealLValue& /obs/, Dou ble_t /xlo/, Double_t /xhi/) const ;
	virtual std::list<Double_t>* plotSamplingHint(RooAbsRealLValue& obs, Doub le_t xlo, Double_t xhi) const ;	virtual std::list<Double_t>* plotSamplingHint(RooAbsRealLValue& obs, Doub le_t xlo, Double_t xhi) const ;

		virtual Bool_t isBinnedDistribution(const RooArgSet&) const { return _int Order==0 ; }

	protected:	protected:

	Double_t evaluate() const;	Double_t evaluate() const;
	Double_t totalVolume() const ;	Double_t totalVolume() const ;
	friend class RooAbsCachedReal ;	friend class RooAbsCachedReal ;
	Double_t totVolume() const ;	Double_t totVolume() const ;

	RooSetProxy _depList ; // List of dependents defining dimensions of histogram	RooSetProxy _depList ; // List of dependents defining dimensions of histogram
	RooDataHist* _dataHist ; // Unowned pointer to underlying histogram	RooDataHist* _dataHist ; // Unowned pointer to underlying histogram

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

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

	* File: $Id: RooHistPdf.h 37219 2010-12-03 12:51:36Z wouter $	* File: $Id: RooHistPdf.h 42232 2011-11-24 23:23:30Z wouter $
	* Authors: *	* Authors: *
	* WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu *	* WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu *
	* DK, David Kirkby, UC Irvine, dkirkby@uci.edu *	* DK, David Kirkby, UC Irvine, dkirkby@uci.edu *
	* *	* *
	* Copyright (c) 2000-2005, Regents of the University of California *	* Copyright (c) 2000-2005, Regents of the University of California *
	* and Stanford University. All rights reserved. *	* and Stanford University. All rights reserved. *
	* *	* *
	* Redistribution and use in source and binary forms, *	* Redistribution and use in source and binary forms, *
	* with or without modification, are permitted according to the terms *	* with or without modification, are permitted according to the terms *
	* listed in LICENSE (http://roofit.sourceforge.net/license.txt) *	* listed in LICENSE (http://roofit.sourceforge.net/license.txt) *

	skipping to change at line 82	skipping to change at line 82
	// Return true if contents is declared to be unit normalized	// Return true if contents is declared to be unit normalized
	return _unitNorm ;	return _unitNorm ;
	}	}

	virtual Bool_t selfNormalized() const { return _unitNorm ; }	virtual Bool_t selfNormalized() const { return _unitNorm ; }

	virtual Int_t getMaxVal(const RooArgSet& vars) const ;	virtual Int_t getMaxVal(const RooArgSet& vars) const ;
	virtual Double_t maxVal(Int_t code) const ;	virtual Double_t maxVal(Int_t code) const ;

	virtual std::list<Double_t>* plotSamplingHint(RooAbsRealLValue& obs, Doub le_t xlo, Double_t xhi) const ;	virtual std::list<Double_t>* plotSamplingHint(RooAbsRealLValue& obs, Doub le_t xlo, Double_t xhi) const ;

		virtual std::list<Double_t>* binBoundaries(RooAbsRealLValue& /obs/, Dou
		ble_t /xlo/, Double_t /xhi/) const ;
		virtual Bool_t isBinnedDistribution(const RooArgSet&) const { return _int
		Order==0 ; }

	protected:	protected:

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

	Double_t evaluate() const;	Double_t evaluate() const;
	Double_t totalVolume() const ;	Double_t totalVolume() const ;
	friend class RooAbsCachedPdf ;	friend class RooAbsCachedPdf ;
	Double_t totVolume() const ;	Double_t totVolume() const ;


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

	RooLinearVar.h	RooLinearVar.h

	skipping to change at line 33	skipping to change at line 33
	#include "RooAbsRealLValue.h"	#include "RooAbsRealLValue.h"
	#include "RooRealProxy.h"	#include "RooRealProxy.h"
	#include "RooFormula.h"	#include "RooFormula.h"
	#include "RooLinTransBinning.h"	#include "RooLinTransBinning.h"

	class RooArgSet ;	class RooArgSet ;

	class RooLinearVar : public RooAbsRealLValue {	class RooLinearVar : public RooAbsRealLValue {
	public:	public:
	// Constructors, assignment etc.	// Constructors, assignment etc.

		RooLinearVar() {} ;
	RooLinearVar(const char name, const char title, RooAbsRealLValue& varia ble, const RooAbsReal& slope, const RooAbsReal& offset, const char *unit= " ") ;	RooLinearVar(const char name, const char title, RooAbsRealLValue& varia ble, const RooAbsReal& slope, const RooAbsReal& offset, const char *unit= " ") ;
	RooLinearVar(const RooLinearVar& other, const char* name=0);	RooLinearVar(const RooLinearVar& other, const char* name=0);
	virtual TObject* clone(const char* newname) const { return new RooLinearV ar(*this,newname); }	virtual TObject* clone(const char* newname) const { return new RooLinearV ar(*this,newname); }
	virtual ~RooLinearVar() ;	virtual ~RooLinearVar() ;

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

	// Jacobian and limits	// Jacobian and limits
	virtual Bool_t hasBinning(const char* name) const ;	virtual Bool_t hasBinning(const char* name) const ;

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

	RooLinkedList.h	RooLinkedList.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_LINKED_LIST	#ifndef ROO_LINKED_LIST
	#define ROO_LINKED_LIST	#define ROO_LINKED_LIST

	#include "TNamed.h"	#include "TNamed.h"
	#include "RooLinkedListElem.h"	#include "RooLinkedListElem.h"
	#include "RooHashTable.h"	#include "RooHashTable.h"

		#include <list>
	class RooLinkedListIter ;	class RooLinkedListIter ;

		class RooFIter ;
	class TIterator ;	class TIterator ;

		class RooAbsArg ;

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

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


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

	// Assignment operator	// Assignment operator
	RooLinkedList& operator=(const RooLinkedList& other) ;	RooLinkedList& operator=(const RooLinkedList& other) ;

	Int_t getHashTableSize() const {	Int_t getHashTableSize() const {
	// Return size of hash table	// Return size of hash table
	return _htableName ? _htableName->size() : 0 ;	return _htableName ? _htableName->size() : 0 ;
	}	}

	void setHashTableSize(Int_t size) ;	void setHashTableSize(Int_t size) ;


	skipping to change at line 54	skipping to change at line 61
	virtual ~RooLinkedList() ;	virtual ~RooLinkedList() ;

	Int_t GetSize() const { return _size ; }	Int_t GetSize() const { return _size ; }

	virtual void Add(TObject* arg) { Add(arg,1) ; }	virtual void Add(TObject* arg) { Add(arg,1) ; }
	virtual Bool_t Remove(TObject* arg) ;	virtual Bool_t Remove(TObject* arg) ;
	TObject* At(Int_t index) const ;	TObject* At(Int_t index) const ;
	Bool_t Replace(const TObject* oldArg, const TObject* newArg) ;	Bool_t Replace(const TObject* oldArg, const TObject* newArg) ;
	TIterator* MakeIterator(Bool_t dir=kTRUE) const ;	TIterator* MakeIterator(Bool_t dir=kTRUE) const ;
	RooLinkedListIter iterator(Bool_t dir=kTRUE) const ;	RooLinkedListIter iterator(Bool_t dir=kTRUE) const ;

		RooFIter fwdIterator() const ;

	void Clear(Option_t *o=0) ;	void Clear(Option_t *o=0) ;
	void Delete(Option_t *o=0) ;	void Delete(Option_t *o=0) ;
	TObject* find(const char* name) const ;	TObject* find(const char* name) const ;

		RooAbsArg* findArg(const RooAbsArg*) const ;
	TObject* FindObject(const char* name) const ;	TObject* FindObject(const char* name) const ;
	TObject* FindObject(const TObject* obj) const ;	TObject* FindObject(const TObject* obj) const ;
	Int_t IndexOf(const char* name) const ;	Int_t IndexOf(const char* name) const ;
	Int_t IndexOf(const TObject* arg) const ;	Int_t IndexOf(const TObject* arg) const ;
	TObject* First() const {	TObject* First() const {
	return _first?_first->_arg:0 ;	return _first?_first->_arg:0 ;
	}	}

	void Print(const char* opt) const ;	void Print(const char* opt) const ;
	void Sort(Bool_t ascend=kTRUE) ;	void Sort(Bool_t ascend=kTRUE) ;

	const char* GetName() const { return _name.Data() ; }	const char* GetName() const { return _name.Data() ; }
	void SetName(const char* name) { _name = name ; }	void SetName(const char* name) { _name = name ; }

	protected:	protected:


		RooLinkedListElem* createElement(TObject* obj, RooLinkedListElem* elem=0)
		;
		void deleteElement(RooLinkedListElem*) ;

	friend class RooLinkedListIter ;	friend class RooLinkedListIter ;

		friend class RooFIter ;

	virtual void Add(TObject* arg, Int_t refCount) ;	virtual void Add(TObject* arg, Int_t refCount) ;

	void swapWithNext(RooLinkedListElem* elem) ;	void swapWithNext(RooLinkedListElem* elem) ;

	RooLinkedListElem* findLink(const TObject* arg) const ;	RooLinkedListElem* findLink(const TObject* arg) const ;

	Int_t _hashThresh ; // Size threshold for hashing	Int_t _hashThresh ; // Size threshold for hashing
	Int_t _size ; // Current size of list	Int_t _size ; // Current size of list
	RooLinkedListElem* _first ; //! Link to first element of list	RooLinkedListElem* _first ; //! Link to first element of list
	RooLinkedListElem* _last ; //! Link to last element of list	RooLinkedListElem* _last ; //! Link to last element of list
	RooHashTable* _htableName ; //! Hash table by name	RooHashTable* _htableName ; //! Hash table by name
	RooHashTable* _htableLink ; //! Hash table by link pointer	RooHashTable* _htableLink ; //! Hash table by link pointer


		Int_t _curStoreSize ; //!
		Int_t _curStoreUsed ; //!
		std::list<std::pair<Int_t,RooLinkedListElem*> > _storeList ; //!
		RooLinkedListElem* _curStore ; //!

	TString _name ;	TString _name ;

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

	#endif	#endif

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

	RooLinkedListElem.h	RooLinkedListElem.h

	skipping to change at line 28	skipping to change at line 28

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

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

	class RooLinkedListElem {	class RooLinkedListElem {
	public:	public:
	// Initial element ctor	// Initial element ctor

		RooLinkedListElem() :
		_prev(0), _next(0), _arg(0), _refCount(0) {
		}

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

		if (after) {
		_prev = after ;
		_next = after->_next ;
		after->_next = this ;
		if (_next) {
		_next->_prev = this ;
		}
		}
		_suc = suc ;
		(*_suc)++ ;
		}

		void release() {
		if (_prev) _prev->_next = _next ;
		if (_next) _next->_prev = _prev ;
		_prev = 0 ;
		_next = 0 ;
		(*_suc)-- ;
		}

	RooLinkedListElem(TObject* arg) :	RooLinkedListElem(TObject* arg) :
	// Constructor with payload	// Constructor with payload
	_prev(0), _next(0), _arg(arg), _refCount(1) {	_prev(0), _next(0), _arg(arg), _refCount(1) {
	}	}

	RooLinkedListElem(TObject* arg, RooLinkedListElem* after) :	RooLinkedListElem(TObject* arg, RooLinkedListElem* after) :
	// Constructor with payload and next chain element	// Constructor with payload and next chain element
	_prev(after), _next(after->_next), _arg(arg), _refCount(1) {	_prev(after), _next(after->_next), _arg(arg), _refCount(1) {

	// Insert self in link	// Insert self in link

	skipping to change at line 57	skipping to change at line 85
	}	}

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

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

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

		Int_t* _suc ; //! Store use count

	protected:	protected:

	// Forbidden	// Forbidden
	RooLinkedListElem(const RooLinkedListElem&) ;	RooLinkedListElem(const RooLinkedListElem&) ;

	ClassDef(RooLinkedListElem,0) // Element of RooLinkedList container class	ClassDef(RooLinkedListElem,0) // Element of RooLinkedList container class
	} ;	} ;

	#endif	#endif

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

	RooLinkedListIter.h	RooLinkedListIter.h

	skipping to change at line 21	skipping to change at line 21
	* *	* *
	* 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_LINKED_LIST_ITER	#ifndef ROO_LINKED_LIST_ITER
	#define ROO_LINKED_LIST_ITER	#define ROO_LINKED_LIST_ITER

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

	#include "RooAbsArg.h"
	#include "RooLinkedList.h"	#include "RooLinkedList.h"

	#if ROOT_VERSION_CODE <= 332546	#if ROOT_VERSION_CODE <= 332546
	#ifndef nullptr	#ifndef nullptr
	#define nullptr 0	#define nullptr 0
	#endif	#endif
	#endif	#endif


		class RooFIter
		{
		public:
		inline RooFIter() : _ptr (0) {}
		inline RooFIter(const RooLinkedList* list) : _ptr (list->_first) {}

		inline RooAbsArg *next() {
		// Return next element in collection
		if (!_ptr) return 0 ;
		TObject* arg = _ptr->_arg ;
		_ptr = _ptr->_next;
		return (RooAbsArg*) arg ;
		}

		private:
		const RooLinkedListElem* _ptr ; //! Next link element
		};

	class RooLinkedListIter : public TIterator {	class RooLinkedListIter : public TIterator {
	public:	public:

	RooLinkedListIter() {	RooLinkedListIter() {
	// coverity[UNINIT_CTOR]	// coverity[UNINIT_CTOR]
	} ;	} ;

	RooLinkedListIter(const RooLinkedList* list, Bool_t forward) :	RooLinkedListIter(const RooLinkedList* list, Bool_t forward) :
	TIterator(), _forward(forward), _list(list)	TIterator(), _forward(forward), _list(list)
	{	{

	skipping to change at line 86	skipping to change at line 103

	virtual TObject *Next() {	virtual TObject *Next() {
	// Return next element in collection	// Return next element in collection
	if (!_ptr) return 0 ;	if (!_ptr) return 0 ;
	_cptr = _ptr;	_cptr = _ptr;
	TObject* arg = _ptr->_arg ;	TObject* arg = _ptr->_arg ;
	_ptr = _forward ? _ptr->_next : _ptr->_prev ;	_ptr = _forward ? _ptr->_next : _ptr->_prev ;
	return arg ;	return arg ;
	}	}


		TObject *NextNV() {
		// Return next element in collection
		if (!_ptr) return 0 ;
		_cptr = _ptr;
		TObject* arg = _ptr->_arg ;
		_ptr = _forward ? _ptr->_next : _ptr->_prev ;
		return arg ;
		}

	virtual void Reset() {	virtual void Reset() {
	// Return iterator to first element in collection	// Return iterator to first element in collection
	_ptr = _forward ? _list->_first : _list->_last ;	_ptr = _forward ? _list->_first : _list->_last ;
	_cptr = _ptr;	_cptr = _ptr;
	}	}

	bool operator!=(const TIterator &aIter) const {	bool operator!=(const TIterator &aIter) const {
	if (nullptr == &aIter)	if (nullptr == &aIter)
	return _cptr;	return _cptr;
	if ((aIter.IsA() == RooLinkedListIter::Class())) {	if ((aIter.IsA() == RooLinkedListIter::Class())) {

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

	RooListProxy.h	RooListProxy.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_LIST_PROXY	#ifndef ROO_LIST_PROXY
	#define ROO_LIST_PROXY	#define ROO_LIST_PROXY

	#include "TObject.h"	#include "TObject.h"
	#include "Riosfwd.h"	#include "Riosfwd.h"
	#include "RooAbsProxy.h"	#include "RooAbsProxy.h"

		#include "RooLinkedListIter.h"
	#include "RooAbsArg.h"	#include "RooAbsArg.h"
	#include "RooArgList.h"	#include "RooArgList.h"

	class RooListProxy : public RooArgList, public RooAbsProxy {	class RooListProxy : public RooArgList, public RooAbsProxy {
	public:	public:

	// Constructors, assignment etc.	// Constructors, assignment etc.
	RooListProxy() : _defValueServer(kTRUE), _defShapeServer(kFALSE) { _iter = createIterator() ; _owner=0 ; } ;	RooListProxy() : _defValueServer(kTRUE), _defShapeServer(kFALSE) { _iter = createIterator() ; _owner=0 ; } ;
	RooListProxy(const char* name, const char* desc, RooAbsArg* owner,	RooListProxy(const char* name, const char* desc, RooAbsArg* owner,
	Bool_t defValueServer=kTRUE, Bool_t defShapeServer=kFALSE) ;	Bool_t defValueServer=kTRUE, Bool_t defShapeServer=kFALSE) ;

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

	RooMath.h	RooMath.h

	skipping to change at line 62	skipping to change at line 62

	// 1-D nth order polynomial interpolation routines	// 1-D nth order polynomial interpolation routines
	static Double_t interpolate(Double_t yArr[],Int_t nOrder, Double_t x) ;	static Double_t interpolate(Double_t yArr[],Int_t nOrder, Double_t x) ;
	static Double_t interpolate(Double_t xa[], Double_t ya[], Int_t n, Double _t x) ;	static Double_t interpolate(Double_t xa[], Double_t ya[], Int_t n, Double _t x) ;

	static Double_t erf(Double_t x) ;	static Double_t erf(Double_t x) ;
	static Double_t erfc(Double_t x) ;	static Double_t erfc(Double_t x) ;

	static void cleanup() ;	static void cleanup() ;


		// Allocate and initialize CERF lookup grid
		static void initFastCERF(Int_t reBins= 800, Double_t reMin=-4.0, Double_t
		reMax=4.0,
		Int_t imBins=1000, Double_t imMin=-4.0, Double_t
		imMax=6.0) ;

	private:	private:

	static Bool_t loadCache() ;	static Bool_t loadCache() ;
	static void storeCache() ;	static void storeCache() ;
	static const char* cacheFileName() ;	static const char* cacheFileName() ;


	// Allocate and initialize CERF lookup grid
	static void initFastCERF(Int_t reBins= 800, Double_t reMin=-4.0, Double_t
	reMax=4.0,
	Int_t imBins=1000, Double_t imMin=-4.0, Double_t
	imMax=6.0) ;

	// CERF lookup grid	// CERF lookup grid
	static pDouble_t* _imCerfArray ; // Lookup table for Im part of complex e rror function	static pDouble_t* _imCerfArray ; // Lookup table for Im part of complex e rror function
	static pDouble_t* _reCerfArray ; // Lookup table for Re part of complex e rror function	static pDouble_t* _reCerfArray ; // Lookup table for Re part of complex e rror function

	// CERF grid dimensions and parameters	// CERF grid dimensions and parameters
	static Int_t _reBins ; // Number of grid points in real dimension of CERF-LUT	static Int_t _reBins ; // Number of grid points in real dimension of CERF-LUT
	static Double_t _reMin ; // Low edge of real dimension of CERF-LUT	static Double_t _reMin ; // Low edge of real dimension of CERF-LUT
	static Double_t _reMax ; // High edge of real dimension of CERF-LUT	static Double_t _reMax ; // High edge of real dimension of CERF-LUT
	static Double_t _reRange ; // Range in real dimension of CERF-LUT	static Double_t _reRange ; // Range in real dimension of CERF-LUT
	static Double_t _reStep ; // Grid spacing in real dimension of CERF-LUT	static Double_t _reStep ; // Grid spacing in real dimension of CERF-LUT

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

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

	* File: $Id: RooMinimizer.h 30378 2009-09-23 13:42:12Z wouter $	* File: $Id: RooMinimizer.h 42262 2011-11-25 23:02:31Z wouter $
	* Authors: *	* Authors: *
	* WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu *	* WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu *
	* DK, David Kirkby, UC Irvine, dkirkby@uci.edu *	* DK, David Kirkby, UC Irvine, dkirkby@uci.edu *
	* AL, Alfio Lazzaro, INFN Milan, alfio.lazzaro@mi.infn.it *	* AL, Alfio Lazzaro, INFN Milan, alfio.lazzaro@mi.infn.it *
	* *	* *
	* *	* *
	* 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
	public:	public:

	RooMinimizer(RooAbsReal& function) ;	RooMinimizer(RooAbsReal& function) ;
	virtual ~RooMinimizer() ;	virtual ~RooMinimizer() ;

	enum Strategy { Speed=0, Balance=1, Robustness=2 } ;	enum Strategy { Speed=0, Balance=1, Robustness=2 } ;
	enum PrintLevel { None=-1, Reduced=0, Normal=1, ExtraForProblem=2, Maximu m=3 } ;	enum PrintLevel { None=-1, Reduced=0, Normal=1, ExtraForProblem=2, Maximu m=3 } ;
	void setStrategy(Int_t strat) ;	void setStrategy(Int_t strat) ;
	void setErrorLevel(Double_t level) ;	void setErrorLevel(Double_t level) ;
	void setEps(Double_t eps) ;	void setEps(Double_t eps) ;

	void optimizeConst(Bool_t flag) ;	void optimizeConst(Int_t flag) ;
	void setEvalErrorWall(Bool_t flag) { _fcn->SetEvalErrorWall(flag); }	void setEvalErrorWall(Bool_t flag) { _fcn->SetEvalErrorWall(flag); }

	RooFitResult* fit(const char* options) ;	RooFitResult* fit(const char* options) ;

	Int_t migrad() ;	Int_t migrad() ;
	Int_t hesse() ;	Int_t hesse() ;
	Int_t minos() ;	Int_t minos() ;
	Int_t minos(const RooArgSet& minosParamList) ;	Int_t minos(const RooArgSet& minosParamList) ;
	Int_t seek() ;	Int_t seek() ;
	Int_t simplex() ;	Int_t simplex() ;

	skipping to change at line 79	skipping to change at line 79
	void setPrintEvalErrors(Int_t numEvalErrors) { _fcn->SetPrintEvalErrors(n umEvalErrors); }	void setPrintEvalErrors(Int_t numEvalErrors) { _fcn->SetPrintEvalErrors(n umEvalErrors); }
	void setVerbose(Bool_t flag=kTRUE) { _verbose = flag ; _fcn->SetVerbose(f lag); }	void setVerbose(Bool_t flag=kTRUE) { _verbose = flag ; _fcn->SetVerbose(f lag); }
	void setProfile(Bool_t flag=kTRUE) { _profile = flag ; }	void setProfile(Bool_t flag=kTRUE) { _profile = flag ; }
	Bool_t setLogFile(const char* logf=0) { return _fcn->SetLogFile(logf); }	Bool_t setLogFile(const char* logf=0) { return _fcn->SetLogFile(logf); }

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

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


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

	protected:	protected:

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

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

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

	skipping to change at line 110	skipping to change at line 112
	TStopwatch _timer ;	TStopwatch _timer ;
	TStopwatch _cumulTimer ;	TStopwatch _cumulTimer ;

	TMatrixDSym* _extV ;	TMatrixDSym* _extV ;

	RooMinimizerFcn *_fcn;	RooMinimizerFcn *_fcn;
	std::string _minimizerType;	std::string _minimizerType;

	static ROOT::Fit::Fitter *_theFitter ;	static ROOT::Fit::Fitter *_theFitter ;


		std::vector<std::pair<std::string,int> > _statusHistory ;

	RooMinimizer(const RooMinimizer&) ;	RooMinimizer(const RooMinimizer&) ;

	ClassDef(RooMinimizer,0) // RooFit interface to ROOT::Fit::Fitter	ClassDef(RooMinimizer,0) // RooFit interface to ROOT::Fit::Fitter
	} ;	} ;

	#endif	#endif

	#endif	#endif

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

	RooMinuit.h	RooMinuit.h

	skipping to change at line 23	skipping to change at line 23
	* with or without modification, are permitted according to the terms *	* with or without modification, are permitted according to the terms *
	* listed in LICENSE (http://roofit.sourceforge.net/license.txt) *	* listed in LICENSE (http://roofit.sourceforge.net/license.txt) *
	************************************************************************ */	************************************************************************ */
	#ifndef ROO_MINUIT	#ifndef ROO_MINUIT
	#define ROO_MINUIT	#define ROO_MINUIT

	#include "TObject.h"	#include "TObject.h"
	#include "TStopwatch.h"	#include "TStopwatch.h"
	#include <fstream>	#include <fstream>
	#include "TMatrixDSymfwd.h"	#include "TMatrixDSymfwd.h"

		#include <vector>
		#include <string>
		#include <map>

	class RooAbsReal ;	class RooAbsReal ;
	class RooFitResult ;	class RooFitResult ;
	class RooArgList ;	class RooArgList ;
	class RooRealVar ;	class RooRealVar ;
	class RooArgSet ;	class RooArgSet ;
	class TVirtualFitter ;	class TVirtualFitter ;
	class TH2F ;	class TH2F ;
	class RooPlot ;	class RooPlot ;


	skipping to change at line 46	skipping to change at line 49
	public:	public:

	RooMinuit(RooAbsReal& function) ;	RooMinuit(RooAbsReal& function) ;
	virtual ~RooMinuit() ;	virtual ~RooMinuit() ;

	enum Strategy { Speed=0, Balance=1, Robustness=2 } ;	enum Strategy { Speed=0, Balance=1, Robustness=2 } ;
	enum PrintLevel { None=-1, Reduced=0, Normal=1, ExtraForProblem=2, Maximu m=3 } ;	enum PrintLevel { None=-1, Reduced=0, Normal=1, ExtraForProblem=2, Maximu m=3 } ;
	void setStrategy(Int_t strat) ;	void setStrategy(Int_t strat) ;
	void setErrorLevel(Double_t level) ;	void setErrorLevel(Double_t level) ;
	void setEps(Double_t eps) ;	void setEps(Double_t eps) ;

	void optimizeConst(Bool_t flag) ;	void optimizeConst(Int_t flag) ;
	void setEvalErrorWall(Bool_t flag) { _doEvalErrorWall = flag ; }	void setEvalErrorWall(Bool_t flag) { _doEvalErrorWall = flag ; }

	RooFitResult* fit(const char* options) ;	RooFitResult* fit(const char* options) ;

	Int_t migrad() ;	Int_t migrad() ;
	Int_t hesse() ;	Int_t hesse() ;
	Int_t minos() ;	Int_t minos() ;
	Int_t minos(const RooArgSet& minosParamList) ; // added FMV, 08/18/03	Int_t minos(const RooArgSet& minosParamList) ; // added FMV, 08/18/03
	Int_t seek() ;	Int_t seek() ;
	Int_t simplex() ;	Int_t simplex() ;

	skipping to change at line 102	skipping to change at line 105
	inline ofstream* logfile() const { return _logfile ; }	inline ofstream* logfile() const { return _logfile ; }
	inline Double_t& maxFCN() { return _maxFCN ; }	inline Double_t& maxFCN() { return _maxFCN ; }

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


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

	private:	private:

	Int_t _evalCounter ;	Int_t _evalCounter ;
	Int_t _printLevel ;	Int_t _printLevel ;
	Int_t _warnLevel ;	Int_t _warnLevel ;
	Int_t _status ;	Int_t _status ;

	Bool_t _optConst ;	Int_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 ;
	Int_t _maxEvalMult ;	Int_t _maxEvalMult ;
	RooArgList* _floatParamList ;	RooArgList* _floatParamList ;
	RooArgList* _initFloatParamList ;	RooArgList* _initFloatParamList ;
	RooArgList* _constParamList ;	RooArgList* _constParamList ;

	skipping to change at line 132	skipping to change at line 137
	Double_t _maxFCN ;	Double_t _maxFCN ;
	ofstream* _logfile ;	ofstream* _logfile ;
	Bool_t _verbose ;	Bool_t _verbose ;
	TStopwatch _timer ;	TStopwatch _timer ;
	TStopwatch _cumulTimer ;	TStopwatch _cumulTimer ;

	TMatrixDSym* _extV ;	TMatrixDSym* _extV ;

	static TVirtualFitter *_theFitter ;	static TVirtualFitter *_theFitter ;


		std::vector<std::pair<std::string,int> > _statusHistory ;

	RooMinuit(const RooMinuit&) ;	RooMinuit(const RooMinuit&) ;

	ClassDef(RooMinuit,0) // RooFit minimizer based on MINUIT	ClassDef(RooMinuit,0) // RooFit minimizer based on MINUIT
	} ;	} ;

	#endif	#endif

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

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

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

	skipping to change at line 28	skipping to change at line 28

	#include "RooAbsPdf.h"	#include "RooAbsPdf.h"
	#include "RooListProxy.h"	#include "RooListProxy.h"
	#include "TMatrixDSym.h"	#include "TMatrixDSym.h"
	#include "TMatrixD.h"	#include "TMatrixD.h"
	#include "TVectorD.h"	#include "TVectorD.h"

	class RooRealVar;	class RooRealVar;
	class RooFitResult ;	class RooFitResult ;


		#include <map>
		#include <vector>

	class RooMultiVarGaussian : public RooAbsPdf {	class RooMultiVarGaussian : public RooAbsPdf {
	public:	public:

	RooMultiVarGaussian() {} ;	RooMultiVarGaussian() {} ;

	RooMultiVarGaussian(const char name, const char title, const RooArgList & xvec, const RooFitResult& fr) ;	RooMultiVarGaussian(const char name, const char title, const RooArgList & xvec, const RooFitResult& fr, Bool_t reduceToConditional=kTRUE) ;
	RooMultiVarGaussian(const char name, const char title, const RooArgList & xvec, const RooArgList& mu, const TMatrixDSym& covMatrix) ;	RooMultiVarGaussian(const char name, const char title, const RooArgList & xvec, const RooArgList& mu, const TMatrixDSym& covMatrix) ;
	RooMultiVarGaussian(const char name, const char title, const RooArgList & xvec, const TVectorD& mu, const TMatrixDSym& covMatrix) ;	RooMultiVarGaussian(const char name, const char title, const RooArgList & xvec, const TVectorD& mu, const TMatrixDSym& covMatrix) ;
	RooMultiVarGaussian(const char name, const char title, const RooArgList & xvec,const TMatrixDSym& covMatrix) ;	RooMultiVarGaussian(const char name, const char title, const RooArgList & xvec,const TMatrixDSym& covMatrix) ;
	void setAnaIntZ(Double_t z) { _z = z ; }	void setAnaIntZ(Double_t z) { _z = z ; }

	RooMultiVarGaussian(const RooMultiVarGaussian& other, const char* name=0) ;	RooMultiVarGaussian(const RooMultiVarGaussian& other, const char* name=0) ;
	virtual TObject* clone(const char* newname) const { return new RooMultiVa rGaussian(*this,newname); }	virtual TObject* clone(const char* newname) const { return new RooMultiVa rGaussian(*this,newname); }
	inline virtual ~RooMultiVarGaussian() { }	inline virtual ~RooMultiVarGaussian() { }

	Int_t getAnalyticalIntegral(RooArgSet& allVars, RooArgSet& analVars, cons t char* rangeName=0) const ;	Int_t getAnalyticalIntegral(RooArgSet& allVars, RooArgSet& analVars, cons t char* rangeName=0) const ;

	skipping to change at line 69	skipping to change at line 72
	class GenData {	class GenData {
	public:	public:
	TMatrixD UT ;	TMatrixD UT ;
	vector<int> omap ;	vector<int> omap ;
	vector<int> pmap ;	vector<int> pmap ;
	TVectorD mu1 ;	TVectorD mu1 ;
	TVectorD mu2 ;	TVectorD mu2 ;
	TMatrixD S12S22I ;	TMatrixD S12S22I ;
	} ;	} ;


		class BitBlock {
		public:
		BitBlock() : b0(0), b1(0), b2(0), b3(0) {} ;

		void setBit(Int_t ibit) ;
		Bool_t getBit(Int_t ibit) ;
		Bool_t operator==(const BitBlock& other) ;

		Int_t b0 ;
		Int_t b1 ;
		Int_t b2 ;
		Int_t b3 ;
		} ;

	static void blockDecompose(const TMatrixD& input, const vector<int>& map1 , const vector<int>& map2, TMatrixDSym& S11, TMatrixD& S12, TMatrixD& S21, TMatrixDSym& S22) ;	static void blockDecompose(const TMatrixD& input, const vector<int>& map1 , const vector<int>& map2, TMatrixDSym& S11, TMatrixD& S12, TMatrixD& S21, TMatrixDSym& S22) ;

	protected:	protected:

	void decodeCode(Int_t code, vector<int>& map1, vector<int>& map2) const;	void decodeCode(Int_t code, vector<int>& map1, vector<int>& map2) const;
	AnaIntData& anaIntData(Int_t code) const ;	AnaIntData& anaIntData(Int_t code) const ;
	GenData& genData(Int_t code) const ;	GenData& genData(Int_t code) const ;


	mutable map<int,AnaIntData> _anaIntCache ; //!	mutable std::map<int,AnaIntData> _anaIntCache ; //!
	mutable map<int,GenData> _genCache ; //!	mutable std::map<int,GenData> _genCache ; //!

		mutable std::vector<BitBlock> _aicMap ; //!

	RooListProxy _x ;	RooListProxy _x ;
	RooListProxy _mu ;	RooListProxy _mu ;
	TMatrixDSym _cov ;	TMatrixDSym _cov ;
	TMatrixDSym _covI ;	TMatrixDSym _covI ;
	Double_t _det ;	Double_t _det ;
	Double_t _z ;	Double_t _z ;

	void syncMuVec() const ;	void syncMuVec() const ;
	mutable TVectorD _muVec ; //! Do not persist	mutable TVectorD _muVec ; //! Do not persist

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

	RooNLLVar.h	RooNLLVar.h

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

	#include "RooAbsOptTestStatistic.h"	#include "RooAbsOptTestStatistic.h"
	#include "RooCmdArg.h"	#include "RooCmdArg.h"
	#include "RooAbsPdf.h"	#include "RooAbsPdf.h"

	class RooNLLVar : public RooAbsOptTestStatistic {	class RooNLLVar : public RooAbsOptTestStatistic {
	public:	public:

	// Constructors, assignment etc	// Constructors, assignment etc

	RooNLLVar() {} ;	RooNLLVar() { _first = kTRUE ; }
	RooNLLVar(const char name, const char title, RooAbsPdf& pdf, RooAbsData & data,	RooNLLVar(const char name, const char title, RooAbsPdf& pdf, RooAbsData & data,
	const RooCmdArg& arg1 , const RooCmdArg& arg2=Roo CmdArg::none(),const RooCmdArg& arg3=RooCmdArg::none(),	const RooCmdArg& arg1 , const RooCmdArg& arg2=Roo CmdArg::none(),const RooCmdArg& arg3=RooCmdArg::none(),
	const RooCmdArg& arg4=RooCmdArg::none(), const RooCmdArg& arg5=R ooCmdArg::none(),const RooCmdArg& arg6=RooCmdArg::none(),	const RooCmdArg& arg4=RooCmdArg::none(), const RooCmdArg& arg5=R ooCmdArg::none(),const RooCmdArg& arg6=RooCmdArg::none(),
	const RooCmdArg& arg7=RooCmdArg::none(), const RooCmdArg& arg8=R ooCmdArg::none(),const RooCmdArg& arg9=RooCmdArg::none()) ;	const RooCmdArg& arg7=RooCmdArg::none(), const RooCmdArg& arg8=R ooCmdArg::none(),const RooCmdArg& arg9=RooCmdArg::none()) ;

	RooNLLVar(const char name, const char title, RooAbsPdf& pdf, RooAbsData & data,	RooNLLVar(const char name, const char title, RooAbsPdf& pdf, RooAbsData & data,
	Bool_t extended=kFALSE, const char* rangeName=0, const char* add CoefRangeName=0,	Bool_t extended=kFALSE, const char* rangeName=0, const char* add CoefRangeName=0,
	Int_t nCPU=1, Bool_t interleave=kFALSE, Bool_t verbose=kTRUE, Bo ol_t splitRange=kFALSE, Bool_t cloneData=kTRUE) ;	Int_t nCPU=1, Bool_t interleave=kFALSE, Bool_t verbose=kTRUE, Bo ol_t splitRange=kFALSE, Bool_t cloneData=kTRUE) ;

	RooNLLVar(const char name, const char title, RooAbsPdf& pdf, RooAbsData & data,	RooNLLVar(const char name, const char title, RooAbsPdf& pdf, RooAbsData & data,

	skipping to change at line 65	skipping to change at line 65

	protected:	protected:

	virtual Bool_t processEmptyDataSets() const { return _extended ; }	virtual Bool_t processEmptyDataSets() const { return _extended ; }

	static RooArgSet _emptySet ; // Supports named argument constructor	static RooArgSet _emptySet ; // Supports named argument constructor

	Bool_t _extended ;	Bool_t _extended ;
	virtual Double_t evaluatePartition(Int_t firstEvent, Int_t lastEvent, Int _t stepSize) const ;	virtual Double_t evaluatePartition(Int_t firstEvent, Int_t lastEvent, Int _t stepSize) const ;
	Bool_t _weightSq ; // Apply weights squared?	Bool_t _weightSq ; // Apply weights squared?

		mutable Bool_t _first ; //!

	ClassDef(RooNLLVar,1) // Function representing (extended) -log(L) of p.d. f and dataset	ClassDef(RooNLLVar,1) // Function representing (extended) -log(L) of p.d. f and dataset
	};	};

	#endif	#endif

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

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

	* File: $Id: RooObjCacheManager.h 39912 2011-06-23 16:40:11Z moneta $	* File: $Id: RooObjCacheManager.h 39817 2011-06-18 12:49:41Z wouter $
	* Authors: *	* Authors: *
	* WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu *	* WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu *
	* DK, David Kirkby, UC Irvine, dkirkby@uci.edu *	* DK, David Kirkby, UC Irvine, dkirkby@uci.edu *
	* *	* *
	* Copyright (c) 2000-2005, Regents of the University of California *	* Copyright (c) 2000-2005, Regents of the University of California *
	* and Stanford University. All rights reserved. *	* and Stanford University. All rights reserved. *
	* *	* *
	* Redistribution and use in source and binary forms, *	* Redistribution and use in source and binary forms, *
	* with or without modification, are permitted according to the terms *	* with or without modification, are permitted according to the terms *
	* listed in LICENSE (http://roofit.sourceforge.net/license.txt) *	* listed in LICENSE (http://roofit.sourceforge.net/license.txt) *

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

	RooProdGenContext.h	RooProdGenContext.h

	skipping to change at line 62	skipping to change at line 62
	RooArgSet* _ccdCloneSet ;	RooArgSet* _ccdCloneSet ;
	RooSuperCategory* _ccdSuper ; // SuperCategory of Common category depend ents	RooSuperCategory* _ccdSuper ; // SuperCategory of Common category depend ents
	RooArgSet* _pdfCloneSet ;	RooArgSet* _pdfCloneSet ;
	RooAbsPdf* _pdfClone ;	RooAbsPdf* _pdfClone ;
	RooRealIntegral* _pdfCcdInt ;	RooRealIntegral* _pdfCcdInt ;
	RooArgSet _uniObs ; // Observable to be generated with flat di stribution	RooArgSet _uniObs ; // Observable to be generated with flat di stribution
	TIterator* _uniIter ; // Iterator over uniform observables	TIterator* _uniIter ; // Iterator over uniform observables
	Bool_t _ccdRefresh ;	Bool_t _ccdRefresh ;
	Double_t * _ccdTable ;	Double_t * _ccdTable ;
	const RooProdPdf *_pdf ; // Original PDF	const RooProdPdf *_pdf ; // Original PDF

	TList _gcList ; // List of component generator contexts	std::list<RooAbsGenContext*> _gcList ; // List of component generator c
	TIterator* _gcIter ; //! Iterator over gcList	ontexts
	RooArgSet _ownedMultiProds ; // Owned auxilary multi-term product PDFs	RooArgSet _ownedMultiProds ; // Owned auxilary multi-term product PDFs

	ClassDef(RooProdGenContext,0) // Context for efficient generation of a a dataset from a RooProdPdf	ClassDef(RooProdGenContext,0) // Context for efficient generation of a a dataset from a RooProdPdf
	};	};

	#endif	#endif

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

	RooProduct.h	RooProduct.h

	skipping to change at line 52	skipping to change at line 52
	virtual Double_t analyticalIntegral(Int_t code, const char* rangeName=0) const;	virtual Double_t analyticalIntegral(Int_t code, const char* rangeName=0) const;

	RooArgSet components() { RooArgSet tmp(_compRSet) ; tmp.add(_compCSet) ; return tmp ; }	RooArgSet components() { RooArgSet tmp(_compRSet) ; tmp.add(_compCSet) ; return tmp ; }

	virtual ~RooProduct() ;	virtual ~RooProduct() ;

	class ProdMap ;	class ProdMap ;

	void printMetaArgs(ostream& os) const ;	void printMetaArgs(ostream& os) const ;


		virtual std::list<Double_t>* binBoundaries(RooAbsRealLValue& /obs/, Dou
		ble_t /xlo/, Double_t /xhi/) const ;
		virtual std::list<Double_t>* plotSamplingHint(RooAbsRealLValue& /obs/,
		Double_t /xlo/, Double_t /xhi/) const ;
		virtual Bool_t isBinnedDistribution(const RooArgSet& obs) const ;

	protected:	protected:

	RooSetProxy _compRSet ;	RooSetProxy _compRSet ;
	RooSetProxy _compCSet ;	RooSetProxy _compCSet ;
	TIterator* _compRIter ; //! do not persist	TIterator* _compRIter ; //! do not persist
	TIterator* _compCIter ; //! do not persist	TIterator* _compCIter ; //! do not persist

	class CacheElem : public RooAbsCacheElement {	class CacheElem : public RooAbsCacheElement {
	public:	public:
	virtual ~CacheElem();	virtual ~CacheElem();

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

	RooProofDriverSelector.h	RooProofDriverSelector.h

	skipping to change at line 28	skipping to change at line 28
	class RooProofDriverSelector : public TSelector {	class RooProofDriverSelector : public TSelector {
	public :	public :
	TTree *fChain; //!pointer to the analyzed TTree or TChain	TTree *fChain; //!pointer to the analyzed TTree or TChain

	// Declaration of leaf types	// Declaration of leaf types
	Int_t i;	Int_t i;

	// List of branches	// List of branches
	TBranch *b_i; //!	TBranch *b_i; //!


	RooProofDriverSelector(TTree * /tree/ =0) { }	RooProofDriverSelector(TTree * /tree/ =0) { b_i = 0 ; _pkg = 0 ; fChai n = 0 ; }
	virtual ~RooProofDriverSelector() { }	virtual ~RooProofDriverSelector() { }
	virtual Int_t Version() const { return 2; }	virtual Int_t Version() const { return 2; }
	virtual void SlaveBegin(TTree *tree);	virtual void SlaveBegin(TTree *tree);
	virtual void Init(TTree* tree);	virtual void Init(TTree* tree);
	virtual Bool_t Notify();	virtual Bool_t Notify();
	virtual Bool_t Process(Long64_t entry);	virtual Bool_t Process(Long64_t entry);
	virtual Int_t GetEntry(Long64_t entry, Int_t getall = 0) { return fCha in ? fChain->GetTree()->GetEntry(entry, getall) : 0; }	virtual Int_t GetEntry(Long64_t entry, Int_t getall = 0) { return fCha in ? fChain->GetTree()->GetEntry(entry, getall) : 0; }
	virtual void SetOption(const char *option) { fOption = option; }	virtual void SetOption(const char *option) { fOption = option; }
	virtual void SetObject(TObject *obj) { fObject = obj; }	virtual void SetObject(TObject *obj) { fObject = obj; }
	virtual void SetInputList(TList *input) { fInput = input; }	virtual void SetInputList(TList *input) { fInput = input; }

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

	RooRealBinding.h	RooRealBinding.h

	skipping to change at line 40	skipping to change at line 40

	virtual Double_t operator()(const Double_t xvector[]) const;	virtual Double_t operator()(const Double_t xvector[]) const;
	virtual Double_t getMinLimit(UInt_t dimension) const;	virtual Double_t getMinLimit(UInt_t dimension) const;
	virtual Double_t getMaxLimit(UInt_t dimension) const;	virtual Double_t getMaxLimit(UInt_t dimension) const;

	virtual void saveXVec() const ;	virtual void saveXVec() const ;
	virtual void restoreXVec() const ;	virtual void restoreXVec() const ;

	virtual const char* getName() const ;	virtual const char* getName() const ;


		virtual std::list<Double_t>* binBoundaries(Int_t) const ;
	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 ;

	protected:	protected:

	void loadValues(const Double_t xvector[]) const;	void loadValues(const Double_t xvector[]) const;
	const RooAbsReal *_func;	const RooAbsReal *_func;
	RooAbsRealLValue **_vars;	RooAbsRealLValue **_vars;
	const RooArgSet *_nset;	const RooArgSet *_nset;
	mutable Bool_t _xvecValid;	mutable Bool_t _xvecValid;
	Bool_t _clipInvalid ;	Bool_t _clipInvalid ;

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

	RooRealMPFE.h	RooRealMPFE.h

	skipping to change at line 36	skipping to change at line 36

	class RooRealMPFE : public RooAbsReal {	class RooRealMPFE : public RooAbsReal {
	public:	public:
	// Constructors, assignment etc	// Constructors, assignment etc
	RooRealMPFE(const char name, const char title, RooAbsReal& arg, Bool_t calcInline=kFALSE) ;	RooRealMPFE(const char name, const char title, RooAbsReal& arg, Bool_t calcInline=kFALSE) ;
	RooRealMPFE(const RooRealMPFE& other, const char* name=0);	RooRealMPFE(const RooRealMPFE& other, const char* name=0);
	virtual TObject* clone(const char* newname) const { return new RooRealMPF E(*this,newname); }	virtual TObject* clone(const char* newname) const { return new RooRealMPF E(*this,newname); }
	virtual ~RooRealMPFE();	virtual ~RooRealMPFE();

	void calculate() const ;	void calculate() const ;

	virtual Double_t getVal(const RooArgSet* nset=0) const ;	virtual Double_t getValV(const RooArgSet* nset=0) const ;
	void standby() ;	void standby() ;

	void setVerbose(Bool_t clientFlag=kTRUE, Bool_t serverFlag=kTRUE) ;	void setVerbose(Bool_t clientFlag=kTRUE, Bool_t serverFlag=kTRUE) ;

	protected:	protected:

	// Function evaluation	// Function evaluation
	virtual Double_t evaluate() const ;	virtual Double_t evaluate() const ;
	friend class RooAbsTestStatistic ;	friend class RooAbsTestStatistic ;

	virtual void constOptimizeTestStatistic(ConstOpCode opcode) ;	virtual void constOptimizeTestStatistic(ConstOpCode opcode, Bool_t doAlso Tracking=kTRUE) ;

	enum State { Initialize,Client,Server,Inline } ;	enum State { Initialize,Client,Server,Inline } ;
	State _state ;	State _state ;

	enum Message { SendReal=0, SendCat=1, Calculate=2, Retrieve=3, ReturnValu e=4, Terminate=5,	enum Message { SendReal=0, SendCat=1, Calculate=2, Retrieve=3, ReturnValu e=4, Terminate=5,
	ConstOpt=6, Verbose=7, RetrieveErrors=8, SendError=9, LogEv alError=10 } ;	ConstOpt=6, Verbose=7, RetrieveErrors=8, SendError=9, LogEv alError=10 } ;

	void initialize() ;	void initialize() ;
	void initVars() ;	void initVars() ;
	void serverLoop() ;	void serverLoop() ;

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

	RooRealProxy.h	RooRealProxy.h

	skipping to change at line 37	skipping to change at line 37
	RooRealProxy() {} ;	RooRealProxy() {} ;
	RooRealProxy(const char* name, const char* desc, RooAbsArg* owner,	RooRealProxy(const char* name, const char* desc, RooAbsArg* owner,
	Bool_t valueServer=kTRUE, Bool_t shapeServer=kFALSE, Bool_t p roxyOwnsArg=kFALSE) ;	Bool_t valueServer=kTRUE, Bool_t shapeServer=kFALSE, Bool_t p roxyOwnsArg=kFALSE) ;
	RooRealProxy(const char* name, const char* desc, RooAbsArg* owner, RooAbs Real& ref,	RooRealProxy(const char* name, const char* desc, RooAbsArg* owner, RooAbs Real& ref,
	Bool_t valueServer=kTRUE, Bool_t shapeServer=kFALSE, Bool_t p roxyOwnsArg=kFALSE) ;	Bool_t valueServer=kTRUE, Bool_t shapeServer=kFALSE, Bool_t p roxyOwnsArg=kFALSE) ;
	RooRealProxy(const char* name, RooAbsArg* owner, const RooRealProxy& othe r) ;	RooRealProxy(const char* name, RooAbsArg* owner, const RooRealProxy& othe r) ;
	virtual TObject* Clone(const char* newName=0) const { return new RooRealP roxy(newName,_owner,*this); }	virtual TObject* Clone(const char* newName=0) const { return new RooRealP roxy(newName,_owner,*this); }
	virtual ~RooRealProxy();	virtual ~RooRealProxy();

	// Accessors	// Accessors

	inline operator Double_t() const { return _isFund?((RooAbsReal*)_arg)->_v	#ifndef _WIN32
	alue:((RooAbsReal*)_arg)->getVal(_nset) ; }	inline operator Double_t() const { return (_arg->_fast && !_arg->_inhibit
		Dirty) ? ((RooAbsReal)_arg)->_value : ((RooAbsReal)_arg)->getVal(_nset) ;
		}
		#else
		inline operator Double_t() const { return (_arg->_fast && !_arg->inhibitD
		irty()) ? ((RooAbsReal)_arg)->_value : ((RooAbsReal)_arg)->getVal(_nset)
		; }
		#endif

	inline const RooAbsReal& arg() const { return (RooAbsReal&)*_arg ; }	inline const RooAbsReal& arg() const { return (RooAbsReal&)*_arg ; }

	// Modifier	// Modifier
	virtual Bool_t setArg(RooAbsReal& newRef) ;	virtual Bool_t setArg(RooAbsReal& newRef) ;

	protected:	protected:

	RooAbsRealLValue* lvptr() const ;	RooAbsRealLValue* lvptr() const ;

	public:	public:

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

	RooRealSumPdf.h	RooRealSumPdf.h

	skipping to change at line 57	skipping to change at line 57

	virtual Double_t expectedEvents(const RooArgSet* nset) const ;	virtual Double_t expectedEvents(const RooArgSet* nset) const ;
	virtual Double_t expectedEvents(const RooArgSet& nset) const {	virtual Double_t expectedEvents(const RooArgSet& nset) const {
	// Return expected number of events for extended likelihood calculation	// Return expected number of events for extended likelihood calculation
	// which is the sum of all coefficients	// which is the sum of all coefficients
	return expectedEvents(&nset) ;	return expectedEvents(&nset) ;
	}	}

	void printMetaArgs(ostream& os) const ;	void printMetaArgs(ostream& os) const ;


		virtual std::list<Double_t>* binBoundaries(RooAbsRealLValue& /obs/, Dou
		ble_t /xlo/, Double_t /xhi/) const ;
		virtual std::list<Double_t>* plotSamplingHint(RooAbsRealLValue& /obs/,
		Double_t /xlo/, Double_t /xhi/) const ;
		Bool_t isBinnedDistribution(const RooArgSet& obs) const ;

	protected:	protected:

	class CacheElem : public RooAbsCacheElement {	class CacheElem : public RooAbsCacheElement {
	public:	public:
	CacheElem() {} ;	CacheElem() {} ;
	virtual ~CacheElem() {} ;	virtual ~CacheElem() {} ;
	virtual RooArgList containedArgs(Action) { RooArgList ret(_funcIntList) ; ret.add(_funcNormList) ; return ret ; }	virtual RooArgList containedArgs(Action) { RooArgList ret(_funcIntList) ; ret.add(_funcNormList) ; return ret ; }
	RooArgList _funcIntList ;	RooArgList _funcIntList ;
	RooArgList _funcNormList ;	RooArgList _funcNormList ;
	} ;	} ;

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

	RooSharedProperties.h	RooSharedProperties.h

	skipping to change at line 34	skipping to change at line 34

	RooSharedProperties() ;	RooSharedProperties() ;
	RooSharedProperties(const char* uuidstr) ;	RooSharedProperties(const char* uuidstr) ;
	virtual ~RooSharedProperties() ;	virtual ~RooSharedProperties() ;
	Bool_t operator==(const RooSharedProperties& other) ;	Bool_t operator==(const RooSharedProperties& other) ;

	virtual RooSharedProperties* clone() = 0 ;	virtual RooSharedProperties* clone() = 0 ;

	virtual void Print(Option_t* opts=0) const ;	virtual void Print(Option_t* opts=0) const ;


		void increaseRefCount() { _refCount++ ; }
		void decreaseRefCount() { if (_refCount>0) _refCount-- ; }
		Int_t refCount() const { return _refCount ; }

		void setInSharedList() { _inSharedList = kTRUE ; }
		Bool_t inSharedList() const { return _inSharedList ; }

	protected:	protected:

	TUUID _uuid ; // Unique object ID	TUUID _uuid ; // Unique object ID

		Int_t _refCount ; //! Use count
		Int_t _inSharedList ; //! Is in shared list

	ClassDef(RooSharedProperties,1) // Abstract interface for shared property implementations	ClassDef(RooSharedProperties,1) // Abstract interface for shared property implementations
	};	};

	#endif	#endif

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

	RooSimGenContext.h	RooSimGenContext.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_SIM_GEN_CONTEXT	#ifndef ROO_SIM_GEN_CONTEXT
	#define ROO_SIM_GEN_CONTEXT	#define ROO_SIM_GEN_CONTEXT

	#include "TList.h"	#include "TList.h"
	#include "RooAbsGenContext.h"	#include "RooAbsGenContext.h"
	#include "RooArgSet.h"	#include "RooArgSet.h"

		#include <vector>

	class RooSimultaneous;	class RooSimultaneous;
	class RooDataSet;	class RooDataSet;
	class RooAbsCategoryLValue ;	class RooAbsCategoryLValue ;

	class RooSimGenContext : public RooAbsGenContext {	class RooSimGenContext : public RooAbsGenContext {
	public:	public:
	RooSimGenContext(const RooSimultaneous &model, const RooArgSet &vars, con st RooDataSet *prototype= 0,	RooSimGenContext(const RooSimultaneous &model, const RooArgSet &vars, con st RooDataSet *prototype= 0,
	const RooArgSet* auxProto=0, Bool_t _verbose= kFALSE);	const RooArgSet* auxProto=0, Bool_t _verbose= kFALSE);
	virtual ~RooSimGenContext();	virtual ~RooSimGenContext();

	skipping to change at line 52	skipping to change at line 53

	RooDataSet* createDataSet(const char* name, const char* title, const RooA rgSet& obs) ;	RooDataSet* createDataSet(const char* name, const char* title, const RooA rgSet& obs) ;
	void updateFractions() ;	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	std::vector<RooAbsGenContext*> _gcList ; // List of component generator c
		ontexts
		std::vector<int> _gcIndex ; // Index value corresponding to
		component
	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

		RooDataSet* _protoData ; //! Prototype dataset

	RooArgSet _allVarsPdf ; // All pdf variables	RooArgSet _allVarsPdf ; // All pdf variables
	TIterator* _proxyIter ; // Iterator over pdf proxies	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. 3 change blocks.
	1 lines changed or deleted	6 lines changed or added

	RooSimultaneous.h	RooSimultaneous.h

	skipping to change at line 83	skipping to change at line 83
	virtual RooPlot plotOn(RooPlot frame, Option_t* drawOptions, Double_t s caleFactor=1.0,	virtual RooPlot plotOn(RooPlot frame, Option_t* drawOptions, Double_t s caleFactor=1.0,
	ScaleType stype=Relative, const RooAbsData* projDa ta=0, const RooArgSet* projSet=0,	ScaleType stype=Relative, const RooAbsData* projDa ta=0, const RooArgSet* projSet=0,
	Double_t precision=1e-3, Bool_t shiftToZero=kFALSE , const RooArgSet* projDataSet=0,	Double_t precision=1e-3, Bool_t shiftToZero=kFALSE , const RooArgSet* projDataSet=0,
	Double_t rangeLo=0, Double_t rangeHi=0, RooCurve:: WingMode wmode=RooCurve::Extended) const;	Double_t rangeLo=0, Double_t rangeHi=0, RooCurve:: WingMode wmode=RooCurve::Extended) const;

	RooAbsPdf* getPdf(const char* catName) const ;	RooAbsPdf* getPdf(const char* catName) const ;
	const RooAbsCategoryLValue& indexCat() const { return (RooAbsCategoryLVal ue&) _indexCat.arg() ; }	const RooAbsCategoryLValue& indexCat() const { return (RooAbsCategoryLVal ue&) _indexCat.arg() ; }

	virtual RooDataSet* generateSimGlobal(const RooArgSet& whatVars, Int_t nE vents) ;	virtual RooDataSet* generateSimGlobal(const RooArgSet& whatVars, Int_t nE vents) ;


		virtual RooDataHist* fillDataHist(RooDataHist hist, const RooArgSet nse
		t, Double_t scaleFactor,
		Bool_t correctForBinVolume=kFALSE, Bool_
		t showProgress=kFALSE) const ;

	protected:	protected:

	void initialize(RooAbsCategoryLValue& inIndexCat, std::map<std::string,Ro oAbsPdf*> pdfMap) ;	void initialize(RooAbsCategoryLValue& inIndexCat, std::map<std::string,Ro oAbsPdf*> pdfMap) ;
	virtual RooPlot* plotOn(RooPlot* frame, RooLinkedList& cmdList) const ;	virtual RooPlot* plotOn(RooPlot* frame, RooLinkedList& cmdList) const ;

	virtual void selectNormalization(const RooArgSet* depSet=0, Bool_t force= kFALSE) ;	virtual void selectNormalization(const RooArgSet* depSet=0, Bool_t force= kFALSE) ;
	virtual void selectNormalizationRange(const char* rangeName=0, Bool_t for ce=kFALSE) ;	virtual void selectNormalizationRange(const char* rangeName=0, Bool_t for ce=kFALSE) ;
	mutable RooSetProxy _plotCoefNormSet ;	mutable RooSetProxy _plotCoefNormSet ;
	const TNamed* _plotCoefNormRange ;	const TNamed* _plotCoefNormRange ;

	class CacheElem : public RooAbsCacheElement {	class CacheElem : public RooAbsCacheElement {
	public:	public:
	virtual ~CacheElem() {} ;	virtual ~CacheElem() {} ;
	RooArgList containedArgs(Action) { return RooArgList(_partIntList) ; }	RooArgList containedArgs(Action) { return RooArgList(_partIntList) ; }
	RooArgList _partIntList ;	RooArgList _partIntList ;
	} ;	} ;
	mutable RooObjCacheManager _partIntMgr ; // Component normalization manag er	mutable RooObjCacheManager _partIntMgr ; // Component normalization manag er

	friend class RooSimGenContext ;	friend class RooSimGenContext ;

		friend class RooSimSplitGenContext ;
		virtual RooAbsGenContext* autoGenContext(const RooArgSet &vars, const Roo
		DataSet* prototype=0, const RooArgSet* auxProto=0,
		Bool_t verbose=kFALSE, Bool_t aut
		oBinned=kTRUE, const char* binnedTag="") const ;
	virtual RooAbsGenContext* genContext(const RooArgSet &vars, const RooData Set *prototype=0,	virtual RooAbsGenContext* genContext(const RooArgSet &vars, const RooData Set *prototype=0,
	const RooArgSet* auxProto=0, Bool_t v erbose= kFALSE) const ;	const RooArgSet* auxProto=0, Bool_t v erbose= kFALSE) const ;

	RooCategoryProxy _indexCat ; // Index category	RooCategoryProxy _indexCat ; // Index category
	TList _pdfProxyList ; // List of PDF proxies (named after applicab le category state)	TList _pdfProxyList ; // List of PDF proxies (named after applicab le category state)
	Int_t _numPdf ; // Number of registered PDFs	Int_t _numPdf ; // Number of registered PDFs

	ClassDef(RooSimultaneous,2) // Simultaneous operator p.d.f, functions li ke C++ 'switch()' on input p.d.fs operating on index category5A	ClassDef(RooSimultaneous,2) // Simultaneous operator p.d.f, functions li ke C++ 'switch()' on input p.d.fs operating on index category5A
	};	};


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

	RooStatsUtils.h	RooStatsUtils.h

	// @(#)root/roostats:$Id: RooStatsUtils.h 40937 2011-09-19 16:16:56Z moneta $	// @(#)root/roostats:$Id: RooStatsUtils.h 42260 2011-11-25 21:37:29Z 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. *
	*************************************************************************/	*************************************************************************/


	#ifndef RooStats_RooStatsUtils	#ifndef ROOSTATS_RooStatsUtils
	#define RooStats_RooStatsUtils	#define ROOSTATS_RooStatsUtils

	#ifndef ROOT_TMath	#ifndef ROOT_TMath
	#include "TMath.h"	#include "TMath.h"
	#endif	#endif

	#ifndef ROOT_Math_DistFuncMathCore	#ifndef ROOT_Math_DistFuncMathCore
	#include"Math/DistFuncMathCore.h"	#include"Math/DistFuncMathCore.h"
	#endif	#endif

	#include "RooArgSet.h"	#include "RooArgSet.h"
	#include "RooRealVar.h"	#include "RooRealVar.h"
	#include "RooAbsCollection.h"	#include "RooAbsCollection.h"
	#include "TIterator.h"	#include "TIterator.h"

		#include "RooStats/ModelConfig.h"
		#include "RooProdPdf.h"

	#include <iostream>	#include <iostream>
	using namespace std ;	using namespace std ;

	namespace RooStats {	namespace RooStats {

	// returns one-sided significance corresponding to a p-value	// returns one-sided significance corresponding to a p-value
	inline Double_t PValueToSignificance(Double_t pvalue){	inline Double_t PValueToSignificance(Double_t pvalue){
	return ::ROOT::Math::normal_quantile_c(pvalue,1);	return ::ROOT::Math::normal_quantile_c(pvalue,1);
	}	}

	skipping to change at line 57	skipping to change at line 59
	inline void RemoveConstantParameters(RooArgSet* set){	inline void RemoveConstantParameters(RooArgSet* set){
	RooArgSet constSet;	RooArgSet constSet;
	RooLinkedListIter it = set->iterator();	RooLinkedListIter it = set->iterator();
	RooRealVar *myarg;	RooRealVar *myarg;
	while ((myarg = (RooRealVar *)it.Next())) {	while ((myarg = (RooRealVar *)it.Next())) {
	if(myarg->isConstant()) constSet.add(*myarg);	if(myarg->isConstant()) constSet.add(*myarg);
	}	}
	set->remove(constSet);	set->remove(constSet);
	}	}


		inline bool SetAllConstant(const RooAbsCollection &coll, bool constant =
		true) {
		// utility function to set all variable constant in a collection
		// (from G. Petrucciani)
		bool changed = false;
		RooLinkedListIter iter = coll.iterator();
		for (RooAbsArg a = (RooAbsArg ) iter.Next(); a != 0; a = (RooAbsAr
		g *) iter.Next()) {
		RooRealVar v = dynamic_cast<RooRealVar >(a);
		if (v && (v->isConstant() != constant)) {
		changed = true;
		v->setConstant(constant);
		}
		}
		return changed;
		}

	// assuming all values in set are RooRealVars, randomize their values	// assuming all values in set are RooRealVars, randomize their values
	inline void RandomizeCollection(RooAbsCollection& set,	inline void RandomizeCollection(RooAbsCollection& set,
	Bool_t randomizeConstants = kTRUE)	Bool_t randomizeConstants = kTRUE)
	{	{
	RooLinkedListIter it = set.iterator();	RooLinkedListIter it = set.iterator();
	RooRealVar* var;	RooRealVar* var;

	// repeat loop tpo avoid calling isConstant for nothing	// repeat loop tpo avoid calling isConstant for nothing
	if (randomizeConstants) {	if (randomizeConstants) {
	while ((var = (RooRealVar*)it.Next()) != NULL)	while ((var = (RooRealVar*)it.Next()) != NULL)

	skipping to change at line 78	skipping to change at line 95
	}	}
	else {	else {
	// exclude constants variables	// exclude constants variables
	while ((var = (RooRealVar*)it.Next()) != NULL)	while ((var = (RooRealVar*)it.Next()) != NULL)
	if (!var->isConstant() )	if (!var->isConstant() )
	var->randomize();	var->randomize();
	}	}

	}	}


		void FactorizePdf(const RooArgSet &observables, RooAbsPdf &pdf, RooArgLi
		st &obsTerms, RooArgList &constraints);

		void FactorizePdf(RooStats::ModelConfig &model, RooAbsPdf &pdf, RooArgLi
		st &obsTerms, RooArgList &constraints);

		RooAbsPdf * MakeNuisancePdf(RooAbsPdf &pdf, const RooArgSet &observables
		, const char *name);

		RooAbsPdf * MakeNuisancePdf(const RooStats::ModelConfig &model, const ch
		ar *name);

	}	}

	#endif	#endif

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

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

	* File: $Id: RooStudyPackage.h 39912 2011-06-23 16:40:11Z moneta $	* File: $Id: RooStudyPackage.h 39817 2011-06-18 12:49:41Z wouter $
	* Authors: *	* Authors: *
	* WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu *	* WV, Wouter Verkerke, UC Santa Barbara, verkerke@slac.stanford.edu *
	* DK, David Kirkby, UC Irvine, dkirkby@uci.edu *	* DK, David Kirkby, UC Irvine, dkirkby@uci.edu *
	* *	* *
	* Copyright (c) 2000-2005, Regents of the University of California *	* Copyright (c) 2000-2005, Regents of the University of California *
	* and Stanford University. All rights reserved. *	* and Stanford University. All rights reserved. *
	* *	* *
	* Redistribution and use in source and binary forms, *	* Redistribution and use in source and binary forms, *
	* with or without modification, are permitted according to the terms *	* with or without modification, are permitted according to the terms *
	* listed in LICENSE (http://roofit.sourceforge.net/license.txt) *	* listed in LICENSE (http://roofit.sourceforge.net/license.txt) *

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

	RooTrace.h	RooTrace.h

	skipping to change at line 38	skipping to change at line 38
	static void create(const TObject* obj) ;	static void create(const TObject* obj) ;
	static void destroy(const TObject* obj) ;	static void destroy(const TObject* obj) ;

	static void active(Bool_t flag) ;	static void active(Bool_t flag) ;
	static void verbose(Bool_t flag) ;	static void verbose(Bool_t flag) ;

	static void dump() ;	static void dump() ;
	static void dump(ostream& os, Bool_t sinceMarked=kFALSE) ;	static void dump(ostream& os, Bool_t sinceMarked=kFALSE) ;
	static void mark() ;	static void mark() ;


		static void callgrind_zero() ;
		static void callgrind_dump() ;

	protected:	protected:

	static void create2(const TObject* obj) ;	static void create2(const TObject* obj) ;
	static void destroy2(const TObject* obj) ;	static void destroy2(const TObject* obj) ;

	void addPad(const TObject* ref, Bool_t doPad) ;	void addPad(const TObject* ref, Bool_t doPad) ;
	Bool_t removePad(const TObject* ref) ;	Bool_t removePad(const TObject* ref) ;

	static Bool_t _active ;	static Bool_t _active ;
	static Bool_t _verbose ;	static Bool_t _verbose ;

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

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

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

	skipping to change at line 36	skipping to change at line 36
	class RooArgSet ;	class RooArgSet ;

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

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

	// Empty ctor	// Empty ctor
	RooTreeDataStore(const char* name, const char* title, const RooArgSet& va rs, const char* wgtVarName=0) ;	RooTreeDataStore(const char* name, const char* title, const RooArgSet& va rs, const char* wgtVarName=0) ;

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

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

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


	skipping to change at line 81	skipping to change at line 82
	virtual RooArgSet* addColumns(const RooArgList& varList) ;	virtual RooArgSet* addColumns(const RooArgList& varList) ;

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

	// Add rows	// Add rows
	virtual void append(RooAbsDataStore& other) ;	virtual void append(RooAbsDataStore& other) ;

	// General & bookkeeping methods	// General & bookkeeping methods
	virtual Bool_t valid() const ;	virtual Bool_t valid() const ;

		virtual Double_t sumEntries() const ;
	virtual Int_t numEntries() const ;	virtual Int_t numEntries() const ;
	virtual void reset() ;	virtual void reset() ;


		// Buffer redirection routines used in inside RooAbsOptTestStatistics
		virtual void attachBuffers(const RooArgSet& extObs) ;
		virtual void resetBuffers() ;
		void restoreAlternateBuffers() ;

	// Tree access	// Tree access
	TTree& tree() { return *_tree ; }	TTree& tree() { return *_tree ; }
	virtual const TTree* tree() const { return _tree ; }	virtual const TTree* tree() const { return _tree ; }

	// Forwarded from TTree	// Forwarded from TTree
	Stat_t GetEntries() const;	Stat_t GetEntries() const;
	void Reset(Option_t* option=0);	void Reset(Option_t* option=0);
	Int_t Fill();	Int_t Fill();
	Int_t GetEntry(Int_t entry = 0, Int_t getall = 0);	Int_t GetEntry(Int_t entry = 0, Int_t getall = 0);


	skipping to change at line 118	skipping to change at line 125
	_extWgtArray = arrayWgt ;	_extWgtArray = arrayWgt ;
	_extWgtErrLoArray = arrayWgtErrLo ;	_extWgtErrLoArray = arrayWgtErrLo ;
	_extWgtErrHiArray = arrayWgtErrHi ;	_extWgtErrHiArray = arrayWgtErrHi ;
	_extSumW2Array = arraySumW2 ;	_extSumW2Array = arraySumW2 ;
	}	}

	const RooArgSet& row() { return _varsww ; }	const RooArgSet& row() { return _varsww ; }

	protected:	protected:


		friend class RooVectorDataStore ;

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

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

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


	skipping to change at line 149	skipping to change at line 158
	Double_t* _extWgtArray ; //! External weight array	Double_t* _extWgtArray ; //! External weight array
	Double_t* _extWgtErrLoArray ; //! External weight array - low error	Double_t* _extWgtErrLoArray ; //! External weight array - low error
	Double_t* _extWgtErrHiArray ; //! External weight array - high error	Double_t* _extWgtErrHiArray ; //! External weight array - high error
	Double_t* _extSumW2Array ; //! External sum of weights array	Double_t* _extSumW2Array ; //! External sum of weights array

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


		RooArgSet _attachedBuffers ; //! Currently attached buffers (if different
		from _varsww)

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

	#endif	#endif

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

	RootFinder.h	RootFinder.h

	// @(#)root/tmva $Id: RootFinder.h 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: RootFinder.h 40005 2011-06-27 15:29:10Z 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 : RootFinder *	* Class : RootFinder *
	* Web : http://tmva.sourceforge.net *	* Web : http://tmva.sourceforge.net *
	* *	* *
	* Description: *	* Description: *
	* Root finding using Brents algorithm *	* Root finding using Brents algorithm *

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

	RtypesCint.h	RtypesCint.h

	/* @(#)root/base:$Id: RtypesCint.h 34513 2010-07-20 15:10:49Z pcanal $*/	/* @(#)root/base:$Id: RtypesCint.h 41093 2011-10-03 12:29:48Z 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_RtypesCint	#ifndef ROOT_RtypesCint

	skipping to change at line 52	skipping to change at line 52
	#define ClassDef2T2(name,Tmpl1,Tmpl2)	#define ClassDef2T2(name,Tmpl1,Tmpl2)
	#define ClassImp2T(name,Tmpl1,Tmpl2) templateClassImp(name)	#define ClassImp2T(name,Tmpl1,Tmpl2) templateClassImp(name)
	#define ClassDef3T2(name,Tmpl1,Tmpl2,Tmpl3)	#define ClassDef3T2(name,Tmpl1,Tmpl2,Tmpl3)
	#define ClassImp3T(name,Tmpl1,Tmpl2,Tmpl3) templateClassImp(name)	#define ClassImp3T(name,Tmpl1,Tmpl2,Tmpl3) templateClassImp(name)

	// Macro not useful (yet?) in CINT	// Macro not useful (yet?) in CINT
	#define ClassImp(X)	#define ClassImp(X)
	#define ClassImpUnique(name,key)	#define ClassImpUnique(name,key)
	#define RootClassVersion(name,VersionNumber)	#define RootClassVersion(name,VersionNumber)


		//////////////////////////////////////////////////////////////////////////
		//
		// Wrapper class around the replacement for the gPad pointer.
		//
		//////////////////////////////////////////////////////////////////////////
		class TVirtualPad;
		struct TPadThreadLocal
		{
		operator TVirtualPad*() { return TVirtualPad::Pad(); }
		operator bool() { return 0!=TVirtualPad::Pad(); }

		// Emulate the pointer behavior
		TVirtualPad* operator->() { return TVirtualPad::Pad(); }
		TVirtualPad& operator=(TVirtualPad other) { return (TVirtualPad::Pad()
		= other); }
		bool operator!=(const TVirtualPad *other) const { return (TVirtualPad::P
		ad() != other); }
		bool operator!=(TVirtualPad *other) const { return (TVirtualPad::Pad() !
		= other); }
		bool operator==(const TVirtualPad *other) const { return (TVirtualPad::P
		ad() == other); }
		bool operator==(TVirtualPad *other) const { return (TVirtualPad::Pad() =
		= other); }
		};

		// Pretty printing routine for CINT
		int G__ateval(TPadThreadLocal &) {
		TVirtualPad *pad = TVirtualPad::Pad();
		if (pad) {
		printf("(class TVirtualPad)%p\n",(void)pad);
		} else {
		printf("(class TVirtualPad)0x0\n",(void)pad);
		}
		return 1;
		}

		TPadThreadLocal gPad;

		//////////////////////////////////////////////////////////////////////////
		//
		// Wrapper class around the replacement for the gDirectory pointer.
		//
		//////////////////////////////////////////////////////////////////////////
		class TDirectory;
		class TFile;
		struct TDirectoryThreadLocal
		{
		operator TDirectory*() { return TDirectory::CurrentDirectory(); }
		operator bool() { return 0!=TDirectory::CurrentDirectory(); }

		// This is needed to support (TFile*)gDirectory
		operator TFile() { return (TFile)(TDirectory::CurrentDirectory()); }
		// The following 2 are needed to remove ambiguity introduced by the oper
		ator TFile*
		operator void*() { return TDirectory::CurrentDirectory(); }

		// Emulate the pointer behavior
		TDirectory* operator->() { return TDirectory::CurrentDirectory(); }
		TDirectory& operator=(TDirectory other) { return (TDirectory::CurrentD
		irectory() = other); }
		bool operator!=(const TDirectory *other) const { return (TDirectory::Cur
		rentDirectory() != other); }
		bool operator!=(TDirectory *other) const { return (TDirectory::CurrentDi
		rectory() != other); }
		bool operator==(const TDirectory *other) const { return (TDirectory::Cur
		rentDirectory() == other); }
		bool operator==(TDirectory *other) const { return (TDirectory::CurrentDi
		rectory() == other); }
		};

		// Pretty printing routine for CINT
		int G__ateval(TDirectoryThreadLocal &) {
		TDirectory *dir = TDirectory::CurrentDirectory();
		if (dir) {
		printf("(class TDirectory)%p\n",(void)dir);
		} else {
		printf("(class TDirectory)0x0\n",(void)dir);
		}
		return 1;
		}

		TDirectoryThreadLocal gDirectory;

		//////////////////////////////////////////////////////////////////////////
		//
		// Wrapper class around the replacement for the gFile pointer.
		//
		//////////////////////////////////////////////////////////////////////////
		class TFile;
		struct TFileThreadLocal
		{
		operator TFile*() { return TFile::CurrentFile(); }
		operator bool() { return 0!=TFile::CurrentFile(); }

		// Emulate the pointer behavior
		TFile* operator->() { return TFile::CurrentFile(); }
		TFile& operator=(TFile other) { return (TFile::CurrentFile() = other);
		}
		bool operator!=(const TFile *other) const { return (TFile::CurrentFile()
		!= other); }
		bool operator!=(TFile *other) const { return (TFile::CurrentFile() != ot
		her); }
		bool operator==(const TFile *other) const { return (TFile::CurrentFile()
		== other); }
		bool operator==(TFile *other) const { return (TFile::CurrentFile() == ot
		her); }
		};

		// Pretty printing routine for CINT
		int G__ateval(TFileThreadLocal &) {
		TFile *dir = TFile::CurrentFile();
		if (dir) {
		printf("(class TFile)%p\n",(void)dir);
		} else {
		printf("(class TFile)0x0\n",(void)dir);
		}
		return 1;
		}

		TFileThreadLocal gFile;

		//////////////////////////////////////////////////////////////////////////
		//
		// Wrapper class around the replacement for the gInterpreter pointer.
		//
		//////////////////////////////////////////////////////////////////////////
		class TInterpreter;
		struct TInterpreterWrapper
		{
		operator TInterpreter*() { return TInterpreter::Instance(); }
		operator bool() { return 0!=TInterpreter::Instance(); }

		// Emulate the pointer behavior
		TInterpreter* operator->() { return TInterpreter::Instance(); }
		TInterpreter& operator=(TInterpreter other) { return (TInterpreter::In
		stance() = other); }
		bool operator!=(const TInterpreter *other) const { return (TInterpreter:
		:Instance() != other); }
		bool operator!=(TInterpreter *other) const { return (TInterpreter::Insta
		nce() != other); }
		bool operator==(const TInterpreter *other) const { return (TInterpreter:
		:Instance() == other); }
		bool operator==(TInterpreter *other) const { return (TInterpreter::Insta
		nce() == other); }
		};

		// Pretty printing routine for CINT
		int G__ateval(TInterpreterWrapper &) {
		TInterpreter *interpreter = TInterpreter::Instance();
		if (interpreter) {
		printf("(class TInterpreter)%p\n",(void)interpreter);
		} else {
		printf("(class TInterpreter)0x0\n",(void)interpreter);
		}
		return 1;
		}

		TInterpreterWrapper gInterpreter;

		//////////////////////////////////////////////////////////////////////////
		//
		// Wrapper class around the replacement for the gVirtualX pointer.
		//
		//////////////////////////////////////////////////////////////////////////
		class TVirtualX;
		struct TVirtualXWrapper
		{
		operator TVirtualX*() { return TVirtualX::Instance(); }
		operator bool() { return 0!=TVirtualX::Instance(); }

		// Emulate the pointer behavior
		TVirtualX* operator->() { return TVirtualX::Instance(); }
		TVirtualX& operator=(TVirtualX other) { return (TVirtualX::Instance()
		= other); }
		bool operator!=(const TVirtualX *other) const { return (TVirtualX::Insta
		nce() != other); }
		bool operator!=(TVirtualX *other) const { return (TVirtualX::Instance()
		!= other); }
		bool operator==(const TVirtualX *other) const { return (TVirtualX::Insta
		nce() == other); }
		bool operator==(TVirtualX *other) const { return (TVirtualX::Instance()
		== other); }
		};

		// Pretty printing routine for CINT
		int G__ateval(TVirtualXWrapper &) {
		TVirtualX *VirtualX = TDirectory::Instance();
		if (VirtualX) {
		printf("(class TVirtualX)%p\n",(void)VirtualX);
		} else {
		printf("(class TVirtualX)0x0\n",(void)VirtualX);
		}
		return 1;
		}

		TVirtualXWrapper gVirtualX;

	#endif	#endif

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

	Rule.h	Rule.h

	// @(#)root/tmva $Id: Rule.h 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: Rule.h 40005 2011-06-27 15:29:10Z stelzer $
	// 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: RuleCut.h 40005 2011-06-27 15:29:10Z stelzer $
	// 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: RuleEnsemble.h 40005 2011-06-27 15:29:10Z stelzer $
	// 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: RuleFit.h 40005 2011-06-27 15:29:10Z stelzer $
	// 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: RuleFitAPI.h 40005 2011-06-27 15:29:10Z stelzer $
	// 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: RuleFitParams.h 40005 2011-06-27 15:29:10Z stelzer $
	// 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 39391 2011-05-26 09:51:59Z moneta $	// @(#)root/roostats:$Id: SPlot.h 41030 2011-09-27 15:06:01Z 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. *
	*************************************************************************/	*************************************************************************/


	skipping to change at line 65	skipping to change at line 65
	const RooArgSet &projDeps=RooArgSet(), bool includeWeigh ts=kTRUE);	const RooArgSet &projDeps=RooArgSet(), bool includeWeigh ts=kTRUE);

	Double_t GetSumOfEventSWeight(Int_t numEvent) const;	Double_t GetSumOfEventSWeight(Int_t numEvent) const;

	Double_t GetYieldFromSWeight(const char* sVariable) const;	Double_t GetYieldFromSWeight(const char* sVariable) const;

	Double_t GetSWeight(Int_t numEvent, const char* sVariable) const;	Double_t GetSWeight(Int_t numEvent, const char* sVariable) const;

	protected:	protected:


		enum {
		kOwnData = BIT(20)
		};

	RooArgList fSWeightVars;	RooArgList fSWeightVars;

	// RooListProxy fSWeightVars;	// RooListProxy fSWeightVars;

	RooDataSet* fSData;	RooDataSet* fSData;

	ClassDef(SPlot,1) // Class used for making sPlots	ClassDef(SPlot,1) // Class used for making sPlots

	};	};


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

	SVEvent.h	SVEvent.h

	// @(#)root/tmva $Id: SVEvent.h 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: SVEvent.h 40005 2011-06-27 15:29:10Z 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 : 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 40012 2011-06-27 16:03:11Z stelzer $	// @(#)root/tmva $Id: SVKernelFunction.h 40005 2011-06-27 15:29:10Z 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 40012 2011-06-27 16:03:11Z stelzer $	// @(#)root/tmva $Id: SVKernelMatrix.h 40005 2011-06-27 15:29:10Z 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: SVWorkingSet.h 40005 2011-06-27 15:29:10Z 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 : 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

	SamplingDistribution.h	SamplingDistribution.h

	// @(#)root/roostats:$Id: SamplingDistribution.h 40937 2011-09-19 16:16:56Z moneta $	// @(#)root/roostats:$Id: SamplingDistribution.h 40920 2011-09-19 06:41: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 40012 2011-06-27 16:03:11Z stelzer $	// @(#)root/tmva $Id: SdivSqrtSplusB.h 40005 2011-06-27 15:29:10Z 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 40012 2011-06-27 16:03:11Z stelzer $	// @(#)root/tmva $Id: SeparationBase.h 40005 2011-06-27 15:29:10Z 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

	SimpleLikelihoodRatioTestStat.h	SimpleLikelihoodRatioTestStat.h

	// @(#)root/roostats:$Id: SimpleLikelihoodRatioTestStat.h 39956 2011-06-24 21:06:20Z wouter $	// @(#)root/roostats:$Id: SimpleLikelihoodRatioTestStat.h 42339 2011-11-30 23:54:18Z 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_SimpleLikelihoodRatioTestStat	#ifndef ROOSTATS_SimpleLikelihoodRatioTestStat
	#define ROOSTATS_SimpleLikelihoodRatioTestStat	#define ROOSTATS_SimpleLikelihoodRatioTestStat

	skipping to change at line 63	skipping to change at line 63

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


	RooFit::MsgLevel msglevel = RooMsgService::instance().globalKillBe	fNullPdf = &nullPdf;
	low();	fAltPdf = &altPdf;
	RooMsgService::instance().setGlobalKillBelow(RooFit::ERROR);
	w.import(nullPdf, RooFit::RecycleConflictNodes());
	w.import(altPdf, RooFit::RecycleConflictNodes());
	RooMsgService::instance().setGlobalKillBelow(msglevel);


	fNullPdf = w.pdf(nullPdf.GetName());	RooArgSet * allNullVars = fNullPdf->getVariables();
	fAltPdf = w.pdf(altPdf.GetName());	fNullParameters = (RooArgSet*) allNullVars->snapshot();
		delete allNullVars;

		RooArgSet * allAltVars = fAltPdf->getVariables();
		fAltParameters = (RooArgSet*) allAltVars->snapshot();
		delete allAltVars;


	fNullParameters = (RooArgSet*) fNullPdf->getVariables()->snapshot(
	);
	fAltParameters = (RooArgSet*) fAltPdf->getVariables()->snapshot();
	fReuseNll=kFALSE ;	fReuseNll=kFALSE ;
	fNllNull=NULL ;	fNllNull=NULL ;
	fNllAlt=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)
	{	{
	// Takes null and alternate parameters from values in nullParamete rs	// Takes null and alternate parameters from values in nullParamete rs
	// and altParameters. Can be overridden.	// and altParameters. Can be overridden.

		fNullPdf = &nullPdf;
	RooFit::MsgLevel msglevel = RooMsgService::instance().globalKillBe	fAltPdf = &altPdf;
	low();
	RooMsgService::instance().setGlobalKillBelow(RooFit::ERROR);
	w.import(nullPdf, RooFit::RecycleConflictNodes());
	w.import(altPdf, RooFit::RecycleConflictNodes());
	RooMsgService::instance().setGlobalKillBelow(msglevel);

	fNullPdf = w.pdf(nullPdf.GetName());
	fAltPdf = w.pdf(altPdf.GetName());

	fNullParameters = (RooArgSet*) nullParameters.snapshot();	fNullParameters = (RooArgSet*) nullParameters.snapshot();
	fAltParameters = (RooArgSet*) altParameters.snapshot();	fAltParameters = (RooArgSet*) altParameters.snapshot();
	fReuseNll=kFALSE ;	fReuseNll=kFALSE ;
	fNllNull=NULL ;	fNllNull=NULL ;
	fNllAlt=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 (fNllNull) delete fNllNull ;
	if (fNllAlt) delete fNllAlt ;	if (fNllAlt) delete fNllAlt ;
	}	}


	static void setAlwaysReuseNLL(Bool_t flag) { fAlwaysReuseNll = flag ;	static void SetAlwaysReuseNLL(Bool_t flag) { fAlwaysReuseNll = flag ;
	}	}
	void setReuseNLL(Bool_t flag) { fReuseNll = 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();
	}	}

	//_________________________________________	//_________________________________________

	skipping to change at line 182	skipping to change at line 175
	if (reuse && !created) {	if (reuse && !created) {
	fNllNull->setData(data, kFALSE) ;	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 = fNllNull->getVariables();	RooArgSet* attachedSet = fNllNull->getVariables();
	attachedSet = fNullParameters;	attachedSet = fNullParameters;
	*attachedSet = nullPOI;	*attachedSet = nullPOI;
	double nullNLL = fNllNull->getVal();	double nullNLL = fNllNull->getVal();


	delete fNllNull ; fNllNull = NULL ;	if (!reuse) {
		delete fNllNull ; fNllNull = NULL ;
		}
	delete attachedSet;	delete attachedSet;

	created = kFALSE ;	created = kFALSE ;
	if (!fNllAlt) {	if (!fNllAlt) {
	fNllAlt = (RooNLLVar*) fAltPdf->createNLL(data, RooFit::CloneData (kFALSE));	fNllAlt = (RooNLLVar*) fAltPdf->createNLL(data, RooFit::CloneData (kFALSE));
	created = kTRUE ;	created = kTRUE ;
	}	}
	if (reuse && !created) {	if (reuse && !created) {
	fNllAlt->setData(data, kFALSE) ;	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 = fNllAlt->getVariables();	attachedSet = fNllAlt->getVariables();
	attachedSet = fAltParameters;	attachedSet = fAltParameters;
	double altNLL = fNllAlt->getVal();	double altNLL = fNllAlt->getVal();


	delete fNllAlt ; fNllAlt = NULL ;	if (!reuse) {
		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;

	RooAbsPdf* fNullPdf;	RooAbsPdf* fNullPdf;
	RooAbsPdf* fAltPdf;	RooAbsPdf* fAltPdf;
	RooArgSet* fNullParameters;	RooArgSet* fNullParameters;
	RooArgSet* fAltParameters;	RooArgSet* fAltParameters;
	bool fFirstEval;	bool fFirstEval;


	RooNLLVar* fNllNull ;	RooNLLVar* fNllNull ; //! transient copy of the null NLL
	RooNLLVar* fNllAlt ;	RooNLLVar* fNllAlt ; //! transient copy of the alt NLL
	static Bool_t fAlwaysReuseNll ;	static Bool_t fAlwaysReuseNll ;
	Bool_t fReuseNll ;	Bool_t fReuseNll ;

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

	}	}

	#endif	#endif

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

	SimulatedAnnealing.h	SimulatedAnnealing.h

	// @(#)root/tmva $Id: SimulatedAnnealing.h 39395 2011-05-26 10:05:54Z monet a $	// @(#)root/tmva $Id: SimulatedAnnealing.h 40005 2011-06-27 15:29:10Z stelz er $
	// 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: SimulatedAnnealingFitter.h 40005 2011-06-27 15:29:10Z stelzer $
	// 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: TActivation.h 40005 2011-06-27 15:29:10Z stelzer $
	// 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 39395 2011-05-26 10:05:54Z monet a $	// @(#)root/tmva $Id: TActivationChooser.h 40005 2011-06-27 15:29:10Z stelz er $
	// 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 39395 2011-05-26 10:05:54Z mone ta $	// @(#)root/tmva $Id: TActivationIdentity.h 40005 2011-06-27 15:29:10Z stel zer $
	// 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: TActivationRadial.h 40005 2011-06-27 15:29:10Z stelze r $
	// 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 39395 2011-05-26 10:05:54Z monet a $	// @(#)root/tmva $Id: TActivationSigmoid.h 40005 2011-06-27 15:29:10Z stelz er $
	// 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: TActivationTanh.h 40005 2011-06-27 15:29:10Z stelzer $
	// 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 39643 2011-06-09 17:32:22Z pcanal $	// @(#)root/tree:$Id: TBasket.h 39642 2011-06-09 17:18:42Z 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. *
	*************************************************************************/	*************************************************************************/


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

	TBranchClones.h	TBranchClones.h

	// @(#)root/tree:$Id: TBranchClones.h 39635 2011-06-09 15:37:27Z pcanal $	// @(#)root/tree:$Id: TBranchClones.h 41347 2011-10-12 07:03:27Z axel $
	// 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. *
	*************************************************************************/	*************************************************************************/


	skipping to change at line 51	skipping to change at line 51
	void Init(TTree tree, TBranch parent, const char name, void clonesad dress, Int_t basketsize=32000,Int_t compress=-1, Int_t splitlevel=1);	void Init(TTree tree, TBranch parent, const char name, void clonesad dress, Int_t basketsize=32000,Int_t compress=-1, Int_t splitlevel=1);

	public:	public:
	TBranchClones();	TBranchClones();
	TBranchClones(TTree tree, const char name, void *clonesaddress, Int_t basketsize=32000,Int_t compress=-1, Int_t splitlevel=1);	TBranchClones(TTree tree, const char name, void *clonesaddress, Int_t basketsize=32000,Int_t compress=-1, Int_t splitlevel=1);
	TBranchClones(TBranch parent, const char name, void *clonesaddress, In t_t basketsize=32000,Int_t compress=-1, Int_t splitlevel=1);	TBranchClones(TBranch parent, const char name, void *clonesaddress, In t_t basketsize=32000,Int_t compress=-1, Int_t splitlevel=1);
	virtual ~TBranchClones();	virtual ~TBranchClones();

	virtual void Browse(TBrowser *b);	virtual void Browse(TBrowser *b);
	virtual Int_t Fill();	virtual Int_t Fill();

		virtual const char* GetClassName() const { return fClassName; }
	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 GetN() const {return fN;}	virtual Int_t GetN() const {return fN;}
	TClonesArray *GetList() const {return fList;}	TClonesArray *GetList() const {return fList;}
	Bool_t IsFolder() const {return kTRUE;}	Bool_t IsFolder() const {return kTRUE;}
	virtual void Print(Option_t *option="") const;	virtual void Print(Option_t *option="") const;
	virtual void Reset(Option_t *option="");	virtual void Reset(Option_t *option="");

		virtual void ResetAfterMerge(TFileMergeInfo *);
	virtual void SetAddress(void *add);	virtual void SetAddress(void *add);
	virtual void SetBasketSize(Int_t buffsize);	virtual void SetBasketSize(Int_t buffsize);
	virtual void UpdateFile();	virtual void UpdateFile();

	ClassDef(TBranchClones,2); //Branch in case of an array of clone object s	ClassDef(TBranchClones,2); //Branch in case of an array of clone object s
	};	};

	#endif	#endif

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

	TBranchProxy.h	TBranchProxy.h

	// @(#)root/treeplayer:$Id: TBranchProxy.h 36449 2010-10-28 20:52:17Z pcana l $	// @(#)root/treeplayer:$Id: TBranchProxy.h 41244 2011-10-06 19:42:35Z pcana l $
	// Author: Philippe Canal 01/06/2004	// Author: Philippe Canal 01/06/2004

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


	skipping to change at line 224	skipping to change at line 224
	// that Setup() has been called. Assumes the object containing th is data	// that Setup() has been called. Assumes the object containing th is data
	// member is held in TClonesArray.	// member is held in TClonesArray.

	char *location;	char *location;

	if (fIsClone) {	if (fIsClone) {

	TClonesArray *tca;	TClonesArray *tca;
	tca = (TClonesArray*)GetStart();	tca = (TClonesArray*)GetStart();


	if (tca->GetLast()<(Int_t)i) return 0;	if (!tca \|\| tca->GetLast()<(Int_t)i) return 0;

	location = (char*)tca->At(i);	location = (char*)tca->At(i);

	return location;	return location;

	} else if (fParent) {	} else if (fParent) {

	//tcaloc = ((unsigned char*)fParent->GetStart());	//tcaloc = ((unsigned char*)fParent->GetStart());
	location = (char*)fParent->GetClaStart(i);	location = (char*)fParent->GetClaStart(i);


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

	TBranchRef.h	TBranchRef.h

	// @(#)root/tree:$Id: TBranchRef.h 39635 2011-06-09 15:37:27Z pcanal $	// @(#)root/tree:$Id: TBranchRef.h 40872 2011-09-13 21:33:33Z 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. *
	*************************************************************************/	*************************************************************************/


	skipping to change at line 39	skipping to change at line 39
	class TTree;	class TTree;

	class TBranchRef : public TBranch {	class TBranchRef : public TBranch {
	private:	private:
	Long64_t fRequestedEntry; //! Cursor indicating which entry is being requested.	Long64_t fRequestedEntry; //! Cursor indicating which entry is being requested.

	protected:	protected:
	TRefTable *fRefTable; // pointer to the TRefTable	TRefTable *fRefTable; // pointer to the TRefTable

	void ReadLeavesImpl(TBuffer &b);	void ReadLeavesImpl(TBuffer &b);

		void FillLeavesImpl(TBuffer &b);

	public:	public:
	TBranchRef();	TBranchRef();
	TBranchRef(TTree *tree);	TBranchRef(TTree *tree);
	virtual ~TBranchRef();	virtual ~TBranchRef();
	virtual void Clear(Option_t *option="");	virtual void Clear(Option_t *option="");
	virtual Int_t Fill();	virtual Int_t Fill();

	virtual void FillLeaves(TBuffer &b);
	TRefTable *GetRefTable() const {return fRefTable;}	TRefTable *GetRefTable() const {return fRefTable;}
	virtual Bool_t Notify();	virtual Bool_t Notify();
	virtual void Print(Option_t *option="") const;	virtual void Print(Option_t *option="") const;
	virtual void Reset(Option_t *option="");	virtual void Reset(Option_t *option="");

		virtual void ResetAfterMerge(TFileMergeInfo *);
	virtual Int_t SetParent(const TObject* obj, Int_t branchID);	virtual Int_t SetParent(const TObject* obj, Int_t branchID);
	virtual void SetRequestedEntry(Long64_t entry) {fRequestedEntry = ent ry;}	virtual void SetRequestedEntry(Long64_t entry) {fRequestedEntry = ent ry;}

	ClassDef(TBranchRef,1); //to support referenced objects on other branch es	ClassDef(TBranchRef,1); //to support referenced objects on other branch es
	};	};

	#endif	#endif

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

	TBranchSTL.h	TBranchSTL.h

	// @(#)root/tree:$Id: TBranchSTL.h 34969 2010-08-24 19:01:19Z pcanal $	// @(#)root/tree:$Id: TBranchSTL.h 40872 2011-09-13 21:33:33Z pcanal $
	// author: Lukasz Janyst <ljanyst@cern.ch>	// author: Lukasz Janyst <ljanyst@cern.ch>

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

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

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

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

	virtual void FillLeaves( TBuffer& b );
	virtual const char *GetClassName() const { return fClassName.Data( ); }	virtual const char *GetClassName() const { return fClassName.Data( ); }

		virtual Int_t GetExpectedType(TClass *&clptr,EDataType &type );
	virtual Int_t GetEntry( Long64_t entry = 0, Int_t getall = 0 );	virtual Int_t GetEntry( Long64_t entry = 0, Int_t getall = 0 );
	virtual TStreamerInfo *GetInfo() const;	virtual TStreamerInfo *GetInfo() const;
	virtual void Print(Option_t*) const;	virtual void Print(Option_t*) const;
	virtual void SetAddress( void* addr );	virtual void SetAddress( void* addr );

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

	private:	private:

	void ReadLeavesImpl( TBuffer& b );	void ReadLeavesImpl( TBuffer& b );

		void FillLeavesImpl( TBuffer& b );

	#ifndef __CINT__	#ifndef __CINT__
	struct ElementBranchHelper_t	struct ElementBranchHelper_t
	{	{
	ElementBranchHelper_t():	ElementBranchHelper_t():
	fBranch( 0 ), fPointers( 0 ), fId( 0 ),	fBranch( 0 ), fPointers( 0 ), fId( 0 ),
	fBaseOffset( 0 ), fPosition( 0 ) {}	fBaseOffset( 0 ), fPosition( 0 ) {}

	TBranchElement* fBranch;	TBranchElement* fBranch;
	std::vector<void> fPointers;	std::vector<void> fPointers;

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

	TDataType.h	TDataType.h

	// @(#)root/meta:$Id: TDataType.h 24077 2008-05-31 19:39:09Z brun $	// @(#)root/meta:$Id: TDataType.h 41070 2011-09-30 12:15:22Z axel $
	// Author: Rene Brun 04/02/95	// Author: Rene Brun 04/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 34	skipping to change at line 34
	#ifndef ROOT_TDictionary	#ifndef ROOT_TDictionary
	#include "TDictionary.h"	#include "TDictionary.h"
	#endif	#endif

	enum EDataType {	enum EDataType {
	kChar_t = 1, kUChar_t = 11, kShort_t = 2, kUShort_t = 12,	kChar_t = 1, kUChar_t = 11, kShort_t = 2, kUShort_t = 12,
	kInt_t = 3, kUInt_t = 13, kLong_t = 4, kULong_t = 14,	kInt_t = 3, kUInt_t = 13, kLong_t = 4, kULong_t = 14,
	kFloat_t = 5, kDouble_t = 8, kDouble32_t = 9, kchar = 10,	kFloat_t = 5, kDouble_t = 8, kDouble32_t = 9, kchar = 10,
	kBool_t = 18, kLong64_t = 16, kULong64_t = 17, kOther_t = -1,	kBool_t = 18, kLong64_t = 16, kULong64_t = 17, kOther_t = -1,
	kNoType_t = 0, kFloat16_t= 19,	kNoType_t = 0, kFloat16_t= 19,

	kCounter = 6, kCharStar = 7, kBits = 15 /* for compatibility with	kCounter = 6, kCharStar = 7, kBits = 15 /* for compatibility with
	TStreamerInfo */	TStreamerInfo */,
		kVoid_t = 20,

		kDataTypeAliasUnsigned_t = 21,
		// could add "long int" etc
		kNumDataTypes
	};	};

	class TDataType : public TDictionary {	class TDataType : public TDictionary {

	private:	private:
	TypedefInfo_t *fInfo; //pointer to CINT typedef info	TypedefInfo_t *fInfo; //pointer to CINT typedef info
	Int_t fSize; //size of type	Int_t fSize; //size of type
	EDataType fType; //type id	EDataType fType; //type id
	Long_t fProperty; //The property information for the (potenti al) underlying class	Long_t fProperty; //The property information for the (potenti al) underlying class
	TString fTrueName; //True name of the (potential) underlying c lass	TString fTrueName; //True name of the (potential) underlying c lass

		static TDataType* fgBuiltins[kNumDataTypes]; //Array of builtins

	void CheckInfo();	void CheckInfo();
	void SetType(const char *name);	void SetType(const char *name);

	protected:	protected:
	TDataType(const TDataType&);	TDataType(const TDataType&);
	TDataType& operator=(const TDataType&);	TDataType& operator=(const TDataType&);

	public:	public:
	TDataType(TypedefInfo_t *info = 0);	TDataType(TypedefInfo_t *info = 0);
	TDataType(const char *typenam);	TDataType(const char *typenam);
	virtual ~TDataType();	virtual ~TDataType();
	Int_t Size() const;	Int_t Size() const;
	Int_t GetType() const { return (Int_t)fType; }	Int_t GetType() const { return (Int_t)fType; }
	const char *GetTypeName() const;	const char *GetTypeName() const;
	const char *GetFullTypeName() const;	const char *GetFullTypeName() const;
	const char AsString(void buf) const;	const char AsString(void buf) const;
	Long_t Property() const;	Long_t Property() const;

	static const char *GetTypeName(EDataType type);	static const char *GetTypeName(EDataType type);

		static TDataType *GetDataType(EDataType type);
	static EDataType GetType(const type_info &typeinfo);	static EDataType GetType(const type_info &typeinfo);

		static void AddBuiltins(TCollection* types);

	ClassDef(TDataType,0) //Basic data type descriptor	ClassDef(TDataType,0) //Basic data type descriptor
	};	};

	#endif	#endif

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

	TDecompSVD.h	TDecompSVD.h

	// @(#)root/matrix:$Id: TDecompSVD.h 39607 2011-06-08 15:03:23Z moneta $	// @(#)root/matrix:$Id: TDecompSVD.h 39525 2011-06-01 08:41:51Z 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

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

	TDictionary.h	TDictionary.h

	// @(#)root/meta:$Id: TDictionary.h 37415 2010-12-08 19:57:59Z pcanal $	// @(#)root/meta:$Id: TDictionary.h 41070 2011-09-30 12:15:22Z axel $
	// Author: Fons Rademakers 20/06/96	// Author: Fons Rademakers 20/06/96

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


	skipping to change at line 92	skipping to change at line 92
	};	};

	class TDictionary : public TNamed {	class TDictionary : public TNamed {

	public:	public:
	TDictionary() { }	TDictionary() { }
	TDictionary(const char* name): TNamed(name, "") { }	TDictionary(const char* name): TNamed(name, "") { }
	virtual ~TDictionary() { }	virtual ~TDictionary() { }

	virtual Long_t Property() const = 0;	virtual Long_t Property() const = 0;

		static TDictionary* GetDictionary(const char* name);
		static TDictionary* GetDictionary(const type_info &typeinfo);

	// Type of STL container (returned by IsSTLContainer).	// Type of STL container (returned by IsSTLContainer).
	enum ESTLType {kNone=0, kVector=1, kList, kDeque, kMap, kMultimap, kSet, kMultiset};	enum ESTLType {kNone=0, kVector=1, kList, kDeque, kMap, kMultimap, kSet, kMultiset};

	ClassDef(TDictionary,0) //ABC defining interface to dictionary	ClassDef(TDictionary,0) //ABC defining interface to dictionary
	};	};

	#endif	#endif

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

	TDirectory.h	TDirectory.h

	// @(#)root/base:$Id: TDirectory.h 27658 2009-02-28 05:34:57Z pcanal $	// @(#)root/base:$Id: TDirectory.h 41092 2011-10-03 07:30:06Z 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 40	skipping to change at line 40
	#include "TDatime.h"	#include "TDatime.h"
	#endif	#endif
	#ifndef ROOT_TUUID	#ifndef ROOT_TUUID
	#include "TUUID.h"	#include "TUUID.h"
	#endif	#endif

	class TBrowser;	class TBrowser;
	class TKey;	class TKey;
	class TFile;	class TFile;


	R__EXTERN TDirectory *gDirectory;

	class TDirectory : public TNamed {	class TDirectory : public TNamed {
	public:	public:
	/** @class Context	/** @class Context
	*	*
	* Small helper to keep current directory context.	* Small helper to keep current directory context.
	* Automatically reverts to "old" directory	* Automatically reverts to "old" directory
	*/	*/
	class TContext {	class TContext {
	private:	private:
	TDirectory *fDirectory; //! Pointer to the previous current directo ry.	TDirectory *fDirectory; //! Pointer to the previous current directo ry.

	skipping to change at line 67	skipping to change at line 65
	friend class TDirectory;	friend class TDirectory;
	public:	public:
	TContext(TDirectory* previous, TDirectory* newCurrent)	TContext(TDirectory* previous, TDirectory* newCurrent)
	: fDirectory(previous),fPrevious(0),fNext(0)	: fDirectory(previous),fPrevious(0),fNext(0)
	{	{
	// Store the current directory so we can restore it	// Store the current directory so we can restore it
	// later and cd to the new directory.	// later and cd to the new directory.
	if ( fDirectory ) fDirectory->RegisterContext(this);	if ( fDirectory ) fDirectory->RegisterContext(this);
	if ( newCurrent ) newCurrent->cd();	if ( newCurrent ) newCurrent->cd();
	}	}

	TContext(TDirectory* newCurrent) : fDirectory(gDirectory),fPrevious(0 ),fNext(0)	TContext(TDirectory* newCurrent) : fDirectory(TDirectory::CurrentDire ctory()),fPrevious(0),fNext(0)
	{	{
	// Store the current directory so we can restore it	// Store the current directory so we can restore it
	// later and cd to the new directory.	// later and cd to the new directory.
	if ( fDirectory ) fDirectory->RegisterContext(this);	if ( fDirectory ) fDirectory->RegisterContext(this);
	if ( newCurrent ) newCurrent->cd();	if ( newCurrent ) newCurrent->cd();
	}	}
	~TContext()	~TContext()
	{	{
	// Destructor. Reset the current directory to its	// Destructor. Reset the current directory to its
	// previous state.	// previous state.

	skipping to change at line 123	skipping to change at line 121
	static void AddDirectory(Bool_t add=kTRUE);	static void AddDirectory(Bool_t add=kTRUE);
	static Bool_t AddDirectoryStatus();	static Bool_t AddDirectoryStatus();
	virtual void Append(TObject *obj, Bool_t replace = kFALSE);	virtual void Append(TObject *obj, Bool_t replace = kFALSE);
	virtual void Add(TObject *obj, Bool_t replace = kFALSE) { Append( obj,replace); }	virtual void Add(TObject *obj, Bool_t replace = kFALSE) { Append( obj,replace); }
	virtual Int_t AppendKey(TKey *) {return 0;}	virtual Int_t AppendKey(TKey *) {return 0;}
	virtual void Browse(TBrowser *b);	virtual void Browse(TBrowser *b);
	virtual void Build(TFile* motherFile = 0, TDirectory* motherDir = 0);	virtual void Build(TFile* motherFile = 0, TDirectory* motherDir = 0);
	virtual void Clear(Option_t *option="");	virtual void Clear(Option_t *option="");
	virtual TObject CloneObject(const TObject obj, Bool_t autoadd = kTR UE);	virtual TObject CloneObject(const TObject obj, Bool_t autoadd = kTR UE);
	virtual void Close(Option_t *option="");	virtual void Close(Option_t *option="");

		static TDirectory *&CurrentDirectory(); // Return the current directory for this thread.
	virtual void Copy(TObject &) const { MayNotUse("Copy(TObject &)") ; }	virtual void Copy(TObject &) const { MayNotUse("Copy(TObject &)") ; }
	virtual Bool_t cd(const char *path = 0);	virtual Bool_t cd(const char *path = 0);
	virtual void DeleteAll(Option_t *option="");	virtual void DeleteAll(Option_t *option="");
	virtual void Delete(const char *namecycle="");	virtual void Delete(const char *namecycle="");
	virtual void Draw(Option_t *option="");	virtual void Draw(Option_t *option="");
	virtual TKey FindKey(const char /keyname/) const {return 0;}	virtual TKey FindKey(const char /keyname/) const {return 0;}
	virtual TKey FindKeyAny(const char /keyname/) const {return 0 ;}	virtual TKey FindKeyAny(const char /keyname/) const {return 0 ;}
	virtual TObject FindObject(const char name) const;	virtual TObject FindObject(const char name) const;
	virtual TObject FindObject(const TObject obj) const;	virtual TObject FindObject(const TObject obj) const;
	virtual TObject FindObjectAny(const char name) const;	virtual TObject FindObjectAny(const char name) const;

	skipping to change at line 206	skipping to change at line 205
	virtual void WriteDirHeader() {}	virtual void WriteDirHeader() {}
	virtual void WriteKeys() {}	virtual void WriteKeys() {}

	static Bool_t Cd(const char *path);	static Bool_t Cd(const char *path);
	static void DecodeNameCycle(const char namecycle, char name, S hort_t &cycle);	static void DecodeNameCycle(const char namecycle, char name, S hort_t &cycle);
	static void EncodeNameCycle(char buffer, const char name, Shor t_t cycle);	static void EncodeNameCycle(char buffer, const char name, Shor t_t cycle);

	ClassDef(TDirectory,5) //Describe directory structure in memory	ClassDef(TDirectory,5) //Describe directory structure in memory
	};	};


		#ifndef __CINT__
		#define gDirectory (TDirectory::CurrentDirectory())

		#elif defined(__MAKECINT__)
		// To properly handle the use of gDirectory in header files (in static decl
		arations)
		R__EXTERN TDirectory *gDirectory;
		#endif

	#endif	#endif

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

	TEmulatedCollectionProxy.h	TEmulatedCollectionProxy.h

	// @(#)root/io:$Id: TEmulatedCollectionProxy.h 36061 2010-10-04 16:05:51Z p canal $	// @(#)root/io:$Id: TEmulatedCollectionProxy.h 41102 2011-10-03 21:42:02Z p canal $
	// Author: Markus Frank 28/10/04	// Author: Markus Frank 28/10/04

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

	skipping to change at line 44	skipping to change at line 44
	friend class TCollectionProxy;	friend class TCollectionProxy;

	public:	public:
	// Container type definition	// Container type definition
	typedef std::vector<char> Cont_t;	typedef std::vector<char> Cont_t;
	// Pointer to container type	// Pointer to container type
	typedef Cont_t *PCont_t;	typedef Cont_t *PCont_t;
	protected:	protected:

	// Some hack to avoid const-ness	// Some hack to avoid const-ness

	virtual TGenCollectionProxy* InitializeEx();	virtual TGenCollectionProxy* InitializeEx(Bool_t silent);

	// Object input streamer	// Object input streamer
	void ReadItems(int nElements, TBuffer &b);	void ReadItems(int nElements, TBuffer &b);

	// Object output streamer	// Object output streamer
	void WriteItems(int nElements, TBuffer &b);	void WriteItems(int nElements, TBuffer &b);

	// Shrink the container	// Shrink the container
	void Shrink(UInt_t nCurr, UInt_t left, Bool_t force);	void Shrink(UInt_t nCurr, UInt_t left, Bool_t force);


	skipping to change at line 66	skipping to change at line 66
	void Expand(UInt_t nCurr, UInt_t left);	void Expand(UInt_t nCurr, UInt_t left);

	public:	public:
	// Virtual copy constructor	// Virtual copy constructor
	virtual TVirtualCollectionProxy* Generate() const;	virtual TVirtualCollectionProxy* Generate() const;

	// Copy constructor	// Copy constructor
	TEmulatedCollectionProxy(const TEmulatedCollectionProxy& copy);	TEmulatedCollectionProxy(const TEmulatedCollectionProxy& copy);

	// Initializing constructor	// Initializing constructor

	TEmulatedCollectionProxy(const char* cl_name);	TEmulatedCollectionProxy(const char* cl_name, Bool_t silent);

	// Standard destructor	// Standard destructor
	virtual ~TEmulatedCollectionProxy();	virtual ~TEmulatedCollectionProxy();

	// Virtual constructor	// Virtual constructor
	virtual void* New() const { return new Cont_t; }	virtual void* New() const { return new Cont_t; }

	// Virtual in-place constructor	// Virtual in-place constructor
	virtual void* New(void* memory) const { return new(memory) Cont_t; }	virtual void* New(void* memory) const { return new(memory) Cont_t; }


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

	TEmulatedMapProxy.h	TEmulatedMapProxy.h

	// @(#)root/io:$Id: TEmulatedMapProxy.h 36061 2010-10-04 16:05:51Z pcanal $	// @(#)root/io:$Id: TEmulatedMapProxy.h 41102 2011-10-03 21:42:02Z pcanal $
	// Author: Markus Frank 28/10/04	// Author: Markus Frank 28/10/04

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

	skipping to change at line 42	skipping to change at line 42
	void WriteMap(int nElements, TBuffer &b);	void WriteMap(int nElements, TBuffer &b);

	public:	public:
	// Virtual copy constructor	// Virtual copy constructor
	virtual TVirtualCollectionProxy* Generate() const;	virtual TVirtualCollectionProxy* Generate() const;

	// Copy constructor	// Copy constructor
	TEmulatedMapProxy(const TEmulatedMapProxy& copy);	TEmulatedMapProxy(const TEmulatedMapProxy& copy);

	// Initializing constructor	// Initializing constructor

	TEmulatedMapProxy(const char* cl_name);	TEmulatedMapProxy(const char* cl_name, Bool_t silent);

	// Standard destructor	// Standard destructor
	virtual ~TEmulatedMapProxy();	virtual ~TEmulatedMapProxy();

	// Return the address of the value at index 'idx'	// Return the address of the value at index 'idx'
	virtual void *At(UInt_t idx);	virtual void *At(UInt_t idx);

	// Return the current size of the container	// Return the current size of the container
	virtual UInt_t Size() const;	virtual UInt_t Size() const;


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

	TEveBoxSet.h	TEveBoxSet.h

	// @(#)root/eve:$Id: TEveBoxSet.h 37234 2010-12-03 18:20:15Z matevz $	// @(#)root/eve:$Id: TEveBoxSet.h 40305 2011-07-20 04:45:36Z matevz $
	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007

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


	skipping to change at line 57	skipping to change at line 57

	struct BEllipticCone_t : public BCone_t { Float_t fR2, fAngle; };	struct BEllipticCone_t : public BCone_t { Float_t fR2, fAngle; };

	protected:	protected:
	EBoxType_e fBoxType; // Type of rendered box.	EBoxType_e fBoxType; // Type of rendered box.

	Float_t fDefWidth; // Breadth assigned to first coordinate (A).	Float_t fDefWidth; // Breadth assigned to first coordinate (A).
	Float_t fDefHeight; // Breadth assigned to second coordinat e (B).	Float_t fDefHeight; // Breadth assigned to second coordinat e (B).
	Float_t fDefDepth; // Breadth assigned to third coordinate (C).	Float_t fDefDepth; // Breadth assigned to third coordinate (C).


		Int_t fBoxSkip; // Number of boxes to skip for each dra
		wn box during scene rotation.

	Bool_t fDrawConeCap;	Bool_t fDrawConeCap;

	static Int_t SizeofAtom(EBoxType_e bt);	static Int_t SizeofAtom(EBoxType_e bt);

	public:	public:
	TEveBoxSet(const char* n="TEveBoxSet", const char* t="");	TEveBoxSet(const char* n="TEveBoxSet", const char* t="");
	virtual ~TEveBoxSet() {}	virtual ~TEveBoxSet() {}

	void Reset(EBoxType_e boxType, Bool_t valIsCol, Int_t chunkSize);	void Reset(EBoxType_e boxType, Bool_t valIsCol, Int_t chunkSize);
	void Reset();	void Reset();

	skipping to change at line 90	skipping to change at line 92
	Float_t GetDefWidth() const { return fDefWidth; }	Float_t GetDefWidth() const { return fDefWidth; }
	Float_t GetDefHeight() const { return fDefHeight; }	Float_t GetDefHeight() const { return fDefHeight; }
	Float_t GetDefDepth() const { return fDefDepth; }	Float_t GetDefDepth() const { return fDefDepth; }
	Bool_t GetDrawConeCap() const { return fDrawConeCap; }	Bool_t GetDrawConeCap() const { return fDrawConeCap; }

	void SetDefWidth(Float_t v) { fDefWidth = v ; }	void SetDefWidth(Float_t v) { fDefWidth = v ; }
	void SetDefHeight(Float_t v) { fDefHeight = v ; }	void SetDefHeight(Float_t v) { fDefHeight = v ; }
	void SetDefDepth(Float_t v) { fDefDepth = v ; }	void SetDefDepth(Float_t v) { fDefDepth = v ; }
	void SetDrawConeCap(Bool_t x) { fDrawConeCap=x; StampObjProps(); }	void SetDrawConeCap(Bool_t x) { fDrawConeCap=x; StampObjProps(); }


		Int_t GetBoxSkip() const { return fBoxSkip; }
		void SetBoxSkip(Int_t bs) { fBoxSkip = bs; }

	ClassDef(TEveBoxSet, 0); // Collection of 3D primitives (fixed-size boxe s, boxes of different sizes, or arbitrary sexto-epipeds); each primitive ca n be assigned a signal value and a TRef.	ClassDef(TEveBoxSet, 0); // Collection of 3D primitives (fixed-size boxe s, boxes of different sizes, or arbitrary sexto-epipeds); each primitive ca n be assigned a signal value and a TRef.
	};	};

	#endif	#endif

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

	TEveDigitSetGL.h	TEveDigitSetGL.h

	// @(#)root/eve:$Id: TEveDigitSetGL.h 33124 2010-04-21 20:04:42Z matevz $	// @(#)root/eve:$Id: TEveDigitSetGL.h 40305 2011-07-20 04:45:36Z matevz $
	// Author: Matevz Tadel 2007	// Author: Matevz Tadel 2007

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


	skipping to change at line 33	skipping to change at line 33
	class TEveDigitSetGL : public TGLObject	class TEveDigitSetGL : public TGLObject
	{	{
	private:	private:
	TEveDigitSetGL(const TEveDigitSetGL&); // Not implemented	TEveDigitSetGL(const TEveDigitSetGL&); // Not implemented
	TEveDigitSetGL& operator=(const TEveDigitSetGL&); // Not implemented	TEveDigitSetGL& operator=(const TEveDigitSetGL&); // Not implemented

	protected:	protected:
	mutable const std::set<Int_t> *fHighlightSet;	mutable const std::set<Int_t> *fHighlightSet;

	Bool_t SetupColor(const TEveDigitSet::DigitBase_t& q) const;	Bool_t SetupColor(const TEveDigitSet::DigitBase_t& q) const;

		void DrawFrameIfNeeded(TGLRnrCtx& rnrCtx) const;

	public:	public:
	TEveDigitSetGL();	TEveDigitSetGL();
	virtual ~TEveDigitSetGL() {}	virtual ~TEveDigitSetGL() {}

	virtual void SetBBox();	virtual void SetBBox();

	virtual void DrawHighlight(TGLRnrCtx& rnrCtx, const TGLPhysicalShape* pshp, Int_t lvl=-1) const;	virtual void DrawHighlight(TGLRnrCtx& rnrCtx, const TGLPhysicalShape* pshp, Int_t lvl=-1) const;

	virtual Bool_t SupportsSecondarySelect() const { return kTRUE; }	virtual Bool_t SupportsSecondarySelect() const { return kTRUE; }

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

	TEveProjections.h	TEveProjections.h

	// @(#)root/eve:$Id: TEveProjections.h 39682 2011-06-11 05:37:08Z matevz $	// @(#)root/eve:$Id: TEveProjections.h 39679 2011-06-11 00:05:06Z matevz $
	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007

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


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

	TEveTrackProjected.h	TEveTrackProjected.h

	// @(#)root/eve:$Id: TEveTrackProjected.h 39682 2011-06-11 05:37:08Z matevz $	// @(#)root/eve:$Id: TEveTrackProjected.h 39679 2011-06-11 00:05:06Z matevz $
	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007	// Authors: Matevz Tadel & Alja Mrak-Tadel: 2006, 2007

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


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

	TFPBlock.h	TFPBlock.h

	// @(#)root/io:$Id: TFPBlock.h 41699 2011-11-01 21:38:19Z pcanal $	// @(#)root/io:$Id: TFPBlock.h 41698 2011-11-01 21:22:54Z pcanal $
	// Author: Elvin Sindrilaru 19/05/2011	// Author: Elvin Sindrilaru 19/05/2011

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2011, 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. *
	*************************************************************************/	*************************************************************************/


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 41699 2011-11-01 21:38:19Z pcanal $	// @(#)root/io:$Id: TFile.h 41698 2011-11-01 21:22:54Z 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 112	skipping to change at line 112
	static Int_t fgReadCalls; //Number of bytes read from al l TFile objects	static Int_t fgReadCalls; //Number of bytes read from al l TFile objects
	static Int_t fgReadaheadSize; //Readahead buffer size	static Int_t fgReadaheadSize; //Readahead buffer size
	static Bool_t fgReadInfo; //if true (default) ReadStream erInfo is called when opening a file	static Bool_t fgReadInfo; //if true (default) ReadStream erInfo is called when opening a file

	virtual EAsyncOpenStatus GetAsyncOpenStatus() { return fAsyncOpenStatus; }	virtual EAsyncOpenStatus GetAsyncOpenStatus() { return fAsyncOpenStatus; }
	virtual void Init(Bool_t create);	virtual void Init(Bool_t create);
	Bool_t FlushWriteCache();	Bool_t FlushWriteCache();
	Int_t ReadBufferViaCache(char *buf, Int_t len);	Int_t ReadBufferViaCache(char *buf, Int_t len);
	Int_t WriteBufferViaCache(const char *buf, Int_t len);	Int_t WriteBufferViaCache(const char *buf, Int_t len);


		// Creating projects
		Int_t MakeProjectParMake(const char packname, const char filen
		ame);
		Int_t MakeProjectParProofInf(const char packname, const char p
		roofinfdir);

	// Interface to basic system I/O routines	// Interface to basic system I/O routines
	virtual Int_t SysOpen(const char *pathname, Int_t flags, UInt_t mode) ;	virtual Int_t SysOpen(const char *pathname, Int_t flags, UInt_t mode) ;
	virtual Int_t SysClose(Int_t fd);	virtual Int_t SysClose(Int_t fd);
	virtual Int_t SysRead(Int_t fd, void *buf, Int_t len);	virtual Int_t SysRead(Int_t fd, void *buf, Int_t len);
	virtual Int_t SysWrite(Int_t fd, const void *buf, Int_t len);	virtual Int_t SysWrite(Int_t fd, const void *buf, Int_t len);
	virtual Long64_t SysSeek(Int_t fd, Long64_t offset, Int_t whence);	virtual Long64_t SysSeek(Int_t fd, Long64_t offset, Int_t whence);
	virtual Int_t SysStat(Int_t fd, Long_t id, Long64_t size, Long_t f lags, Long_t modtime);	virtual Int_t SysStat(Int_t fd, Long_t id, Long64_t size, Long_t f lags, Long_t modtime);
	virtual Int_t SysSync(Int_t fd);	virtual Int_t SysSync(Int_t fd);

	// Interface for text-based TDirectory I/O	// Interface for text-based TDirectory I/O

	skipping to change at line 149	skipping to change at line 153
	kRecovered = BIT(10),	kRecovered = BIT(10),
	kHasReferences = BIT(11),	kHasReferences = BIT(11),
	kDevNull = BIT(12),	kDevNull = BIT(12),
	kWriteError = BIT(14), // BIT(13) is taken up by TObject	kWriteError = BIT(14), // BIT(13) is taken up by TObject
	kBinaryFile = BIT(15),	kBinaryFile = BIT(15),
	kRedirected = BIT(16)	kRedirected = BIT(16)
	};	};
	enum ERelativeTo { kBeg = 0, kCur = 1, kEnd = 2 };	enum ERelativeTo { kBeg = 0, kCur = 1, kEnd = 2 };
	enum { kStartBigFile = 2000000000 };	enum { kStartBigFile = 2000000000 };
	// File type	// File type

	enum EFileType { kDefault = 0, kLocal = 1, kNet = 2, kWeb = 3, kFile = 4 };	enum EFileType { kDefault = 0, kLocal = 1, kNet = 2, kWeb = 3, kFile = 4 , kMerge = 5};

	TFile();	TFile();
	TFile(const char fname, Option_t option="", const char *ftitle="", Int _t compress=1);	TFile(const char fname, Option_t option="", const char *ftitle="", Int _t compress=1);
	virtual ~TFile();	virtual ~TFile();
	virtual void Close(Option_t option=""); // MENU*	virtual void Close(Option_t option=""); // MENU*
	virtual void Copy(TObject &) const { MayNotUse("Copy(TObject &)") ; }	virtual void Copy(TObject &) const { MayNotUse("Copy(TObject &)") ; }

		virtual Bool_t Cp(const char *dst, Bool_t progressbar = kTRUE,UInt_ t buffersize = 1000000);
	virtual TKey* CreateKey(TDirectory* mother, const TObject* obj, co nst char* name, Int_t bufsize);	virtual TKey* CreateKey(TDirectory* mother, const TObject* obj, co nst char* name, Int_t bufsize);
	virtual TKey* CreateKey(TDirectory* mother, const void* obj, const TClass* cl,	virtual TKey* CreateKey(TDirectory* mother, const void* obj, const TClass* cl,
	const char* name, Int_t bufsize);	const char* name, Int_t bufsize);

		static TFile *&CurrentFile(); // Return the current file for this t hread.
	virtual void Delete(const char *namecycle="");	virtual void Delete(const char *namecycle="");
	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; }
	Long64_t GetArchiveOffset() const { return fArchiveOffset; }	Long64_t GetArchiveOffset() const { return fArchiveOffset; }
	Int_t GetBestBuffer() const;	Int_t GetBestBuffer() const;
	virtual Int_t GetBytesToPrefetch() const;	virtual Int_t GetBytesToPrefetch() const;
	TFileCacheRead *GetCacheRead() const;	TFileCacheRead *GetCacheRead() const;

	skipping to change at line 289	skipping to change at line 295
	UInt_t buffersize = 1000000);	UInt_t buffersize = 1000000);

	static UInt_t SetOpenTimeout(UInt_t timeout); // in ms	static UInt_t SetOpenTimeout(UInt_t timeout); // in ms
	static UInt_t GetOpenTimeout(); // in ms	static UInt_t GetOpenTimeout(); // in ms
	static Bool_t SetOnlyStaged(Bool_t onlystaged);	static Bool_t SetOnlyStaged(Bool_t onlystaged);
	static Bool_t GetOnlyStaged();	static Bool_t GetOnlyStaged();

	ClassDef(TFile,8) //ROOT file	ClassDef(TFile,8) //ROOT file
	};	};


		#ifndef __CINT__
		#define gFile (TFile::CurrentFile())

		#elif defined(__MAKECINT__)
		// To properly handle the use of gFile in header files (in static declarati
		ons)
		R__EXTERN TFile *gFile;
		#endif

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

	skipping to change at line 323	skipping to change at line 337
	public:	public:
	~TFileOpenHandle() { }	~TFileOpenHandle() { }

	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;

	//_________________________________________________________________________ _____	//_________________________________________________________________________ _____
	inline Int_t TFile::GetCompressionAlgorithm() const	inline Int_t TFile::GetCompressionAlgorithm() const
	{	{
	return (fCompress < 0) ? -1 : fCompress / 100;	return (fCompress < 0) ? -1 : fCompress / 100;
	}	}

	//_________________________________________________________________________ _____	//_________________________________________________________________________ _____
	inline Int_t TFile::GetCompressionLevel() const	inline Int_t TFile::GetCompressionLevel() const
	{	{
	return (fCompress < 0) ? -1 : fCompress % 100;	return (fCompress < 0) ? -1 : fCompress % 100;

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

	TFileIter.h	TFileIter.h

	// @(#)root/table:$Id: TFileIter.h 23736 2008-05-08 04:53:29Z brun $	// @(#)root/table:$Id: TFileIter.h 41088 2011-10-01 19:38:48Z pcanal $
	// Author: Valery Fine(fine@bnl.gov) 01/03/2001	// Author: Valery Fine(fine@bnl.gov) 01/03/2001

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
	* Copyright (C) 2001 [BNL] Brookhaven National Laboratory. *	* Copyright (C) 2001 [BNL] Brookhaven National Laboratory. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	skipping to change at line 64	skipping to change at line 64
	#include "TList.h"	#include "TList.h"
	#endif	#endif
	#ifndef ROOT_TFile	#ifndef ROOT_TFile
	#include "TFile.h"	#include "TFile.h"
	#endif	#endif

	class TFileIter : public TListIter {	class TFileIter : public TListIter {

	private:	private:


	TFile *fFileBackUp; //! temporary data-members
	TDirectory *fDirectoryBackUp; //! to save/restore TFile/TDirectory glob
	al scope
	TFileIter *fNestedIterator; //! The inner TFidrectory interator;	TFileIter *fNestedIterator; //! The inner TFidrectory interator;

	virtual TIterator &operator=(const TIterator &) { return *this; }	virtual TIterator &operator=(const TIterator &) { return *this; }
	virtual bool operator!=(const TIterator &it) const { return TListIter::o perator!=(it);}	virtual bool operator!=(const TIterator &it) const { return TListIter::o perator!=(it);}

	protected:	protected:
	TDirectory *fRootFile; // TDirectory/TFile to be iterated over	TDirectory *fRootFile; // TDirectory/TFile to be iterated over
	TString fEventName; // current key name	TString fEventName; // current key name
	UInt_t fRunNumber; // current "run number"	UInt_t fRunNumber; // current "run number"
	UInt_t fEventNumber; // current "event number"	UInt_t fEventNumber; // current "event number"
	Int_t fCursorPosition; // the position of the current key in the sorted TKey list	Int_t fCursorPosition; // the position of the current key in the sorted TKey list
	Bool_t fOwnTFile; // Bit whether this classs creates TFile on its own to delete	Bool_t fOwnTFile; // Bit whether this classs creates TFile on its own to delete

	void Initialize();	void Initialize();
	TObject ReadObj(const TKey key) const;	TObject ReadObj(const TKey key) const;

	void RestoreFileScope();
	void SaveFileScope();
	TKey NextEventKey(UInt_t eventNumber=UInt_t(-1), UInt_t runNumber=UI nt_t(-1), const char name="*");	TKey NextEventKey(UInt_t eventNumber=UInt_t(-1), UInt_t runNumber=UI nt_t(-1), const char name="*");

	public:	public:

	TFileIter(const char name, Option_t option = "",	TFileIter(const char name, Option_t option = "",
	const char *ftitle = "", Int_t compress = 1,	const char *ftitle = "", Int_t compress = 1,
	Int_t netopt = 0);	Int_t netopt = 0);
	TFileIter(TFile *file=0);	TFileIter(TFile *file=0);
	TFileIter(TDirectory *directory);	TFileIter(TDirectory *directory);
	TFileIter(const TFileIter &);	TFileIter(const TFileIter &);

	skipping to change at line 250	skipping to change at line 246

	//_________________________________________________________________________ _	//_________________________________________________________________________ _
	inline int TFileIter::operator!=(const char *name) const	inline int TFileIter::operator!=(const char *name) const
	{ return !(operator==(name)); }	{ return !(operator==(name)); }

	//_________________________________________________________________________ _	//_________________________________________________________________________ _
	inline TObject *TFileIter::operator()(){ return Next(); }	inline TObject *TFileIter::operator()(){ return Next(); }
	//_________________________________________________________________________ _	//_________________________________________________________________________ _
	inline TObject *TFileIter::operator()(Int_t nSkip){ return Next(nSkip);}	inline TObject *TFileIter::operator()(Int_t nSkip){ return Next(nSkip);}


	//_________________________________________________________________________
	_
	inline void TFileIter::SaveFileScope()
	{ fFileBackUp = gFile; fDirectoryBackUp = gDirectory; }

	//_________________________________________________________________________
	_
	inline void TFileIter::RestoreFileScope()
	{ gFile = fFileBackUp; gDirectory = fDirectoryBackUp; }

	#endif	#endif

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

	TFileMerger.h	TFileMerger.h

	// @(#)root/io:$Id: TFileMerger.h 42194 2011-11-23 14:02:02Z axel $	// @(#)root/io:$Id: TFileMerger.h 41444 2011-10-18 09:36:59Z 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 51	skipping to change at line 51
	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 spe ed	TStopwatch fWatch; // stop watch to measure file copy spe ed

	TList *fFileList; // a list of files, which shall be mer ged	TList fFileList; // a list the file (TFile) which shal l be merged
	TFile *fOutputFile; // the outputfile for merging	TFile *fOutputFile; // the outputfile for merging
	TString fOutputFilename; // the name of the outputfile for merg ing	TString fOutputFilename; // the name of the outputfile for merg ing
	Bool_t fFastMethod; // True if using Fast merging algorith m (default)	Bool_t fFastMethod; // True if using Fast merging algorith m (default)
	Bool_t fNoTrees; // True if Trees should not be merged (default is kFALSE)	Bool_t fNoTrees; // True if Trees should not be merged (default is kFALSE)
	Bool_t fExplicitCompLevel;// True if the user explicitly request ed a compressio level change (default kFALSE)	Bool_t fExplicitCompLevel;// True if the user explicitly request ed a compressio level change (default kFALSE)
	Bool_t fCompressionChange;// True if the output and input have d ifferent compression level (default kFALSE)	Bool_t fCompressionChange;// True if the output and input have d ifferent compression level (default kFALSE)
	Int_t fPrintLevel; // How much information to print out a t run time.	Int_t fPrintLevel; // How much information to print out a t run time.

		TString fMsgPrefix; // Prefix to be used when printing inf ormational message (default TFileMerger)


		Int_t fMaxOpenedFiles; // Maximum number of files opened at th e same time by the TFileMerger.
	Bool_t fLocal; // Makes local copies of merging files if True (default is kTRUE)	Bool_t fLocal; // Makes local copies of merging files if True (default is kTRUE)
	Bool_t fHistoOneGo; // Merger histos in one go (default is kTRUE)	Bool_t fHistoOneGo; // Merger histos in one go (default is kTRUE)

	TList *fMergeList; // list of the files need to be merged	TList *fMergeList; // list of TObjString containing the na
		me of the files need to be merged
		TList *fExcessFiles; //! List of TObjString containing the n
		ame of the files not yet added to fFileList due to user or system limitiati
		on on the max number of files opened.

		Bool_t OpenExcessFiles();
		virtual Bool_t AddFile(TFile *source, Bool_t own, Bool_t cpProgress);
		virtual Bool_t MergeRecursive(TDirectory target, TList sourcelist, Int
		_t type = kRegular \| kAll);

	public:	public:

		enum EPartialMergeType {
		kRegular = 0, // Normal merge, overwritting the outp
		ut file.
		kIncremental = BIT(1), // Merge the input file with the conte
		nt of the output file (if already exising).
		kResetable = BIT(2), // Only the objects with a MergeAfterR
		eset member function.
		kNonResetable = BIT(3), // Only the objects without a MergeAft
		erReset member function.

		kAll = BIT(2)\|BIT(3), // Merge all type of objects (d
		efault)
		kAllIncremental = kIncremental \| kAll // Merge incrementally all type
		of objects.
		};
	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; }	Int_t GetPrintLevel() const { return fPrintLevel; }
	void SetPrintLevel(Int_t level) { fPrintLevel = level; }	void SetPrintLevel(Int_t level) { fPrintLevel = level; }
	Bool_t HasCompressionChange() const { return fCompressionChange; }	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; }

		TFile *GetOutputFile() const { return fOutputFile; }
		Int_t GetMaxOpenedFies() const { return fMaxOpenedFiles; }
		void SetMaxOpenedFiles(Int_t newmax);
		const char *GetMsgPrefix() const { return fMsgPrefix; }
		void SetMsgPrefix(const char *prefix);

	//--- 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, Bool_t force = kTRUE);	virtual Bool_t AddFile(TFile *source, Bool_t cpProgress = kTRUE);
		virtual Bool_t AddAdoptFile(TFile *source, Bool_t cpProgress = kTRUE);
		virtual Bool_t OutputFile(const char *url, Bool_t force);
	virtual Bool_t OutputFile(const char *url, Bool_t force, Int_t compressi onLevel);	virtual Bool_t OutputFile(const char *url, Bool_t force, Int_t compressi onLevel);

		virtual Bool_t OutputFile(const char url, const char mode = "RECREATE"
		);
		virtual Bool_t OutputFile(const char url, const char mode, Int_t compr
		essionLevel);
	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 PartialMerge(Int_t type = kAll \| kIncremental);
	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);	virtual void RecursiveRemove(TObject *obj);


	ClassDef(TFileMerger,3) // File copying and merging services	ClassDef(TFileMerger,4) // File copying and merging services
	};	};

	#endif	#endif

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

	TFilePrefetch.h	TFilePrefetch.h

	// @(#)root/io:$Id: TFilePrefetch.h 41699 2011-11-01 21:38:19Z pcanal $	// @(#)root/io:$Id: TFilePrefetch.h 41698 2011-11-01 21:22:54Z pcanal $
	// Author: Elvin Sindrilaru 19/05/2011	// Author: Elvin Sindrilaru 19/05/2011

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2011, 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. *
	*************************************************************************/	*************************************************************************/


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

	TFriendProxyDescriptor.h	TFriendProxyDescriptor.h

	// @(#)rooeeplayer:$Id: TFriendProxyDescriptor.h 20882 2007-11-19 11:31:26Z rdm $	// @(#)rooeeplayer:$Id: TFriendProxyDescriptor.h 41244 2011-10-06 19:42:35Z pcanal $
	// Author: Philippe Canal 06/06/2004	// Author: Philippe Canal 06/06/2004

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


	skipping to change at line 30	skipping to change at line 30
	#endif	#endif

	namespace ROOT {	namespace ROOT {

	class TFriendProxyDescriptor : public TNamed {	class TFriendProxyDescriptor : public TNamed {

	Bool_t fDuplicate;	Bool_t fDuplicate;
	Int_t fIndex;	Int_t fIndex;
	TList fListOfTopProxies;	TList fListOfTopProxies;


		private:
		TFriendProxyDescriptor(const TFriendProxyDescriptor &b);
		TFriendProxyDescriptor& operator=(const TFriendProxyDescriptor &b);

	public:	public:
	TFriendProxyDescriptor(const char treename, const char aliasname, I nt_t index);	TFriendProxyDescriptor(const char treename, const char aliasname, I nt_t index);

	TFriendProxyDescriptor(const TFriendProxyDescriptor &b) :TNamed(b){;}
	TFriendProxyDescriptor& operator=(const TFriendProxyDescriptor&) {ret
	urn *this;}

	Int_t GetIndex() const { return fIndex; }	Int_t GetIndex() const { return fIndex; }
	TList *GetListOfTopProxies() { return &fListOfTopProxies; }	TList *GetListOfTopProxies() { return &fListOfTopProxies; }

	Bool_t IsEquivalent(const TFriendProxyDescriptor *other);	Bool_t IsEquivalent(const TFriendProxyDescriptor *other);

	void OutputClassDecl(FILE *hf, int offset, UInt_t maxVarname);	void OutputClassDecl(FILE *hf, int offset, UInt_t maxVarname);
	void OutputDecl(FILE *hf, int offset, UInt_t maxVarname);	void OutputDecl(FILE *hf, int offset, UInt_t maxVarname);

	Bool_t IsDuplicate() { return fDuplicate; }	Bool_t IsDuplicate() { return fDuplicate; }

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

	TFumili.h	TFumili.h

	// @(#)root/fumili:$Id: TFumili.h 20882 2007-11-19 11:31:26Z rdm $	// @(#)root/fumili:$Id: TFumili.h 40814 2011-09-06 13:55:49Z moneta $
	// Author: Rene Brun 31/08/99	// Author: Rene Brun 31/08/99

	/////////////////////////////////////////////////////////////////////////	/////////////////////////////////////////////////////////////////////////
	// //	// //
	// TFumili //	// TFumili //
	// //	// //
	// The FUMILI Minimization package //	// The FUMILI Minimization package //
	// //	// //
	/////////////////////////////////////////////////////////////////////////	/////////////////////////////////////////////////////////////////////////


	skipping to change at line 24	skipping to change at line 24

	#ifndef ROOT_TVirtualFitter	#ifndef ROOT_TVirtualFitter
	#include "TVirtualFitter.h"	#include "TVirtualFitter.h"
	#endif	#endif

	class TF1;	class TF1;

	class TFumili : public TVirtualFitter {	class TFumili : public TVirtualFitter {
	private:	private:
	Int_t fMaxParam; //	Int_t fMaxParam; //

	Int_t fMaxParam2; // fMaxParam*fMaxParam
	Int_t fNlog; //	Int_t fNlog; //
	Int_t fNfcn; // Number of FCN calls;	Int_t fNfcn; // Number of FCN calls;
	Int_t fNED1; // Number of experimental vectors X=(x1,x2,...xK)	Int_t fNED1; // Number of experimental vectors X=(x1,x2,...xK)
	Int_t fNED2; // K - Length of vector X plus 2 (for chi2)	Int_t fNED2; // K - Length of vector X plus 2 (for chi2)
	Int_t fNED12; // fNED1+fNED2	Int_t fNED12; // fNED1+fNED2
	Int_t fNpar; // fNpar - number of parameters	Int_t fNpar; // fNpar - number of parameters
	Int_t fNstepDec; // fNstepDec - maximum number of step decreasing c ounter	Int_t fNstepDec; // fNstepDec - maximum number of step decreasing c ounter
	Int_t fNlimMul; // fNlimMul - after fNlimMul successful iterations permits four-fold increasing of fPL	Int_t fNlimMul; // fNlimMul - after fNlimMul successful iterations permits four-fold increasing of fPL
	Int_t fNmaxIter; // fNmaxIter - maximum number of iterations	Int_t fNmaxIter; // fNmaxIter - maximum number of iterations
	Int_t fLastFixed; // Last fixed parameter number	Int_t fLastFixed; // Last fixed parameter number

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

	TGComboBox.h	TGComboBox.h

	// @(#)root/gui:$Id: TGComboBox.h 39338 2011-05-23 11:50:22Z bellenot $	// @(#)root/gui:$Id: TGComboBox.h 40783 2011-08-31 17:09:16Z rdm $
	// 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 43	skipping to change at line 43
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////

	#ifndef ROOT_TGListBox	#ifndef ROOT_TGListBox
	#include "TGListBox.h"	#include "TGListBox.h"
	#endif	#endif

	class TGScrollBarElement;	class TGScrollBarElement;
	class TGTextEntry;	class TGTextEntry;

	class TGComboBoxPopup : public TGCompositeFrame {	class TGComboBoxPopup : public TGCompositeFrame {


	protected:	protected:
	TGListBox *fListBox;	TGListBox *fListBox;
	TGLBEntry *fSelected;	TGLBEntry *fSelected;


		private:
		TGComboBoxPopup(const TGComboBoxPopup&); // Not implemented
		TGComboBoxPopup& operator=(const TGComboBoxPopup&); // Not implemented

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

	private:	private:

	TGComboBox(const TGComboBox&); // Not implemented	TGComboBox(const TGComboBox&); // Not implemented
	TGComboBox& operator=(const TGComboBox&); // Not implemented	TGComboBox& operator=(const TGComboBox&); // Not implemented

	protected:	protected:
	TGLBEntry *fSelEntry; // selected item frame	TGLBEntry *fSelEntry; // selected item frame
	TGTextEntry *fTextEntry; // text entry	TGTextEntry *fTextEntry; // text entry
	TGScrollBarElement *fDDButton; // button controlling drop down of popup	TGScrollBarElement *fDDButton; // button controlling drop down of popup
	TGComboBoxPopup *fComboFrame; // popup containing a listbox	TGComboBoxPopup *fComboFrame; // popup containing a listbox
	TGListBox *fListBox; // the listbox with text items	TGListBox *fListBox; // the listbox with text items
	const TGPicture *fBpic; // down arrow picture used in fDDBu tton	const TGPicture *fBpic; // down arrow picture used in fDDBu tton
	TGLayoutHints *fLhs; // layout hints for selected item f rame	TGLayoutHints *fLhs; // layout hints for selected item f rame

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

	TGFSContainer.h	TGFSContainer.h

	// @(#)root/gui:$Id: TGFSContainer.h 36090 2010-10-05 17:32:34Z rdm $	// @(#)root/gui:$Id: TGFSContainer.h 41285 2011-10-07 15:41:14Z bellenot $
	// Author: Fons Rademakers 19/01/98	// Author: Fons Rademakers 19/01/98

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


	skipping to change at line 126	skipping to change at line 126
	}	}

	virtual Bool_t HandleDNDFinished() {	virtual Bool_t HandleDNDFinished() {
	return ((TGFrame )(const_cast<TGWindow>(GetParent())))->HandleDNDFi nished();	return ((TGFrame )(const_cast<TGWindow>(GetParent())))->HandleDNDFi nished();
	}	}

	void SetDNDData(TDNDData *data) {	void SetDNDData(TDNDData *data) {
	if (fDNDData.fDataLength > 0)	if (fDNDData.fDataLength > 0)
	free(fDNDData.fData);	free(fDNDData.fData);
	fDNDData.fData = calloc(sizeof(unsigned char), data->fDataLength);	fDNDData.fData = calloc(sizeof(unsigned char), data->fDataLength);

	memcpy(fDNDData.fData, data->fData, data->fDataLength);	if (fDNDData.fData)
		memcpy(fDNDData.fData, data->fData, data->fDataLength);
	fDNDData.fDataLength = data->fDataLength;	fDNDData.fDataLength = data->fDataLength;
	fDNDData.fDataType = data->fDataType;	fDNDData.fDataType = data->fDataType;
	}	}

	void SetDNDObject(TObject *obj) {	void SetDNDObject(TObject *obj) {
	if (fDNDData.fDataLength)	if (fDNDData.fDataLength)
	free(fDNDData.fData);	free(fDNDData.fData);
	fBuf->WriteObject(obj);	fBuf->WriteObject(obj);
	fDNDData.fData = fBuf->Buffer();	fDNDData.fData = fBuf->Buffer();
	fDNDData.fDataLength = fBuf->Length();	fDNDData.fDataLength = fBuf->Length();

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

	TGFileBrowser.h	TGFileBrowser.h

	// @(#)root/gui:$Id: TGFileBrowser.h 33618 2010-05-27 06:51:26Z bellenot $	// @(#)root/gui:$Id: TGFileBrowser.h 40383 2011-07-28 07:46:59Z bellenot $
	// Author: Bertrand Bellenot 26/09/2007	// Author: Bertrand Bellenot 26/09/2007

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


	skipping to change at line 24	skipping to change at line 24

	#ifndef ROOT_TGFrame	#ifndef ROOT_TGFrame
	#include "TGFrame.h"	#include "TGFrame.h"
	#endif	#endif

	#ifndef ROOT_TBrowserImp	#ifndef ROOT_TBrowserImp
	#include "TBrowserImp.h"	#include "TBrowserImp.h"
	#endif	#endif

	#include <list>	#include <list>

		#include <map>

	class TGCanvas;	class TGCanvas;
	class TGListTree;	class TGListTree;
	class TGListTreeItem;	class TGListTreeItem;
	class TGPicture;	class TGPicture;
	class TGComboBox;	class TGComboBox;
	class TContextMenu;	class TContextMenu;
	class TRegexp;	class TRegexp;
	class TString;	class TString;
	class TRootBrowser;	class TRootBrowser;
	class TSystemDirectory;	class TSystemDirectory;
	class TSystemFile;	class TSystemFile;

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

	public:	public:
	typedef std::list<TGListTreeItem*> sLTI_t;	typedef std::list<TGListTreeItem*> sLTI_t;
	typedef sLTI_t::iterator sLTI_i;	typedef sLTI_t::iterator sLTI_i;
	typedef sLTI_t::reverse_iterator sLTI_ri;	typedef sLTI_t::reverse_iterator sLTI_ri;

		typedef std::map<TGListTreeItem, const char > mFiltered_t;
		typedef mFiltered_t::iterator mFiltered_i;

	protected:	protected:
	TRootBrowser *fNewBrowser; // Pointer back to the Browser	TRootBrowser *fNewBrowser; // Pointer back to the Browser
	TGHorizontalFrame *fTopFrame; // Top horizontal frame	TGHorizontalFrame *fTopFrame; // Top horizontal frame
	TGHorizontalFrame *fBotFrame; // Bottom horizontal frame	TGHorizontalFrame *fBotFrame; // Bottom horizontal frame
	TGCanvas *fCanvas; // Canvas for the list tree	TGCanvas *fCanvas; // Canvas for the list tree
	TGListTree *fListTree; // Main list tree	TGListTree *fListTree; // Main list tree
	TGListTreeItem *fListLevel; // Current list tree level	TGListTreeItem *fListLevel; // Current list tree level
	TGListTreeItem *fCurrentDir; // Current (list tree) directory	TGListTreeItem *fCurrentDir; // Current (list tree) directory
	TGListTreeItem *fRootDir; // Root (list tree) directory	TGListTreeItem *fRootDir; // Root (list tree) directory
	TGComboBox *fDrawOption; // Draw options combobox	TGComboBox *fDrawOption; // Draw options combobox
	TGComboBox *fFileType; // File type combobox	TGComboBox *fFileType; // File type combobox
	TContextMenu *fContextMenu; // pointer to context menu	TContextMenu *fContextMenu; // pointer to context menu
	TGPictureButton *fSortButton; // "Sort" button	TGPictureButton *fSortButton; // "Sort" button
	TGPictureButton *fRefreshButton; // "Refresh" button	TGPictureButton *fRefreshButton; // "Refresh" button

		TGPictureButton *fFilterButton; // "Filter" button
	const TGPicture *fRootIcon; // Root files icon	const TGPicture *fRootIcon; // Root files icon
	const TGPicture *fFileIcon; // System files icon	const TGPicture *fFileIcon; // System files icon
	const TGPicture *fCachedPic; // Cached picture	const TGPicture *fCachedPic; // Cached picture
	TString fCachedPicName; // Cached picture name	TString fCachedPicName; // Cached picture name
	TRegexp *fFilter; // Regular expression used to fil ter files	TRegexp *fFilter; // Regular expression used to fil ter files
	TSystemDirectory *fDir; // Actual (selected) system direc tory	TSystemDirectory *fDir; // Actual (selected) system direc tory
	TSystemFile *fFile; // Actual (selected) system file	TSystemFile *fFile; // Actual (selected) system file
	Int_t fGroupSize; // total number of items when ico n box switched to "global view" mode	Int_t fGroupSize; // total number of items when ico n box switched to "global view" mode
	Long_t fNKeys, fCnt; // Counters for keys inside a Roo t file	Long_t fNKeys, fCnt; // Counters for keys inside a Roo t file
	Bool_t fGrouped; // kTRUE if Root file content (ke ys) is grouped	Bool_t fGrouped; // kTRUE if Root file content (ke ys) is grouped
	Bool_t fShowHidden; // kTRUE to display hidden files	Bool_t fShowHidden; // kTRUE to display hidden files
	Bool_t fDblClick; // kTRUE if user double-clicked o n a list tree item	Bool_t fDblClick; // kTRUE if user double-clicked o n a list tree item

	sLTI_t fSortedItems; // List of sorted list-tree items .	sLTI_t fSortedItems; // List of sorted list-tree items .

		mFiltered_t fFilteredItems; // List of filtered list-tree ite
		ms.
		TString fFilterStr; // Filter expression string

	void CreateBrowser();	void CreateBrowser();

	public:	public:
	TGFileBrowser(const TGWindow p, TBrowser b=0, UInt_t w=200, UInt_t h=4 00);	TGFileBrowser(const TGWindow p, TBrowser b=0, UInt_t w=200, UInt_t h=4 00);
	virtual ~TGFileBrowser();	virtual ~TGFileBrowser();

	virtual void Add(TObject obj, const char name = 0, Int_t check = -1);	virtual void Add(TObject obj, const char name = 0, Int_t check = -1);
	virtual void BrowseObj(TObject *obj);	virtual void BrowseObj(TObject *obj);
	virtual void RecursiveRemove(TObject *obj);	virtual void RecursiveRemove(TObject *obj);

	skipping to change at line 95	skipping to change at line 101

	TRootBrowser *GetNewBrowser() const { return fNewBrowser; }	TRootBrowser *GetNewBrowser() const { return fNewBrowser; }
	void SetNewBrowser(TRootBrowser* b) { fNewBrowser = b; }	void SetNewBrowser(TRootBrowser* b) { fNewBrowser = b; }

	void AddFSDirectory(const char* entry, const char* path=0, Option _t *opt="");	void AddFSDirectory(const char* entry, const char* path=0, Option _t *opt="");
	void AddKey(TGListTreeItem itm, TObject obj, const char *name = 0);	void AddKey(TGListTreeItem itm, TObject obj, const char *name = 0);
	void AddRemoteFile(TObject *obj);	void AddRemoteFile(TObject *obj);
	void ApplyFilter(Int_t id);	void ApplyFilter(Int_t id);
	void Chdir(TGListTreeItem *item);	void Chdir(TGListTreeItem *item);
	void Checked(TObject *obj, Bool_t check);	void Checked(TObject *obj, Bool_t check);

		Bool_t CheckFiltered(TGListTreeItem *item, Bool_t but = kFALSE);
	void CheckRemote(TGListTreeItem *item);	void CheckRemote(TGListTreeItem *item);
	Bool_t CheckSorted(TGListTreeItem *item, Bool_t but = kFALSE);	Bool_t CheckSorted(TGListTreeItem *item, Bool_t but = kFALSE);
	void Clicked(TGListTreeItem *item, Int_t btn, Int_t x, Int_t y);	void Clicked(TGListTreeItem *item, Int_t btn, Int_t x, Int_t y);
	TString DirName(TGListTreeItem* item);	TString DirName(TGListTreeItem* item);
	TString FullPathName(TGListTreeItem* item);	TString FullPathName(TGListTreeItem* item);
	void DoubleClicked(TGListTreeItem *item, Int_t btn);	void DoubleClicked(TGListTreeItem *item, Int_t btn);
	Long_t XXExecuteDefaultAction(TObject *obj);	Long_t XXExecuteDefaultAction(TObject *obj);
	char FormatFileInfo(const char fname, Long64_t size, Long_t modt ime);	char FormatFileInfo(const char fname, Long64_t size, Long_t modt ime);
	void GetFilePictures(const TGPicture *pic, Int_t file_type, Bool _t is_link, const char name);	void GetFilePictures(const TGPicture *pic, Int_t file_type, Bool _t is_link, const char name);
	void GetObjPicture(const TGPicture *pic, TObject obj);	void GetObjPicture(const TGPicture *pic, TObject obj);
	void GotoDir(const char *path);	void GotoDir(const char *path);
	void PadModified();	void PadModified();

		void RequestFilter();
	void Selected(char *);	void Selected(char *);
	void ToggleSort();	void ToggleSort();
	void Update();	void Update();

	ClassDef(TGFileBrowser, 0) // File browser.	ClassDef(TGFileBrowser, 0) // File browser.
	};	};

	#endif	#endif

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

	TGLAutoRotator.h	TGLAutoRotator.h

	// @(#)root/eve:$Id: TGLAutoRotator.h 39682 2011-06-11 05:37:08Z matevz $	// @(#)root/eve:$Id: TGLAutoRotator.h 39680 2011-06-11 05:20:52Z 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. *
	*************************************************************************/	*************************************************************************/


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

	TGLPlotBox.h	TGLPlotBox.h

	skipping to change at line 49	skipping to change at line 49
	TGLVertex3 f3DBox[8];	TGLVertex3 f3DBox[8];
	mutable TGLVertex3 f2DBox[8];	mutable TGLVertex3 f2DBox[8];
	mutable TGLVertex3 f2DBoxU[8];	mutable TGLVertex3 f2DBoxU[8];
	mutable Int_t fFrontPoint;	mutable Int_t fFrontPoint;

	//The sizes of a "unit" cube.	//The sizes of a "unit" cube.
	Double_t fRangeXU;	Double_t fRangeXU;
	Double_t fRangeYU;	Double_t fRangeYU;
	Double_t fRangeZU;	Double_t fRangeZU;


		Bool_t fDrawBack;
		Bool_t fDrawFront;

	public:	public:

	TGLPlotBox(Bool_t xoySelectable, Bool_t xozSelectable, Bool_t yozSelecta ble);	TGLPlotBox(Bool_t xoySelectable, Bool_t xozSelectable, Bool_t yozSelecta ble);
	//ClassDef macro adds some virtual functions,	//ClassDef macro adds some virtual functions,
	//so, to supress g++ warnings virtual destructor declared.	//so, to supress g++ warnings virtual destructor declared.
	virtual ~TGLPlotBox();	virtual ~TGLPlotBox();

	void DrawBox(Int_t selectedPart, Bool_t selectionPass,	void DrawBox(Int_t selectedPart, Bool_t selectionPass,
	const std::vector<Double_t> &zLevels,	const std::vector<Double_t> &zLevels,
	Bool_t highColor)const;	Bool_t highColor)const;

	skipping to change at line 77	skipping to change at line 80
	void SetFrameColor(const TColor *color);	void SetFrameColor(const TColor *color);

	Int_t FindFrontPoint()const;	Int_t FindFrontPoint()const;
	Int_t GetFrontPoint()const;	Int_t GetFrontPoint()const;

	const TGLVertex3 *Get3DBox()const;	const TGLVertex3 *Get3DBox()const;
	const TGLVertex3 *Get2DBox()const;	const TGLVertex3 *Get2DBox()const;

	static const Int_t fgFramePlanes[][4];	static const Int_t fgFramePlanes[][4];
	static const Int_t fgBackPairs[][2];	static const Int_t fgBackPairs[][2];

		static const Int_t fgFrontPairs[][2];
	static const Double_t fgNormals[][3];	static const Double_t fgNormals[][3];


		void SetDrawFront(Bool_t d) {fDrawFront = d;}
		Bool_t GetDrawFront() const {return fDrawFront;}

		void SetDrawBack(Bool_t d) {fDrawBack = d;}
		Bool_t GetDrawBack() const {return fDrawBack;}

	private:	private:

		void DrawBack(Int_t selectedPart, Bool_t selectionPass, const std::vecto
		r<Double_t> &zLevels, Bool_t highColor)const;
		void DrawFront()const;
	void DrawBackPlane(Int_t plane, Bool_t selectionPass,	void DrawBackPlane(Int_t plane, Bool_t selectionPass,
	const std::vector<Double_t> &zLevels)const;	const std::vector<Double_t> &zLevels)const;

	ClassDef(TGLPlotBox, 0)//Back box for plot.	ClassDef(TGLPlotBox, 0)//Back box for plot.
	};	};

	#endif	#endif

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

	TGLPlotPainter.h	TGLPlotPainter.h

	// @(#)root/gl:$Id: TGLPlotPainter.h 38817 2011-04-13 09:32:44Z couet $	// @(#)root/gl:$Id: TGLPlotPainter.h 40858 2011-09-13 06:45:50Z tpochep $
	// Author: Timur Pocheptsov 14/06/2006	// Author: Timur Pocheptsov 14/06/2006

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


	skipping to change at line 227	skipping to change at line 227
	TGLBoxCut fBoxCut;	TGLBoxCut fBoxCut;

	std::vector<Double_t> fZLevels;	std::vector<Double_t> fZLevels;
	Bool_t fHighColor;	Bool_t fHighColor;

	enum ESelectionBase{	enum ESelectionBase{
	kHighColorSelectionBase = 7,	kHighColorSelectionBase = 7,
	kTrueColorSelectionBase = 10	kTrueColorSelectionBase = 10
	};	};


	ESelectionBase fSelectionBase;	Int_t fSelectionBase;
	mutable Bool_t fDrawPalette;	mutable Bool_t fDrawPalette;

		Bool_t fDrawAxes;

	public:	public:
	/* TGLPlotPainter(TH1 hist, TGLPlotCamera camera, TGLPlotCoordinates *c oord, Int_t context,	/* TGLPlotPainter(TH1 hist, TGLPlotCamera camera, TGLPlotCoordinates *c oord, Int_t context,
	Bool_t xoySelectable, Bool_t xozSelectable, Bool_t yozSel ectable);	Bool_t xoySelectable, Bool_t xozSelectable, Bool_t yozSel ectable);
	TGLPlotPainter(TGLPlotCamera camera, Int_t context);/	TGLPlotPainter(TGLPlotCamera camera, Int_t context);/
	TGLPlotPainter(TH1 hist, TGLPlotCamera camera, TGLPlotCoordinates *coo rd,	TGLPlotPainter(TH1 hist, TGLPlotCamera camera, TGLPlotCoordinates *coo rd,
	Bool_t xoySelectable, Bool_t xozSelectable, Bool_t yozSel ectable);	Bool_t xoySelectable, Bool_t xozSelectable, Bool_t yozSel ectable);
	TGLPlotPainter(TGL5DDataSet data, TGLPlotCamera camera, TGLPlotCoordin ates *coord);	TGLPlotPainter(TGL5DDataSet data, TGLPlotCamera camera, TGLPlotCoordin ates *coord);
	TGLPlotPainter(TGLPlotCamera *camera);	TGLPlotPainter(TGLPlotCamera *camera);


	skipping to change at line 278	skipping to change at line 279
	void InvalidateSelection();	void InvalidateSelection();

	enum ECutAxisID {	enum ECutAxisID {
	kXAxis = 7,	kXAxis = 7,
	kYAxis = 8,	kYAxis = 8,
	kZAxis = 9	kZAxis = 9
	};	};

	Bool_t CutAxisSelected()const{return !fHighColor && fSelectedP art <= kZAxis && fSelectedPart >= kXAxis;}	Bool_t CutAxisSelected()const{return !fHighColor && fSelectedP art <= kZAxis && fSelectedPart >= kXAxis;}


		void SetDrawFrontBox(Bool_t b) {fBackBox.SetDrawFront(b);}
		void SetDrawBackBox(Bool_t b) {fBackBox.SetDrawBack(b);}
		void SetDrawAxes(Bool_t s) {fDrawAxes = s;}
		Bool_t GetDrawAxes() {return fDrawAxes;}

	protected:	protected:
	const TColor *GetPadColor()const;	const TColor *GetPadColor()const;
	//	//
	void MoveSection(Int_t px, Int_t py);	void MoveSection(Int_t px, Int_t py);
	void DrawSections()const;	void DrawSections()const;
	virtual void DrawSectionXOZ()const = 0;	virtual void DrawSectionXOZ()const = 0;
	virtual void DrawSectionYOZ()const = 0;	virtual void DrawSectionYOZ()const = 0;
	virtual void DrawSectionXOY()const = 0;	virtual void DrawSectionXOY()const = 0;

	virtual void DrawPaletteAxis()const;	virtual void DrawPaletteAxis()const;

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

	TGLVoxelPainter.h	TGLVoxelPainter.h

	skipping to change at line 61	skipping to change at line 61
	void DrawPlot()const;	void DrawPlot()const;

	void DrawSectionXOZ()const;	void DrawSectionXOZ()const;
	void DrawSectionYOZ()const;	void DrawSectionYOZ()const;
	void DrawSectionXOY()const;	void DrawSectionXOY()const;

	void DrawPalette()const;	void DrawPalette()const;
	void DrawPaletteAxis()const;	void DrawPaletteAxis()const;

	//Aux. functions.	//Aux. functions.

	void SetVoxelColor(Double_t binContent)const;	void FindVoxelColor(Double_t binContent, Float_t *rgba)const;
		void SetVoxelColor(const Float_t *rgba)const;

	Bool_t HasSections()const;	Bool_t HasSections()const;

	void PreparePalette()const;	void PreparePalette()const;

	TF1 *fTransferFunc;	TF1 *fTransferFunc;

	ClassDef(TGLVoxelPainter, 0)//Voxel painter	ClassDef(TGLVoxelPainter, 0)//Voxel painter
	};	};

	#endif	#endif

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

	TGenericClassInfo.h	TGenericClassInfo.h

	// @(#)root/base:$Id: TGenericClassInfo.h 39635 2011-06-09 15:37:27Z pcanal $	// @(#)root/base:$Id: TGenericClassInfo.h 39611 2011-06-08 19:35:17Z 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 52	skipping to change at line 52
	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;	MergeFunc_t fMerge;

		ResetAfterMergeFunc_t fResetAfterMerge;
	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 130	skipping to change at line 131
	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 SetMerge(MergeFunc_t);

		void SetResetAfterMerge(ResetAfterMergeF unc_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

	TGeoBoolNode.h	TGeoBoolNode.h

	// @(#):$Id: TGeoBoolNode.h 32690 2010-03-21 08:47:56Z brun $	// @(#):$Id: TGeoBoolNode.h 41234 2011-10-06 15:48:52Z agheata $
	// Author: Andrei Gheata 30/05/02	// Author: Andrei Gheata 30/05/02

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


	skipping to change at line 41	skipping to change at line 41
	class TGeoHMatrix;	class TGeoHMatrix;

	class TGeoBoolNode : public TObject	class TGeoBoolNode : public TObject
	{	{
	public:	public:
	enum EGeoBoolType {	enum EGeoBoolType {
	kGeoUnion,	kGeoUnion,
	kGeoIntersection,	kGeoIntersection,
	kGeoSubtraction	kGeoSubtraction
	};	};

		struct ThreadData_t
		{
		Int_t fSelected; // ! selected branch

		ThreadData_t();
		~ThreadData_t();
		};
		ThreadData_t& GetThreadData() const;
		void ClearThreadData() const;
	private:	private:
	TGeoBoolNode(const TGeoBoolNode&); // Not implemented	TGeoBoolNode(const TGeoBoolNode&); // Not implemented
	TGeoBoolNode& operator=(const TGeoBoolNode&); // Not implemented	TGeoBoolNode& operator=(const TGeoBoolNode&); // Not implemented

	protected:	protected:

	Int_t fSelected; // ! selected branch
	TGeoShape *fLeft; // shape on the left branch	TGeoShape *fLeft; // shape on the left branch
	TGeoShape *fRight; // shape on the right branch	TGeoShape *fRight; // shape on the right branch
	TGeoMatrix *fLeftMat; // transformation that applies to the left branch	TGeoMatrix *fLeftMat; // transformation that applies to the left branch
	TGeoMatrix *fRightMat; // transformation that applies to the right branch	TGeoMatrix *fRightMat; // transformation that applies to the right branch
	Int_t fNpoints; //! number of points on the mesh	Int_t fNpoints; //! number of points on the mesh
	Double_t *fPoints; //! array of mesh points	Double_t *fPoints; //! array of mesh points


		mutable std::vector<ThreadData_t*> fThreadData; //! Navigation data per
		thread
		mutable Int_t fThreadSize; //! Size for the navigat
		ion data array
	// methods	// methods
	Bool_t MakeBranch(const char *expr, Bool_t left);	Bool_t MakeBranch(const char *expr, Bool_t left);
	public:	public:
	// constructors	// constructors
	TGeoBoolNode();	TGeoBoolNode();
	TGeoBoolNode(const char expr1, const char expr2);	TGeoBoolNode(const char expr1, const char expr2);
	TGeoBoolNode(TGeoShape left, TGeoShape right, TGeoMatrix lmat=0, TGeo Matrix rmat=0);	TGeoBoolNode(TGeoShape left, TGeoShape right, TGeoMatrix lmat=0, TGeo Matrix rmat=0);

	// destructor	// destructor
	virtual ~TGeoBoolNode();	virtual ~TGeoBoolNode();

	skipping to change at line 84	skipping to change at line 95
	TGeoMatrix *GetLeftMatrix() const {return fLeftMat;}	TGeoMatrix *GetLeftMatrix() const {return fLeftMat;}
	TGeoMatrix *GetRightMatrix() const {return fRightMat;}	TGeoMatrix *GetRightMatrix() const {return fRightMat;}
	TGeoShape *GetLeftShape() const {return fLeft;}	TGeoShape *GetLeftShape() const {return fLeft;}
	TGeoShape *GetRightShape() const {return fRight;}	TGeoShape *GetRightShape() const {return fRight;}
	virtual void Paint(Option_t *option);	virtual void Paint(Option_t *option);
	void RegisterMatrices();	void RegisterMatrices();
	virtual Double_t Safety(Double_t *point, Bool_t in=kTRUE) const = 0;	virtual Double_t Safety(Double_t *point, Bool_t in=kTRUE) const = 0;
	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(ostream &out, Option_t *option = "");
	virtual void SetPoints(Double_t *points) const;	virtual void SetPoints(Double_t *points) const;
	virtual void SetPoints(Float_t *points) const;	virtual void SetPoints(Float_t *points) const;

	void SetSelected(Int_t sel) {fSelected = sel;}	void SetSelected(Int_t sel);
	virtual void Sizeof3D() const;	virtual void Sizeof3D() const;

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

	/////////////////////////////////////////////////////////////////////////// ///	/////////////////////////////////////////////////////////////////////////// ///
	// //	// //
	// TGeoUnion - Boolean node representing a union between two components. //	// TGeoUnion - Boolean node representing a union between two components. //
	// //	// //
	/////////////////////////////////////////////////////////////////////////// ///	/////////////////////////////////////////////////////////////////////////// ///

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

	TGeoManager.h	TGeoManager.h

	// @(#)root/geom:$Id: TGeoManager.h 39018 2011-04-25 09:38:31Z agheata $	// @(#)root/geom:$Id: TGeoManager.h 41744 2011-11-03 10:55:33Z 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 93	skipping to change at line 93
	TVirtualGeoPainter *fPainter; //! current painter	TVirtualGeoPainter *fPainter; //! current painter

	TObjArray *fMatrices; //-> list of local transformati ons	TObjArray *fMatrices; //-> list of local transformati ons
	TObjArray *fShapes; //-> list of shapes	TObjArray *fShapes; //-> list of shapes
	TObjArray *fVolumes; //-> list of volumes	TObjArray *fVolumes; //-> list of volumes
	TObjArray *fPhysicalNodes; //-> list of physical nodes	TObjArray *fPhysicalNodes; //-> list of physical nodes
	TObjArray *fGShapes; //! list of runtime shapes	TObjArray *fGShapes; //! list of runtime shapes
	TObjArray *fGVolumes; //! list of runtime volumes	TObjArray *fGVolumes; //! list of runtime volumes
	TObjArray *fTracks; //-> list of tracks attached to geometry	TObjArray *fTracks; //-> list of tracks attached to geometry
	TObjArray *fPdgNames; //-> list of pdg names for trac ks	TObjArray *fPdgNames; //-> list of pdg names for trac ks

	TObjArray *fNavigators; //! list of navigators	// TObjArray *fNavigators; //! list of navigators
	TList *fMaterials; //-> list of materials	TList *fMaterials; //-> list of materials
	TList *fMedia; //-> list of tracking media	TList *fMedia; //-> list of tracking media
	TObjArray *fNodes; //-> current branch of nodes	TObjArray *fNodes; //-> current branch of nodes
	TObjArray *fOverlaps; //-> list of geometrical overla ps	TObjArray *fOverlaps; //-> list of geometrical overla ps
	UChar_t *fBits; //! bits used for voxelization	UChar_t *fBits; //! bits used for voxelization

		// Map of navigatorr arrays per thread
		typedef std::map<Long_t, TGeoNavigatorArray *> NavigatorsMap_t;
		typedef NavigatorsMap_t::iterator NavigatorsMapIt_t;
		typedef std::map<Long_t, Int_t> ThreadsMap_t;
		typedef ThreadsMap_t::const_iterator ThreadsMapIt_t;

		NavigatorsMap_t fNavigators; //! Map between thread id's and
		navigator arrays
		static ThreadsMap_t fgThreadId; //! Thread id's map
		static Int_t fgNumThreads; //! Number of registered thread
		s
		static Bool_t fgLockNavigators; //! Lock existing navigators
	TGeoNavigator *fCurrentNavigator; //! current navigator	TGeoNavigator *fCurrentNavigator; //! current navigator
	TGeoVolume *fCurrentVolume; //! current volume	TGeoVolume *fCurrentVolume; //! current volume
	TGeoVolume *fTopVolume; //! top level volume in geometr y	TGeoVolume *fTopVolume; //! top level volume in geometr y
	TGeoNode *fTopNode; //! top physical node	TGeoNode *fTopNode; //! top physical node
	TGeoVolume *fMasterVolume; // master volume	TGeoVolume *fMasterVolume; // master volume
	TGeoHMatrix *fGLMatrix; // matrix to be used for view t ransformations	TGeoHMatrix *fGLMatrix; // matrix to be used for view t ransformations
	TObjArray *fUniqueVolumes; //-> list of unique volumes	TObjArray *fUniqueVolumes; //-> list of unique volumes
	TGeoShape *fClippingShape; //! clipping shape for raytraci ng	TGeoShape *fClippingShape; //! clipping shape for raytraci ng
	TGeoElementTable *fElementTable; //! table of elements	TGeoElementTable *fElementTable; //! table of elements

	Int_t *fNodeIdArray; //! array of node id's	Int_t *fNodeIdArray; //! array of node id's

	Int_t fIntSize; //! int buffer size
	Int_t fDblSize; //! dbl buffer size
	Int_t *fIntBuffer; //! transient int buffer
	Int_t fNLevel; // maximum accepted level in ge ometry	Int_t fNLevel; // maximum accepted level in ge ometry

	Double_t *fDblBuffer; //! transient dbl buffer
	TGeoVolume *fPaintVolume; //! volume currently painted	TGeoVolume *fPaintVolume; //! volume currently painted
	THashList *fHashVolumes; //! hash list of volumes provid ing fast search	THashList *fHashVolumes; //! hash list of volumes provid ing fast search
	THashList *fHashGVolumes; //! hash list of group volumes providing fast search	THashList *fHashGVolumes; //! hash list of group volumes providing fast search
	THashList *fHashPNE; //-> hash list of phisical node entries	THashList *fHashPNE; //-> hash list of phisical node entries
	mutable TObjArray *fArrayPNE; //! array of phisical node entr ies	mutable TObjArray *fArrayPNE; //! array of phisical node entr ies
	Int_t fSizePNEId; // size of the array of unique ID's for PN entries	Int_t fSizePNEId; // size of the array of unique ID's for PN entries
	Int_t fNPNEId; // number of PN entries having a unique ID	Int_t fNPNEId; // number of PN entries having a unique ID
	Int_t *fKeyPNEId; //[fSizePNEId] array of uid val ues for PN entries	Int_t *fKeyPNEId; //[fSizePNEId] array of uid val ues for PN entries
	Int_t *fValuePNEId; //[fSizePNEId] array of pointer s to PN entries with ID's	Int_t *fValuePNEId; //[fSizePNEId] array of pointer s to PN entries with ID's

		Bool_t fMultiThread; //! Flag for multi-threading
	//--- private methods	//--- private methods

	Bool_t IsLoopingVolumes() const {return fLoopVolumes; }	Bool_t IsLoopingVolumes() const {return fLoopVolumes; }
	void Init();	void Init();
	Bool_t InitArrayPNE() const;	Bool_t InitArrayPNE() const;
	Bool_t InsertPNEId(Int_t uid, Int_t ientry);	Bool_t InsertPNEId(Int_t uid, Int_t ientry);
	void SetLoopVolumes(Bool_t flag=kTRUE) {fLoopVolumes=fl ag;}	void SetLoopVolumes(Bool_t flag=kTRUE) {fLoopVolumes=fl ag;}
	void UpdateElements();	void UpdateElements();
	void Voxelize(Option_t *option = 0);	void Voxelize(Option_t *option = 0);

	public:	public:
	// constructors	// constructors
	TGeoManager();	TGeoManager();
	TGeoManager(const char name, const char title);	TGeoManager(const char name, const char title);
	// destructor	// destructor
	virtual ~TGeoManager();	virtual ~TGeoManager();

		struct ThreadData_t
		{
		Int_t fIntSize; //! int buffer size
		Int_t fDblSize; //! dbl buffer size
		Int_t *fIntBuffer; //! transient int buffer
		Double_t *fDblBuffer; //! transient dbl buffer

		ThreadData_t();
		~ThreadData_t();
		};

		mutable std::vector<ThreadData_t*> fThreadData; //! Thread private data
		mutable Int_t fThreadSize; //! Length of thread dat
		a

		ThreadData_t& GetThreadData() const;
		void ClearThreadData() const;
	//--- adding geometrical objects	//--- adding geometrical objects
	Int_t AddMaterial(const TGeoMaterial *material);	Int_t AddMaterial(const TGeoMaterial *material);
	Int_t AddOverlap(const TNamed *ovlp);	Int_t AddOverlap(const TNamed *ovlp);
	Int_t AddTransformation(const TGeoMatrix *matrix);	Int_t AddTransformation(const TGeoMatrix *matrix);
	Int_t AddShape(const TGeoShape *shape);	Int_t AddShape(const TGeoShape *shape);
	Int_t AddTrack(Int_t id, Int_t pdgcode, TObject *partic le=0);	Int_t AddTrack(Int_t id, Int_t pdgcode, TObject *partic le=0);
	Int_t AddTrack(TVirtualGeoTrack *track);	Int_t AddTrack(TVirtualGeoTrack *track);
	Int_t AddVolume(TGeoVolume *volume);	Int_t AddVolume(TGeoVolume *volume);

	Int_t AddNavigator(TGeoNavigator *navigator);	TGeoNavigator *AddNavigator();
	void ClearOverlaps();	void ClearOverlaps();
	void RegisterMatrix(const TGeoMatrix *matrix);	void RegisterMatrix(const TGeoMatrix *matrix);
	void SortOverlaps();	void SortOverlaps();
	//--- browsing and tree navigation	//--- browsing and tree navigation
	void Browse(TBrowser *b);	void Browse(TBrowser *b);
	void SetVisibility(TObject *obj, Bool_t vis);	void SetVisibility(TObject *obj, Bool_t vis);
	virtual Bool_t cd(const char path=""); // MENU*	virtual Bool_t cd(const char path=""); // MENU*
	Bool_t CheckPath(const char *path) const;	Bool_t CheckPath(const char *path) const;
	void CdNode(Int_t nodeid);	void CdNode(Int_t nodeid);
	void CdDown(Int_t index);	void CdDown(Int_t index);
	void CdUp();	void CdUp();
	void CdTop();	void CdTop();
	void CdNext();	void CdNext();
	void GetBranchNames(Int_t *names) const;	void GetBranchNames(Int_t *names) const;
	void GetBranchNumbers(Int_t copyNumbers, Int_t volum eNumbers) const;	void GetBranchNumbers(Int_t copyNumbers, Int_t volum eNumbers) const;
	void GetBranchOnlys(Int_t *isonly) const;	void GetBranchOnlys(Int_t *isonly) const;

	Int_t GetNmany() const {return fCurrentNavigator->GetNm any();}	Int_t GetNmany() const {return GetCurrentNavigator()->G etNmany();}
	const char *GetPdgName(Int_t pdg) const;	const char *GetPdgName(Int_t pdg) const;
	void SetPdgName(Int_t pdg, const char *name);	void SetPdgName(Int_t pdg, const char *name);
	Bool_t IsFolder() const { return kTRUE; }	Bool_t IsFolder() const { return kTRUE; }
	//--- visualization settings	//--- visualization settings
	virtual void Edit(Option_t option=""); // MENU*	virtual void Edit(Option_t option=""); // MENU*
	void BombTranslation(const Double_t tr, Double_t bom btr);	void BombTranslation(const Double_t tr, Double_t bom btr);
	void UnbombTranslation(const Double_t tr, Double_t b ombtr);	void UnbombTranslation(const Double_t tr, Double_t b ombtr);
	void ClearAttributes(); // MENU	void ClearAttributes(); // MENU
	void DefaultAngles(); // MENU	void DefaultAngles(); // MENU
	void DefaultColors(); // MENU	void DefaultColors(); // MENU

	skipping to change at line 361	skipping to change at line 384
	Double_t Safety(Bool_t inside=kFALSE);	Double_t Safety(Bool_t inside=kFALSE);
	TGeoNode SearchNode(Bool_t downwards=kFALSE, const TGeoNod e skipnode=0);	TGeoNode SearchNode(Bool_t downwards=kFALSE, const TGeoNod e skipnode=0);
	TGeoNode *Step(Bool_t is_geom=kTRUE, Bool_t cross=kTRUE);	TGeoNode *Step(Bool_t is_geom=kTRUE, Bool_t cross=kTRUE);
	void DisableInactiveVolumes() {fActivity=kTRUE;}	void DisableInactiveVolumes() {fActivity=kTRUE;}
	void EnableInactiveVolumes() {fActivity=kFALSE;}	void EnableInactiveVolumes() {fActivity=kFALSE;}
	void SetCurrentTrack(Int_t i) {fCurrentTrack = (TVirtu alGeoTrack*)fTracks->At(i);}	void SetCurrentTrack(Int_t i) {fCurrentTrack = (TVirtu alGeoTrack*)fTracks->At(i);}
	void SetCurrentTrack(TVirtualGeoTrack *track) {fCurren tTrack=track;}	void SetCurrentTrack(TVirtualGeoTrack *track) {fCurren tTrack=track;}
	Int_t GetNtracks() const {return fNtracks;}	Int_t GetNtracks() const {return fNtracks;}
	TVirtualGeoTrack *GetCurrentTrack() {return fCurrentTrack;}	TVirtualGeoTrack *GetCurrentTrack() {return fCurrentTrack;}
	TVirtualGeoTrack GetLastTrack() {return (TVirtualGeoTrack)((fNtra cks>0)?fTracks->At(fNtracks-1):NULL);}	TVirtualGeoTrack GetLastTrack() {return (TVirtualGeoTrack)((fNtra cks>0)?fTracks->At(fNtracks-1):NULL);}

	const Double_t *GetLastPoint() const {return fCurrentNavigator->G etLastPoint();}	const Double_t *GetLastPoint() const {return GetCurrentNavigator( )->GetLastPoint();}
	TVirtualGeoTrack GetTrack(Int_t index) {return (index<fNtr acks)?(TVirtualGeoTrack)fTracks->At(index):0;}	TVirtualGeoTrack GetTrack(Int_t index) {return (index<fNtr acks)?(TVirtualGeoTrack)fTracks->At(index):0;}
	Int_t GetTrackIndex(Int_t id) const;	Int_t GetTrackIndex(Int_t id) const;
	TVirtualGeoTrack *GetTrackOfId(Int_t id) const;	TVirtualGeoTrack *GetTrackOfId(Int_t id) const;
	TVirtualGeoTrack *FindTrackWithId(Int_t id) const;	TVirtualGeoTrack *FindTrackWithId(Int_t id) const;
	TVirtualGeoTrack *GetParentTrackOfId(Int_t id) const;	TVirtualGeoTrack *GetParentTrackOfId(Int_t id) const;
	Int_t GetVirtualLevel();	Int_t GetVirtualLevel();
	Bool_t GotoSafeLevel();	Bool_t GotoSafeLevel();
	Int_t GetSafeLevel() const;	Int_t GetSafeLevel() const;

	Double_t GetSafeDistance() const {return fCurrentNavi	Double_t GetSafeDistance() const {return GetCurrentNa
	gator->GetSafeDistance();}	vigator()->GetSafeDistance();}
	Double_t GetLastSafety() const {return fCurrentNavi	Double_t GetLastSafety() const {return GetCurrentNa
	gator->GetLastSafety();}	vigator()->GetLastSafety();}
	Double_t GetStep() const {return fCurrentNavi	Double_t GetStep() const {return GetCurrentNa
	gator->GetStep();}	vigator()->GetStep();}
	void InspectState() const;	void InspectState() const;
	Bool_t IsAnimatingTracks() const {return fIsGeomReadi ng;}	Bool_t IsAnimatingTracks() const {return fIsGeomReadi ng;}

	Bool_t IsCheckingOverlaps() const {return fCurrentNavi gator->IsCheckingOverlaps();}	Bool_t IsCheckingOverlaps() const {return GetCurrentNa vigator()->IsCheckingOverlaps();}
	Bool_t IsMatrixTransform() const {return fMatrixTrans form;}	Bool_t IsMatrixTransform() const {return fMatrixTrans form;}
	Bool_t IsMatrixReflection() const {return fMatrixRefle ction;}	Bool_t IsMatrixReflection() const {return fMatrixRefle ction;}
	Bool_t IsSameLocation(Double_t x, Double_t y, Double_t z , Bool_t change=kFALSE);	Bool_t IsSameLocation(Double_t x, Double_t y, Double_t z , Bool_t change=kFALSE);

	Bool_t IsSameLocation() const {return fCurrentNavigator- >IsSameLocation();}	Bool_t IsSameLocation() const {return GetCurrentNavigato r()->IsSameLocation();}
	Bool_t IsSamePoint(Double_t x, Double_t y, Double_t z) c onst;	Bool_t IsSamePoint(Double_t x, Double_t y, Double_t z) c onst;

	Bool_t IsStartSafe() const {return fCurrentNavigator->Is	Bool_t IsStartSafe() const {return GetCurrentNavigator()
	StartSafe();}	->IsStartSafe();}
	void SetCheckingOverlaps(Bool_t flag=kTRUE) {fCurrentN	void SetCheckingOverlaps(Bool_t flag=kTRUE) {GetCurren
	avigator->SetCheckingOverlaps(flag);}	tNavigator()->SetCheckingOverlaps(flag);}
	void SetStartSafe(Bool_t flag=kTRUE) {fCurrentNaviga	void SetStartSafe(Bool_t flag=kTRUE) {GetCurrentNavi
	tor->SetStartSafe(flag);}	gator()->SetStartSafe(flag);}
	void SetMatrixTransform(Bool_t on=kTRUE) {fMatrixTrans form = on;}	void SetMatrixTransform(Bool_t on=kTRUE) {fMatrixTrans form = on;}
	void SetMatrixReflection(Bool_t flag=kTRUE) {fMatrixRe flection = flag;}	void SetMatrixReflection(Bool_t flag=kTRUE) {fMatrixRe flection = flag;}

	void SetStep(Double_t step) {fCurrentNavigator->SetSte	void SetStep(Double_t step) {GetCurrentNavigator()->Se
	p(step);}	tStep(step);}
	Bool_t IsCurrentOverlapping() const {return fCurrentNavi	Bool_t IsCurrentOverlapping() const {return GetCurrentNa
	gator->IsCurrentOverlapping();}	vigator()->IsCurrentOverlapping();}
	Bool_t IsEntering() const {return fCurrentNavi	Bool_t IsEntering() const {return GetCurrentNa
	gator->IsEntering();}	vigator()->IsEntering();}
	Bool_t IsExiting() const {return fCurrentNavi	Bool_t IsExiting() const {return GetCurrentNa
	gator->IsExiting();}	vigator()->IsExiting();}
	Bool_t IsStepEntering() const {return fCurrentNavi	Bool_t IsStepEntering() const {return GetCurrentNa
	gator->IsStepEntering();}	vigator()->IsStepEntering();}
	Bool_t IsStepExiting() const {return fCurrentNavi	Bool_t IsStepExiting() const {return GetCurrentNa
	gator->IsStepExiting();}	vigator()->IsStepExiting();}
	Bool_t IsOutside() const {return fCurrentNavi	Bool_t IsOutside() const {return GetCurrentNa
	gator->IsOutside();}	vigator()->IsOutside();}
	Bool_t IsOnBoundary() const {return fCurrentNavi	Bool_t IsOnBoundary() const {return GetCurrentNa
	gator->IsOnBoundary();}	vigator()->IsOnBoundary();}
	Bool_t IsNullStep() const {return fCurrentNavi	Bool_t IsNullStep() const {return GetCurrentNa
	gator->IsNullStep();}	vigator()->IsNullStep();}
	Bool_t IsActivityEnabled() const {return fActivity;}	Bool_t IsActivityEnabled() const {return fActivity;}

	void SetOutside(Bool_t flag=kTRUE) {fCurrentNavigator- >SetOutside(flag);}	void SetOutside(Bool_t flag=kTRUE) {GetCurrentNavigato r()->SetOutside(flag);}

	//--- cleaning	//--- cleaning
	void CleanGarbage();	void CleanGarbage();
	void ClearShape(const TGeoShape *shape);	void ClearShape(const TGeoShape *shape);
	void ClearTracks() {fTracks->Delete(); fNtracks=0;}	void ClearTracks() {fTracks->Delete(); fNtracks=0;}

		void ClearNavigators();
	void RemoveMaterial(Int_t index);	void RemoveMaterial(Int_t index);

		void RemoveNavigator(const TGeoNavigator *nav);
	void ResetUserData();	void ResetUserData();

	//--- utilities	//--- utilities
	Int_t CountNodes(const TGeoVolume *vol=0, Int_t nlevels =10000, Int_t option=0);	Int_t CountNodes(const TGeoVolume *vol=0, Int_t nlevels =10000, Int_t option=0);
	virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);	virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);
	static Int_t Parse(const char* expr, TString &expr1, TString & expr2, TString &expr3);	static Int_t Parse(const char* expr, TString &expr1, TString & expr2, TString &expr3);
	Int_t ReplaceVolume(TGeoVolume vorig, TGeoVolume vnew );	Int_t ReplaceVolume(TGeoVolume vorig, TGeoVolume vnew );
	Int_t TransformVolumeToAssembly(const char *vname);	Int_t TransformVolumeToAssembly(const char *vname);
	UChar_t *GetBits() {return fBits;}	UChar_t *GetBits() {return fBits;}
	virtual Int_t GetByteCount(Option_t *option=0);	virtual Int_t GetByteCount(Option_t *option=0);
	Int_t *GetIntBuffer(Int_t length);	Int_t *GetIntBuffer(Int_t length);
	Double_t *GetDblBuffer(Int_t length);	Double_t *GetDblBuffer(Int_t length);
	void SetAllIndex();	void SetAllIndex();

		void SetMultiThread(Bool_t flag=kTRUE) {fMultiThread =
		flag;}
		Bool_t IsMultiThread() const {return fMultiThread;}
		static void SetNavigatorsLock(Bool_t flag) {fgLockNavigators
		= flag;}
		static Int_t ThreadId();
		static Int_t GetNumThreads() {return fgNumThreads;}
		static void ClearThreadsMap();

	//--- I/O	//--- I/O

	virtual Int_t Export(const char filename, const char name="", Option_t *option="v");	virtual Int_t Export(const char filename, const char name="", Option_t *option="vg");
	static void LockGeometry();	static void LockGeometry();
	static void UnlockGeometry();	static void UnlockGeometry();
	static Int_t GetVerboseLevel();	static Int_t GetVerboseLevel();
	static void SetVerboseLevel(Int_t vl);	static void SetVerboseLevel(Int_t vl);
	static TGeoManager Import(const char filename, const char name="", Option_t option="");	static TGeoManager Import(const char filename, const char name="", Option_t option="");
	static Bool_t IsLocked();	static Bool_t IsLocked();
	Bool_t IsStreamingVoxels() const {return fStreamVoxels;}	Bool_t IsStreamingVoxels() const {return fStreamVoxels;}

	//--- list getters	//--- list getters
	TObjArray *GetListOfNodes() {return fNodes;}	TObjArray *GetListOfNodes() {return fNodes;}

	skipping to change at line 440	skipping to change at line 471
	TObjArray *GetListOfOverlaps() {return fOverlaps;}	TObjArray *GetListOfOverlaps() {return fOverlaps;}
	TObjArray *GetListOfMatrices() const {return fMatrices;}	TObjArray *GetListOfMatrices() const {return fMatrices;}
	TList *GetListOfMaterials() const {return fMaterials; }	TList *GetListOfMaterials() const {return fMaterials; }
	TList *GetListOfMedia() const {return fMedia;}	TList *GetListOfMedia() const {return fMedia;}
	TObjArray *GetListOfVolumes() const {return fVolumes;}	TObjArray *GetListOfVolumes() const {return fVolumes;}
	TObjArray *GetListOfGVolumes() const {return fGVolumes;}	TObjArray *GetListOfGVolumes() const {return fGVolumes;}
	TObjArray *GetListOfShapes() const {return fShapes;}	TObjArray *GetListOfShapes() const {return fShapes;}
	TObjArray *GetListOfGShapes() const {return fGShapes;}	TObjArray *GetListOfGShapes() const {return fGShapes;}
	TObjArray *GetListOfUVolumes() const {return fUniqueVolu mes;}	TObjArray *GetListOfUVolumes() const {return fUniqueVolu mes;}
	TObjArray *GetListOfTracks() const {return fTracks;}	TObjArray *GetListOfTracks() const {return fTracks;}

	TObjArray *GetListOfNavigators() const {return fNavigators ;}	TGeoNavigatorArray *GetListOfNavigators() const;
	TGeoElementTable *GetElementTable();	TGeoElementTable *GetElementTable();

	//--- modeler state getters/setters	//--- modeler state getters/setters
	void DoBackupState();	void DoBackupState();
	void DoRestoreState();	void DoRestoreState();
	TGeoNode GetNode(Int_t level) const {return (TGeoNode)fN odes->UncheckedAt(level);}	TGeoNode GetNode(Int_t level) const {return (TGeoNode)fN odes->UncheckedAt(level);}

	Int_t GetNodeId() const {return fCurrentNavig	Int_t GetNodeId() const {return GetCurrentNav
	ator->GetNodeId();}	igator()->GetNodeId();}
	TGeoNode *GetNextNode() const {return fCurrentNavig	TGeoNode *GetNextNode() const {return GetCurrentNav
	ator->GetNextNode();}	igator()->GetNextNode();}
	TGeoNode *GetMother(Int_t up=1) const {return fCurrentNavig	TGeoNode *GetMother(Int_t up=1) const {return GetCurrentNav
	ator->GetMother(up);}	igator()->GetMother(up);}
	TGeoHMatrix *GetMotherMatrix(Int_t up=1) const {return fCurren	TGeoHMatrix *GetMotherMatrix(Int_t up=1) const {return GetCurr
	tNavigator->GetMotherMatrix(up);}	entNavigator()->GetMotherMatrix(up);}
	TGeoHMatrix *GetHMatrix();	TGeoHMatrix *GetHMatrix();

	TGeoHMatrix *GetCurrentMatrix() const {return fCurrentNavig ator->GetCurrentMatrix();}	TGeoHMatrix *GetCurrentMatrix() const {return GetCurrentNav igator()->GetCurrentMatrix();}
	TGeoHMatrix *GetGLMatrix() const {return fGLMatrix;}	TGeoHMatrix *GetGLMatrix() const {return fGLMatrix;}

	TGeoNavigator *GetCurrentNavigator() const {return fCurrentNavig	TGeoNavigator *GetCurrentNavigator() const;
	ator;}	TGeoNode *GetCurrentNode() const {return GetCurrentNav
	TGeoNode *GetCurrentNode() const {return fCurrentNavig	igator()->GetCurrentNode();}
	ator->GetCurrentNode();}
	Int_t GetCurrentNodeId() const;	Int_t GetCurrentNodeId() const;

	const Double_t *GetCurrentPoint() const {return fCurrentNavig	const Double_t *GetCurrentPoint() const {return GetCurrentNav
	ator->GetCurrentPoint();}	igator()->GetCurrentPoint();}
	const Double_t *GetCurrentDirection() const {return fCurrentNavig	const Double_t *GetCurrentDirection() const {return GetCurrentNav
	ator->GetCurrentDirection();}	igator()->GetCurrentDirection();}
	TGeoVolume *GetCurrentVolume() const {return fCurrentNavigato	TGeoVolume *GetCurrentVolume() const {return GetCurrentNaviga
	r->GetCurrentVolume();}	tor()->GetCurrentVolume();}
	const Double_t *GetCldirChecked() const {return fCurrentNavigato	const Double_t *GetCldirChecked() const {return GetCurrentNaviga
	r->GetCldirChecked();}	tor()->GetCldirChecked();}
	const Double_t *GetCldir() const {return fCurrentNavigato	const Double_t *GetCldir() const {return GetCurrentNaviga
	r->GetCldir();}	tor()->GetCldir();}
	const Double_t *GetNormal() const {return fCurrentNavigato	const Double_t *GetNormal() const {return GetCurrentNaviga
	r->GetNormal();}	tor()->GetNormal();}
	Int_t GetLevel() const {return fCurrentNavigato	Int_t GetLevel() const {return GetCurrentNaviga
	r->GetLevel();}	tor()->GetLevel();}
	Int_t GetMaxLevel() const {return fNLevel;}	Int_t GetMaxLevel() const {return fNLevel;}
	const char *GetPath() const;	const char *GetPath() const;

	Int_t GetStackLevel() const {return fCurrentNavigato r->GetStackLevel();}	Int_t GetStackLevel() const {return GetCurrentNaviga tor()->GetStackLevel();}
	TGeoVolume *GetMasterVolume() const {return fMasterVolume;}	TGeoVolume *GetMasterVolume() const {return fMasterVolume;}
	TGeoVolume *GetTopVolume() const {return fTopVolume;}	TGeoVolume *GetTopVolume() const {return fTopVolume;}
	TGeoNode *GetTopNode() const {return fTopNode;}	TGeoNode *GetTopNode() const {return fTopNode;}
	TGeoPhysicalNode GetPhysicalNode(Int_t i) const {return (TGeoPhysi calNode)fPhysicalNodes->UncheckedAt(i);}	TGeoPhysicalNode GetPhysicalNode(Int_t i) const {return (TGeoPhysi calNode)fPhysicalNodes->UncheckedAt(i);}

	void SetCurrentPoint(Double_t *point) {fCurrentNavigat	void SetCurrentPoint(Double_t *point) {GetCurrentNavig
	or->SetCurrentPoint(point);}	ator()->SetCurrentPoint(point);}
	void SetCurrentPoint(Double_t x, Double_t y, Double_t	void SetCurrentPoint(Double_t x, Double_t y, Double_t
	z) {fCurrentNavigator->SetCurrentPoint(x,y,z);}	z) {GetCurrentNavigator()->SetCurrentPoint(x,y,z);}
	void SetLastPoint(Double_t x, Double_t y, Double_t z)	void SetLastPoint(Double_t x, Double_t y, Double_t z)
	{fCurrentNavigator->SetLastPoint(x,y,z);}	{GetCurrentNavigator()->SetLastPoint(x,y,z);}
	void SetCurrentDirection(Double_t *dir) {fCurrentNavig	void SetCurrentDirection(Double_t *dir) {GetCurrentNav
	ator->SetCurrentDirection(dir);}	igator()->SetCurrentDirection(dir);}
	void SetCurrentDirection(Double_t nx, Double_t ny, Dou	void SetCurrentDirection(Double_t nx, Double_t ny, Dou
	ble_t nz) {fCurrentNavigator->SetCurrentDirection(nx,ny,nz);}	ble_t nz) {GetCurrentNavigator()->SetCurrentDirection(nx,ny,nz);}
	void SetCldirChecked(Double_t *dir) {fCurrentNavigator	void SetCldirChecked(Double_t *dir) {GetCurrentNavigat
	->SetCldirChecked(dir);}	or()->SetCldirChecked(dir);}

	//--- point/vector reference frame conversion	//--- point/vector reference frame conversion

	void LocalToMaster(const Double_t local, Double_t ma	void LocalToMaster(const Double_t local, Double_t ma
	ster) const {fCurrentNavigator->LocalToMaster(local, master);}	ster) const {GetCurrentNavigator()->LocalToMaster(local, master);}
	void LocalToMasterVect(const Double_t *local, Double_t	void LocalToMasterVect(const Double_t *local, Double_t
	*master) const {fCurrentNavigator->LocalToMasterVect(local, master);}	*master) const {GetCurrentNavigator()->LocalToMasterVect(local, master);}
	void LocalToMasterBomb(const Double_t *local, Double_t	void LocalToMasterBomb(const Double_t *local, Double_t
	*master) const {fCurrentNavigator->LocalToMasterBomb(local, master);}	*master) const {GetCurrentNavigator()->LocalToMasterBomb(local, master);}
	void MasterToLocal(const Double_t master, Double_t l	void MasterToLocal(const Double_t master, Double_t l
	ocal) const {fCurrentNavigator->MasterToLocal(master, local);}	ocal) const {GetCurrentNavigator()->MasterToLocal(master, local);}
	void MasterToLocalVect(const Double_t *master, Double_	void MasterToLocalVect(const Double_t *master, Double_
	t *local) const {fCurrentNavigator->MasterToLocalVect(master, local);}	t *local) const {GetCurrentNavigator()->MasterToLocalVect(master, local);}
	void MasterToLocalBomb(const Double_t *master, Double_	void MasterToLocalBomb(const Double_t *master, Double_
	t *local) const {fCurrentNavigator->MasterToLocalBomb(master, local);}	t *local) const {GetCurrentNavigator()->MasterToLocalBomb(master, local);}
	void MasterToTop(const Double_t master, Double_t top ) const;	void MasterToTop(const Double_t master, Double_t top ) const;
	void TopToMaster(const Double_t top, Double_t master ) const;	void TopToMaster(const Double_t top, Double_t master ) const;

	//--- general use getters/setters	//--- general use getters/setters
	TGeoMaterial FindDuplicateMaterial(const TGeoMaterial mat) co nst;	TGeoMaterial FindDuplicateMaterial(const TGeoMaterial mat) co nst;
	TGeoVolume FindVolumeFast(const charname, Bool_t multi=kFAL SE);	TGeoVolume FindVolumeFast(const charname, Bool_t multi=kFAL SE);
	TGeoMaterial GetMaterial(const char matname) const;	TGeoMaterial GetMaterial(const char matname) const;
	TGeoMaterial *GetMaterial(Int_t id) const;	TGeoMaterial *GetMaterial(Int_t id) const;
	TGeoMedium GetMedium(const char medium) const;	TGeoMedium GetMedium(const char medium) const;
	TGeoMedium *GetMedium(Int_t numed) const;	TGeoMedium *GetMedium(Int_t numed) const;
	Int_t GetMaterialIndex(const char *matname) const;	Int_t GetMaterialIndex(const char *matname) const;
	// TGeoShape GetShape(const char name) const;	// TGeoShape GetShape(const char name) const;
	TGeoVolume GetVolume(const charname) const;	TGeoVolume GetVolume(const charname) const;
	TGeoVolume GetVolume(Int_t uid) const {return (TGeoVolume)f UniqueVolumes->At(uid);}	TGeoVolume GetVolume(Int_t uid) const {return (TGeoVolume)f UniqueVolumes->At(uid);}
	Int_t GetUID(const char *volname) const;	Int_t GetUID(const char *volname) const;
	Int_t GetNNodes() {if (!fNNodes) CountNodes(); return f NNodes;}	Int_t GetNNodes() {if (!fNNodes) CountNodes(); return f NNodes;}

	TGeoNodeCache *GetCache() const {return fCurrentNavigato r->GetCache();}	TGeoNodeCache *GetCache() const {return GetCurrentNaviga tor()->GetCache();}
	// void SetCache(const TGeoNodeCache cache) {fCache = (TGeoNodeCache)cache;}	// void SetCache(const TGeoNodeCache cache) {fCache = (TGeoNodeCache)cache;}
	void SetAnimateTracks(Bool_t flag=kTRUE) {fIsGeomReadi ng=flag;}	void SetAnimateTracks(Bool_t flag=kTRUE) {fIsGeomReadi ng=flag;}
	virtual ULong_t SizeOf(const TGeoNode node, Option_t option); / / size of the geometry in memory	virtual ULong_t SizeOf(const TGeoNode node, Option_t option); / / size of the geometry in memory
	void SelectTrackingMedia();	void SelectTrackingMedia();

	//--- stack manipulation	//--- stack manipulation

	Int_t PushPath(Int_t startlevel=0) {return fCurrentNavi	Int_t PushPath(Int_t startlevel=0) {return GetCurrentNa
	gator->PushPath(startlevel);}	vigator()->PushPath(startlevel);}
	Bool_t PopPath() {return fCurrentNavigator->PopPath();}	Bool_t PopPath() {return GetCurrentNavigator()->PopPath(
	Bool_t PopPath(Int_t index) {return fCurrentNavigator->P	);}
	opPath(index);}	Bool_t PopPath(Int_t index) {return GetCurrentNavigator(
	Int_t PushPoint(Int_t startlevel=0) {return fCurrentNav	)->PopPath(index);}
	igator->PushPoint(startlevel);}	Int_t PushPoint(Int_t startlevel=0) {return GetCurrentN
	Bool_t PopPoint() {return fCurrentNavigator->PopPoint();	avigator()->PushPoint(startlevel);}
	}	Bool_t PopPoint() {return GetCurrentNavigator()->PopPoin
	Bool_t PopPoint(Int_t index) {return fCurrentNavigator->	t();}
	PopPoint(index);}	Bool_t PopPoint(Int_t index) {return GetCurrentNavigator
	void PopDummy(Int_t ipop=9999) {return fCurrentNavigat	()->PopPoint(index);}
	or->PopDummy(ipop);}	void PopDummy(Int_t ipop=9999) {return GetCurrentNavig
		ator()->PopDummy(ipop);}

	ClassDef(TGeoManager, 12) // geometry manager	ClassDef(TGeoManager, 12) // geometry manager
	};	};

	R__EXTERN TGeoManager *gGeoManager;	R__EXTERN TGeoManager *gGeoManager;

	#endif	#endif

End of changes. 30 change blocks.
	110 lines changed or deleted	146 lines changed or added

	TGeoPatternFinder.h	TGeoPatternFinder.h

	// @(#)root/geom:$Id: TGeoPatternFinder.h 39018 2011-04-25 09:38:31Z agheat a $	// @(#)root/geom:$Id: TGeoPatternFinder.h 41234 2011-10-06 15:48:52Z agheat a $
	// Author: Andrei Gheata 30/10/01	// Author: Andrei Gheata 30/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 34	skipping to change at line 34

	/////////////////////////////////////////////////////////////////////////// /////	/////////////////////////////////////////////////////////////////////////// /////
	// //	// //
	// TGeoPatternFinder - base finder class for patterns. A pattern is specify ing	// TGeoPatternFinder - base finder class for patterns. A pattern is specify ing
	// a division type //	// a division type //
	// //	// //
	/////////////////////////////////////////////////////////////////////////// /////	/////////////////////////////////////////////////////////////////////////// /////

	class TGeoPatternFinder : public TObject	class TGeoPatternFinder : public TObject
	{	{

		public:
		struct ThreadData_t
		{
		TGeoMatrix *fMatrix; //! generic matrix
		Int_t fCurrent; //! current division element
		Int_t fNextIndex; //! index of next node

		ThreadData_t();
		~ThreadData_t();
		};
		ThreadData_t& GetThreadData() const;
		void ClearThreadData() const;

	protected :	protected :
	enum EGeoPatternFlags {	enum EGeoPatternFlags {
	kPatternReflected = BIT(14),	kPatternReflected = BIT(14),
	kPatternSpacedOut = BIT(15)	kPatternSpacedOut = BIT(15)
	};	};
	Double_t fStep; // division step length	Double_t fStep; // division step length
	Double_t fStart; // starting point on divided axis	Double_t fStart; // starting point on divided axis
	Double_t fEnd; // ending point	Double_t fEnd; // ending point

	Int_t fCurrent; // current division element
	Int_t fNdivisions; // number of divisions	Int_t fNdivisions; // number of divisions
	Int_t fDivIndex; // index of first div. node	Int_t fDivIndex; // index of first div. node

	TGeoMatrix *fMatrix; // generic matrix
	TGeoVolume *fVolume; // volume to which applies	TGeoVolume *fVolume; // volume to which applies

	Int_t fNextIndex; //! index of next node


		mutable std::vector<ThreadData_t*> fThreadData; //! Vector of thread pri
		vate transient data
		mutable Int_t fThreadSize; //! Size of the thread v
		ector

		protected:
	TGeoPatternFinder(const TGeoPatternFinder&);	TGeoPatternFinder(const TGeoPatternFinder&);
	TGeoPatternFinder& operator=(const TGeoPatternFinder&);	TGeoPatternFinder& operator=(const TGeoPatternFinder&);

	public:	public:
	// constructors	// constructors
	TGeoPatternFinder();	TGeoPatternFinder();
	TGeoPatternFinder(TGeoVolume *vol, Int_t ndiv);	TGeoPatternFinder(TGeoVolume *vol, Int_t ndiv);
	// destructor	// destructor
	virtual ~TGeoPatternFinder();	virtual ~TGeoPatternFinder();
	// methods	// methods

		virtual TGeoMatrix* CreateMatrix() const = 0;
	virtual void cd(Int_t /idiv/) {}	virtual void cd(Int_t /idiv/) {}
	virtual TGeoNode *CdNext();	virtual TGeoNode *CdNext();
	virtual TGeoNode FindNode(Double_t /point/, const Double_t * /di r/=0) {return 0;}	virtual TGeoNode FindNode(Double_t /point/, const Double_t * /di r/=0) {return 0;}
	virtual Int_t GetByteCount() const {return 36;}	virtual Int_t GetByteCount() const {return 36;}

	Int_t GetCurrent() {return fCurrent;}	Int_t GetCurrent();// {return fCurrent;}
	Int_t GetDivIndex() {return fDivIndex;}	Int_t GetDivIndex() {return fDivIndex;}
	virtual Int_t GetDivAxis() {return 1;}	virtual Int_t GetDivAxis() {return 1;}

	virtual TGeoMatrix *GetMatrix() {return fMatrix;}	virtual TGeoMatrix *GetMatrix();// {return fMatrix;}
	Int_t GetNdiv() const {return fNdivisions;}	Int_t GetNdiv() const {return fNdivisions;}

	Int_t GetNext() const {return fNextIndex;}	Int_t GetNext() const;// {return fNextIndex;}
	TGeoNode *GetNodeOffset(Int_t idiv) {return fVolume->GetNode(f DivIndex+idiv);}	TGeoNode *GetNodeOffset(Int_t idiv) {return fVolume->GetNode(f DivIndex+idiv);}
	Double_t GetStart() const {return fStart;}	Double_t GetStart() const {return fStart;}
	Double_t GetStep() const {return fStep;}	Double_t GetStep() const {return fStep;}
	Double_t GetEnd() const {return fEnd;}	Double_t GetEnd() const {return fEnd;}
	TGeoVolume *GetVolume() const {return fVolume;}	TGeoVolume *GetVolume() const {return fVolume;}
	virtual Bool_t IsOnBoundary(const Double_t * /point/) const {retu rn kFALSE;}	virtual Bool_t IsOnBoundary(const Double_t * /point/) const {retu rn kFALSE;}
	Bool_t IsReflected() const {return TObject::TestBit(kPatter nReflected);}	Bool_t IsReflected() const {return TObject::TestBit(kPatter nReflected);}
	Bool_t IsSpacedOut() const {return TObject::TestBit(kPatter nSpacedOut);}	Bool_t IsSpacedOut() const {return TObject::TestBit(kPatter nSpacedOut);}
	virtual	virtual

	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE) = 0;
	void Reflect(Bool_t flag=kTRUE) {TObject::SetBit(kPattern Reflected,flag);}	void Reflect(Bool_t flag=kTRUE) {TObject::SetBit(kPattern Reflected,flag);}
	void SetDivIndex(Int_t index) {fDivIndex = index;}	void SetDivIndex(Int_t index) {fDivIndex = index;}

	void SetNext(Int_t index) {fNextIndex = index;}	void SetNext(Int_t index);// {fNextIndex = index;}
	void SetRange(Double_t start, Double_t step, Int_t ndivis ions);	void SetRange(Double_t start, Double_t step, Int_t ndivis ions);
	void SetSpacedOut(Bool_t flag) {TObject::SetBit(kPatternS pacedOut,flag);}	void SetSpacedOut(Bool_t flag) {TObject::SetBit(kPatternS pacedOut,flag);}
	void SetVolume(TGeoVolume *vol) {fVolume = vol;}	void SetVolume(TGeoVolume *vol) {fVolume = vol;}

		virtual void UpdateMatrix(Int_t , TGeoHMatrix &) const {}


	ClassDef(TGeoPatternFinder, 3) // patterns to divide volume s	ClassDef(TGeoPatternFinder, 4) // patterns to divide volume s
	};	};

	/////////////////////////////////////////////////////////////////////////// /	/////////////////////////////////////////////////////////////////////////// /
	// / /	// / /
	// TGeoPatternX - a X axis divison pattern / /	// TGeoPatternX - a X axis divison pattern / /
	// / /	// / /
	/////////////////////////////////////////////////////////////////////////// /	/////////////////////////////////////////////////////////////////////////// /

	class TGeoTranslation;	class TGeoTranslation;


	skipping to change at line 109	skipping to change at line 125
	public:	public:
	// constructors	// constructors
	TGeoPatternX();	TGeoPatternX();
	TGeoPatternX(TGeoVolume *vol, Int_t ndivisions);	TGeoPatternX(TGeoVolume *vol, Int_t ndivisions);
	TGeoPatternX(TGeoVolume *vol, Int_t ndivisions, Double_t step);	TGeoPatternX(TGeoVolume *vol, Int_t ndivisions, Double_t step);
	TGeoPatternX(TGeoVolume *vol, Int_t ndivisions, Double_t start, Double_t end);	TGeoPatternX(TGeoVolume *vol, Int_t ndivisions, Double_t start, Double_t end);

	// destructor	// destructor
	virtual ~TGeoPatternX();	virtual ~TGeoPatternX();
	// methods	// methods

		virtual TGeoMatrix* CreateMatrix() const;
	virtual void cd(Int_t idiv);	virtual void cd(Int_t idiv);
	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);
	virtual Double_t FindNextBoundary(Double_t point, Double_t dir, Int _t &indnext);	virtual Double_t FindNextBoundary(Double_t point, Double_t dir, Int _t &indnext);
	virtual Int_t GetDivAxis() {return 1;}	virtual Int_t GetDivAxis() {return 1;}
	virtual Bool_t IsOnBoundary(const Double_t *point) const;	virtual Bool_t IsOnBoundary(const Double_t *point) const;
	virtual	virtual
	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);
	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(ostream &out, Option_t *option = "");

		virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;

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

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


	skipping to change at line 138	skipping to change at line 156
	{	{
	public:	public:
	// constructors	// constructors
	TGeoPatternY();	TGeoPatternY();
	TGeoPatternY(TGeoVolume *vol, Int_t ndivisions);	TGeoPatternY(TGeoVolume *vol, Int_t ndivisions);
	TGeoPatternY(TGeoVolume *vol, Int_t ndivisions, Double_t step);	TGeoPatternY(TGeoVolume *vol, Int_t ndivisions, Double_t step);
	TGeoPatternY(TGeoVolume *vol, Int_t ndivisions, Double_t start, Double_t end);	TGeoPatternY(TGeoVolume *vol, Int_t ndivisions, Double_t start, Double_t end);
	// destructor	// destructor
	virtual ~TGeoPatternY();	virtual ~TGeoPatternY();
	// methods	// methods

		virtual TGeoMatrix* CreateMatrix() const;
	virtual void cd(Int_t idiv);	virtual void cd(Int_t idiv);
	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);
	virtual Double_t FindNextBoundary(Double_t point, Double_t dir, Int _t &indnext);	virtual Double_t FindNextBoundary(Double_t point, Double_t dir, Int _t &indnext);
	virtual Int_t GetDivAxis() {return 2;}	virtual Int_t GetDivAxis() {return 2;}
	virtual Bool_t IsOnBoundary(const Double_t *point) const;	virtual Bool_t IsOnBoundary(const Double_t *point) const;
	virtual	virtual
	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);
	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(ostream &out, Option_t *option = "");

		virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;

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

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


	skipping to change at line 167	skipping to change at line 187
	{	{
	public:	public:
	// constructors	// constructors
	TGeoPatternZ();	TGeoPatternZ();
	TGeoPatternZ(TGeoVolume *vol, Int_t ndivisions);	TGeoPatternZ(TGeoVolume *vol, Int_t ndivisions);
	TGeoPatternZ(TGeoVolume *vol, Int_t ndivisions, Double_t step);	TGeoPatternZ(TGeoVolume *vol, Int_t ndivisions, Double_t step);
	TGeoPatternZ(TGeoVolume *vol, Int_t ndivisions, Double_t start, Double_t end);	TGeoPatternZ(TGeoVolume *vol, Int_t ndivisions, Double_t start, Double_t end);
	// destructor	// destructor
	virtual ~TGeoPatternZ();	virtual ~TGeoPatternZ();
	// methods	// methods

		virtual TGeoMatrix* CreateMatrix() const;
	virtual void cd(Int_t idiv);	virtual void cd(Int_t idiv);
	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);
	virtual Double_t FindNextBoundary(Double_t point, Double_t dir, Int _t &indnext);	virtual Double_t FindNextBoundary(Double_t point, Double_t dir, Int _t &indnext);
	virtual Int_t GetDivAxis() {return 3;}	virtual Int_t GetDivAxis() {return 3;}
	virtual Bool_t IsOnBoundary(const Double_t *point) const;	virtual Bool_t IsOnBoundary(const Double_t *point) const;
	virtual	virtual
	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);
	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(ostream &out, Option_t *option = "");

		virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;

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

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


	skipping to change at line 197	skipping to change at line 219
	public:	public:
	// constructors	// constructors
	TGeoPatternParaX();	TGeoPatternParaX();
	TGeoPatternParaX(TGeoVolume *vol, Int_t ndivisions);	TGeoPatternParaX(TGeoVolume *vol, Int_t ndivisions);
	TGeoPatternParaX(TGeoVolume *vol, Int_t ndivisions, Double_t step);	TGeoPatternParaX(TGeoVolume *vol, Int_t ndivisions, Double_t step);
	TGeoPatternParaX(TGeoVolume *vol, Int_t ndivisions, Double_t start, Doub le_t end);	TGeoPatternParaX(TGeoVolume *vol, Int_t ndivisions, Double_t start, Doub le_t end);

	// destructor	// destructor
	virtual ~TGeoPatternParaX();	virtual ~TGeoPatternParaX();
	// methods	// methods

		virtual TGeoMatrix* CreateMatrix() const;
	virtual void cd(Int_t idiv);	virtual void cd(Int_t idiv);
	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);
	virtual Int_t GetDivAxis() {return 1;}	virtual Int_t GetDivAxis() {return 1;}
	virtual Bool_t IsOnBoundary(const Double_t *point) const;	virtual Bool_t IsOnBoundary(const Double_t *point) const;
	virtual	virtual
	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);
	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(ostream &out, Option_t *option = "");

		virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;

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

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


	skipping to change at line 229	skipping to change at line 253
	public:	public:
	// constructors	// constructors
	TGeoPatternParaY();	TGeoPatternParaY();
	TGeoPatternParaY(TGeoVolume *vol, Int_t ndivisions);	TGeoPatternParaY(TGeoVolume *vol, Int_t ndivisions);
	TGeoPatternParaY(TGeoVolume *vol, Int_t ndivisions, Double_t step);	TGeoPatternParaY(TGeoVolume *vol, Int_t ndivisions, Double_t step);
	TGeoPatternParaY(TGeoVolume *vol, Int_t ndivisions, Double_t start, Doub le_t end);	TGeoPatternParaY(TGeoVolume *vol, Int_t ndivisions, Double_t start, Doub le_t end);

	// destructor	// destructor
	virtual ~TGeoPatternParaY();	virtual ~TGeoPatternParaY();
	// methods	// methods

		virtual TGeoMatrix* CreateMatrix() const;
	virtual void cd(Int_t idiv);	virtual void cd(Int_t idiv);
	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);
	virtual Int_t GetDivAxis() {return 2;}	virtual Int_t GetDivAxis() {return 2;}
	virtual Bool_t IsOnBoundary(const Double_t *point) const;	virtual Bool_t IsOnBoundary(const Double_t *point) const;
	virtual	virtual
	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);
	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(ostream &out, Option_t *option = "");

		virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;

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

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


	skipping to change at line 262	skipping to change at line 288
	public:	public:
	// constructors	// constructors
	TGeoPatternParaZ();	TGeoPatternParaZ();
	TGeoPatternParaZ(TGeoVolume *vol, Int_t ndivisions);	TGeoPatternParaZ(TGeoVolume *vol, Int_t ndivisions);
	TGeoPatternParaZ(TGeoVolume *vol, Int_t ndivisions, Double_t step);	TGeoPatternParaZ(TGeoVolume *vol, Int_t ndivisions, Double_t step);
	TGeoPatternParaZ(TGeoVolume *vol, Int_t ndivisions, Double_t start, Doub le_t end);	TGeoPatternParaZ(TGeoVolume *vol, Int_t ndivisions, Double_t start, Doub le_t end);

	// destructor	// destructor
	virtual ~TGeoPatternParaZ();	virtual ~TGeoPatternParaZ();
	// methods	// methods

		virtual TGeoMatrix* CreateMatrix() const;
	virtual void cd(Int_t idiv);	virtual void cd(Int_t idiv);
	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);
	virtual Int_t GetDivAxis() {return 3;}	virtual Int_t GetDivAxis() {return 3;}
	virtual Bool_t IsOnBoundary(const Double_t *point) const;	virtual Bool_t IsOnBoundary(const Double_t *point) const;
	virtual	virtual
	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);
	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(ostream &out, Option_t *option = "");

		virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;

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

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


	skipping to change at line 295	skipping to change at line 323
	public:	public:
	// constructors	// constructors
	TGeoPatternTrapZ();	TGeoPatternTrapZ();
	TGeoPatternTrapZ(TGeoVolume *vol, Int_t ndivisions);	TGeoPatternTrapZ(TGeoVolume *vol, Int_t ndivisions);
	TGeoPatternTrapZ(TGeoVolume *vol, Int_t ndivisions, Double_t step);	TGeoPatternTrapZ(TGeoVolume *vol, Int_t ndivisions, Double_t step);
	TGeoPatternTrapZ(TGeoVolume *vol, Int_t ndivisions, Double_t start, Doub le_t end);	TGeoPatternTrapZ(TGeoVolume *vol, Int_t ndivisions, Double_t start, Doub le_t end);

	// destructor	// destructor
	virtual ~TGeoPatternTrapZ();	virtual ~TGeoPatternTrapZ();
	// methods	// methods

		virtual TGeoMatrix* CreateMatrix() const;
	Double_t GetTxz() const {return fTxz;}	Double_t GetTxz() const {return fTxz;}
	Double_t GetTyz() const {return fTyz;}	Double_t GetTyz() const {return fTyz;}
	virtual void cd(Int_t idiv);	virtual void cd(Int_t idiv);
	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);
	virtual Int_t GetDivAxis() {return 3;}	virtual Int_t GetDivAxis() {return 3;}
	virtual Bool_t IsOnBoundary(const Double_t *point) const;	virtual Bool_t IsOnBoundary(const Double_t *point) const;
	virtual	virtual
	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);
	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(ostream &out, Option_t *option = "");

		virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;

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

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


	skipping to change at line 325	skipping to change at line 355
	{	{
	public:	public:
	// constructors	// constructors
	TGeoPatternCylR();	TGeoPatternCylR();
	TGeoPatternCylR(TGeoVolume *vol, Int_t ndivisions);	TGeoPatternCylR(TGeoVolume *vol, Int_t ndivisions);
	TGeoPatternCylR(TGeoVolume *vol, Int_t ndivisions, Double_t step);	TGeoPatternCylR(TGeoVolume *vol, Int_t ndivisions, Double_t step);
	TGeoPatternCylR(TGeoVolume *vol, Int_t ndivisions, Double_t start, Doubl e_t end);	TGeoPatternCylR(TGeoVolume *vol, Int_t ndivisions, Double_t start, Doubl e_t end);
	// destructor	// destructor
	virtual ~TGeoPatternCylR();	virtual ~TGeoPatternCylR();
	// methods	// methods

	virtual void cd(Int_t idiv) {fCurrent=idiv;}	virtual TGeoMatrix* CreateMatrix() const;
		virtual void cd(Int_t idiv);
	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);
	virtual Int_t GetDivAxis() {return 1;}	virtual Int_t GetDivAxis() {return 1;}
	virtual Bool_t IsOnBoundary(const Double_t *point) const;	virtual Bool_t IsOnBoundary(const Double_t *point) const;
	virtual	virtual
	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);
	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(ostream &out, Option_t *option = "");

		virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;

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

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


	skipping to change at line 364	skipping to change at line 396

	public:	public:
	// constructors	// constructors
	TGeoPatternCylPhi();	TGeoPatternCylPhi();
	TGeoPatternCylPhi(TGeoVolume *vol, Int_t ndivisions);	TGeoPatternCylPhi(TGeoVolume *vol, Int_t ndivisions);
	TGeoPatternCylPhi(TGeoVolume *vol, Int_t ndivisions, Double_t step);	TGeoPatternCylPhi(TGeoVolume *vol, Int_t ndivisions, Double_t step);
	TGeoPatternCylPhi(TGeoVolume *vol, Int_t ndivisions, Double_t start, Dou ble_t end);	TGeoPatternCylPhi(TGeoVolume *vol, Int_t ndivisions, Double_t start, Dou ble_t end);
	// destructor	// destructor
	virtual ~TGeoPatternCylPhi();	virtual ~TGeoPatternCylPhi();
	// methods	// methods

		virtual TGeoMatrix* CreateMatrix() const;
	virtual void cd(Int_t idiv);	virtual void cd(Int_t idiv);
	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);
	virtual Int_t GetDivAxis() {return 2;}	virtual Int_t GetDivAxis() {return 2;}
	virtual Bool_t IsOnBoundary(const Double_t *point) const;	virtual Bool_t IsOnBoundary(const Double_t *point) const;
	virtual	virtual
	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);
	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(ostream &out, Option_t *option = "");

		virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;

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

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


	skipping to change at line 392	skipping to change at line 426
	{	{
	public:	public:
	// constructors	// constructors
	TGeoPatternSphR();	TGeoPatternSphR();
	TGeoPatternSphR(TGeoVolume *vol, Int_t ndivisions);	TGeoPatternSphR(TGeoVolume *vol, Int_t ndivisions);
	TGeoPatternSphR(TGeoVolume *vol, Int_t ndivisions, Double_t step);	TGeoPatternSphR(TGeoVolume *vol, Int_t ndivisions, Double_t step);
	TGeoPatternSphR(TGeoVolume *vol, Int_t ndivisions, Double_t start, Doubl e_t end);	TGeoPatternSphR(TGeoVolume *vol, Int_t ndivisions, Double_t start, Doubl e_t end);
	// destructor	// destructor
	virtual ~TGeoPatternSphR();	virtual ~TGeoPatternSphR();
	// methods	// methods

	virtual void cd(Int_t idiv) {fCurrent=idiv;}	virtual TGeoMatrix* CreateMatrix() const;
		virtual void cd(Int_t idiv);
	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);
	virtual Int_t GetDivAxis() {return 1;}	virtual Int_t GetDivAxis() {return 1;}
	virtual	virtual
	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);
	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(ostream &out, Option_t *option = "");

		virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;

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

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


	skipping to change at line 419	skipping to change at line 455
	{	{
	public:	public:
	// constructors	// constructors
	TGeoPatternSphTheta();	TGeoPatternSphTheta();
	TGeoPatternSphTheta(TGeoVolume *vol, Int_t ndivisions);	TGeoPatternSphTheta(TGeoVolume *vol, Int_t ndivisions);
	TGeoPatternSphTheta(TGeoVolume *vol, Int_t ndivisions, Double_t step);	TGeoPatternSphTheta(TGeoVolume *vol, Int_t ndivisions, Double_t step);
	TGeoPatternSphTheta(TGeoVolume *vol, Int_t ndivisions, Double_t start, D ouble_t end);	TGeoPatternSphTheta(TGeoVolume *vol, Int_t ndivisions, Double_t start, D ouble_t end);
	// destructor	// destructor
	virtual ~TGeoPatternSphTheta();	virtual ~TGeoPatternSphTheta();
	// methods	// methods

	virtual void cd(Int_t idiv) {fCurrent=idiv;}	virtual TGeoMatrix* CreateMatrix() const;
		virtual void cd(Int_t idiv);
	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);
	virtual Int_t GetDivAxis() {return 2;}	virtual Int_t GetDivAxis() {return 2;}
	virtual	virtual
	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);
	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(ostream &out, Option_t *option = "");

		virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;

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

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


	skipping to change at line 446	skipping to change at line 484
	{	{
	public:	public:
	// constructors	// constructors
	TGeoPatternSphPhi();	TGeoPatternSphPhi();
	TGeoPatternSphPhi(TGeoVolume *vol, Int_t ndivisions);	TGeoPatternSphPhi(TGeoVolume *vol, Int_t ndivisions);
	TGeoPatternSphPhi(TGeoVolume *vol, Int_t ndivisions, Double_t step);	TGeoPatternSphPhi(TGeoVolume *vol, Int_t ndivisions, Double_t step);
	TGeoPatternSphPhi(TGeoVolume *vol, Int_t ndivisions, Double_t start, Dou ble_t end);	TGeoPatternSphPhi(TGeoVolume *vol, Int_t ndivisions, Double_t start, Dou ble_t end);
	// destructor	// destructor
	virtual ~TGeoPatternSphPhi();	virtual ~TGeoPatternSphPhi();
	// methods	// methods

	virtual void cd(Int_t idiv) {fCurrent=idiv;}	virtual TGeoMatrix* CreateMatrix() const;
		virtual void cd(Int_t idiv);
	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);
	virtual Int_t GetDivAxis() {return 3;}	virtual Int_t GetDivAxis() {return 3;}
	virtual	virtual
	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);	TGeoPatternFinder *MakeCopy(Bool_t reflect=kFALSE);
	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(ostream &out, Option_t *option = "");

		virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;

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

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


	skipping to change at line 482	skipping to change at line 522
	TGeoPatternHoneycomb(const TGeoPatternHoneycomb&);	TGeoPatternHoneycomb(const TGeoPatternHoneycomb&);
	TGeoPatternHoneycomb& operator=(const TGeoPatternHoneycomb&);	TGeoPatternHoneycomb& operator=(const TGeoPatternHoneycomb&);

	public:	public:
	// constructors	// constructors
	TGeoPatternHoneycomb();	TGeoPatternHoneycomb();
	TGeoPatternHoneycomb(TGeoVolume *vol, Int_t nrows);	TGeoPatternHoneycomb(TGeoVolume *vol, Int_t nrows);
	// destructor	// destructor
	virtual ~TGeoPatternHoneycomb();	virtual ~TGeoPatternHoneycomb();
	// methods	// methods

	virtual void cd(Int_t idiv) {fCurrent=idiv;}	TGeoPatternFinder *MakeCopy(Bool_t) {return 0;}
		virtual TGeoMatrix* CreateMatrix() const;
		virtual void cd(Int_t idiv);
	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);	virtual TGeoNode FindNode(Double_t point, const Double_t *dir=0);

		virtual void UpdateMatrix(Int_t idiv, TGeoHMatrix &matrix) const;

	ClassDef(TGeoPatternHoneycomb, 1) // pattern for honeycomb d ivisions	ClassDef(TGeoPatternHoneycomb, 1) // pattern for honeycomb d ivisions
	};	};

	#endif	#endif

End of changes. 40 change blocks.
	15 lines changed or deleted	60 lines changed or added

	TGeoScaledShape.h	TGeoScaledShape.h

	// @(#)root/geom:$Id: TGeoScaledShape.h 42572 2012-01-05 15:04:42Z agheata $	// @(#)root/geom:$Id: TGeoScaledShape.h 40117 2011-07-04 12:17:06Z agheata $
	// Author: Andrei Gheata 26/09/05	// Author: Andrei Gheata 26/09/05

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

	TGeoShape.h	TGeoShape.h

	// @(#)root/geom:$Id: TGeoShape.h 39018 2011-04-25 09:38:31Z agheata $	// @(#)root/geom:$Id: TGeoShape.h 41234 2011-10-06 15:48:52Z agheata $
	// Author: Andrei Gheata 31/01/02	// Author: Andrei Gheata 31/01/02

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


	skipping to change at line 77	skipping to change at line 77
	kGeoTrd1 = BIT(23),	kGeoTrd1 = BIT(23),
	kGeoTrd2 = BIT(24),	kGeoTrd2 = BIT(24),
	kGeoComb = BIT(25),	kGeoComb = BIT(25),
	kGeoClosedShape = BIT(26),	kGeoClosedShape = BIT(26),
	kGeoXtru = BIT(27),	kGeoXtru = BIT(27),
	kGeoParaboloid = BIT(28),	kGeoParaboloid = BIT(28),
	kGeoHalfSpace = BIT(29),	kGeoHalfSpace = BIT(29),
	kGeoHype = BIT(30),	kGeoHype = BIT(30),
	kGeoSavePrimitive = BIT(20)	kGeoSavePrimitive = BIT(20)
	};	};

		virtual void ClearThreadData() const {}

	protected :	protected :
	// data members	// data members
	Int_t fShapeId; // shape id	Int_t fShapeId; // shape id
	UInt_t fShapeBits; // shape bits	UInt_t fShapeBits; // shape bits
	// methods	// methods
	virtual void FillBuffer3D(TBuffer3D & buffer, Int_t reqSections , Bool_t localFrame) const;	virtual void FillBuffer3D(TBuffer3D & buffer, Int_t reqSections , Bool_t localFrame) const;
	Int_t GetBasicColor() const;	Int_t GetBasicColor() const;
	void SetOnBoundary(Bool_t /flag=kTRUE/) {;}	void SetOnBoundary(Bool_t /flag=kTRUE/) {;}
	void TransformPoints(Double_t *points, UInt_t NbPoints) const;	void TransformPoints(Double_t *points, UInt_t NbPoints) const;

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

	TGeoVolume.h	TGeoVolume.h

	// @(#)root/geom:$Id: TGeoVolume.h 42572 2012-01-05 15:04:42Z agheata $	// @(#)root/geom:$Id: TGeoVolume.h 41234 2011-10-06 15:48:52Z agheata $
	// Author: Andrei Gheata 30/05/02	// Author: Andrei Gheata 30/05/02

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/
	// Author : date : Wed 24 Oct 2001 01:39:36 PM CEST	// Author : date : Wed 24 Oct 2001 01:39:36 PM CEST

	skipping to change at line 82	skipping to change at line 82

	TObject *fField; //! just a hook for now	TObject *fField; //! just a hook for now
	TString fOption; //! option - if any	TString fOption; //! option - if any
	Int_t fNumber; // volume serial number in the list of volumes	Int_t fNumber; // volume serial number in the list of volumes
	Int_t fNtotal; // total number of physical nodes	Int_t fNtotal; // total number of physical nodes

	TGeoVolume(const TGeoVolume&);	TGeoVolume(const TGeoVolume&);
	TGeoVolume& operator=(const TGeoVolume&);	TGeoVolume& operator=(const TGeoVolume&);

	public:	public:

		virtual void ClearThreadData() const;

		public:
	enum EGeoVolumeTypes {	enum EGeoVolumeTypes {
	kVolumeReplicated = BIT(14),	kVolumeReplicated = BIT(14),
	kVolumeSelected = BIT(15),	kVolumeSelected = BIT(15),
	kVolumeDiv = BIT(16),	kVolumeDiv = BIT(16),
	kVolumeOverlap = BIT(17),	kVolumeOverlap = BIT(17),
	kVolumeImportNodes = BIT(18),	kVolumeImportNodes = BIT(18),
	kVolumeMulti = BIT(19),	kVolumeMulti = BIT(19),
	kVoxelsXYZ = BIT(20),	kVoxelsXYZ = BIT(20),
	kVoxelsCyl = BIT(21),	kVoxelsCyl = BIT(21),
	kVolumeClone = BIT(22),	kVolumeClone = BIT(22),

	skipping to change at line 296	skipping to change at line 299

	/////////////////////////////////////////////////////////////////////////// /	/////////////////////////////////////////////////////////////////////////// /
	// / /	// / /
	// TGeoVolumeAssembly - special assembly of volumes. The assembly has no / /	// TGeoVolumeAssembly - special assembly of volumes. The assembly has no / /
	// medium and its shape is the union of all component shapes / /	// medium and its shape is the union of all component shapes / /
	// / /	// / /
	/////////////////////////////////////////////////////////////////////////// /	/////////////////////////////////////////////////////////////////////////// /

	class TGeoVolumeAssembly : public TGeoVolume	class TGeoVolumeAssembly : public TGeoVolume
	{	{

	private:	public:
	Int_t fCurrent; //! index of current selected nod	struct ThreadData_t
	e	{
	Int_t fNext; //! index of next node to be ente	Int_t fCurrent; //! index of current selected nod
	red	e
		Int_t fNext; //! index of next node to be ente
		red

		ThreadData_t();
		~ThreadData_t();
		};

		ThreadData_t& GetThreadData() const;
		virtual void ClearThreadData() const;

		protected:
		mutable std::vector<ThreadData_t*> fThreadData; //! Thread specific data
		vector
		mutable Int_t fThreadSize; //! Thread vector size

	public:	public:
	TGeoVolumeAssembly();	TGeoVolumeAssembly();
	TGeoVolumeAssembly(const char *name);	TGeoVolumeAssembly(const char *name);
	virtual ~TGeoVolumeAssembly();	virtual ~TGeoVolumeAssembly();

	virtual void AddNode(const TGeoVolume vol, Int_t copy_no, TGeoMatrix mat=0, Option_t *option="");	virtual void AddNode(const TGeoVolume vol, Int_t copy_no, TGeoMatrix mat=0, Option_t *option="");
	virtual void AddNodeOverlap(const TGeoVolume vol, Int_t copy_no, TGe oMatrix mat, Option_t *option);	virtual void AddNodeOverlap(const TGeoVolume vol, Int_t copy_no, TGe oMatrix mat, Option_t *option);
	virtual TGeoVolume *CloneVolume() const;	virtual TGeoVolume *CloneVolume() const;
	virtual TGeoVolume Divide(const char divname, Int_t iaxis, Int_t ndiv, Double_t start, Double_t step, Int_t numed=0, Option_t *option="");	virtual TGeoVolume Divide(const char divname, Int_t iaxis, Int_t ndiv, Double_t start, Double_t step, Int_t numed=0, Option_t *option="");
	TGeoVolume Divide(TGeoVolume cell, TGeoPatternFinder pattern, Opt ion_t option="spacedout");	TGeoVolume Divide(TGeoVolume cell, TGeoPatternFinder pattern, Opt ion_t option="spacedout");
	virtual void DrawOnly(Option_t *) {;}	virtual void DrawOnly(Option_t *) {;}

	virtual Int_t GetCurrentNodeIndex() const {return fCurrent;}	virtual Int_t GetCurrentNodeIndex() const;
	virtual Int_t GetNextNodeIndex() const {return fNext;}	virtual Int_t GetNextNodeIndex() const;
	virtual Bool_t IsAssembly() const {return kTRUE;}	virtual Bool_t IsAssembly() const {return kTRUE;}
	virtual Bool_t IsVisible() const {return kFALSE;}	virtual Bool_t IsVisible() const {return kFALSE;}
	static TGeoVolumeAssembly MakeAssemblyFromVolume(TGeoVolume vol);	static TGeoVolumeAssembly MakeAssemblyFromVolume(TGeoVolume vol);

	void SetCurrentNodeIndex(Int_t index) {fCurrent = index;}	void SetCurrentNodeIndex(Int_t index);
	void SetNextNodeIndex(Int_t index) {fNext = index;}	void SetNextNodeIndex(Int_t index);

	ClassDef(TGeoVolumeAssembly, 2) // an assembly of volumes	ClassDef(TGeoVolumeAssembly, 2) // an assembly of volumes
	};	};

	inline Int_t TGeoVolume::GetNdaughters() const {if (!fNodes) return 0; retu rn (fNodes->GetEntriesFast());}	inline Int_t TGeoVolume::GetNdaughters() const {if (!fNodes) return 0; retu rn (fNodes->GetEntriesFast());}

	#endif	#endif

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

	TGeoVoxelFinder.h	TGeoVoxelFinder.h

	// @(#)root/geom:$Id: TGeoVoxelFinder.h 21497 2007-12-19 16:28:00Z brun $	// @(#)root/geom:$Id: TGeoVoxelFinder.h 41341 2011-10-11 14:58:29Z agheata $
	// Author: Andrei Gheata 04/02/02	// Author: Andrei Gheata 04/02/02

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


	skipping to change at line 33	skipping to change at line 33
	*	*
	*************************************************************************/	*************************************************************************/

	class TGeoVoxelFinder : public TObject	class TGeoVoxelFinder : public TObject
	{	{
	public:	public:
	enum EVoxelsType {	enum EVoxelsType {
	kGeoInvalidVoxels = BIT(15),	kGeoInvalidVoxels = BIT(15),
	kGeoRebuildVoxels = BIT(16)	kGeoRebuildVoxels = BIT(16)
	};	};

		struct ThreadData_t
		{
		Int_t fNcandidates; //! number of candidates
		Int_t fCurrentVoxel; //! index of current voxel in sorted
		list
		Int_t *fCheckList; //! list of candidates
		UChar_t *fBits1; //! bits used for list intersection

		Int_t fSlices[3]; //! slice indices for current voxel
		Int_t fInc[3]; //! slice index increment
		Double_t fInvdir[3]; //! 1/current director cosines
		Double_t fLimits[3]; //! limits on X,Y,Z

		ThreadData_t();
		~ThreadData_t();
		};
		ThreadData_t& GetThreadData(Int_t tid=0) const;
		void ClearThreadData() const;

	protected:	protected:
	TGeoVolume *fVolume; // volume to which applies	TGeoVolume *fVolume; // volume to which applies


	Int_t fNcandidates; // ! number of candidates
	Int_t fCurrentVoxel; // ! index of current voxel in sorted
	list
	Int_t fIbx; // number of different boundaries on X axis	Int_t fIbx; // number of different boundaries on X axis
	Int_t fIby; // number of different boundaries on Y axis	Int_t fIby; // number of different boundaries on Y axis
	Int_t fIbz; // number of different boundaries on Z axis	Int_t fIbz; // number of different boundaries on Z axis
	Int_t fNboxes; // length of boxes array	Int_t fNboxes; // length of boxes array
	Int_t fNox; // length of array of X offsets	Int_t fNox; // length of array of X offsets
	Int_t fNoy; // length of array of Y offsets	Int_t fNoy; // length of array of Y offsets
	Int_t fNoz; // length of array of Z offsets	Int_t fNoz; // length of array of Z offsets
	Int_t fNex; // length of array of X extra offsets	Int_t fNex; // length of array of X extra offsets
	Int_t fNey; // length of array of Y extra offsets	Int_t fNey; // length of array of Y extra offsets
	Int_t fNez; // length of array of Z extra offsets	Int_t fNez; // length of array of Z extra offsets
	Int_t fNx; // length of array of X voxels	Int_t fNx; // length of array of X voxels
	Int_t fNy; // length of array of Y voxels	Int_t fNy; // length of array of Y voxels
	Int_t fNz; // length of array of Z voxels	Int_t fNz; // length of array of Z voxels
	Int_t fPriority[3]; // priority for each axis	Int_t fPriority[3]; // priority for each axis

	Int_t fSlices[3]; // ! slice indices for current voxel
	Int_t fInc[3]; // ! slice index increment
	Double_t fInvdir[3]; // ! 1/current director cosines
	Double_t fLimits[3]; // limits on X,Y,Z
	Double_t *fBoxes; //[fNboxes] list of bounding boxes	Double_t *fBoxes; //[fNboxes] list of bounding boxes
	Double_t *fXb; //[fIbx] ordered array of X box bound aries	Double_t *fXb; //[fIbx] ordered array of X box bound aries
	Double_t *fYb; //[fIby] ordered array of Y box bound aries	Double_t *fYb; //[fIby] ordered array of Y box bound aries
	Double_t *fZb; //[fIbz] ordered array of Z box bound aries	Double_t *fZb; //[fIbz] ordered array of Z box bound aries
	Int_t *fOBx; //[fNox] offsets of daughter indices for slices X	Int_t *fOBx; //[fNox] offsets of daughter indices for slices X
	Int_t *fOBy; //[fNoy] offsets of daughter indices for slices Y	Int_t *fOBy; //[fNoy] offsets of daughter indices for slices Y
	Int_t *fOBz; //[fNoz] offsets of daughter indices for slices Z	Int_t *fOBz; //[fNoz] offsets of daughter indices for slices Z
	Int_t *fOEx; //[fNox] offsets of extra indices for slices X	Int_t *fOEx; //[fNox] offsets of extra indices for slices X
	Int_t *fOEy; //[fNoy] offsets of extra indices for slices Y	Int_t *fOEy; //[fNoy] offsets of extra indices for slices Y
	Int_t *fOEz; //[fNoz] offsets of extra indices for slices Z	Int_t *fOEz; //[fNoz] offsets of extra indices for slices Z
	Int_t *fExtraX; //[fNex] indices of extra daughters i n X slices	Int_t *fExtraX; //[fNex] indices of extra daughters i n X slices
	Int_t *fExtraY; //[fNey] indices of extra daughters i n Y slices	Int_t *fExtraY; //[fNey] indices of extra daughters i n Y slices
	Int_t *fExtraZ; //[fNez] indices of extra daughters i n Z slices	Int_t *fExtraZ; //[fNez] indices of extra daughters i n Z slices
	Int_t *fNsliceX; //[fNox] number of candidates in X sl ice	Int_t *fNsliceX; //[fNox] number of candidates in X sl ice
	Int_t *fNsliceY; //[fNoy] number of candidates in Y sl ice	Int_t *fNsliceY; //[fNoy] number of candidates in Y sl ice
	Int_t *fNsliceZ; //[fNoz] number of candidates in Z sl ice	Int_t *fNsliceZ; //[fNoz] number of candidates in Z sl ice
	UChar_t *fIndcX; //[fNx] array of slices bits on X	UChar_t *fIndcX; //[fNx] array of slices bits on X
	UChar_t *fIndcY; //[fNy] array of slices bits on Y	UChar_t *fIndcY; //[fNy] array of slices bits on Y
	UChar_t *fIndcZ; //[fNz] array of slices bits on Z	UChar_t *fIndcZ; //[fNz] array of slices bits on Z

	Int_t *fCheckList; //! list of candidates
	UChar_t *fBits1; //! bits used for list intersection	mutable std::vector<ThreadData_t*> fThreadData; //!
		mutable Int_t fThreadSize; //!

	TGeoVoxelFinder(const TGeoVoxelFinder&);	TGeoVoxelFinder(const TGeoVoxelFinder&);
	TGeoVoxelFinder& operator=(const TGeoVoxelFinder&);	TGeoVoxelFinder& operator=(const TGeoVoxelFinder&);

	void BuildVoxelLimits();	void BuildVoxelLimits();
	Int_t *GetExtraX(Int_t islice, Bool_t left, Int_t &nextra) const;	Int_t *GetExtraX(Int_t islice, Bool_t left, Int_t &nextra) const;
	Int_t *GetExtraY(Int_t islice, Bool_t left, Int_t &nextra) const;	Int_t *GetExtraY(Int_t islice, Bool_t left, Int_t &nextra) const;
	Int_t *GetExtraZ(Int_t islice, Bool_t left, Int_t &nextra) const;	Int_t *GetExtraZ(Int_t islice, Bool_t left, Int_t &nextra) const;

	Bool_t GetIndices(Double_t *point);	Bool_t GetIndices(Double_t *point, Int_t tid=0);
	Int_t GetPriority(Int_t iaxis) const {return fPriority[iax is];}	Int_t GetPriority(Int_t iaxis) const {return fPriority[iax is];}

	Int_t GetNcandidates() const {return fNcandidates;	Int_t GetNcandidates(Int_t tid=0) const;
	}	Int_t GetValidExtra(Int_t list, Int_t &ncheck, Int_t tid=
	Int_t GetValidExtra(Int_t list, Int_t &ncheck);	0);
	Int_t GetValidExtra(Int_t n1, UChar_t array1, Int_t *list	Int_t GetValidExtra(Int_t n1, UChar_t array1, Int_t *list
	, Int_t &ncheck);	, Int_t &ncheck, Int_t tid=0);
	Int_t GetValidExtra(Int_t n1, UChar_t array1, Int_t n2, U	Int_t GetValidExtra(Int_t n1, UChar_t array1, Int_t n2, U
	Char_t array2, Int_t list, Int_t &ncheck);	Char_t array2, Int_t list, Int_t &ncheck, Int_t tid=0);
	Int_t *GetVoxelCandidates(Int_t i, Int_t j, Int_t k, Int_t	Int_t *GetVoxelCandidates(Int_t i, Int_t j, Int_t k, Int_t
	&ncheck);	&ncheck, Int_t tid=0);
	// Bool_t Intersect(Int_t n1, Int_t array1, Int_t n2, Int_t array2,	// Bool_t Intersect(Int_t n1, Int_t array1, Int_t n2, Int_t array2,
	// Int_t n3, Int_t array3, Int_t &nf, Int_t r esult);	// Int_t n3, Int_t array3, Int_t &nf, Int_t r esult);
	Bool_t Intersect(Int_t n1, UChar_t array1, Int_t &nf, Int_ t result);	Bool_t Intersect(Int_t n1, UChar_t array1, Int_t &nf, Int_ t result);
	Bool_t Intersect(Int_t n1, UChar_t array1, Int_t n2, UChar _t array2,	Bool_t Intersect(Int_t n1, UChar_t array1, Int_t n2, UChar _t array2,
	Int_t &nf, Int_t *result);	Int_t &nf, Int_t *result);
	Bool_t Intersect(Int_t n1, UChar_t array1, Int_t n2, UChar _t array2,	Bool_t Intersect(Int_t n1, UChar_t array1, Int_t n2, UChar _t array2,
	Int_t n3, UChar_t array3, Int_t &nf, Int_t r esult);	Int_t n3, UChar_t array3, Int_t &nf, Int_t r esult);
	// void IntersectAndStore(Int_t n1, Int_t array1, Int_t n 2, Int_t array2,	// void IntersectAndStore(Int_t n1, Int_t array1, Int_t n 2, Int_t array2,
	// Int_t n3, Int_t *array3);	// Int_t n3, Int_t *array3);

	Bool_t IntersectAndStore(Int_t n1, UChar_t *array1);	Bool_t IntersectAndStore(Int_t n1, UChar_t *array1, Int_t t
	Bool_t IntersectAndStore(Int_t n1, UChar_t *array1, Int_t n	id=0);
	2, UChar_t *array2);	Bool_t IntersectAndStore(Int_t n1, UChar_t *array1, Int_t n
		2, UChar_t *array2, Int_t tid=0);
	Bool_t IntersectAndStore(Int_t n1, UChar_t array1, Int_t n 2, UChar_t array2,	Bool_t IntersectAndStore(Int_t n1, UChar_t array1, Int_t n 2, UChar_t array2,

	Int_t n3, UChar_t *array3);	Int_t n3, UChar_t *array3, Int_t tid=0);
	void SortAll(Option_t *option="");	void SortAll(Option_t *option="");
	// Bool_t Union(Int_t n1, Int_t array1, Int_t n2, Int_t ar ray2,	// Bool_t Union(Int_t n1, Int_t array1, Int_t n2, Int_t ar ray2,
	// Int_t n3, Int_t *array3);	// Int_t n3, Int_t *array3);

	Bool_t Union(Int_t n1, UChar_t *array1);	Bool_t Union(Int_t n1, UChar_t *array1, Int_t tid=0);
	Bool_t Union(Int_t n1, UChar_t array1, Int_t n2, UChar_t	Bool_t Union(Int_t n1, UChar_t array1, Int_t n2, UChar_t
	array2);	array2, Int_t tid=0);
	Bool_t Union(Int_t n1, UChar_t array1, Int_t n2, UChar_t array2,	Bool_t Union(Int_t n1, UChar_t array1, Int_t n2, UChar_t array2,

	Int_t n3, UChar_t *array3);	Int_t n3, UChar_t *array3, Int_t tid=0);
	public :	public :
	TGeoVoxelFinder();	TGeoVoxelFinder();
	TGeoVoxelFinder(TGeoVolume *vol);	TGeoVoxelFinder(TGeoVolume *vol);
	virtual ~TGeoVoxelFinder();	virtual ~TGeoVoxelFinder();

	virtual void CreateCheckList();	virtual void CreateCheckList(Int_t tid=0);
	void DaughterToMother(Int_t id, Double_t local, Double_t master) const;	void DaughterToMother(Int_t id, Double_t local, Double_t master) const;
	virtual Double_t Efficiency();	virtual Double_t Efficiency();

	virtual Int_t GetCheckList(Double_t point, Int_t &nelem);	virtual Int_t GetCheckList(Double_t point, Int_t &nelem, Int_t ti
	Int_t *GetCheckList(Int_t &nelem) const {nelem=fNcandidates	d=0);
	; return fCheckList;}	Int_t *GetCheckList(Int_t &nelem, Int_t tid=0) const;
	// virtual Bool_t GetNextIndices(Double_t point, Double_t dir);	// virtual Bool_t GetNextIndices(Double_t point, Double_t dir);

	virtual Int_t GetNextCandidates(Double_t point, Int_t &ncheck);	virtual Int_t GetNextCandidates(Double_t point, Int_t &ncheck, In t_t tid=0);
	virtual void FindOverlaps(Int_t inode) const;	virtual void FindOverlaps(Int_t inode) const;
	Bool_t IsInvalid() const {return TObject::TestBit(kGeoInval idVoxels);}	Bool_t IsInvalid() const {return TObject::TestBit(kGeoInval idVoxels);}
	Bool_t NeedRebuild() const {return TObject::TestBit(kGeoReb uildVoxels);}	Bool_t NeedRebuild() const {return TObject::TestBit(kGeoReb uildVoxels);}
	Double_t *GetBoxes() const {return fBoxes;}	Double_t *GetBoxes() const {return fBoxes;}
	Bool_t IsSafeVoxel(Double_t *point, Int_t inode, Double_t m insafe) const;	Bool_t IsSafeVoxel(Double_t *point, Int_t inode, Double_t m insafe) const;
	virtual void Print(Option_t *option="") const;	virtual void Print(Option_t *option="") const;
	void PrintVoxelLimits(Double_t *point) const;	void PrintVoxelLimits(Double_t *point) const;
	void SetInvalid(Bool_t flag=kTRUE) {TObject::SetBit(kGeoI nvalidVoxels, flag);}	void SetInvalid(Bool_t flag=kTRUE) {TObject::SetBit(kGeoI nvalidVoxels, flag);}
	void SetNeedRebuild(Bool_t flag=kTRUE) {TObject::SetBit(k GeoRebuildVoxels, flag);}	void SetNeedRebuild(Bool_t flag=kTRUE) {TObject::SetBit(k GeoRebuildVoxels, flag);}

	virtual Int_t GetNextVoxel(Double_t point, Double_t *dir, Int_t &	virtual Int_t GetNextVoxel(Double_t point, Double_t *dir, Int_t &
	ncheck);	ncheck, Int_t tid=0);
	virtual void SortCrossedVoxels(Double_t point, Double_t dir);	virtual void SortCrossedVoxels(Double_t point, Double_t dir, In
		t_t tid=0);
	virtual void Voxelize(Option_t *option="");	virtual void Voxelize(Option_t *option="");


	ClassDef(TGeoVoxelFinder, 3) // voxel finder class	ClassDef(TGeoVoxelFinder, 4) // voxel finder class
	};	};

	#endif	#endif

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

	TGeoXtru.h	TGeoXtru.h

	// @(#)root/geom:$Id: TGeoXtru.h 39105 2011-05-05 08:57:04Z agheata $	// @(#)root/geom:$Id: TGeoXtru.h 41234 2011-10-06 15:48:52Z 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 33	skipping to change at line 33
	// TGeoXtru - An extrusion with fixed outline shape in x-y and a sequence / /	// TGeoXtru - An extrusion with fixed outline shape in x-y and a sequence / /
	// of z extents (segments). The overall scale of the outline scales / /	// of z extents (segments). The overall scale of the outline scales / /
	// linearly between z points and the center can have an x-y offset. / /	// linearly between z points and the center can have an x-y offset. / /
	// / /	// / /
	// Based on the initial implementation of R. Hatcher / /	// Based on the initial implementation of R. Hatcher / /
	// / /	// / /
	/////////////////////////////////////////////////////////////////////////// /	/////////////////////////////////////////////////////////////////////////// /

	class TGeoXtru : public TGeoBBox	class TGeoXtru : public TGeoBBox
	{	{

		public:
		struct ThreadData_t
		{
		Int_t fSeg; // !current segment [0,fNvert-1]
		Int_t fIz; // !current z plane [0,fNz-1]
		Double_t *fXc; // ![fNvert] current X positions for polyg
		on vertices
		Double_t *fYc; // ![fNvert] current Y positions for polyg
		on vertices
		TGeoPolygon *fPoly; // !polygon defining section shape

		ThreadData_t();
		~ThreadData_t();
		};
		ThreadData_t& GetThreadData() const;
		virtual void ClearThreadData() const;

	protected:	protected:
	// data members	// data members
	Int_t fNvert; // number of vertices of the 2D polygon (a t least 3)	Int_t fNvert; // number of vertices of the 2D polygon (a t least 3)
	Int_t fNz; // number of z planes (at least two)	Int_t fNz; // number of z planes (at least two)
	Double_t fZcurrent; // current Z position	Double_t fZcurrent; // current Z position

	TGeoPolygon *fPoly; // polygon defining section shape
	Double_t *fX; //[fNvert] X positions for polygon vertice s	Double_t *fX; //[fNvert] X positions for polygon vertice s
	Double_t *fY; //[fNvert] Y positions for polygon vertice s	Double_t *fY; //[fNvert] Y positions for polygon vertice s

	Double_t *fXc; //[fNvert] current X positions for polygon
	vertices
	Double_t *fYc; //[fNvert] current Y positions for polygon
	vertices
	Double_t *fZ; //[fNz] array of Z planes positions	Double_t *fZ; //[fNz] array of Z planes positions
	Double_t *fScale; //[fNz] array of scale factors (for each Z )	Double_t *fScale; //[fNz] array of scale factors (for each Z )
	Double_t *fX0; //[fNz] array of X offsets (for each Z)	Double_t *fX0; //[fNz] array of X offsets (for each Z)
	Double_t *fY0; //[fNz] array of Y offsets (for each Z)	Double_t *fY0; //[fNz] array of Y offsets (for each Z)

	Int_t fSeg; // !current segment [0,fNvert-1]
	Int_t fIz; // !current z plane [0,fNz-1]


		mutable std::vector<ThreadData_t*> fThreadData; //! Navigation data per
		thread
		mutable Int_t fThreadSize; //! size of thread-speci
		fic array
	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, Bool_t in);	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);
	void SetSeg(Int_t iseg) {fSeg = iseg;}	void SetSeg(Int_t 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();
	// methods	// methods
	virtual Double_t Capacity() const;	virtual Double_t Capacity() const;

	skipping to change at line 108	skipping to change at line 120
	virtual Double_t Safety(Double_t *point, Bool_t in=kTRUE) const;	virtual Double_t Safety(Double_t *point, Bool_t in=kTRUE) const;
	virtual void SavePrimitive(ostream &out, Option_t *option = "") ;	virtual void SavePrimitive(ostream &out, Option_t *option = "") ;
	void SetCurrentZ(Double_t z, Int_t iz);	void SetCurrentZ(Double_t z, Int_t iz);
	void SetCurrentVertices(Double_t x0, Double_t y0, Doubl e_t scale);	void SetCurrentVertices(Double_t x0, Double_t y0, Doubl e_t scale);
	virtual void SetDimensions(Double_t *param);	virtual void SetDimensions(Double_t *param);
	virtual void SetPoints(Double_t *points) const;	virtual void SetPoints(Double_t *points) const;
	virtual void SetPoints(Float_t *points) const;	virtual void SetPoints(Float_t *points) const;
	virtual void SetSegsAndPols(TBuffer3D &buff) const;	virtual void SetSegsAndPols(TBuffer3D &buff) const;
	virtual void Sizeof3D() const;	virtual void Sizeof3D() const;


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

	#endif	#endif

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

	TH1.h	TH1.h

	// @(#)root/hist:$Id: TH1.h 38629 2011-03-25 15:47:54Z moneta $	// @(#)root/hist:$Id: TH1.h 40378 2011-07-27 20:45:07Z pcanal $
	// Author: Rene Brun 26/12/94	// Author: Rene Brun 26/12/94

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


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

	TH2.h	TH2.h

	// @(#)root/hist:$Id: TH2.h 29775 2009-08-13 15:07:28Z moneta $	// @(#)root/hist:$Id: TH2.h 40378 2011-07-27 20:45:07Z pcanal $
	// Author: Rene Brun 26/12/94	// Author: Rene Brun 26/12/94

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


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

	TH3.h	TH3.h

	// @(#)root/hist:$Id: TH3.h 37961 2011-02-03 10:44:09Z moneta $	// @(#)root/hist:$Id: TH3.h 40378 2011-07-27 20:45:07Z pcanal $
	// Author: Rene Brun 27/10/95	// Author: Rene Brun 27/10/95

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


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

	THnSparse.h	THnSparse.h

	// @(#)root/hist:$Id: THnSparse.h 36894 2010-11-24 11:04:47Z moneta $	// @(#)root/hist:$Id: THnSparse.h 41546 2011-10-24 14:42:42Z axel $
	// Author: Axel Naumann (2007-09-11)	// Author: Axel Naumann (2007-09-11)

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


	skipping to change at line 37	skipping to change at line 37
	#endif	#endif
	#ifndef ROOT_TObjArray	#ifndef ROOT_TObjArray
	#include "TObjArray.h"	#include "TObjArray.h"
	#endif	#endif
	#ifndef ROOT_TArrayD	#ifndef ROOT_TArrayD
	#include "TArrayD.h"	#include "TArrayD.h"
	#endif	#endif
	#ifndef ROOT_TFitResultPtr	#ifndef ROOT_TFitResultPtr
	#include "TFitResultPtr.h"	#include "TFitResultPtr.h"
	#endif	#endif

		#ifndef ROOT_THnSparse_Internal
		#include "THnSparse_Internal.h"
		#endif

	// needed only for template instantiations of THnSparseT:	// needed only for template instantiations of THnSparseT:
	#ifndef ROOT_TArrayF	#ifndef ROOT_TArrayF
	#include "TArrayF.h"	#include "TArrayF.h"
	#endif	#endif
	#ifndef ROOT_TArrayL	#ifndef ROOT_TArrayL
	#include "TArrayL.h"	#include "TArrayL.h"
	#endif	#endif
	#ifndef ROOT_TArrayI	#ifndef ROOT_TArrayI
	#include "TArrayI.h"	#include "TArrayI.h"

	skipping to change at line 63	skipping to change at line 66
	#endif	#endif

	class TAxis;	class TAxis;
	class TCollection;	class TCollection;
	class TH1;	class TH1;
	class TH1D;	class TH1D;
	class TH2D;	class TH2D;
	class TH3D;	class TH3D;
	class TF1;	class TF1;


	class THnSparseArrayChunk: public TObject {
	private:

	THnSparseArrayChunk(const THnSparseArrayChunk&); // Not implemented
	THnSparseArrayChunk& operator=(const THnSparseArrayChunk&); // Not imple
	mented

	public:
	THnSparseArrayChunk():
	fCoordinateAllocationSize(-1), fSingleCoordinateSize(0), fCoordinates
	Size(0), fCoordinates(0),
	fContent(0), fSumw2(0) {}

	THnSparseArrayChunk(Int_t coordsize, bool errors, TArray* cont);
	virtual ~THnSparseArrayChunk();

	Int_t fCoordinateAllocationSize; //! size of the allocated coordinate
	buffer; -1 means none or fCoordinatesSize
	Int_t fSingleCoordinateSize; // size of a single bin coordinate
	Int_t fCoordinatesSize; // size of the bin coordinate buffer
	Char_t *fCoordinates; //[fCoordinatesSize] compact bin coordin
	ate buffer
	TArray *fContent; // bin content
	TArrayD *fSumw2; // bin errors

	void AddBin(Int_t idx, const Char_t* idxbuf);
	void AddBinContent(Int_t idx, Double_t v = 1.) {
	fContent->SetAt(v + fContent->GetAt(idx), idx);
	if (fSumw2)
	fSumw2->SetAt(v * v+ fSumw2->GetAt(idx), idx);
	}
	void Sumw2();
	Int_t GetEntries() const { return fCoordinatesSize / fSingleCoordinateSi
	ze; }
	Bool_t Matches(Int_t idx, const Char_t* idxbuf) const {
	// Check whether bin at idx batches idxbuf.
	// If we don't store indexes we trust the caller that it does match,
	// see comment in THnSparseCompactBinCoord::GetHash().
	return fSingleCoordinateSize <= 8 \|\|
	!memcmp(fCoordinates + idx * fSingleCoordinateSize, idxbuf, fSingl
	eCoordinateSize); }

	ClassDef(THnSparseArrayChunk, 1); // chunks of linearized bins
	};

	class THnSparseCompactBinCoord;	class THnSparseCompactBinCoord;

	class THnSparse: public TNamed {	class THnSparse: public TNamed {
	private:	private:
	Int_t fNdimensions; // number of dimensions	Int_t fNdimensions; // number of dimensions
	Int_t fChunkSize; // number of entries for each chunk	Int_t fChunkSize; // number of entries for each chunk
	Long64_t fFilledBins; // number of filled bins	Long64_t fFilledBins; // number of filled bins
	TObjArray fAxes; // axes of the histogram	TObjArray fAxes; // axes of the histogram

		TObjArray fBrowsables; //! browser-helpers for each axis
	TObjArray fBinContent; // array of THnSparseArrayChunk	TObjArray fBinContent; // array of THnSparseArrayChunk
	TExMap fBins; //! filled bins	TExMap fBins; //! filled bins
	TExMap fBinsContinued;//! filled bins for non-unique hashes, contain ing pairs of (bin index 0, bin index 1)	TExMap fBinsContinued;//! filled bins for non-unique hashes, contain ing pairs of (bin index 0, bin index 1)
	Double_t fEntries; // number of entries, spread over chunks	Double_t fEntries; // number of entries, spread over chunks
	Double_t fTsumw; // total sum of weights	Double_t fTsumw; // total sum of weights
	Double_t fTsumw2; // total sum of weights squared; -1 if no erro rs are calculated	Double_t fTsumw2; // total sum of weights squared; -1 if no erro rs are calculated
	TArrayD fTsumwx; // total sum of weight*X for each dimension	TArrayD fTsumwx; // total sum of weight*X for each dimension
	TArrayD fTsumwx2; // total sum of weightXX for each dimension	TArrayD fTsumwx2; // total sum of weightXX for each dimension
	THnSparseCompactBinCoord *fCompactCoord; //! compact coordinate	THnSparseCompactBinCoord *fCompactCoord; //! compact coordinate
	Double_t *fIntegral; //! array with bin weight sums	Double_t *fIntegral; //! array with bin weight sums

	skipping to change at line 269	skipping to change at line 234
	Double_t ComputeIntegral();	Double_t ComputeIntegral();
	void GetRandom(Double_t *rand, Bool_t subBinRandom = kTRUE);	void GetRandom(Double_t *rand, Bool_t subBinRandom = kTRUE);

	void Print(Option_t* option = "") const;	void Print(Option_t* option = "") const;
	void PrintEntries(Long64_t from = 0, Long64_t howmany = -1, Option_t* op tions = 0) const;	void PrintEntries(Long64_t from = 0, Long64_t howmany = -1, Option_t* op tions = 0) const;
	void PrintBin(Int_t* coord, Option_t* options) const {	void PrintBin(Int_t* coord, Option_t* options) const {
	PrintBin(-1, coord, options);	PrintBin(-1, coord, options);
	}	}
	void PrintBin(Long64_t idx, Option_t* options) const;	void PrintBin(Long64_t idx, Option_t* options) const;


		void Browse(TBrowser *b);
		Bool_t IsFolder() const { return kTRUE; }

	//void Draw(Option_t* option = "");	//void Draw(Option_t* option = "");

	ClassDef(THnSparse, 2); // Interfaces of sparse n-dimensional histogram	ClassDef(THnSparse, 2); // Interfaces of sparse n-dimensional histogram
	};	};

	//_________________________________________________________________________ _____	//_________________________________________________________________________ _____
	//	//
	// Templated implementation of the abstract base THnSparse.	// Templated implementation of the abstract base THnSparse.
	// All functionality and the interfaces to be used are in THnSparse!	// All functionality and the interfaces to be used are in THnSparse!
	//	//

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

	TInetAddress.h	TInetAddress.h

	// @(#)root/base:$Id: TInetAddress.h 31825 2009-12-10 20:16:27Z pcanal $	// @(#)root/base:$Id: TInetAddress.h 41637 2011-10-28 15:34:35Z rdm $
	// Author: Fons Rademakers 16/12/96	// Author: Fons Rademakers 16/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 45	skipping to change at line 45
	namespace std { using ::vector; }	namespace std { using ::vector; }
	#endif	#endif

	class TInetAddress : public TObject {	class TInetAddress : public TObject {

	friend class TSystem;	friend class TSystem;
	friend class TUnixSystem;	friend class TUnixSystem;
	friend class TWinNTSystem;	friend class TWinNTSystem;
	friend class TUUID;	friend class TUUID;
	friend class TSocket;	friend class TSocket;

		friend class TUDPSocket;
	friend class TServerSocket;	friend class TServerSocket;
	friend class TXSocket; // special for BaBar	friend class TXSocket; // special for BaBar

	public:	public:
	typedef std::vector<UInt_t> AddressList_t;	typedef std::vector<UInt_t> AddressList_t;
	typedef std::vector<TString> AliasList_t;	typedef std::vector<TString> AliasList_t;

	private:	private:
	TString fHostname; // fully qualified hostname	TString fHostname; // fully qualified hostname
	Int_t fFamily; // address family	Int_t fFamily; // address family

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

	TKDTreeBinning.h	TKDTreeBinning.h

	// @(#)root/mathcore:$Id: TKDTreeBinning.h 39938 2011-06-24 11:23:38Z monet a $	// @(#)root/mathcore:$Id: TKDTreeBinning.h 39937 2011-06-24 11:21:29Z monet a $
	// Authors: B. Rabacal 11/2010	// Authors: B. Rabacal 11/2010

	/**********************************************************************	/**********************************************************************
	* *	* *
	* Copyright (c) 2010 , LCG ROOT MathLib Team *	* Copyright (c) 2010 , LCG ROOT MathLib Team *
	* *	* *
	* *	* *
	**********************************************************************/	**********************************************************************/

	// Header file for class TKDTreeBinning	// Header file for class TKDTreeBinning

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

	TKey.h	TKey.h

	// @(#)root/io:$Id: TKey.h 38345 2011-03-09 17:41:42Z pcanal $	// @(#)root/io:$Id: TKey.h 41408 2011-10-16 21:28:45Z pcanal $
	// Author: Rene Brun 28/12/94	// Author: Rene Brun 28/12/94

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


	skipping to change at line 69	skipping to change at line 69

	virtual Int_t Read(const char *name) { return TObject::Read(name); }	virtual Int_t Read(const char *name) { return TObject::Read(name); }
	virtual void Create(Int_t nbytes, TFile* f = 0);	virtual void Create(Int_t nbytes, TFile* f = 0);
	void Build(TDirectory* motherDir, const char* classname, Lon g64_t filepos);	void Build(TDirectory* motherDir, const char* classname, Lon g64_t filepos);
	virtual void Reset(); // Currently only for the use of TBasket.	virtual void Reset(); // Currently only for the use of TBasket.
	virtual Int_t WriteFileKeepBuffer(TFile *f = 0);	virtual Int_t WriteFileKeepBuffer(TFile *f = 0);

	public:	public:
	TKey();	TKey();
	TKey(TDirectory* motherDir);	TKey(TDirectory* motherDir);

		TKey(TDirectory* motherDir, const TKey &orig, UShort_t pidOffset);
	TKey(const char name, const char title, const TClass cl, Int_t nbytes , TDirectory motherDir = 0);	TKey(const char name, const char title, const TClass cl, Int_t nbytes , TDirectory motherDir = 0);
	TKey(const TString &name, const TString &title, const TClass cl, Int_t nbytes, TDirectory motherDir = 0);	TKey(const TString &name, const TString &title, const TClass cl, Int_t nbytes, TDirectory motherDir = 0);
	TKey(const TObject obj, const char name, Int_t bufsize, TDirectory* mo therDir = 0);	TKey(const TObject obj, const char name, Int_t bufsize, TDirectory* mo therDir = 0);
	TKey(const void obj, const TClass cl, const char name, Int_t bufsize, TDirectory motherDir = 0);	TKey(const void obj, const TClass cl, const char name, Int_t bufsize, TDirectory motherDir = 0);
	TKey(Long64_t pointer, Int_t nbytes, TDirectory* motherDir = 0);	TKey(Long64_t pointer, Int_t nbytes, TDirectory* motherDir = 0);
	virtual ~TKey();	virtual ~TKey();

	virtual void Browse(TBrowser *b);	virtual void Browse(TBrowser *b);
	virtual void Delete(Option_t *option="");	virtual void Delete(Option_t *option="");
	virtual void DeleteBuffer();	virtual void DeleteBuffer();

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

	TLeafS.h	TLeafS.h

	// @(#)root/tree:$Id: TLeafS.h 36407 2010-10-22 02:04:08Z pcanal $	// @(#)root/tree:$Id: TLeafS.h 40172 2011-07-08 20:40:05Z 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 42	skipping to change at line 42
	Short_t *fValue; //!Pointer to data buffer	Short_t *fValue; //!Pointer to data buffer
	Short_t **fPointer; //!Address of pointer to data buffer	Short_t **fPointer; //!Address of pointer to data buffer

	public:	public:
	TLeafS();	TLeafS();
	TLeafS(TBranch parent, const char name, const char *type);	TLeafS(TBranch parent, const char name, const char *type);
	virtual ~TLeafS();	virtual ~TLeafS();

	virtual void Export(TClonesArray *list, Int_t n);	virtual void Export(TClonesArray *list, Int_t n);
	virtual void FillBasket(TBuffer &b);	virtual void FillBasket(TBuffer &b);

		virtual Int_t GetMaximum() const { return fMaximum; }
		virtual Int_t GetMinimum() const { return fMinimum; }
	const char *GetTypeName() const;	const char *GetTypeName() const;
	Double_t GetValue(Int_t i=0) const;	Double_t GetValue(Int_t i=0) const;
	virtual void *GetValuePointer() const {return fValue;}	virtual void *GetValuePointer() const {return fValue;}
	virtual void Import(TClonesArray *list, Int_t n);	virtual void Import(TClonesArray *list, Int_t n);
	virtual void PrintValue(Int_t i=0) const;	virtual void PrintValue(Int_t i=0) const;
	virtual void ReadBasket(TBuffer &b);	virtual void ReadBasket(TBuffer &b);
	virtual void ReadBasketExport(TBuffer &b, TClonesArray *list, Int_t n );	virtual void ReadBasketExport(TBuffer &b, TClonesArray *list, Int_t n );
	virtual void ReadValue(istream & s);	virtual void ReadValue(istream & s);
	virtual void SetAddress(void *add=0);	virtual void SetAddress(void *add=0);

		virtual void SetMaximum(Short_t max) { fMaximum = max; }
		virtual void SetMinimum(Short_t min) { fMinimum = min; }

	ClassDef(TLeafS,1); //A TLeaf for a 16 bit Integer data type.	ClassDef(TLeafS,1); //A TLeaf for a 16 bit Integer data type.
	};	};

	#endif	#endif

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

	TMath.h	TMath.h

	// @(#)root/mathcore:$Id: TMath.h 38578 2011-03-23 14:01:53Z moneta $	// @(#)root/mathcore:$Id: TMath.h 41847 2011-11-09 18:03:47Z rdm $
	// Authors: Rene Brun, Anna Kreshuk, Eddy Offermann, Fons Rademakers 29/0 7/95	// Authors: Rene Brun, Anna Kreshuk, Eddy Offermann, Fons Rademakers 29/0 7/95

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


	skipping to change at line 35	skipping to change at line 35
	#ifndef ROOT_Rtypes	#ifndef ROOT_Rtypes
	#include "Rtypes.h"	#include "Rtypes.h"
	#endif	#endif
	#ifndef ROOT_TMathBase	#ifndef ROOT_TMathBase
	#include "TMathBase.h"	#include "TMathBase.h"
	#endif	#endif

	#include "TError.h"	#include "TError.h"
	#include <algorithm>	#include <algorithm>
	#include <limits>	#include <limits>

		#include <cmath>

	namespace TMath {	namespace TMath {

	/* ************************* */	/* ************************* */
	/* * Fundamental constants * */	/* * Fundamental constants * */
	/* ************************* */	/* ************************* */

	inline Double_t Pi() { return 3.14159265358979323846; }	inline Double_t Pi() { return 3.14159265358979323846; }
	inline Double_t TwoPi() { return 2.0 * Pi(); }	inline Double_t TwoPi() { return 2.0 * Pi(); }
	inline Double_t PiOver2() { return Pi() / 2.0; }	inline Double_t PiOver2() { return Pi() / 2.0; }

	skipping to change at line 160	skipping to change at line 161
	/* ************************ */	/* ************************ */
	inline Double_t Sqrt(Double_t x);	inline Double_t Sqrt(Double_t x);
	inline Double_t Ceil(Double_t x);	inline Double_t Ceil(Double_t x);
	inline Int_t CeilNint(Double_t x);	inline Int_t CeilNint(Double_t x);
	inline Double_t Floor(Double_t x);	inline Double_t Floor(Double_t x);
	inline Int_t FloorNint(Double_t x);	inline Int_t FloorNint(Double_t x);
	inline Double_t Exp(Double_t x);	inline Double_t Exp(Double_t x);
	inline Double_t Ldexp(Double_t x, Int_t exp);	inline Double_t Ldexp(Double_t x, Int_t exp);
	Double_t Factorial(Int_t i);	Double_t Factorial(Int_t i);
	inline Double_t Power(Double_t x, Double_t y);	inline Double_t Power(Double_t x, Double_t y);

		inline Double_t Power(Double_t x, Int_t y);
	inline Double_t Log(Double_t x);	inline Double_t Log(Double_t x);
	Double_t Log2(Double_t x);	Double_t Log2(Double_t x);
	inline Double_t Log10(Double_t x);	inline Double_t Log10(Double_t x);
	Int_t Nint(Float_t x);	Int_t Nint(Float_t x);
	Int_t Nint(Double_t x);	Int_t Nint(Double_t x);
	inline Int_t Finite(Double_t x);	inline Int_t Finite(Double_t x);
	inline Int_t IsNaN(Double_t x);	inline Int_t IsNaN(Double_t x);

	inline Double_t QuietNaN();	inline Double_t QuietNaN();
	inline Double_t SignalingNaN();	inline Double_t SignalingNaN();

	skipping to change at line 283	skipping to change at line 285
	Double_t LogNormal(Double_t x, Double_t sigma, Double_t theta=0, Double_ t m=1);	Double_t LogNormal(Double_t x, Double_t sigma, Double_t theta=0, Double_ t m=1);
	Double_t NormQuantile(Double_t p);	Double_t NormQuantile(Double_t p);
	Double_t Poisson(Double_t x, Double_t par);	Double_t Poisson(Double_t x, Double_t par);
	Double_t PoissonI(Double_t x, Double_t par);	Double_t PoissonI(Double_t x, Double_t par);
	Double_t Prob(Double_t chi2,Int_t ndf);	Double_t Prob(Double_t chi2,Int_t ndf);
	Double_t Student(Double_t T, Double_t ndf);	Double_t Student(Double_t T, Double_t ndf);
	Double_t StudentI(Double_t T, Double_t ndf);	Double_t StudentI(Double_t T, Double_t ndf);
	Double_t StudentQuantile(Double_t p, Double_t ndf, Bool_t lower_tail=kTR UE);	Double_t StudentQuantile(Double_t p, Double_t ndf, Bool_t lower_tail=kTR UE);
	Double_t Vavilov(Double_t x, Double_t kappa, Double_t beta2);	Double_t Vavilov(Double_t x, Double_t kappa, Double_t beta2);
	Double_t VavilovI(Double_t x, Double_t kappa, Double_t beta2);	Double_t VavilovI(Double_t x, Double_t kappa, Double_t beta2);

	Double_t Voigt(Double_t x, Double_t sigma, Double_t lg, Int_t R = 4);	Double_t Voigt(Double_t x, Double_t sigma, Double_t lg, Int_t r = 4);

	/* ************************** */	/* ************************** */
	/* * Statistics over arrays * */	/* * Statistics over arrays * */
	/* ************************** */	/* ************************** */

	//Mean, Geometric Mean, Median, RMS(sigma)	//Mean, Geometric Mean, Median, RMS(sigma)

	template <typename T> Double_t Mean(Long64_t n, const T a, const Double _t w=0);	template <typename T> Double_t Mean(Long64_t n, const T a, const Double _t w=0);
	template <typename Iterator> Double_t Mean(Iterator first, Iterator last );	template <typename Iterator> Double_t Mean(Iterator first, Iterator last );
	template <typename Iterator, typename WeightIterator> Double_t Mean(Iter ator first, Iterator last, WeightIterator w);	template <typename Iterator, typename WeightIterator> Double_t Mean(Iter ator first, Iterator last, WeightIterator w);

	skipping to change at line 362	skipping to change at line 364
	# endif	# endif
	#endif	#endif
	#if defined(R__AIX) \|\| defined(R__SOLARIS_CC50) \|\| \	#if defined(R__AIX) \|\| defined(R__SOLARIS_CC50) \|\| \
	defined(R__HPUX11) \|\| defined(R__GLIBC) \|\| \	defined(R__HPUX11) \|\| defined(R__GLIBC) \|\| \
	(defined(R__MACOSX) && (defined(__INTEL_COMPILER) \|\| defined(__arm__)))	(defined(R__MACOSX) && (defined(__INTEL_COMPILER) \|\| defined(__arm__)))
	// math functions are defined inline so we have to include them here	// math functions are defined inline so we have to include them here
	# include <math.h>	# include <math.h>
	# ifdef R__SOLARIS_CC50	# ifdef R__SOLARIS_CC50
	extern "C" { int finite(double); }	extern "C" { int finite(double); }
	# endif	# endif

	# if defined(R__GLIBC) && defined(__STRICT_ANSI__)	// # if defined(R__GLIBC) && defined(__STRICT_ANSI__)
	# ifndef finite	// # ifndef finite
	# define finite __finite	// # define finite __finite
	# endif	// # endif
	# ifndef isnan	// # ifndef isnan
	# define isnan __isnan	// # define isnan __isnan
	# endif	// # endif
	# endif	// # endif
	#else	#else
	// don't want to include complete <math.h>	// don't want to include complete <math.h>
	extern "C" {	extern "C" {
	extern double sin(double);	extern double sin(double);
	extern double cos(double);	extern double cos(double);
	extern double tan(double);	extern double tan(double);
	extern double sinh(double);	extern double sinh(double);
	extern double cosh(double);	extern double cosh(double);
	extern double tanh(double);	extern double tanh(double);
	extern double asin(double);	extern double asin(double);

	skipping to change at line 470	skipping to change at line 472

	inline Double_t TMath::Exp(Double_t x)	inline Double_t TMath::Exp(Double_t x)
	{ return exp(x); }	{ return exp(x); }

	inline Double_t TMath::Ldexp(Double_t x, Int_t exp)	inline Double_t TMath::Ldexp(Double_t x, Int_t exp)
	{ return ldexp(x, exp); }	{ return ldexp(x, exp); }

	inline Double_t TMath::Power(Double_t x, Double_t y)	inline Double_t TMath::Power(Double_t x, Double_t y)
	{ return pow(x, y); }	{ return pow(x, y); }


		inline Double_t TMath::Power(Double_t x, Int_t y) {
		#ifdef R__ANSISTREAM
		return std::pow(x, y);
		#else
		return pow(x, (Double_t) y);
		#endif
		}

	inline Double_t TMath::Log(Double_t x)	inline Double_t TMath::Log(Double_t x)
	{ return log(x); }	{ return log(x); }

	inline Double_t TMath::Log10(Double_t x)	inline Double_t TMath::Log10(Double_t x)
	{ return log10(x); }	{ return log10(x); }

	inline Int_t TMath::Finite(Double_t x)	inline Int_t TMath::Finite(Double_t x)
	#if defined(R__HPUX11)	#if defined(R__HPUX11)
	{ return isfinite(x); }	{ return isfinite(x); }
	#elif defined(R__MACOSX) && defined(__arm__)	#elif defined(R__MACOSX) && defined(__arm__)

	skipping to change at line 492	skipping to change at line 502
	{ return isfinite(x); }	{ return isfinite(x); }
	#else	#else
	// from cmath	// from cmath
	{ return std::isfinite(x); }	{ return std::isfinite(x); }
	#endif	#endif
	#else	#else
	{ return finite(x); }	{ return finite(x); }
	#endif	#endif

	inline Int_t TMath::IsNaN(Double_t x)	inline Int_t TMath::IsNaN(Double_t x)

	#if defined(R__MACOSX) && defined(__arm__)	#if (defined(R__ANSISTREAM) \|\| (defined(R__MACOSX) && defined(__arm__))) &&
	#ifdef isnan	!defined(_AIX)
		#if defined(isnan) \|\| defined(R__SOLARIS_CC50) \|\| defined(__INTEL_COMPILER)
	// from math.h	// from math.h

	{ return isnan(x); }	{ return ::isnan(x); }
	#else	#else
	// from cmath	// from cmath
	{ return std::isnan(x); }	{ return std::isnan(x); }
	#endif	#endif
	#else	#else
	{ return isnan(x); }	{ return isnan(x); }
	#endif	#endif

	//--------wrapper to numeric_limits	//--------wrapper to numeric_limits
	//_________________________________________________________________________ ___	//_________________________________________________________________________ ___

	skipping to change at line 1014	skipping to change at line 1024
	{	{
	// Returns k_th order statistic of the array a of size n	// Returns k_th order statistic of the array a of size n
	// (k_th smallest element out of n elements).	// (k_th smallest element out of n elements).
	//	//
	// C-convention is used for array indexing, so if you want	// C-convention is used for array indexing, so if you want
	// the second smallest element, call KOrdStat(n, a, 1).	// the second smallest element, call KOrdStat(n, a, 1).
	//	//
	// If work is supplied, it is used to store the sorting index and	// If work is supplied, it is used to store the sorting index and
	// assumed to be >= n. If work=0, local storage is used, either on	// assumed to be >= n. If work=0, local storage is used, either on
	// the stack if n < kWorkMax or on the heap for n >= kWorkMax.	// the stack if n < kWorkMax or on the heap for n >= kWorkMax.

		// Note that the work index array will not contain the sorted indices bu
		t
		// all indeces of the smaller element in arbitrary order in work[0,...,k
		-1] and
		// all indeces of the larger element in arbitrary order in work[k+1,..,n
		-1]
		// work[k] will contain instead the index of the returned element.
	//	//
	// Taken from "Numerical Recipes in C++" without the index array	// Taken from "Numerical Recipes in C++" without the index array
	// implemented by Anna Khreshuk.	// implemented by Anna Khreshuk.
	//	//
	// See also the declarations at the top of this file	// See also the declarations at the top of this file

	const Int_t kWorkMax = 100;	const Int_t kWorkMax = 100;

	typedef Size Index;	typedef Size Index;


End of changes. 9 change blocks.
	13 lines changed or deleted	31 lines changed or added

	TMessage.h	TMessage.h

	// @(#)root/net:$Id: TMessage.h 39697 2011-06-13 21:43:43Z pcanal $	// @(#)root/net:$Id: TMessage.h 41637 2011-10-28 15:34:35Z rdm $
	// Author: Fons Rademakers 19/12/96	// Author: Fons Rademakers 19/12/96

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


	skipping to change at line 41	skipping to change at line 41
	#include "TBits.h"	#include "TBits.h"
	#endif	#endif

	class TList;	class TList;
	class TVirtualStreamerInfo;	class TVirtualStreamerInfo;

	class TMessage : public TBufferFile {	class TMessage : public TBufferFile {

	friend class TAuthenticate;	friend class TAuthenticate;
	friend class TSocket;	friend class TSocket;

		friend class TUDPSocket;
	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 and algorithm	Int_t fCompress; //Compression level and algorithm
	char *fBufComp; //Compressed buffer	char *fBufComp; //Compressed buffer

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

	TMinuitMinimizer.h	TMinuitMinimizer.h

	// @(#)root/minuit:$Id: TMinuitMinimizer.h 40566 2011-08-11 16:30:49Z monet a $	// @(#)root/minuit:$Id: TMinuitMinimizer.h 40564 2011-08-11 16:28:02Z 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

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

	TNeuronInput.h	TNeuronInput.h

	// @(#)root/tmva $Id: TNeuronInput.h 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: TNeuronInput.h 40005 2011-06-27 15:29:10Z stelzer $
	// 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: TNeuronInputAbs.h 40005 2011-06-27 15:29:10Z stelzer $
	// 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 39395 2011-05-26 10:05:54Z mone ta $	// @(#)root/tmva $Id: TNeuronInputChooser.h 40005 2011-06-27 15:29:10Z stel zer $
	// 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: TNeuronInputSqSum.h 40005 2011-06-27 15:29:10Z stelze r $
	// 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: TNeuronInputSum.h 40005 2011-06-27 15:29:10Z stelzer $
	// 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

	TParameter.h	TParameter.h

	// @(#)root/base:$Id: TParameter.h 40366 2011-07-26 15:36:39Z ganis $	// @(#)root/base:$Id: TParameter.h 40272 2011-07-18 11:12:14Z rdm $
	// Author: Maarten Ballintijn 21/06/2004	// Author: Maarten Ballintijn 21/06/2004

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


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

	TPerfStats.h	TPerfStats.h

	// @(#)root/proofplayer:$Id: TPerfStats.h 41406 2011-10-16 08:56:43Z ganis $	// @(#)root/proofplayer:$Id: TPerfStats.h 40699 2011-08-25 10:36:29Z rdm $
	// Author: Kristjan Gulbrandsen 11/05/04	// Author: Kristjan Gulbrandsen 11/05/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. *
	*************************************************************************/	*************************************************************************/


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

	TProfile.h	TProfile.h

	// @(#)root/hist:$Id: TProfile.h 35194 2010-09-08 09:07:44Z moneta $	// @(#)root/hist:$Id: TProfile.h 40378 2011-07-27 20:45:07Z pcanal $
	// Author: Rene Brun 29/09/95	// Author: Rene Brun 29/09/95

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


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

	TProofBenchTypes.h	TProofBenchTypes.h

	// @(#)root/proof:$Id: TProofBenchTypes.h 40802 2011-09-05 09:51:55Z ganis $	// @(#)root/proof:$Id: TProofBenchTypes.h 40115 2011-07-04 11:41:46Z ganis $
	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2005, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2005, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOT_TProofBenchTypes	#ifndef ROOT_TProofBenchTypes
	#define ROOT_TProofBenchTypes	#define ROOT_TProofBenchTypes

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

	TProofDebug.h	TProofDebug.h

	// @(#)root/proof:$Id: TProofDebug.h 41406 2011-10-16 08:56:43Z ganis $	// @(#)root/proof:$Id: TProofDebug.h 40699 2011-08-25 10:36:29Z rdm $
	// Author: Maarten Ballintijn 19/6/2002	// Author: Maarten Ballintijn 19/6/2002

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


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

	TProofMonSender.h	TProofMonSender.h

	// @(#)root/proofplayer:$Id: TProofMonSender.h 41406 2011-10-16 08:56:43Z g anis $	// @(#)root/proofplayer:$Id: TProofMonSender.h 40699 2011-08-25 10:36:29Z r dm $
	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOT_TProofMonSender	#ifndef ROOT_TProofMonSender
	#define ROOT_TProofMonSender	#define ROOT_TProofMonSender

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

	TProofMonSenderML.h	TProofMonSenderML.h

	// @(#)root/proofplayer:$Id: TProofMonSenderML.h 41406 2011-10-16 08:56:43Z ganis $	// @(#)root/proofplayer:$Id: TProofMonSenderML.h 40699 2011-08-25 10:36:29Z rdm $
	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOT_TProofMonSenderML	#ifndef ROOT_TProofMonSenderML
	#define ROOT_TProofMonSenderML	#define ROOT_TProofMonSenderML

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

	TProofMonSenderSQL.h	TProofMonSenderSQL.h

	// @(#)root/proofplayer:$Id: TProofMonSenderSQL.h 41406 2011-10-16 08:56:43 Z ganis $	// @(#)root/proofplayer:$Id: TProofMonSenderSQL.h 40699 2011-08-25 10:36:29 Z rdm $
	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOT_TProofMonSenderSQL	#ifndef ROOT_TProofMonSenderSQL
	#define ROOT_TProofMonSenderSQL	#define ROOT_TProofMonSenderSQL

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

	TProofPlayer.h	TProofPlayer.h

	// @(#)root/proofplayer:$Id: TProofPlayer.h 40188 2011-07-11 13:13:11Z gani s $	// @(#)root/proofplayer:$Id: TProofPlayer.h 40186 2011-07-11 12:00:50Z gani s $
	// Author: Maarten Ballintijn 07/01/02	// Author: Maarten Ballintijn 07/01/02

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


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

	TProofServ.h	TProofServ.h

	// @(#)root/proof:$Id: TProofServ.h 39697 2011-06-13 21:43:43Z pcanal $	// @(#)root/proof:$Id: TProofServ.h 39696 2011-06-13 21:35:34Z 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. *
	*************************************************************************/	*************************************************************************/


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

	TRandom1.h	TRandom1.h

	// @(#)root/mathcore:$Id: TRandom1.h 39607 2011-06-08 15:03:23Z moneta $	// @(#)root/mathcore:$Id: TRandom1.h 39600 2011-06-08 13:04:37Z 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. *
	*************************************************************************/	*************************************************************************/


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

	TRandom3.h	TRandom3.h

	// @(#)root/mathcore:$Id: TRandom3.h 39607 2011-06-08 15:03:23Z moneta $	// @(#)root/mathcore:$Id: TRandom3.h 39600 2011-06-08 13:04:37Z 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. *
	*************************************************************************/	*************************************************************************/


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

	TRefArray.h	TRefArray.h

	// @(#)root/cont:$Id: TRefArray.h 34744 2010-08-07 06:16:36Z brun $	// @(#)root/cont:$Id: TRefArray.h 40584 2011-08-14 02:56:29Z pcanal $
	// Author: Rene Brun 02/10/2001	// Author: Rene Brun 02/10/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 171	skipping to change at line 171
	return (at < fLowerBound \|\| at-fLowerBound >= fSize)	return (at < fLowerBound \|\| at-fLowerBound >= fSize)
	? OutOfBoundsError(where, at)	? OutOfBoundsError(where, at)
	: kTRUE;	: kTRUE;
	}	}

	inline TObject *TRefArray::operator[](Int_t at) const	inline TObject *TRefArray::operator[](Int_t at) const
	{	{
	int j = at-fLowerBound;	int j = at-fLowerBound;
	if (j >= 0 && j < fSize) {	if (j >= 0 && j < fSize) {
	if (!fPID) return 0;	if (!fPID) return 0;

		if (!TProcessID::IsValid(fPID)) return 0;
	TObject *obj = fPID->GetObjectWithID(fUIDs[j]);	TObject *obj = fPID->GetObjectWithID(fUIDs[j]);
	if (obj==0) obj = GetFromTable(j);	if (obj==0) obj = GetFromTable(j);
	return obj;	return obj;
	}	}
	BoundsOk("At", at);	BoundsOk("At", at);
	return 0;	return 0;
	}	}

	inline TObject *TRefArray::At(Int_t at) const	inline TObject *TRefArray::At(Int_t at) const
	{	{
	// Return the object at position i. Returns 0 if i is out of bounds.	// Return the object at position i. Returns 0 if i is out of bounds.
	int j = at-fLowerBound;	int j = at-fLowerBound;
	if (j >= 0 && j < fSize) {	if (j >= 0 && j < fSize) {
	if (!fPID) return 0;	if (!fPID) return 0;

		if (!TProcessID::IsValid(fPID)) return 0;
	TObject *obj = fPID->GetObjectWithID(fUIDs[j]);	TObject *obj = fPID->GetObjectWithID(fUIDs[j]);
	if (obj==0) obj = GetFromTable(j);	if (obj==0) obj = GetFromTable(j);
	return obj;	return obj;
	}	}
	BoundsOk("At", at);	BoundsOk("At", at);
	return 0;	return 0;
	}	}

	#endif	#endif

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

	TSQLMonitoring.h	TSQLMonitoring.h

	// @(#)root/net:$Id: TSQLMonitoring.h 41406 2011-10-16 08:56:43Z ganis $	// @(#)root/net:$Id: TSQLMonitoring.h 40576 2011-08-12 10:33:08Z ganis $
	// Author: J.F. Grosse-Oetringhaus, G.Ganis	// Author: J.F. Grosse-Oetringhaus, G.Ganis

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

	TSchemaRuleProcessor.h	TSchemaRuleProcessor.h

	// @(#)root/core:$Id: TSchemaRuleProcessor.h 42194 2011-11-23 14:02:02Z axe l $	// @(#)root/core:$Id: TSchemaRuleProcessor.h 41697 2011-11-01 21:03:41Z pca nal $
	// author: Lukasz Janyst <ljanyst@cern.ch>	// author: Lukasz Janyst <ljanyst@cern.ch>

	#ifndef ROOT_TSchemaRuleProcessor	#ifndef ROOT_TSchemaRuleProcessor
	#define ROOT_TSchemaRuleProcessor	#define ROOT_TSchemaRuleProcessor

	#if !defined(__CINT__)	#if !defined(__CINT__)
	// Do no clutter the dictionary (in particular with STL containers)	// Do no clutter the dictionary (in particular with STL containers)

	#include <stdlib.h>	#include <stdlib.h>
	#include <string>	#include <string>

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

	// Extra spaces.	// Extra spaces.
	elem = Trim( source.substr( last, size ) );	elem = Trim( source.substr( last, size ) );
	if( !elem.empty() ) {	if( !elem.empty() ) {
	unsigned int level = 0;	unsigned int level = 0;

	// Split between the typename and the membername	// Split between the typename and the membername
	// Take in consideration template names.	// Take in consideration template names.
	for(std::string::size_type j=elem.size(); j>0; --j) {	for(std::string::size_type j=elem.size(); j>0; --j) {
	std::string::size_type i = j-1;	std::string::size_type i = j-1;

	if (elem[i]=='<') { --level; }	if (elem[i]=='<') { ++level; }
	else if (elem[i]=='>') { ++level; }	else if (elem[i]=='>') { if (level==0) { continue; } ;
		--level; }
	else if (level == 0 && isspace(elem[i])) {	else if (level == 0 && isspace(elem[i])) {
	type = elem.substr( 0, i );	type = elem.substr( 0, i );
	// At the first iteration we know we have a space.	// At the first iteration we know we have a space.
	while( elem[i]=='*' \|\| elem[i]=='&' \|\| isspace(elem [i]) ) {	while( elem[i]=='*' \|\| elem[i]=='&' \|\| isspace(elem [i]) ) {
	++i;	++i;
	if (strcmp("const",elem.c_str()+i)==0 && (i+5)>e lem.size()	if (strcmp("const",elem.c_str()+i)==0 && (i+5)>e lem.size()
	&& ( elem[i+5]=='*' \|\| elem[i+5]=='&' \|\| iss pace(elem[i+5])) ) {	&& ( elem[i+5]=='*' \|\| elem[i+5]=='&' \|\| iss pace(elem[i+5])) ) {
	i += 5;	i += 5;
	type += "const ";	type += "const ";
	} else if (elem[i]=='*' \|\| elem[i]=='&') {	} else if (elem[i]=='*' \|\| elem[i]=='&') {

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

	TSessionViewer.h	TSessionViewer.h

	// @(#)root/sessionviewer:$Id: TSessionViewer.h 20882 2007-11-19 11:31:26Z rdm $	// @(#)root/sessionviewer:$Id: TSessionViewer.h 40088 2011-06-30 15:10:06Z bellenot $
	// Author: Marek Biskup, Jakub Madejczyk, Bertrand Bellenot 10/08/2005	// Author: Marek Biskup, Jakub Madejczyk, Bertrand Bellenot 10/08/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 445	skipping to change at line 445

	void Build(TSessionViewer *gui);	void Build(TSessionViewer *gui);

	TCanvas *GetStatsCanvas() const { return fStatsCanvas; }	TCanvas *GetStatsCanvas() const { return fStatsCanvas; }
	TEditQueryFrame *GetQueryEditFrame() const { return fFD; }	TEditQueryFrame *GetQueryEditFrame() const { return fFD; }
	TGTab *GetTab() const { return fTab; }	TGTab *GetTab() const { return fTab; }

	void Feedback(TList *objs);	void Feedback(TList *objs);
	void Modified(Bool_t mod = kTRUE);	void Modified(Bool_t mod = kTRUE);
	void Progress(Long64_t total, Long64_t processed);	void Progress(Long64_t total, Long64_t processed);

	void Progress(Long64_t total, Long64_t processed,	void Progress(Long64_t total, Long64_t processed, Long64_t bytesread
	Long64_t bytesread, Float_t initTime,	,
	Float_t procTime, Float_t evtrti,	Float_t initTime, Float_t procTime,
	Float_t mbrti);	Float_t evtrti, Float_t mbrti, Int_t actw, Int_t tses,
		Float_t eses);
		void Progress(Long64_t total, Long64_t processed, Long64_t bytesread
		,
		Float_t initTime, Float_t procTime,
		Float_t evtrti, Float_t mbrti) {
		Progress(total, processed, bytesread, initTime, procTi
		me,
		evtrti, mbrti, -1, -1, -1.); }
	void ProgressLocal(Long64_t total, Long64_t processed);	void ProgressLocal(Long64_t total, Long64_t processed);
	void IndicateStop(Bool_t aborted);	void IndicateStop(Bool_t aborted);
	void ResetProgressDialog(const char *selec, Int_t files, Long64_t fi rst, Long64_t entries);	void ResetProgressDialog(const char *selec, Int_t files, Long64_t fi rst, Long64_t entries);

	//Function that handle input from user:	//Function that handle input from user:
	void OnBtnSubmit();	void OnBtnSubmit();
	void OnBtnFinalize();	void OnBtnFinalize();
	void OnBtnStop();	void OnBtnStop();
	void OnBtnAbort();	void OnBtnAbort();
	void OnBtnShowLog();	void OnBtnShowLog();

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

	TSocket.h	TSocket.h

	// @(#)root/net:$Id: TSocket.h 39697 2011-06-13 21:43:43Z pcanal $	// @(#)root/net:$Id: TSocket.h 39696 2011-06-13 21:35:34Z pcanal $
	// Author: Fons Rademakers 18/12/96	// Author: Fons Rademakers 18/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. *
	*************************************************************************/	*************************************************************************/


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

	TSpline1.h	TSpline1.h

	// @(#)root/tmva $Id: TSpline1.h 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: TSpline1.h 40005 2011-06-27 15:29:10Z 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 : 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: TSpline2.h 40005 2011-06-27 15:29:10Z 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 : 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

	TStatus.h	TStatus.h

	// @(#)root/proofplayer:$Id: TStatus.h 40188 2011-07-11 13:13:11Z ganis $	// @(#)root/proofplayer:$Id: TStatus.h 40186 2011-07-11 12:00:50Z ganis $
	// Author: Maarten Ballintijn 12/03/2004	// Author: Maarten Ballintijn 12/03/2004

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


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

	TThread.h	TThread.h

	// @(#)root/thread:$Id: TThread.h 39262 2011-05-19 09:10:49Z rdm $	// @(#)root/thread:$Id: TThread.h 41086 2011-09-30 21:27:53Z pcanal $
	// 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 44	skipping to change at line 44
	#endif	#endif
	#ifndef ROOT_TSystem	#ifndef ROOT_TSystem
	#include "TSystem.h"	#include "TSystem.h"
	#endif	#endif
	#ifndef ROOT_TTimer	#ifndef ROOT_TTimer
	#include "TTimer.h"	#include "TTimer.h"
	#endif	#endif
	#ifndef ROOT_Varargs	#ifndef ROOT_Varargs
	#include "Varargs.h"	#include "Varargs.h"
	#endif	#endif

		#ifndef ROOT_TThreadSlots
		#include "TThreadSlots.h"
		#endif

	class TThreadImp;	class TThreadImp;

	class TThread : public TNamed {	class TThread : public TNamed {

	friend class TThreadImp;	friend class TThreadImp;
	friend class TPosixThread;	friend class TPosixThread;
	friend class TThreadTimer;	friend class TThreadTimer;
	friend class TThreadCleaner;	friend class TThreadCleaner;
	friend class TWin32Thread;	friend class TWin32Thread;

	skipping to change at line 93	skipping to change at line 96
	EState fState; // thread state	EState fState; // thread state
	EState fStateComing; // coming thread state	EState fStateComing; // coming thread state
	Long_t fId; // thread id	Long_t fId; // thread id
	Long_t fHandle; // Win32 thread handle	Long_t fHandle; // Win32 thread handle
	Bool_t fDetached; // kTRUE if thread is Detached	Bool_t fDetached; // kTRUE if thread is Detached
	Bool_t fNamed; // kTRUE if thread is Named	Bool_t fNamed; // kTRUE if thread is Named
	VoidRtnFunc_t fFcnRetn; // void* start function of thread	VoidRtnFunc_t fFcnRetn; // void* start function of thread
	VoidFunc_t fFcnVoid; // void start function of thread	VoidFunc_t fFcnVoid; // void start function of thread
	void *fThreadArg; // thread start function argument s	void *fThreadArg; // thread start function argument s
	void *fClean; // support of cleanup structure	void *fClean; // support of cleanup structure

	void *fTsd[20]; // thread specific data container	void *fTsd[ROOT::kMaxThreadSlot]; // thread specific data conta iner
	char fComment[100]; // thread specific state comment	char fComment[100]; // thread specific state comment

	static TThreadImp *fgThreadImp; // static pointer to thread imple mentation	static TThreadImp *fgThreadImp; // static pointer to thread imple mentation
	static char * volatile fgXAct; // Action name to do by main thre ad	static char * volatile fgXAct; // Action name to do by main thre ad
	static void ** volatile fgXArr; // pointer to control array of vo id pointers for action	static void ** volatile fgXArr; // pointer to control array of vo id pointers for action
	static volatile Int_t fgXAnb; // size of array above	static volatile Int_t fgXAnb; // size of array above
	static volatile Int_t fgXArt; // return XA flag	static volatile Int_t fgXArt; // return XA flag
	static Long_t fgMainId; // thread id of main thread	static Long_t fgMainId; // thread id of main thread
	static TThread *fgMain; // pointer to chain of TThread's	static TThread *fgMain; // pointer to chain of TThread's
	static TMutex *fgMainMutex; // mutex to protect chain of thre ads	static TMutex *fgMainMutex; // mutex to protect chain of thre ads

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

	TVirtualArray.h	TVirtualArray.h

	// @(#)root/io:$Id: TVirtualArray.h 42194 2011-11-23 14:02:02Z axel $	// @(#)root/io:$Id: TVirtualArray.h 41520 2011-10-20 17:10:04Z pcanal $
	// Author: Philippe Canal July, 2008	// Author: Philippe Canal July, 2008

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


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

	TVirtualCollectionProxy.h	TVirtualCollectionProxy.h

	// @(#)root/cont:$Id: TVirtualCollectionProxy.h 36061 2010-10-04 16:05:51Z pcanal $	// @(#)root/cont:$Id: TVirtualCollectionProxy.h 41024 2011-09-27 13:26:26Z pcanal $
	// Author: Philippe Canal 20/08/2003	// Author: Philippe Canal 20/08/2003

	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2003, Rene Brun, Fons Rademakers and al. *	* Copyright (C) 1995-2003, 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 56	skipping to change at line 56
	protected:	protected:
	TClassRef fClass;	TClassRef fClass;
	UInt_t fProperties;	UInt_t fProperties;
	virtual void SetValueClass(TClass *newcl) = 0;	virtual void SetValueClass(TClass *newcl) = 0;
	friend class TClass;	friend class TClass;

	public:	public:
	enum EProperty {	enum EProperty {
	kIsInitialized = BIT(1),	kIsInitialized = BIT(1),
	kIsAssociative = BIT(2),	kIsAssociative = BIT(2),

	kIsEmulated = BIT(3)	kIsEmulated = BIT(3),
		kNeedDelete = BIT(4) // Flag to indicate that this collection th
		at contains directly or indirectly (only via other collection) some pointer
		s that will need explicit deletions.
	};	};

	class TPushPop {	class TPushPop {
	// Helper class that insures that push and pop are done when entering	// Helper class that insures that push and pop are done when entering
	// and leaving a C++ context (even in the presence of exceptions)	// and leaving a C++ context (even in the presence of exceptions)
	public:	public:
	TVirtualCollectionProxy *fProxy;	TVirtualCollectionProxy *fProxy;
	inline TPushPop(TVirtualCollectionProxy *proxy,	inline TPushPop(TVirtualCollectionProxy *proxy,
	void *objectstart) : fProxy(proxy) { fProxy->PushProxy(objectstart ); }	void *objectstart) : fProxy(proxy) { fProxy->PushProxy(objectstart ); }
	inline ~TPushPop() { fProxy->PopProxy(); }	inline ~TPushPop() { fProxy->PopProxy(); }

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

	TVirtualPad.h	TVirtualPad.h

	// @(#)root/base:$Id: TVirtualPad.h 29712 2009-08-07 08:00:45Z brun $	// @(#)root/base:$Id: TVirtualPad.h 41495 2011-10-20 09:54:31Z rdm $
	// Author: Rene Brun 05/12/95	// Author: Rene Brun 05/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 251	skipping to change at line 251
	virtual void ResetToolTip(TObject *tip) = 0;	virtual void ResetToolTip(TObject *tip) = 0;
	virtual void CloseToolTip(TObject *tip) = 0;	virtual void CloseToolTip(TObject *tip) = 0;

	virtual TVirtualViewer3D GetViewer3D(Option_t type = "") = 0;	virtual TVirtualViewer3D GetViewer3D(Option_t type = "") = 0;
	virtual Bool_t HasViewer3D() const = 0;	virtual Bool_t HasViewer3D() const = 0;
	virtual void ReleaseViewer3D(Option_t * type = "") = 0;	virtual void ReleaseViewer3D(Option_t * type = "") = 0;

	virtual Int_t GetGLDevice() = 0;	virtual Int_t GetGLDevice() = 0;
	virtual void SetCopyGLDevice(Bool_t copy) = 0;	virtual void SetCopyGLDevice(Bool_t copy) = 0;


		virtual Bool_t PadInSelectionMode() const;
		virtual Bool_t PadInHighlightMode() const;

		virtual void PushTopLevelSelectable(TObject *top);
		virtual void PushSelectableObject(TObject *obj);
		virtual void PopTopLevelSelectable();

	static TVirtualPad *&Pad();	static TVirtualPad *&Pad();

	ClassDef(TVirtualPad,2) //Abstract base class for Pads and Canvases	ClassDef(TVirtualPad,2) //Abstract base class for Pads and Canvases
	};	};


		//
		//Small scope-guard class to add/remove object's into pad's stack of select
		able objects.
		//Does nothing, unless you implement non-standard picking.
		//

		class TPickerStackGuard {
		public:
		TPickerStackGuard(TObject *obj);
		~TPickerStackGuard();

		private:
		TPickerStackGuard(const TPickerStackGuard &rhs);
		TPickerStackGuard &operator = (const TPickerStackGuard &rhs);
		};

	#ifndef __CINT__	#ifndef __CINT__
	#define gPad (TVirtualPad::Pad())	#define gPad (TVirtualPad::Pad())


	R__EXTERN void *(gThreadTsd)(void*,Int_t);
	#endif	#endif
	R__EXTERN Int_t (gThreadXAR)(const char xact, Int_t nb, void *ar, Int_t iret);	R__EXTERN Int_t (gThreadXAR)(const char xact, Int_t nb, void *ar, Int_t iret);

	#endif	#endif

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

	TWebFile.h	TWebFile.h

	// @(#)root/net:$Id: TWebFile.h 34712 2010-08-03 09:27:19Z rdm $	// @(#)root/net:$Id: TWebFile.h 40671 2011-08-23 12:18:37Z rdm $
	// Author: Fons Rademakers 17/01/97	// Author: Fons Rademakers 17/01/97

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


	skipping to change at line 43	skipping to change at line 43

	class TSocket;	class TSocket;
	class TWebSocket;	class TWebSocket;

	class TWebFile : public TFile {	class TWebFile : public TFile {

	friend class TWebSocket;	friend class TWebSocket;
	friend class TWebSystem;	friend class TWebSystem;

	private:	private:

		TWebFile() : fSocket(0) { }

		protected:
	mutable Long64_t fSize; // file size	mutable Long64_t fSize; // file size
	TSocket *fSocket; // socket for HTTP/1.1 (stays alive between calls)	TSocket *fSocket; // socket for HTTP/1.1 (stays alive between calls)
	TUrl fProxy; // proxy URL	TUrl fProxy; // proxy URL
	Bool_t fHasModRoot; // true if server has mod_root inst alled	Bool_t fHasModRoot; // true if server has mod_root inst alled
	Bool_t fHTTP11; // true if server support HTTP/1.1	Bool_t fHTTP11; // true if server support HTTP/1.1
	Bool_t fNoProxy; // don't use proxy	Bool_t fNoProxy; // don't use proxy
	TString fMsgReadBuffer; // cache ReadBuffer() msg	TString fMsgReadBuffer; // cache ReadBuffer() msg
	TString fMsgReadBuffer10; // cache ReadBuffer10() msg	TString fMsgReadBuffer10; // cache ReadBuffer10() msg
	TString fMsgGetHead; // cache GetHead() msg	TString fMsgGetHead; // cache GetHead() msg
	TString fBasicUrl; // basic url without authentication and options	TString fBasicUrl; // basic url without authentication and options
	TUrl fUrlOrg; // save original url in case of tem p redirection	TUrl fUrlOrg; // save original url in case of tem p redirection
	TString fBasicUrlOrg; // save original url in case of tem p redirection	TString fBasicUrlOrg; // save original url in case of tem p redirection

	static TUrl fgProxy; // globally set proxy URL	static TUrl fgProxy; // globally set proxy URL


	TWebFile() : fSocket(0) { }	virtual void Init(Bool_t readHeadOnly);
	void Init(Bool_t readHeadOnly);	virtual void CheckProxy();
	void CheckProxy();	virtual TString BasicAuthentication();
	TString BasicAuthentication();	virtual Int_t GetHead();
	Int_t GetHead();	virtual Int_t GetLine(TSocket s, char line, Int_t maxsize);
	Int_t GetLine(TSocket s, char line, Int_t maxsize);	virtual Int_t GetHunk(TSocket s, char hunk, Int_t maxsize);
	Int_t GetHunk(TSocket s, char hunk, Int_t maxsize);	virtual const char HttpTerminator(const char start, const char *peeked
	const char HttpTerminator(const char start, const char *peeked, Int_t	, Int_t peeklen);
	peeklen);	virtual Int_t GetFromWeb(char *buf, Int_t len, const TString &msg)
	Int_t GetFromWeb(char *buf, Int_t len, const TString &msg);	;
	Int_t GetFromWeb10(char *buf, Int_t len, const TString &msg);	virtual Int_t GetFromWeb10(char *buf, Int_t len, const TString &ms
	Bool_t ReadBuffer10(char *buf, Int_t len);	g);
	Bool_t ReadBuffers10(char buf, Long64_t pos, Int_t *len, Int_t nb	virtual Bool_t ReadBuffer10(char *buf, Int_t len);
	uf);	virtual Bool_t ReadBuffers10(char buf, Long64_t pos, Int_t *len,
	void SetMsgReadBuffer10(const char *redirectLocation = 0, Bool_t	Int_t nbuf);
	tempRedirect = kFALSE);	virtual void SetMsgReadBuffer10(const char *redirectLocation = 0,
		Bool_t tempRedirect = kFALSE);

	public:	public:
	TWebFile(const char url, Option_t opt="");	TWebFile(const char url, Option_t opt="");
	TWebFile(TUrl url, Option_t *opt="");	TWebFile(TUrl url, Option_t *opt="");
	virtual ~TWebFile();	virtual ~TWebFile();


	Long64_t GetSize() const;	virtual Long64_t GetSize() const;
	Bool_t IsOpen() const;	virtual Bool_t IsOpen() const;
	Int_t ReOpen(Option_t *mode);	virtual Int_t ReOpen(Option_t *mode);
	Bool_t ReadBuffer(char *buf, Int_t len);	virtual Bool_t ReadBuffer(char *buf, Int_t len);
	Bool_t ReadBuffer(char *buf, Long64_t pos, Int_t len);	virtual Bool_t ReadBuffer(char *buf, Long64_t pos, Int_t len);
	Bool_t ReadBuffers(char buf, Long64_t pos, Int_t *len, Int_t nbuf	virtual Bool_t ReadBuffers(char buf, Long64_t pos, Int_t *len, In
	);	t_t nbuf);
	void Seek(Long64_t offset, ERelativeTo pos = kBeg);	virtual void Seek(Long64_t offset, ERelativeTo pos = kBeg);

	static void SetProxy(const char *url);	static void SetProxy(const char *url);
	static const char *GetProxy();	static const char *GetProxy();

	ClassDef(TWebFile,2) //A ROOT file that reads via a http server	ClassDef(TWebFile,2) //A ROOT file that reads via a http server
	};	};

	class TWebSystem : public TSystem {	class TWebSystem : public TSystem {

	private:	private:

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

	TXNetFile.h	TXNetFile.h

	// @(#)root/netx:$Id: TXNetFile.h 34444 2010-07-16 02:17:39Z pcanal $	// @(#)root/netx:$Id: TXNetFile.h 41550 2011-10-24 15:30:04Z rdm $
	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *	* Copyright (C) 1995-2004, Rene Brun and Fons Rademakers. *
	* All rights reserved. *	* All rights reserved. *
	* *	* *
	* For the licensing terms see $ROOTSYS/LICENSE. *	* For the licensing terms see $ROOTSYS/LICENSE. *
	* For the list of contributors see $ROOTSYS/README/CREDITS. *	* For the list of contributors see $ROOTSYS/README/CREDITS. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOT_TXNetFile	#ifndef ROOT_TXNetFile
	#define ROOT_TXNetFile	#define ROOT_TXNetFile

	skipping to change at line 55	skipping to change at line 55

	#ifndef ROOT_TNetFile	#ifndef ROOT_TNetFile
	#include "TNetFile.h"	#include "TNetFile.h"
	#endif	#endif
	#ifndef ROOT_TString	#ifndef ROOT_TString
	#include "TString.h"	#include "TString.h"
	#endif	#endif
	#ifndef ROOT_TUrl	#ifndef ROOT_TUrl
	#include "TUrl.h"	#include "TUrl.h"
	#endif	#endif

	#ifdef OLDXRDOUC	#ifndef ROOT_XrdSysToOuc
	# include "XrdSysToOuc.h"	#include "XrdSysToOuc.h"
	#endif	#endif

	class TFileStager;	class TFileStager;
	class TSocket;	class TSocket;
	class XrdClient;	class XrdClient;
	class XrdSysRecMutex;	class XrdSysRecMutex;

	class TXNetFile : public TNetFile {	class TXNetFile : public TNetFile {

	friend class TXNetSystem;	friend class TXNetSystem;

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

	TXNetSystem.h	TXNetSystem.h

	// @(#)root/netx:$Id: TXNetSystem.h 30170 2009-09-15 13:35:35Z rdm $	// @(#)root/netx:$Id: TXNetSystem.h 41574 2011-10-25 13:42:03Z ganis $
	// Author: Frank Winklmeier, Fabrizio Furano	// Author: Frank Winklmeier, Fabrizio Furano

	/*************************************************************************	/*************************************************************************
	* 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 40	skipping to change at line 40
	#endif	#endif

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

	#ifndef ROOT_TString	#ifndef ROOT_TString
	#include "TString.h"	#include "TString.h"
	#endif	#endif


	#ifndef OLDXRDLOCATE	#include "XrdProofdXrdVers.h"

		#if ROOTXRDVERS >= ROOT_OldXrdLocate
	#ifndef ROOT_THashList	#ifndef ROOT_THashList
	#include "THashList.h"	#include "THashList.h"
	#endif	#endif
	#endif	#endif

	#include "XrdOuc/XrdOucString.hh"	#include "XrdOuc/XrdOucString.hh"
	#include "XrdClient/XrdClientVector.hh"	#include "XrdClient/XrdClientVector.hh"

	class XrdClientAdmin;	class XrdClientAdmin;
	class TCollection;	class TCollection;
	class TXNetSystemConnectGuard;	class TXNetSystemConnectGuard;

	typedef XrdClientVector<XrdOucString> vecString;	typedef XrdClientVector<XrdOucString> vecString;
	typedef XrdClientVector<bool> vecBool;	typedef XrdClientVector<bool> vecBool;


	#ifndef OLDXRDLOCATE	#if ROOTXRDVERS >= ROOT_OldXrdLocate
	class TXrdClientAdminWrapper : public TNamed {	class TXrdClientAdminWrapper : public TNamed {
	public:	public:
	TXrdClientAdminWrapper(const char key, XrdClientAdmin ca) : TNamed(key ,""), fXCA(ca) { }	TXrdClientAdminWrapper(const char key, XrdClientAdmin ca) : TNamed(key ,""), fXCA(ca) { }
	virtual ~TXrdClientAdminWrapper();	virtual ~TXrdClientAdminWrapper();
	XrdClientAdmin *fXCA;	XrdClientAdmin *fXCA;
	};	};
	#endif	#endif

	class TXNetSystem : public TNetSystem {	class TXNetSystem : public TNetSystem {


	skipping to change at line 86	skipping to change at line 88
	TString fDirEntry; // Last dir entry	TString fDirEntry; // Last dir entry
	TString fUrl; // Initial url	TString fUrl; // Initial url

	static Bool_t fgInitDone; // Avoid initializing more than once	static Bool_t fgInitDone; // Avoid initializing more than once
	static Bool_t fgRootdBC; // Control rootd backward compatibility	static Bool_t fgRootdBC; // Control rootd backward compatibility

	XrdClientAdmin Connect(const char url); // Connect to server	XrdClientAdmin Connect(const char url); // Connect to server
	void *GetDirPtr() const { return fDirp; }	void *GetDirPtr() const { return fDirp; }
	void InitXrdClient();	void InitXrdClient();


	#ifndef OLDXRDLOCATE	#if ROOTXRDVERS >= ROOT_OldXrdLocate
	static THashList fgAddrFQDN; // Cross-table address<->FQDN	static THashList fgAddrFQDN; // Cross-table address<->FQDN
	static THashList fgAdminHash; // List of existing XrdClientAdmin	static THashList fgAdminHash; // List of existing XrdClientAdmin
	static XrdClientAdmin GetClientAdmin(const char url);	static XrdClientAdmin GetClientAdmin(const char url);
	static TString GetKey(const char *url);	static TString GetKey(const char *url);
	#endif	#endif

	public:	public:
	TXNetSystem(Bool_t owner = kTRUE);	TXNetSystem(Bool_t owner = kTRUE);
	TXNetSystem(const char *url, Bool_t owner = kTRUE);	TXNetSystem(const char *url, Bool_t owner = kTRUE);
	virtual ~TXNetSystem() { }	virtual ~TXNetSystem() { }

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

	Timer.h	Timer.h

	// @(#)root/tmva $Id: Timer.h 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: Timer.h 40005 2011-06-27 15:29:10Z 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 : 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 40012 2011-06-27 16:03:11Z stelzer $	// @(#)root/tmva $Id: Tools.h 40005 2011-06-27 15:29:10Z 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 40961 2011-09-20 17:08:56Z moneta $	// @(#)root/roostats:$Id: ToyMCSampler.h 42320 2011-11-30 10:37:33Z 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 76	skipping to change at line 76
	fPdf = NULL;	fPdf = NULL;
	fPriorNuisance = NULL;	fPriorNuisance = NULL;
	fNullPOI = NULL;	fNullPOI = NULL;
	fNuisancePars = NULL;	fNuisancePars = NULL;
	fObservables = NULL;	fObservables = NULL;
	fGlobalObservables = NULL;	fGlobalObservables = NULL;

	fSize = 0.05;	fSize = 0.05;
	fNEvents = 0;	fNEvents = 0;
	fGenerateBinned = kFALSE;	fGenerateBinned = kFALSE;

		fGenerateBinnedTag = "";
		fGenerateAutoBinned = kTRUE;
	fExpectedNuisancePar = kFALSE;	fExpectedNuisancePar = kFALSE;

	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;	fNuisanceParametersSampler = NULL;

	_allVars = NULL ;	_allVars = NULL ;
	_gs1 = NULL ;	_gs1 = NULL ;
	_gs2 = NULL ;	_gs2 = NULL ;
	_gs3 = NULL ;	_gs3 = NULL ;
	_gs4 = NULL ;	_gs4 = NULL ;


		//suppress messages for num integration of Roofit
		RooMsgService::instance().getStream(1).removeTopic(RooFit::NumInteg
		ration);

	fUseMultiGen = kFALSE ;	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;

	fSize = 0.05;	fSize = 0.05;
	fNEvents = 0;	fNEvents = 0;
	fGenerateBinned = kFALSE;	fGenerateBinned = kFALSE;

		fGenerateBinnedTag = "";
		fGenerateAutoBinned = kTRUE;
	fExpectedNuisancePar = kFALSE;	fExpectedNuisancePar = kFALSE;

	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;	fNuisanceParametersSampler = NULL;

	_allVars = NULL ;	_allVars = NULL ;
	_gs1 = NULL ;	_gs1 = NULL ;
	_gs2 = NULL ;	_gs2 = NULL ;
	_gs3 = NULL ;	_gs3 = NULL ;
	_gs4 = NULL ;	_gs4 = NULL ;


		//suppress messages for num integration of Roofit
		RooMsgService::instance().getStream(1).removeTopic(RooFit::NumInteg
		ration);

	fUseMultiGen = kFALSE ;	fUseMultiGen = kFALSE ;
	}	}

	virtual ~ToyMCSampler();	virtual ~ToyMCSampler();

	static void SetAlwaysUseMultiGen(Bool_t flag) { fgAlwaysUseMultiGen = flag ; }	static void SetAlwaysUseMultiGen(Bool_t flag) { fgAlwaysUseMultiGen = flag ; }
	void SetUseMultiGen(Bool_t flag) { fUseMultiGen = flag ; }	void SetUseMultiGen(Bool_t flag) { fUseMultiGen = flag ; }

	// main interface	// main interface
	virtual SamplingDistribution* GetSamplingDistribution(RooArgSet& para mPoint);	virtual SamplingDistribution* GetSamplingDistribution(RooArgSet& para mPoint);

	skipping to change at line 230	skipping to change at line 240

	// Set the TestStatistic (want the argument to be a function of the d ata & parameter points	// Set the TestStatistic (want the argument to be a function of the d ata & parameter points
	virtual void SetTestStatistic(TestStatistic *testStatistic) { fTestSt at = testStatistic; }	virtual void SetTestStatistic(TestStatistic *testStatistic) { fTestSt at = testStatistic; }

	virtual void SetExpectedNuisancePar(Bool_t i = kTRUE) { fExpectedNuis ancePar = i; }	virtual void SetExpectedNuisancePar(Bool_t i = kTRUE) { fExpectedNuis ancePar = i; }
	virtual void SetAsimovNuisancePar(Bool_t i = kTRUE) { fExpectedNuisan cePar = i; }	virtual void SetAsimovNuisancePar(Bool_t i = kTRUE) { fExpectedNuisan cePar = i; }

	// Checks for sufficient information to do a GetSamplingDistribution( ...).	// Checks for sufficient information to do a GetSamplingDistribution( ...).
	Bool_t CheckConfig(void);	Bool_t CheckConfig(void);


	// control to use bin data generation	// control to use bin data generation (=> see RooFit::AllBinned() opt ion)
	void SetGenerateBinned(bool binned = true) { fGenerateBinned = binned ; }	void SetGenerateBinned(bool binned = true) { fGenerateBinned = binned ; }

		// name of the tag for individual components to be generated binned (
		=> see RooFit::GenBinned() option)
		void SetGenerateBinnedTag( const char* binnedTag = "" ) { fGenerateBi
		nnedTag = binnedTag; }
		// set auto binned generation (=> see RooFit::AutoBinned() option)
		void SetGenerateAutoBinned( Bool_t autoBinned = kTRUE ) { fGenerateAu
		toBinned = autoBinned; }

	// Set the name of the sampling distribution used for plotting	// Set the name of the sampling distribution used for plotting
	void SetSamplingDistName(const char* name) { if(name) fSamplingDistNa me = name; }	void SetSamplingDistName(const char* name) { if(name) fSamplingDistNa me = name; }
	string GetSamplingDistName(void) { return fSamplingDistName; }	string GetSamplingDistName(void) { return fSamplingDistName; }

	// This option forces a maximum number of total toys.	// This option forces a maximum number of total toys.
	void SetMaxToys(Double_t t) { fMaxToys = t; }	void SetMaxToys(Double_t t) { fMaxToys = t; }

	void SetToysLeftTail(Double_t toys, Double_t threshold) {	void SetToysLeftTail(Double_t toys, Double_t threshold) {
	fToysInTails = toys;	fToysInTails = toys;

	skipping to change at line 290	skipping to change at line 304
	RooAbsPdf *fPriorNuisance; // prior pdf for nuisance parameters	RooAbsPdf *fPriorNuisance; // prior pdf for nuisance parameters
	RooArgSet *fNullPOI; // parameters of interest	RooArgSet *fNullPOI; // parameters of interest
	const RooArgSet *fNuisancePars;	const RooArgSet *fNuisancePars;
	const RooArgSet *fObservables;	const RooArgSet *fObservables;
	const RooArgSet *fGlobalObservables;	const RooArgSet *fGlobalObservables;
	Int_t fNToys; // number of toys to generate	Int_t fNToys; // number of toys to generate
	Int_t fNEvents; // number of events per toy (may be ignored depending on settings)	Int_t fNEvents; // number of events per toy (may be ignored depending on settings)
	Double_t fSize;	Double_t fSize;
	Bool_t fExpectedNuisancePar; // whether to use expectation values for nuisance parameters (ie Asimov data set)	Bool_t fExpectedNuisancePar; // whether to use expectation values for nuisance parameters (ie Asimov data set)
	Bool_t fGenerateBinned;	Bool_t fGenerateBinned;

		TString fGenerateBinnedTag;
		Bool_t fGenerateAutoBinned;

	// minimum no of toys in tails for adaptive sampling	// minimum no of toys in tails for adaptive sampling
	// (taking weights into account, therefore double)	// (taking weights into account, therefore double)
	// Default: 0.0 which means no adaptive sampling	// Default: 0.0 which means no adaptive sampling
	Double_t fToysInTails;	Double_t fToysInTails;
	// maximum no of toys	// maximum no of toys
	// (taking weights into account, therefore double)	// (taking weights into account, therefore double)
	Double_t fMaxToys;	Double_t fMaxToys;
	// tails	// tails
	Double_t fAdaptiveLowLimit;	Double_t fAdaptiveLowLimit;

	skipping to change at line 325	skipping to change at line 341
	mutable list<RooAbsPdf::GenSpec*> _gsList ; //!	mutable list<RooAbsPdf::GenSpec*> _gsList ; //!
	mutable RooAbsPdf::GenSpec* _gs1 ; //! GenSpec #1	mutable RooAbsPdf::GenSpec* _gs1 ; //! GenSpec #1
	mutable RooAbsPdf::GenSpec* _gs2 ; //! GenSpec #2	mutable RooAbsPdf::GenSpec* _gs2 ; //! GenSpec #2
	mutable RooAbsPdf::GenSpec* _gs3 ; //! GenSpec #3	mutable RooAbsPdf::GenSpec* _gs3 ; //! GenSpec #3
	mutable RooAbsPdf::GenSpec* _gs4 ; //! GenSpec #4	mutable RooAbsPdf::GenSpec* _gs4 ; //! GenSpec #4

	static Bool_t fgAlwaysUseMultiGen ; // Use PrepareMultiGen always	static Bool_t fgAlwaysUseMultiGen ; // Use PrepareMultiGen always
	Bool_t fUseMultiGen ; // Use PrepareMultiGen?	Bool_t fUseMultiGen ; // Use PrepareMultiGen?

	protected:	protected:

	ClassDef(ToyMCSampler,2) // A simple implementation of the TestStatSampl er interface	ClassDef(ToyMCSampler,3) // A simple implementation of the TestStatSampl er interface
	};	};
	}	}

	#endif	#endif

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

	ToyMCSamplerOld.h	ToyMCSamplerOld.h

	// @(#)root/roostats:$Id: ToyMCSamplerOld.h 42194 2011-11-23 14:02:02Z axel $	// @(#)root/roostats:$Id: ToyMCSamplerOld.h 42339 2011-11-30 23:54:18Z 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 39934 2011-06-24 09:15:34Z moneta $	// @(#)root/roostats:$Id: ToyMCStudy.h 39928 2011-06-24 08:18: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_ToyMCStudy	#ifndef ROOSTATS_ToyMCStudy
	#define ROOSTATS_ToyMCStudy	#define ROOSTATS_ToyMCStudy

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

	TransformationHandler.h	TransformationHandler.h

	// @(#)root/tmva $Id: TransformationHandler.h 39395 2011-05-26 10:05:54Z mo neta $	// @(#)root/tmva $Id: TransformationHandler.h 40005 2011-06-27 15:29:10Z st elzer $
	// 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 40012 2011-06-27 16:03:11Z stelzer $	// @(#)root/tmva $Id: Types.h 40005 2011-06-27 15:29:10Z 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

	UnBinData.h	UnBinData.h

	// @(#)root/mathcore:$Id: UnBinData.h 34127 2010-06-25 09:13:45Z moneta $	// @(#)root/mathcore:$Id: UnBinData.h 42007 2011-11-15 13:23:17Z moneta $
	// Author: L. Moneta Wed Aug 30 11:15:23 2006	// Author: L. Moneta Wed Aug 30 11:15:23 2006

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

	// Header file for class UnBinData	// Header file for class UnBinData

	skipping to change at line 52	skipping to change at line 52
	@ingroup FitData	@ingroup FitData
	*/	*/
	class UnBinData : public FitData {	class UnBinData : public FitData {

	public :	public :

	/**	/**
	constructor from dimension of point and max number of points (to pre -allocate vector)	constructor from dimension of point and max number of points (to pre -allocate vector)
	*/	*/


	explicit UnBinData(unsigned int maxpoints = 0, unsigned int dim = 1 );	explicit UnBinData(unsigned int maxpoints = 0, unsigned int dim = 1, boo l isWeighted = false );

	/**	/**
	constructor from range and default option	constructor from range and default option
	*/	*/

	explicit UnBinData (const DataRange & range, unsigned int maxpoints = 0 , unsigned int dim = 1);	explicit UnBinData (const DataRange & range, unsigned int maxpoints = 0 , unsigned int dim = 1, bool isWeighted = false);

	/**	/**
	constructor from options and range	constructor from options and range
	*/	*/

	UnBinData (const DataOptions & opt, const DataRange & range, unsigned i nt maxpoints = 0, unsigned int dim = 1 );	UnBinData (const DataOptions & opt, const DataRange & range, unsigned i nt maxpoints = 0, unsigned int dim = 1, bool isWeighted = false );

	/**	/**
	constructor for 1D external data (data are not copied inside)	constructor for 1D external data (data are not copied inside)
	*/	*/
	UnBinData(unsigned int n, const double * dataX );	UnBinData(unsigned int n, const double * dataX );

	/**	/**
	constructor for 2D external data (data are not copied inside)	constructor for 2D external data (data are not copied inside)

		or 1D data with a weight (if isWeighted = true)
	*/	*/

	UnBinData(unsigned int n, const double * dataX, const double * dataY );	UnBinData(unsigned int n, const double * dataX, const double * dataY, bo ol isWeighted = false );

	/**	/**
	constructor for 3D external data (data are not copied inside)	constructor for 3D external data (data are not copied inside)

		or 2D data with a weight (if isWeighted = true)
	*/	*/

	UnBinData(unsigned int n, const double * dataX, const double * dataY, co nst double * dataZ );	UnBinData(unsigned int n, const double * dataX, const double * dataY, co nst double * dataZ, bool isWeighted = false );

	/**	/**
	constructor for multi-dim external data (data are not copied inside)	constructor for multi-dim external data (data are not copied inside)
	Uses as argument an iterator of a list (or vector) containing the con st double * of the data	Uses as argument an iterator of a list (or vector) containing the con st double * of the data
	An example could be the std::vector<const double *>::begin	An example could be the std::vector<const double *>::begin

		In case of weighted data, the external data must have a dim+1 lists o
		f data
		The apssed dim refers just to the coordinate size
	*/	*/
	template<class Iterator>	template<class Iterator>

	UnBinData(unsigned int n, unsigned int dim, Iterator dataItr ) :	UnBinData(unsigned int n, unsigned int dim, Iterator dataItr, bool isWei ghted = false ) :
	FitData( ),	FitData( ),
	fDim(dim),	fDim(dim),

		fPointSize( (isWeighted) ? dim +1 : dim),
	fNPoints(n),	fNPoints(n),
	fDataVector(0)	fDataVector(0)
	{	{

	fDataWrapper = new DataWrapper(dim, dataItr);	fDataWrapper = new DataWrapper(fPointSize, dataItr);
	}	}

	/**	/**
	constructor for 1D data and a range (data are copied inside according to the given range)	constructor for 1D data and a range (data are copied inside according to the given range)
	*/	*/
	UnBinData(unsigned int maxpoints, const double * dataX, const DataRange & range);	UnBinData(unsigned int maxpoints, const double * dataX, const DataRange & range);

	/**	/**
	constructor for 2D data and a range (data are copied inside according to the given range)	constructor for 2D data and a range (data are copied inside according to the given range)

		or 1 1D data set + weight. If is weighted dataY is the pointer to th e list of the weights
	*/	*/

	UnBinData(unsigned int maxpoints, const double * dataX, const double * d ataY, const DataRange & range);	UnBinData(unsigned int maxpoints, const double * dataX, const double * d ataY, const DataRange & range, bool isWeighted = false);

	/**	/**
	constructor for 3D data and a range (data are copied inside according to the given range)	constructor for 3D data and a range (data are copied inside according to the given range)

		or a 2D data set + weights. If is weighted dataZ is the pointer to t he list of the weights
	*/	*/

	UnBinData(unsigned int maxpoints, const double * dataX, const double * d ataY, const double * dataZ, const DataRange & range);	UnBinData(unsigned int maxpoints, const double * dataX, const double * d ataY, const double * dataZ, const DataRange & range, bool isWeighted = fals e);

	/**	/**
	constructor for multi-dim external data and a range (data are copied inside according to the range)	constructor for multi-dim external data and a range (data are copied inside according to the range)
	Uses as argument an iterator of a list (or vector) containing the con st double * of the data	Uses as argument an iterator of a list (or vector) containing the con st double * of the data
	An example could be the std::vector<const double *>::begin	An example could be the std::vector<const double *>::begin
	*/	*/
	template<class Iterator>	template<class Iterator>

	UnBinData(unsigned int maxpoints, unsigned int dim, Iterator dataItr, co nst DataRange & range ) :	UnBinData(unsigned int maxpoints, unsigned int dim, Iterator dataItr, co nst DataRange & range, bool isWeighted = false ) :
	FitData( ),	FitData( ),
	fDim(dim),	fDim(dim),

		fPointSize( (isWeighted) ? dim +1 : dim),
	fNPoints(0),	fNPoints(0),
	fDataVector(0),	fDataVector(0),
	fDataWrapper(0)	fDataWrapper(0)
	{	{

	unsigned int n = dim*maxpoints;	unsigned int n = fPointSize*maxpoints;
	if ( n > MaxSize() ) {	if ( n > MaxSize() ) {
	MATH_ERROR_MSGVAL("UnBinData","Invalid data size n - no allocation done", n );	MATH_ERROR_MSGVAL("UnBinData","Invalid data size n - no allocation done", n );
	}	}
	else if (n > 0) {	else if (n > 0) {
	fDataVector = new DataVector(n);	fDataVector = new DataVector(n);

	// use data wrapper to get the data	// use data wrapper to get the data

	ROOT::Fit::DataWrapper wdata(dim, dataItr);	ROOT::Fit::DataWrapper wdata(fPointSize, dataItr);
	for (unsigned int i = 0; i < maxpoints; ++i) {	for (unsigned int i = 0; i < maxpoints; ++i) {
	bool isInside = true;	bool isInside = true;
	for (unsigned int icoord = 0; icoord < dim; ++icoord)	for (unsigned int icoord = 0; icoord < dim; ++icoord)
	isInside &= range.IsInside( wdata.Coords(i)[icoord], icoord );	isInside &= range.IsInside( wdata.Coords(i)[icoord], icoord );

		// treat here the weight as an extra coordinate
	if ( isInside ) Add(wdata.Coords(i));	if ( isInside ) Add(wdata.Coords(i));
	}	}

	if (fNPoints < maxpoints) (fDataVector->Data()).resize(fDim*fNPoin ts);	if (fNPoints < maxpoints) (fDataVector->Data()).resize(fPointSize* fNPoints);
	}	}
	}	}

	private:	private:
	/// copy constructor (private)	/// copy constructor (private)
	UnBinData(const UnBinData &) : FitData() {}	UnBinData(const UnBinData &) : FitData() {}
	/// assignment operator (private)	/// assignment operator (private)
	UnBinData & operator= (const UnBinData &) { return *this; }	UnBinData & operator= (const UnBinData &) { return *this; }

	public:	public:

	#ifdef LATER	#ifdef LATER
	/**	/**
	Create from a compatible UnBinData set	Create from a compatible UnBinData set
	*/	*/

	UnBinData (const UnBinData & data , const DataOptions & opt, const DataR ange & range) :	UnBinData (const UnBinData & data , const DataOptions & opt, const DataR ange & range) :
	DataVector(opt,range, data.DataSize() ),	DataVector(opt,range, data.DataSize() ),
	fDim(data.fDim),	fDim(data.fDim),

		fPointSize(data.fPointSize),
	fNPoints(data.fNPoints)	fNPoints(data.fNPoints)
	{	{
	// for (Iterator itr = begin; itr != end; ++itr)	// for (Iterator itr = begin; itr != end; ++itr)
	// if (itr->IsInRange(range) )	// if (itr->IsInRange(range) )
	// Add(*itr);	// Add(*itr);
	}	}
	#endif	#endif

	/**	/**
	destructor, delete pointer to internal data or external data wrapper	destructor, delete pointer to internal data or external data wrapper
	*/	*/
	virtual ~UnBinData() {	virtual ~UnBinData() {
	if (fDataVector) delete fDataVector;	if (fDataVector) delete fDataVector;
	if (fDataWrapper) delete fDataWrapper;	if (fDataWrapper) delete fDataWrapper;
	}	}

	/**	/**

	preallocate a data set given size and dimension	preallocate a data set given size and dimension of the coordinates
	if a vector already exists with correct dimension (point size) extend the existing one	if a vector already exists with correct dimension (point size) extend the existing one
	to a total size of maxpoints (equivalent to a Resize)	to a total size of maxpoints (equivalent to a Resize)
	*/	*/

	void Initialize(unsigned int maxpoints, unsigned int dim = 1);	void Initialize(unsigned int maxpoints, unsigned int dim = 1, bool isWei ghted = false);

	/**	/**

	return fit point size (for unbin data is equivalent to coordinate dim	add one dim coordinate data (unweighted)
	ension)
	*/
	unsigned int PointSize() const {
	return fDim;
	}

	/**
	return size of internal data vector (is 0 for external data)
	*/
	unsigned int DataSize() const {
	return (fDataVector) ? fDataVector->Size() : 0;
	}

	/**
	add one dim coordinate data
	*/	*/
	void Add(double x) {	void Add(double x) {
	int index = fNPoints*PointSize();	int index = fNPoints*PointSize();
	assert(fDataVector != 0);	assert(fDataVector != 0);
	assert(PointSize() == 1);	assert(PointSize() == 1);
	assert (index + PointSize() <= DataSize() );	assert (index + PointSize() <= DataSize() );

	(fDataVector->Data())[ index ] = x;	(fDataVector->Data())[ index ] = x;

	fNPoints++;	fNPoints++;
	}	}

	/**	/**
	add 2-dim coordinate data	add 2-dim coordinate data

		can also be used to add 1-dim data with a weight
	*/	*/
	void Add(double x, double y) {	void Add(double x, double y) {
	int index = fNPoints*PointSize();	int index = fNPoints*PointSize();
	assert(fDataVector != 0);	assert(fDataVector != 0);
	assert(PointSize() == 2);	assert(PointSize() == 2);
	assert (index + PointSize() <= DataSize() );	assert (index + PointSize() <= DataSize() );

	(fDataVector->Data())[ index ] = x;	(fDataVector->Data())[ index ] = x;
	(fDataVector->Data())[ index+1 ] = y;	(fDataVector->Data())[ index+1 ] = y;

	fNPoints++;	fNPoints++;
	}	}

	/**	/**
	add 3-dim coordinate data	add 3-dim coordinate data

		can also be used to add 2-dim data with a weight
	*/	*/
	void Add(double x, double y, double z) {	void Add(double x, double y, double z) {
	int index = fNPoints*PointSize();	int index = fNPoints*PointSize();
	assert(fDataVector != 0);	assert(fDataVector != 0);
	assert(PointSize() == 3);	assert(PointSize() == 3);
	assert (index + PointSize() <= DataSize() );	assert (index + PointSize() <= DataSize() );

	(fDataVector->Data())[ index ] = x;	(fDataVector->Data())[ index ] = x;
	(fDataVector->Data())[ index+1 ] = y;	(fDataVector->Data())[ index+1 ] = y;
	(fDataVector->Data())[ index+2 ] = z;	(fDataVector->Data())[ index+2 ] = z;

	fNPoints++;	fNPoints++;
	}	}

	/**	/**
	add multi-dim coordinate data	add multi-dim coordinate data
	*/	*/
	void Add(const double *x) {	void Add(const double *x) {

	int index = fNPoints*PointSize();	int index = fNPoints*fPointSize;

		assert(fDataVector != 0);
		assert (index + PointSize() <= DataSize() );

		double * itr = &( (fDataVector->Data()) [ index ]);

		for (unsigned int i = 0; i < fDim; ++i)
		*itr++ = x[i];

		fNPoints++;
		}

		/**
		add multi-dim coordinate data + weight
		*/
		void Add(const double *x, double w) {
		int index = fNPoints*fPointSize;

	assert(fDataVector != 0);	assert(fDataVector != 0);
	assert (index + PointSize() <= DataSize() );	assert (index + PointSize() <= DataSize() );

	double * itr = &( (fDataVector->Data()) [ index ]);	double * itr = &( (fDataVector->Data()) [ index ]);

	for (unsigned int i = 0; i < fDim; ++i)	for (unsigned int i = 0; i < fDim; ++i)
	*itr++ = x[i];	*itr++ = x[i];

		*itr = w;

	fNPoints++;	fNPoints++;
	}	}

	/**	/**
	return pointer to coordinate data	return pointer to coordinate data
	*/	*/
	const double * Coords(unsigned int ipoint) const {	const double * Coords(unsigned int ipoint) const {
	if (fDataVector)	if (fDataVector)

	return &( (fDataVector->Data()) [ ipoint*PointSize() ] );	return &( (fDataVector->Data()) [ ipoint*fPointSize ] );
	else	else
	return fDataWrapper->Coords(ipoint);	return fDataWrapper->Coords(ipoint);
	}	}


		bool IsWeighted() const {
		return (fPointSize == fDim+1);
		}

		double Weight(unsigned int ipoint) const {
		if (fPointSize == fDim) return 1;
		if (fDataVector )
		return (fDataVector->Data()) [ ipoint*fPointSize + 1 ] ;
		else
		return 0; // weights are not supported for wrapper data sets
		}

	/**	/**
	resize the vector to the given npoints	resize the vector to the given npoints
	*/	*/
	void Resize (unsigned int npoints);	void Resize (unsigned int npoints);

	/**	/**
	return number of contained points	return number of contained points
	*/	*/
	unsigned int NPoints() const { return fNPoints; }	unsigned int NPoints() const { return fNPoints; }

	/**	/**
	return number of contained points	return number of contained points
	*/	*/
	unsigned int Size() const { return fNPoints; }	unsigned int Size() const { return fNPoints; }

	/**	/**
	return coordinate data dimension	return coordinate data dimension
	*/	*/
	unsigned int NDim() const { return fDim; }	unsigned int NDim() const { return fDim; }


		/**
		return point size. For unweighted data is equivalent to coordinate d
		imension,
		for weighted data is NDim()+1
		*/
		unsigned int PointSize() const {
		return fPointSize;
		}

		/**
		return size of internal data vector (is 0 for external data)
		*/
		unsigned int DataSize() const {
		return (fDataVector) ? fDataVector->Size() : 0;
		}

	protected:	protected:

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

	private:	private:

	unsigned int fDim; // coordinate data dimension	unsigned int fDim; // coordinate data dimension

		unsigned int fPointSize; // poit size dimension (coordinate + weight)
	unsigned int fNPoints; // numer of fit points	unsigned int fNPoints; // numer of fit points

	DataVector * fDataVector; // pointer to internal data vector (null f or external data)	DataVector * fDataVector; // pointer to internal data vector (null f or external data)
	DataWrapper * fDataWrapper; // pointer to structure wrapping external data (null when data are copied in)	DataWrapper * fDataWrapper; // pointer to structure wrapping external data (null when data are copied in)

	};	};

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

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

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

	VariableDecorrTransform.h	VariableDecorrTransform.h

	// @(#)root/tmva $Id: VariableDecorrTransform.h 40012 2011-06-27 16:03:11Z stelzer $	// @(#)root/tmva $Id: VariableDecorrTransform.h 40005 2011-06-27 15:29:10Z 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 40012 2011-06-27 16:03:11Z s telzer $	// @(#)root/tmva $Id: VariableGaussTransform.h 40005 2011-06-27 15:29:10Z 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 39395 2011-05-26 10:05:54 Z moneta $	// @(#)root/tmva $Id: VariableIdentityTransform.h 40005 2011-06-27 15:29:10 Z 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 : 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 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: VariableInfo.h 40005 2011-06-27 15:29:10Z 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 : 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 39395 2011-05-26 10:05:5 4Z moneta $	// @(#)root/tmva $Id: VariableNormalizeTransform.h 40005 2011-06-27 15:29:1 0Z 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 : 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 39395 2011-05-26 10:05:54Z mon eta $	// @(#)root/tmva $Id: VariablePCATransform.h 40005 2011-06-27 15:29:10Z ste lzer $
	// 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 39395 2011-05-26 10:05:5 4Z moneta $	// @(#)root/tmva $Id: VariableRearrangeTransform.h 40005 2011-06-27 15:29:1 0Z 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 : 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 39395 2011-05-26 10:05:54Z mo neta $	// @(#)root/tmva $Id: VariableTransformBase.h 40005 2011-06-27 15:29:10Z st elzer $
	// 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 40027 2011-06-27 17:12:07Z stelzer $	// @(#)root/tmva $Id: Version.h 40005 2011-06-27 15:29:10Z 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 *

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

	Volume.h	Volume.h

	// @(#)root/tmva $Id: Volume.h 39395 2011-05-26 10:05:54Z moneta $	// @(#)root/tmva $Id: Volume.h 40005 2011-06-27 15:29:10Z 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 : 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

	ZipLZMA.h	ZipLZMA.h

	// @(#)root/lzma:$Id: ZipLZMA.h 39880 2011-06-22 13:47:06Z rdm $	// @(#)root/lzma:$Id: ZipLZMA.h 41319 2011-10-11 08:53:15Z pcanal $
	/*************************************************************************	/*************************************************************************
	* Copyright (C) 1995-2011, 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. *
	*************************************************************************/	*************************************************************************/


	static const int kHeaderSize = 9;

	void R__zipLZMA(int cxlevel, int srcsize, char src, int tgtsize, char t gt, int *irep);	void R__zipLZMA(int cxlevel, int srcsize, char src, int tgtsize, char t gt, int *irep);

	void R__unzipLZMA(int srcsize, unsigned char src, int tgtsize, unsigned char tgt, int *irep);	void R__unzipLZMA(int srcsize, unsigned char src, int tgtsize, unsigned char tgt, int *irep);

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

	compiledata.h	compiledata.h
	/* This is file is automatically generated */	/* This is file is automatically generated */
	#define BUILD_ARCH "linux"	#define BUILD_ARCH "linux"
	#define BUILD_NODE "Linux lxbuild147.cern.ch 2.6.18-194.26.1.el5 #1 SMP Wed Nov 10 09:51:11 CET 2010 i686 i686 i386 GNU/Linux"	#define BUILD_NODE "Linux lxbuild147.cern.ch 2.6.18-194.26.1.el5 #1 SMP Wed Nov 10 09:51:11 CET 2010 i686 i686 i386 GNU/Linux"
	#define COMPILER "/afs/cern.ch/sw/lcg/contrib/gcc/4.3.5/i686-slc5-gcc43-opt /bin/g++"	#define COMPILER "/afs/cern.ch/sw/lcg/contrib/gcc/4.3.5/i686-slc5-gcc43-opt /bin/g++"
	#define COMPILERVERS "gcc435"	#define COMPILERVERS "gcc435"

	#define MAKESHAREDLIB "cd $BuildDir ; g++ -c $Opt -pipe -m32 -Wall -W -Wov	#define MAKESHAREDLIB "cd $BuildDir ; g++ -c $Opt -pipe -m32 -Wall -W -Wov
	erloaded-virtual -fPIC -pthread $IncludePath $SourceFiles ; g++ $ObjectFile	erloaded-virtual -fPIC -pthread $IncludePath $SourceFiles ; g++ $ObjectFile
	s -shared -Wl,-soname,$LibName.so -m32 -O2 $LinkedLibs -o $SharedLib"	s -shared -Wl,-soname,$LibName.so -m32 -O2 -Wl,--no-undefined $LinkedLibs
	#define MAKEEXE "cd $BuildDir ; g++ -c -pipe -m32 -Wall -W -Woverloaded-vi	-o $SharedLib"
	rtual -fPIC -pthread $IncludePath $SourceFiles; g++ $ObjectFiles -m32 -O2	#define MAKEEXE "cd $BuildDir ; g++ -c -pipe -m32 -Wall -W -Woverloaded-vi
	-o $ExeName $LinkedLibs -lm -ldl -pthread -rdynamic"	rtual -fPIC -pthread $IncludePath $SourceFiles; g++ $ObjectFiles -m32 -O2
		-Wl,--no-undefined -o $ExeName $LinkedLibs -lm -ldl -pthread -rdynamic"
	#define CXXOPT "-O2"	#define CXXOPT "-O2"
	#define CXXDEBUG "-g"	#define CXXDEBUG "-g"
	#define ROOTBUILD ""	#define ROOTBUILD ""

	#define LINKEDLIBS "-L$ROOTSYS/lib -lCore -lCint -lMathCore -lRint "	#define LINKEDLIBS "-L$ROOTSYS/lib -lCore -lCint -lRint "
	#define INCLUDEPATH "-I$ROOTSYS/include"	#define INCLUDEPATH "-I$ROOTSYS/include"
	#define OBJEXT "o"	#define OBJEXT "o"
	#define SOEXT "so"	#define SOEXT "so"

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

	BinData.h	BinData.h

	// @(#)root/mathcore:$Id: BinData.h 33180 2010-04-25 10:14:07Z moneta $	// @(#)root/mathcore:$Id: BinData.h 42007 2011-11-15 13:23:17Z moneta $
	// Author: L. Moneta Wed Aug 30 11:15:23 2006	// Author: L. Moneta Wed Aug 30 11:15:23 2006

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

	// Header file for class BinData	// Header file for class BinData

	skipping to change at line 114	skipping to change at line 114
	constructor from external data for 2D with errors on coordinate and value	constructor from external data for 2D with errors on coordinate and value
	*/	*/
	BinData(unsigned int n, const double * dataX, const double * dataY, cons t double * val, const double * ex , const double * ey, const double * eval );	BinData(unsigned int n, const double * dataX, const double * dataY, cons t double * val, const double * ex , const double * ey, const double * eval );

	/**	/**
	constructor from external data for 3D with errors on coordinate and value	constructor from external data for 3D with errors on coordinate and value
	*/	*/
	BinData(unsigned int n, const double * dataX, const double * dataY, cons t double * dataZ, const double * val, const double * ex , const double * ey , const double * ez , const double * eval );	BinData(unsigned int n, const double * dataX, const double * dataY, cons t double * dataZ, const double * val, const double * ex , const double * ey , const double * ez , const double * eval );

	/**	/**

	copy constructor	copy constructors
	*/	*/
	BinData(const BinData &);	BinData(const BinData &);

	/**	/**
	assignment operator	assignment operator
	*/	*/
	BinData & operator= (const BinData &);	BinData & operator= (const BinData &);

	/**	/**
	destructor	destructor

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

	FitConfig.h	FitConfig.h

	// @(#)root/mathcore:$Id: FitConfig.h 39474 2011-05-30 07:48:13Z moneta $	// @(#)root/mathcore:$Id: FitConfig.h 42007 2011-11-15 13:23:17Z 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 110	skipping to change at line 110
	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	Set the parameter settings from a vector of parameter settings
		*/
		void SetParamsSettings (const std::vector<ROOT::Fit::ParameterSettings>&
		pars ) {
		fSettings = pars;
		}

		/*
		Set the parameter settings from a fit Result
	*/	*/
	void SetFromFitResult (const FitResult & rhs);	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)

	skipping to change at line 163	skipping to change at line 170

	///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	///Update configuration after a fit using the FitResult
	bool UpdateAfterFit() const { return fUpdateAfterFit; }	bool UpdateAfterFit() const { return fUpdateAfterFit; }


		///Apply Weight correction for error matrix computation
		bool UseWeightCorrection() const { return fWeightCorr; }

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

	///set Minos erros	///set Minos erros
	void SetMinosErrors(bool on = true) { fMinosErrors = on; }	void SetMinosErrors(bool on = true) { fMinosErrors = on; }


		///apply the weight correction for error matric computation
		void SetWeightCorrection(bool on = true) { fWeightCorr = 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	///Update configuration after a fit using the FitResult
	void SetUpdateAfterFit(bool on = true) { fUpdateAfterFit = on; }	void SetUpdateAfterFit(bool on = true) { fUpdateAfterFit = on; }

	skipping to change at line 201	skipping to change at line 214
	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 H esse after minimizing)	bool fParabErrors; // get correct parabolic errors estimate (call H 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	bool fUpdateAfterFit; // update the configuration after a fit using th e result

		bool fWeightCorr; // apply correction to errors for weights fits

	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. 5 change blocks.
	2 lines changed or deleted	17 lines changed or added

	FitUtil.h	FitUtil.h

	// @(#)root/mathcore:$Id: FitUtil.h 39382 2011-05-26 08:31:43Z moneta $	// @(#)root/mathcore:$Id: FitUtil.h 42007 2011-11-15 13:23:17Z 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 64	skipping to change at line 64
	/**	/**
	evaluate the Chi2 gradient given a model function and the data at th e point x.	evaluate the Chi2 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 Ch i2 evaluation	return also nPoints as the effective number of used points in the Ch i2 evaluation
	*/	*/
	void EvaluateChi2Gradient(const IModelFunction & func, const BinData & d ata, const double * x, double * grad, unsigned int & nPoints);	void EvaluateChi2Gradient(const IModelFunction & func, const BinData & d ata, const double * x, double * grad, unsigned int & nPoints);

	/**	/**
	evaluate the LogL given a model function and the data at the point x .	evaluate the 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 EvaluateLogL(const IModelFunction & func, const UnBinData & data, const double * x, unsigned int & nPoints);	double EvaluateLogL(const IModelFunction & func, const UnBinData & data, const double * x, int iWeight, bool extended, unsigned int & nPoints);

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

		By default is extended, pass extedend to false if want to be not ext ended (MultiNomial)
	*/	*/

	double EvaluatePoissonLogL(const IModelFunction & func, const BinData & data, const double * x, int iWeight, unsigned int & nPoints);	double EvaluatePoissonLogL(const IModelFunction & func, const BinData & data, const double * x, int iWeight, bool extended, 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. 4 change blocks.
	3 lines changed or deleted	4 lines changed or added

	G__ci_fproto.h	G__ci_fproto.h

	skipping to change at line 15	skipping to change at line 15
	* CINT header file G__ci_fproto.h	* CINT header file G__ci_fproto.h
	************************************************************************	************************************************************************
	* Description:	* Description:
	* C/C++ interpreter header file for API function prototypes	* C/C++ interpreter header file for API function prototypes
	************************************************************************	************************************************************************
	* Copyright(c) 1995~2005 Masaharu Goto (cint@pcroot.cern.ch)	* Copyright(c) 1995~2005 Masaharu Goto (cint@pcroot.cern.ch)
	*	*
	* For the licensing terms see the file COPYING	* For the licensing terms see the file COPYING
	*	*
	************************************************************************/	************************************************************************/

		#ifndef G__CI_FPROTO_INCLUDE
		#define G__CI_FPROTO_INCLUDE

	G__DECL_API(0, unsigned long, G__uint, (G__value buf))	G__DECL_API(0, unsigned long, G__uint, (G__value buf))
	G__DECL_API(1, int, G__fgetline, (char *string))	G__DECL_API(1, int, G__fgetline, (char *string))
	G__DECL_API(2, int, G__load, (char *commandfile))	G__DECL_API(2, int, G__load, (char *commandfile))
	/* G__DECL_API(???, float, G__float, (G__value buf))*/	/* G__DECL_API(???, float, G__float, (G__value buf))*/
	G__DECL_API(221, int, G__globalsetup,(void))	G__DECL_API(221, int, G__globalsetup,(void))
	G__DECL_API(3, int, G__call_setup_funcs, (void))	G__DECL_API(3, int, G__call_setup_funcs, (void))
	G__DECL_API(4, void, G__reset_setup_funcs, (void))	G__DECL_API(4, void, G__reset_setup_funcs, (void))
	G__DECL_API(5, G__CONST char*, G__cint_version, (void))	G__DECL_API(5, G__CONST char*, G__cint_version, (void))
	G__DECL_API(6, void, G__init_garbagecollection, (void))	G__DECL_API(6, void, G__init_garbagecollection, (void))

	skipping to change at line 407	skipping to change at line 409
	int reftype,int para_nu,int ansi, int access,int isconst, \	int reftype,int para_nu,int ansi, int access,int isconst, \
	G__CONST char paras,G__CONST cha r comment))	G__CONST char paras,G__CONST cha r comment))
	#endif /* G__TRUEP2F */	#endif /* G__TRUEP2F */
	G__DECL_API(267, int, G__memfunc_para_setup, (int ifn,int type,int tagnum,i nt typenum,int reftype, \	G__DECL_API(267, int, G__memfunc_para_setup, (int ifn,int type,int tagnum,i nt typenum,int reftype, \
	G__value para_default,char para_def,char *para_name))	G__value para_default,char para_def,char *para_name))

	G__DECL_API(268, struct G__ifunc_table_internal, G__get_ifunc_internal, (s truct G__ifunc_table iref))	G__DECL_API(268, struct G__ifunc_table_internal, G__get_ifunc_internal, (s truct G__ifunc_table iref))

	#define G__NUMBER_OF_API_FUNCTIONS 270	#define G__NUMBER_OF_API_FUNCTIONS 270
	G__DUMMYTOCHECKFORDUPLICATES(G__NUMBER_OF_API_FUNCTIONS)	G__DUMMYTOCHECKFORDUPLICATES(G__NUMBER_OF_API_FUNCTIONS)


		#endif /* G__CI_FPROTO_INCLUDE */

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

	HypoTestCalculatorGeneric.h	HypoTestCalculatorGeneric.h

	skipping to change at line 63	skipping to change at line 63

	~HypoTestCalculatorGeneric();	~HypoTestCalculatorGeneric();

	public:	public:

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

	// set the model for the null hypothesis (only B)	// set the model for the null hypothesis (only B)
	virtual void SetNullModel(const ModelConfig &nullModel) { fNullModel = &nullModel; }	virtual void SetNullModel(const ModelConfig &nullModel) { fNullModel = &nullModel; }

		const RooAbsData * GetData(void) const { return fData; }
	const ModelConfig* GetNullModel(void) const { return fNullModel; }	const ModelConfig* GetNullModel(void) const { return fNullModel; }
	// set the model for the alternate hypothesis (S+B)	// set the model for the alternate hypothesis (S+B)
	virtual void SetAlternateModel(const ModelConfig &altModel) { fAltMod el = &altModel; }	virtual void SetAlternateModel(const ModelConfig &altModel) { fAltMod el = &altModel; }
	const ModelConfig* GetAlternateModel(void) const { return fAltModel; }	const ModelConfig* GetAlternateModel(void) const { return fAltModel; }
	// Set the DataSet	// Set the DataSet
	virtual void SetData(RooAbsData &data) { fData = &data; }	virtual void SetData(RooAbsData &data) { fData = &data; }

	// Returns instance of TestStatSampler. Use to change properties of	// Returns instance of TestStatSampler. Use to change properties of
	// TestStatSampler, e.g. GetTestStatSampler.SetTestSize(Double_t size );	// TestStatSampler, e.g. GetTestStatSampler.SetTestSize(Double_t size );
	TestStatSampler* GetTestStatSampler(void) const { return fTestStatSam pler; }	TestStatSampler* GetTestStatSampler(void) const { return fTestStatSam pler; }

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

	LiteralString.h	LiteralString.h

	// @(#)root/reflex:$Id: LiteralString.h 32414 2010-02-26 05:43:25Z axel $	// @(#)root/reflex:$Id: LiteralString.h 41522 2011-10-20 22:40:16Z pcanal $
	// Author: Axel Naumann, 2010	// Author: Axel Naumann, 2010

	// Copyright CERN, CH-1211 Geneva 23, 2004-2010, All rights reserved.	// Copyright CERN, CH-1211 Geneva 23, 2004-2010, All rights reserved.
	//	//
	// Permission to use, copy, modify, and distribute this software for any	// Permission to use, copy, modify, and distribute this software for any
	// purpose is hereby granted without fee, provided that this copyright and	// purpose is hereby granted without fee, provided that this copyright and
	// permissions notice appear in all copies and derivatives.	// permissions notice appear in all copies and derivatives.
	//	//
	// This software is provided "as is" without express or implied warranty.	// This software is provided "as is" without express or implied warranty.


	skipping to change at line 35	skipping to change at line 35
	LiteralString(const LiteralString& other);	LiteralString(const LiteralString& other);

	~LiteralString();	~LiteralString();

	static void Add(const char* s);	static void Add(const char* s);
	static void Remove(const char* s);	static void Remove(const char* s);

	LiteralString& operator=(const LiteralString& other);	LiteralString& operator=(const LiteralString& other);

	const char* c_str() const { return fLiteral; }	const char* c_str() const { return fLiteral; }

	const char key() const { return (const char) &fLiteral; }	const char key() const { return const_cast<const char>(&fLiteral) ; }
	size_t length() const { return strlen(fLiteral); }	size_t length() const { return strlen(fLiteral); }
	void erase(size_t i);	void erase(size_t i);

	void ToHeap();	void ToHeap();
	bool IsLiteral() const { return !fAllocSize; }	bool IsLiteral() const { return !fAllocSize; }

	bool operator<(const LiteralString& other) const {	bool operator<(const LiteralString& other) const {
	return strcmp(fLiteral, other.fLiteral) < 0; }	return strcmp(fLiteral, other.fLiteral) < 0; }
	bool operator>(const LiteralString& other) const {	bool operator>(const LiteralString& other) const {
	return strcmp(fLiteral, other.fLiteral) > 0; }	return strcmp(fLiteral, other.fLiteral) > 0; }

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

	Minuit2Minimizer.h	Minuit2Minimizer.h

	skipping to change at line 146	skipping to change at line 146
	*/	*/
	virtual bool Minimize();	virtual bool Minimize();

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

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

	/// return pointer to X values at the minimum	/// return pointer to X values at the minimum

	virtual const double * X() const {	virtual const double * X() const;
	fValues = fState.Params();
	return (fValues.size() ) ? &fValues.front() : 0;
	}

	/// return pointer to gradient values at the minimum	/// return pointer to gradient values at the minimum
	virtual const double * MinGradient() const { return 0; } // not availab le in Minuit2	virtual const double * MinGradient() const { return 0; } // not availab le in Minuit2

	/// number of function calls to reach the minimum	/// number of function calls to reach the minimum
	virtual unsigned int NCalls() const { return fState.NFcn(); }	virtual unsigned int NCalls() const { return fState.NFcn(); }

	/// this is <= Function().NDim() which is the total	/// this is <= Function().NDim() which is the total
	/// number of variables (free+ constrained ones)	/// number of variables (free+ constrained ones)
	virtual unsigned int NDim() const { return fDim; }	virtual unsigned int NDim() const { return fDim; }

End of changes. 1 change blocks.
	4 lines changed or deleted	1 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	#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	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	686-slc5-gcc43-opt linux --fail-on-missing --enable-builtin-pcre --enable-c
	intex --enable-explicitlink --enable-gdml --enable-genvector --enable-krb5	intex --enable-explicitlink --enable-gdml --enable-genvector --enable-krb5
	--enable-mathmore --enable-minuit2 --enable-mysql --enable-oracle --enable-	--enable-mathmore --enable-minuit2 --enable-mysql --enable-oracle --enable-
	python --enable-qt --enable-qtgsi --enable-reflex --enable-roofit --enable-	python --enable-qt --enable-qtgsi --enable-reflex --enable-roofit --enable-
	table --enable-unuran --with-castor-incdir=/afs/cern.ch/sw/lcg/external/cas	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	tor/2.1.9-4/i686-slc5-gcc43-opt/usr/include/shift --with-castor-libdir=/afs
	s/cern.ch/sw/lcg/external/castor/2.1.8-10/i686-slc5-gcc43-opt/usr/lib --wit	/cern.ch/sw/lcg/external/castor/2.1.9-4/i686-slc5-gcc43-opt/usr/lib --with-
	h-cern-libdir=/afs/cern.ch/sw/lcg/external/cernlib/2006a/i686-slc5-gcc43-op	cern-libdir=/afs/cern.ch/sw/lcg/external/cernlib/2006a/i686-slc5-gcc43-opt/
	t/lib --with-dcap-libdir=/afs/cern.ch/sw/lcg/external/dcache_client/1.9.3p1	lib --with-dcap-libdir=/afs/cern.ch/sw/lcg/external/dcache_client/1.9.3p1/i
	/i686-slc5-gcc43-opt/dcap/lib --with-dcap-incdir=/afs/cern.ch/sw/lcg/extern	686-slc5-gcc43-opt/dcap/lib --with-dcap-incdir=/afs/cern.ch/sw/lcg/external
	al/dcache_client/1.9.3p1/i686-slc5-gcc43-opt/dcap/include --with-fftw3-incd	/dcache_client/1.9.3p1/i686-slc5-gcc43-opt/dcap/include --with-fftw3-incdir
	ir=/afs/cern.ch/sw/lcg/external/fftw3/3.1.2/i686-slc5-gcc43-opt/include --w	=/afs/cern.ch/sw/lcg/external/fftw3/3.1.2/i686-slc5-gcc43-opt/include --wit
	ith-fftw3-libdir=/afs/cern.ch/sw/lcg/external/fftw3/3.1.2/i686-slc5-gcc43-o	h-fftw3-libdir=/afs/cern.ch/sw/lcg/external/fftw3/3.1.2/i686-slc5-gcc43-opt
	pt/lib --with-gccxml=/afs/cern.ch/sw/lcg/external/gccxml/0.9.0_20100114/i68	/lib --with-gccxml=/afs/cern.ch/sw/lcg/external/gccxml/0.9.0_20100114/i686-
	6-slc5-gcc43-opt/bin --with-gfal-libdir=/afs/cern.ch/sw/lcg/external/Grid/g	slc5-gcc43-opt/bin --with-gfal-libdir=/afs/cern.ch/sw/lcg/external/Grid/gfa
	fal/1.11.8-2/i686-slc5-gcc43-opt/lib --with-gfal-incdir=/afs/cern.ch/sw/lcg	l/1.11.8-2/i686-slc5-gcc43-opt/lib --with-gfal-incdir=/afs/cern.ch/sw/lcg/e
	/external/Grid/gfal/1.11.8-2/i686-slc5-gcc43-opt/include --with-gsl-incdir=	xternal/Grid/gfal/1.11.8-2/i686-slc5-gcc43-opt/include --with-gsl-incdir=/a
	/afs/cern.ch/sw/lcg/external/GSL/1.10/i686-slc5-gcc43-opt/include --with-gs	fs/cern.ch/sw/lcg/external/GSL/1.10/i686-slc5-gcc43-opt/include --with-gsl-
	l-libdir=/afs/cern.ch/sw/lcg/external/GSL/1.10/i686-slc5-gcc43-opt/lib --wi	libdir=/afs/cern.ch/sw/lcg/external/GSL/1.10/i686-slc5-gcc43-opt/lib --with
	th-mysql-incdir=/afs/cern.ch/sw/lcg/external/mysql/5.5.14/i686-slc5-gcc43-o	-mysql-incdir=/afs/cern.ch/sw/lcg/external/mysql/5.5.14/i686-slc5-gcc43-opt
	pt/include --with-mysql-libdir=/afs/cern.ch/sw/lcg/external/mysql/5.5.14/i6	/include --with-mysql-libdir=/afs/cern.ch/sw/lcg/external/mysql/5.5.14/i686
	86-slc5-gcc43-opt/lib --with-oracle-incdir=/afs/cern.ch/sw/lcg/external/ora	-slc5-gcc43-opt/lib --with-oracle-incdir=/afs/cern.ch/sw/lcg/external/oracl
	cle/11.2.0.1.0p3/i686-slc5-gcc43-opt/include --with-oracle-libdir=/afs/cern	e/11.2.0.1.0p3/i686-slc5-gcc43-opt/include --with-oracle-libdir=/afs/cern.c
	.ch/sw/lcg/external/oracle/11.2.0.1.0p3/i686-slc5-gcc43-opt/lib --with-rfio	h/sw/lcg/external/oracle/11.2.0.1.0p3/i686-slc5-gcc43-opt/lib --with-rfio-i
	-incdir=/afs/cern.ch/sw/lcg/external/castor/2.1.8-10/i686-slc5-gcc43-opt/us	ncdir=/afs/cern.ch/sw/lcg/external/castor/2.1.9-4/i686-slc5-gcc43-opt/usr/i
	r/include/shift --with-rfio-libdir=/afs/cern.ch/sw/lcg/external/castor/2.1.	nclude/shift --with-rfio-libdir=/afs/cern.ch/sw/lcg/external/castor/2.1.9-4
	8-10/i686-slc5-gcc43-opt/usr/lib --with-pythia6-libdir=/afs/cern.ch/sw/lcg/	/i686-slc5-gcc43-opt/usr/lib --with-pythia6-libdir=/afs/cern.ch/sw/lcg/exte
	external/MCGenerators/pythia6/424.2/i686-slc5-gcc43-opt/lib --with-pythia8-	rnal/MCGenerators/pythia6/424.2/i686-slc5-gcc43-opt/lib --with-pythia8-incd
	incdir=/afs/cern.ch/sw/lcg/external/MCGenerators/pythia8/145/i686-slc5-gcc4	ir=/afs/cern.ch/sw/lcg/external/MCGenerators/pythia8/145/i686-slc5-gcc43-op
	3-opt/include --with-pythia8-libdir=/afs/cern.ch/sw/lcg/external/MCGenerato	t/include --with-pythia8-libdir=/afs/cern.ch/sw/lcg/external/MCGenerators/p
	rs/pythia8/145/i686-slc5-gcc43-opt/lib --with-gviz-incdir=/afs/cern.ch/sw/l	ythia8/145/i686-slc5-gcc43-opt/lib --with-gviz-incdir=/afs/cern.ch/sw/lcg/e
	cg/external/graphviz/2.24.0/i686-slc5-gcc43-opt/include/graphviz --with-gvi	xternal/graphviz/2.24.0/i686-slc5-gcc43-opt/include/graphviz --with-gviz-li
	z-libdir=/afs/cern.ch/sw/lcg/external/graphviz/2.24.0/i686-slc5-gcc43-opt/l	bdir=/afs/cern.ch/sw/lcg/external/graphviz/2.24.0/i686-slc5-gcc43-opt/lib -
	ib"	-with-xrootd=/afs/cern.ch/sw/lcg/external/xrootd/3.1.0/i686-slc5-gcc43-opt"
	#define R__CONFIGUREFEATURES "asimage astiff builtin_afterimage builtin_ft	#define R__CONFIGUREFEATURES "asimage astiff builtin_afterimage builtin_ft
	gl builtin_glew builtin_pcre builtin_lzma castor cintex dcache exceptions e	gl builtin_glew builtin_pcre builtin_lzma castor cintex dcache exceptions e
	xplicitlink fftw3 gviz gdml genvector gfal krb5 ldap mathmore memstat minui	xplicitlink fftw3 gdml genvector gfal krb5 ldap mathmore memstat minuit2 my
	t2 mysql opengl oracle pythia8 python qt qtgsi reflex roofit rfio shadowpw	sql opengl oracle pythia8 python qt qtgsi reflex roofit rfio shadowpw share
	shared ssl table tmva unuran x11 xft xml xrootd thread"	d ssl table tmva unuran x11 xft xml xrootd thread"

	#endif	#endif

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

	RooAbsPdf.h	RooAbsPdf.h

	skipping to change at line 59	skipping to change at line 59
	virtual ~RooAbsPdf();	virtual ~RooAbsPdf();

	// Toy MC generation	// Toy MC generation
	RooDataSet *generate(const RooArgSet &whatVars, Int_t nEvents, const RooC mdArg& arg1,	RooDataSet *generate(const RooArgSet &whatVars, Int_t nEvents, const RooC mdArg& arg1,
	const RooCmdArg& arg2=RooCmdArg::none(), const RooCm dArg& arg3=RooCmdArg::none(),	const RooCmdArg& arg2=RooCmdArg::none(), const RooCm dArg& arg3=RooCmdArg::none(),
	const RooCmdArg& arg4=RooCmdArg::none(), const RooCm dArg& arg5=RooCmdArg::none()) ;	const RooCmdArg& arg4=RooCmdArg::none(), const RooCm dArg& arg5=RooCmdArg::none()) ;
	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	RooDataSet *generate(const RooArgSet &whatVars, Int_t nEvents = 0, Bool_t
	verbose=kFALSE) const;	verbose=kFALSE, Bool_t autoBinned=kTRUE,
		const char* binnedTag="", Bool_t expectedData=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:
	virtual ~GenSpec() ;	virtual ~GenSpec() ;

	GenSpec() { _genContext = 0 ; _protoData = 0 ; }	GenSpec() { _genContext = 0 ; _protoData = 0 ; _init = kFALSE ; }
	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, Bool_t init=kFALSE) ;
	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 ;

		Bool_t _init ;
	ClassDef(GenSpec,0) // Generation specification	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,	virtual RooDataHist *generateBinned(const RooArgSet &whatVars, Double_t n Events, const RooCmdArg& arg1,
	const RooCmdArg& arg2=RooCmdArg::none(), const RooCmdArg& arg3=RooCmdArg::none(),	const RooCmdArg& arg2=RooCmdArg::none(), const RooCmdArg& arg3=RooCmdArg::none(),
	const RooCmdArg& arg4=RooCmdArg::none(), const RooCmdArg& arg5=RooCmdArg::none()) ;	const RooCmdArg& arg4=RooCmdArg::none(), const RooCmdArg& arg5=RooCmdArg::none()) ;

	RooDataHist *generateBinned(const RooArgSet &whatVars,	virtual RooDataHist *generateBinned(const RooArgSet &whatVars,
	const RooCmdArg& arg1=RooCmdArg::none(),const RooCmdArg& arg2=RooCmdArg::none(),	const RooCmdArg& arg1=RooCmdArg::none(),const RooCmdArg& arg2=RooCmdArg::none(),
	const RooCmdArg& arg3=RooCmdArg::none(),const RooCmdArg& arg4=RooCmdArg::none(),	const RooCmdArg& arg3=RooCmdArg::none(),const RooCmdArg& arg4=RooCmdArg::none(),
	const RooCmdArg& arg5=RooCmdArg::none(),const RooCmdArg& arg6=RooCmdArg::none()) ;	const RooCmdArg& arg5=RooCmdArg::none(),const RooCmdArg& arg6=RooCmdArg::none()) ;

	RooDataHist *generateBinned(const RooArgSet &whatVars, Double_t nEvents, Bool_t expectedData=kFALSE, Bool_t extended=kFALSE) const;	virtual RooDataHist *generateBinned(const RooArgSet &whatVars, Double_t n Events, Bool_t expectedData=kFALSE, Bool_t extended=kFALSE) const;

	virtual RooDataSet* generateSimGlobal(const RooArgSet& whatVars, Int_t nE vents) ;	virtual RooDataSet* generateSimGlobal(const RooArgSet& whatVars, Int_t nE vents) ;

	virtual RooPlot* plotOn(RooPlot* frame,	virtual RooPlot* plotOn(RooPlot* frame,
	const RooCmdArg& arg1=RooCmdArg::none(), const Roo CmdArg& arg2=RooCmdArg::none(),	const RooCmdArg& arg1=RooCmdArg::none(), const Roo CmdArg& arg2=RooCmdArg::none(),
	const RooCmdArg& arg3=RooCmdArg::none(), const Roo CmdArg& arg4=RooCmdArg::none(),	const RooCmdArg& arg3=RooCmdArg::none(), const Roo CmdArg& arg4=RooCmdArg::none(),
	const RooCmdArg& arg5=RooCmdArg::none(), const Roo CmdArg& arg6=RooCmdArg::none(),	const RooCmdArg& arg5=RooCmdArg::none(), const Roo CmdArg& arg6=RooCmdArg::none(),
	const RooCmdArg& arg7=RooCmdArg::none(), const Roo CmdArg& arg8=RooCmdArg::none(),	const RooCmdArg& arg7=RooCmdArg::none(), const Roo CmdArg& arg8=RooCmdArg::none(),
	const RooCmdArg& arg9=RooCmdArg::none(), const Roo CmdArg& arg10=RooCmdArg::none()	const RooCmdArg& arg9=RooCmdArg::none(), const Roo CmdArg& arg10=RooCmdArg::none()
	) const {	) const {

	skipping to change at line 177	skipping to change at line 179
	// Create cumulative density function from p.d.f	// Create cumulative density function from p.d.f
	RooAbsReal* createCdf(const RooArgSet& iset, const RooArgSet& nset=RooArg Set()) ;	RooAbsReal* createCdf(const RooArgSet& iset, const RooArgSet& nset=RooArg Set()) ;
	RooAbsReal* createCdf(const RooArgSet& iset, const RooCmdArg& arg1, const RooCmdArg& arg2=RooCmdArg::none(),	RooAbsReal* createCdf(const RooArgSet& iset, const RooCmdArg& arg1, 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(),
	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 RooCmdArg& arg7=RooCmdArg::none(), const RooCm dArg& arg8=RooCmdArg::none()) ;
	RooAbsReal* createScanCdf(const RooArgSet& iset, const RooArgSet& nset, I nt_t numScanBins, Int_t intOrder) ;	RooAbsReal* createScanCdf(const RooArgSet& iset, const RooArgSet& nset, I nt_t numScanBins, Int_t intOrder) ;

	// Function evaluation support	// Function evaluation support
	virtual Bool_t traceEvalHook(Double_t value) const ;	virtual Bool_t traceEvalHook(Double_t value) const ;

	virtual Double_t getVal(const RooArgSet* set=0) const ;	virtual Double_t getValV(const RooArgSet* set=0) const ;
	virtual Double_t getLogVal(const RooArgSet* set=0) const ;	virtual Double_t getLogVal(const RooArgSet* set=0) const ;

	void setNormValueCaching(Int_t minNumIntDim, Int_t ipOrder=2) ;	void setNormValueCaching(Int_t minNumIntDim, Int_t ipOrder=2) ;
	Int_t minDimNormValueCaching() const { return _minDimNormValueCache ; }	Int_t minDimNormValueCaching() const { return _minDimNormValueCache ; }
	Int_t intOrderNormValueCaching() const { return _valueCacheIntOrder ; }	Int_t intOrderNormValueCaching() const { return _valueCacheIntOrder ; }

	Double_t getNorm(const RooArgSet& nset) const {	Double_t getNorm(const RooArgSet& nset) const {
	// Get p.d.f normalization term needed for observables 'nset'	// Get p.d.f normalization term needed for observables 'nset'
	return getNorm(&nset) ;	return getNorm(&nset) ;
	}	}

	skipping to change at line 249	skipping to change at line 251
	}	}
	void setNormRangeOverride(const char* rangeName) ;	void setNormRangeOverride(const char* rangeName) ;

	protected:	protected:

	public:	public:
	virtual const RooAbsReal* getNormObj(const RooArgSet* set, const RooArgSe t* iset, const TNamed* rangeName=0) const ;	virtual const RooAbsReal* getNormObj(const RooArgSet* set, const RooArgSe t* iset, const TNamed* rangeName=0) const ;
	protected:	protected:

	RooDataSet generate(RooAbsGenContext& context, const RooArgSet& whatVars , const RooDataSet prototype,	RooDataSet generate(RooAbsGenContext& context, const RooArgSet& whatVars , const RooDataSet prototype,

	Int_t nEvents, Bool_t verbose, Bool_t randProtoOrder,	Int_t nEvents, Bool_t verbose, Bool_t randProtoOrder,
	Bool_t resampleProto) const ;	Bool_t resampleProto, Bool_t skipInit=kFALSE,
		Bool_t extended=kFALSE) const ;

	// Implementation version	// Implementation version
	virtual RooPlot* paramOn(RooPlot* frame, const RooArgSet& params, Bool_t showConstants=kFALSE,	virtual RooPlot* paramOn(RooPlot* frame, const RooArgSet& params, Bool_t showConstants=kFALSE,
	const char label= "", Int_t sigDigits = 2, Opti on_t options = "NELU", Double_t xmin=0.65,	const char label= "", Int_t sigDigits = 2, Opti on_t options = "NELU", Double_t xmin=0.65,
	Double_t xmax= 0.99,Double_t ymax=0.95, const Roo CmdArg* formatCmd=0) ;	Double_t xmax= 0.99,Double_t ymax=0.95, const Roo CmdArg* formatCmd=0) ;

	virtual RooPlot* plotOn(RooPlot* frame, RooLinkedList& cmdList) const ;	virtual RooPlot* plotOn(RooPlot* frame, RooLinkedList& cmdList) const ;
	void plotOnCompSelect(RooArgSet* selNodes) const ;	void plotOnCompSelect(RooArgSet* selNodes) const ;

	virtual RooPlot plotOn(RooPlot frame, PlotOpt o) const;	virtual RooPlot plotOn(RooPlot frame, PlotOpt o) const;

	friend class RooEffGenContext ;	friend class RooEffGenContext ;
	friend class RooAddGenContext ;	friend class RooAddGenContext ;
	friend class RooProdGenContext ;	friend class RooProdGenContext ;
	friend class RooSimGenContext ;	friend class RooSimGenContext ;

		friend class RooSimSplitGenContext ;
	friend class RooConvGenContext ;	friend class RooConvGenContext ;
	friend class RooSimultaneous ;	friend class RooSimultaneous ;
	friend class RooAddGenContextOrig ;	friend class RooAddGenContextOrig ;

		friend class RooProdPdf ;
	friend class RooMCStudy ;	friend class RooMCStudy ;

	Int_t* randomizeProtoOrder(Int_t nProto,Int_t nGen,Bool_t resample=kFALSE ) const ;	Int_t* randomizeProtoOrder(Int_t nProto,Int_t nGen,Bool_t resample=kFALSE ) const ;


		virtual RooAbsGenContext* binnedGenContext(const RooArgSet &vars, Bool_t
		verbose= kFALSE) const ;

	virtual RooAbsGenContext* genContext(const RooArgSet &vars, const RooData Set *prototype=0,	virtual RooAbsGenContext* genContext(const RooArgSet &vars, const RooData Set *prototype=0,
	const RooArgSet* auxProto=0, Bool_t v erbose= kFALSE) const ;	const RooArgSet* auxProto=0, Bool_t v erbose= kFALSE) const ;


		virtual RooAbsGenContext* autoGenContext(const RooArgSet &vars, const Roo
		DataSet* prototype=0, const RooArgSet* auxProto=0,
		Bool_t verbose=kFALSE, Bool_t aut
		oBinned=kTRUE, const char* binnedTag="") const ;

	friend class RooExtendPdf ;	friend class RooExtendPdf ;
	// This also forces the definition of a copy ctor in derived classes	// This also forces the definition of a copy ctor in derived classes
	RooAbsPdf(const RooAbsPdf& other, const char* name = 0);	RooAbsPdf(const RooAbsPdf& other, const char* name = 0);

	friend class RooRealIntegral ;	friend class RooRealIntegral ;
	static Int_t _verboseEval ;	static Int_t _verboseEval ;

	virtual Bool_t syncNormalization(const RooArgSet* dset, Bool_t adjustProx ies=kTRUE) const ;	virtual Bool_t syncNormalization(const RooArgSet* dset, Bool_t adjustProx ies=kTRUE) const ;

	friend class RooAbsAnaConvPdf ;	friend class RooAbsAnaConvPdf ;

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

	RooAbsTestStatistic.h	RooAbsTestStatistic.h

	skipping to change at line 50	skipping to change at line 50
	RooAbsTestStatistic() ;	RooAbsTestStatistic() ;
	RooAbsTestStatistic(const char name, const char title, RooAbsReal& real , RooAbsData& data,	RooAbsTestStatistic(const char name, const char title, RooAbsReal& real , RooAbsData& data,
	const RooArgSet& projDeps, const char* rangeName=0, co nst char* addCoefRangeName=0,	const RooArgSet& projDeps, const char* rangeName=0, co nst char* addCoefRangeName=0,
	Int_t nCPU=1, Bool_t interleave=kFALSE, Bool_t verbose =kTRUE, Bool_t splitCutRange=kTRUE) ;	Int_t nCPU=1, Bool_t interleave=kFALSE, Bool_t verbose =kTRUE, Bool_t splitCutRange=kTRUE) ;
	RooAbsTestStatistic(const RooAbsTestStatistic& other, const char* name=0) ;	RooAbsTestStatistic(const RooAbsTestStatistic& other, const char* name=0) ;
	virtual ~RooAbsTestStatistic();	virtual ~RooAbsTestStatistic();
	virtual RooAbsTestStatistic* create(const char name, const char title, RooAbsReal& real, RooAbsData& data,	virtual RooAbsTestStatistic* create(const char name, const char title, RooAbsReal& real, RooAbsData& data,
	const RooArgSet& projDeps, const char* rangeName=0, const char* addCoefRangeName=0,	const RooArgSet& projDeps, const char* rangeName=0, const char* addCoefRangeName=0,
	Int_t nCPU=1, Bool_t interleave=kFALSE , Bool_t 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, Bool_t doAlso TrackingOpt=kTRUE) ;

	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) ;	Bool_t setData(RooAbsData& data, Bool_t cloneData=kTRUE) ;

	protected:	protected:

	skipping to change at line 107	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 ; }	virtual Bool_t setDataSlave(RooAbsData& /data/, Bool_t /cloneData/=kT RUE, Bool_t /ownNewDataAnyway/=kFALSE) { 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

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

	RooAddPdf.h	RooAddPdf.h

	skipping to change at line 86	skipping to change at line 86

	void fixCoefNormalization(const RooArgSet& refCoefNorm) ;	void fixCoefNormalization(const RooArgSet& refCoefNorm) ;
	void fixCoefRange(const char* rangeName) ;	void fixCoefRange(const char* rangeName) ;

	const RooArgSet& getCoefNormalization() const { return _refCoefNorm ; }	const RooArgSet& getCoefNormalization() const { return _refCoefNorm ; }
	const char* getCoefRange() const { return _refCoefRangeName?RooNameReg::s tr(_refCoefRangeName):"" ; }	const char* getCoefRange() const { return _refCoefRangeName?RooNameReg::s tr(_refCoefRangeName):"" ; }

	virtual void resetErrorCounters(Int_t resetValue=10) ;	virtual void resetErrorCounters(Int_t resetValue=10) ;

	virtual std::list<Double_t>* plotSamplingHint(RooAbsRealLValue& obs, Doub le_t xlo, Double_t xhi) const ;	virtual std::list<Double_t>* plotSamplingHint(RooAbsRealLValue& obs, Doub le_t xlo, Double_t xhi) const ;

		virtual std::list<Double_t>* binBoundaries(RooAbsRealLValue& /obs/, Dou
		ble_t /xlo/, Double_t /xhi/) const ;
		Bool_t isBinnedDistribution(const RooArgSet& obs) const ;

	void printMetaArgs(ostream& os) const ;	void printMetaArgs(ostream& os) const ;

	protected:	protected:

	virtual void selectNormalization(const RooArgSet* depSet=0, Bool_t force= kFALSE) ;	virtual void selectNormalization(const RooArgSet* depSet=0, Bool_t force= kFALSE) ;
	virtual void selectNormalizationRange(const char* rangeName=0, Bool_t for ce=kFALSE) ;	virtual void selectNormalizationRange(const char* rangeName=0, Bool_t for ce=kFALSE) ;

	mutable RooSetProxy _refCoefNorm ; // Reference observable set for coef ficient interpretation	mutable RooSetProxy _refCoefNorm ; // Reference observable set for coef ficient interpretation
	mutable TNamed* _refCoefRangeName ; // Reference range name for coeffici ent interpreation	mutable TNamed* _refCoefRangeName ; // Reference range name for coeffici ent interpreation

	Bool_t _projectCoefs ; // If true coefficients need to be project ed for use in evaluate()	Bool_t _projectCoefs ; // If true coefficients need to be project ed for use in evaluate()
	mutable Double_t* _coefCache ; //! Transiet cache with transformed values of coefficients	mutable Double_t* _coefCache ; //! Transiet cache with transformed values of coefficients

	class CacheElem : public RooAbsCacheElement {	class CacheElem : public RooAbsCacheElement {
	public:	public:
	virtual ~CacheElem() {} ;	virtual ~CacheElem() {} ;

	RooArgList _suppNormList ; // Supplemental normalization list	RooArgList _suppNormList ; // Supplemental normalization list

		Bool_t _needSupNorm ; // Does the above list contain any non-unit en tries?

	RooArgList _projList ; // Projection integrals to be multiplied with co efficients	RooArgList _projList ; // Projection integrals to be multiplied with co efficients
	RooArgList _suppProjList ; // Projection integrals to be multiplied wit h coefficients for supplemental normalization terms	RooArgList _suppProjList ; // Projection integrals to be multiplied wit h coefficients for supplemental normalization terms
	RooArgList _refRangeProjList ; // Range integrals to be multiplied with coefficients (reference range)	RooArgList _refRangeProjList ; // Range integrals to be multiplied with coefficients (reference range)
	RooArgList _rangeProjList ; // Range integrals to be multiplied with co efficients (target range)	RooArgList _rangeProjList ; // Range integrals to be multiplied with co efficients (target range)

	virtual RooArgList containedArgs(Action) ;	virtual RooArgList containedArgs(Action) ;

	} ;	} ;
	mutable RooObjCacheManager _projCacheMgr ; // Manager of cache with coef ficient projections and transformations	mutable RooObjCacheManager _projCacheMgr ; // Manager of cache with coef ficient projections and transformations

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

	RooDataHist.h	RooDataHist.h

	skipping to change at line 82	skipping to change at line 82
	void add(const RooAbsData& dset, const RooFormulaVar* cutVar=0, Double_t weight=1.0 ) ;	void add(const RooAbsData& dset, const RooFormulaVar* cutVar=0, Double_t weight=1.0 ) ;
	void add(const RooAbsData& dset, const char* cut, Double_t weight=1.0 ) ;	void add(const RooAbsData& dset, const char* cut, Double_t weight=1.0 ) ;

	virtual const RooArgSet* get() const {	virtual const RooArgSet* get() const {
	// Return set with coordinates of center of current bin	// Return set with coordinates of center of current bin
	return &_vars ;	return &_vars ;
	}	}
	virtual const RooArgSet* get(Int_t masterIdx) const ;	virtual const RooArgSet* get(Int_t masterIdx) const ;
	virtual const RooArgSet* get(const RooArgSet& coord) const ;	virtual const RooArgSet* get(const RooArgSet& coord) const ;
	virtual Int_t numEntries() const ;	virtual Int_t numEntries() const ;

	virtual Double_t sumEntries(const char* cutSpec=0, const char* cutRange=0	virtual Double_t sumEntries() const ;
	) const ;	virtual Double_t sumEntries(const char* cutSpec, const char* cutRange=0)
		const ;
	virtual Bool_t isWeighted() const {	virtual Bool_t isWeighted() const {
	// Return true as all histograms have in principle events weight != 1	// Return true as all histograms have in principle events weight != 1
	return kTRUE ;	return kTRUE ;
	}	}
	virtual Bool_t isNonPoissonWeighted() const ;	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 {

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

	RooDataSet.h	RooDataSet.h

	skipping to change at line 67	skipping to change at line 67
	const RooFormulaVar& cutVar, const char* wgtVarName=0) ;	const RooFormulaVar& cutVar, const char* wgtVarName=0) ;

	RooDataSet(RooDataSet const & other, const char* newname=0) ;	RooDataSet(RooDataSet const & other, const char* newname=0) ;
	virtual TObject* Clone(const char* newname=0) const { return new RooDataS et(*this,newname?newname:GetName()) ; }	virtual TObject* Clone(const char* newname=0) const { return new RooDataS et(*this,newname?newname:GetName()) ; }
	virtual ~RooDataSet() ;	virtual ~RooDataSet() ;

	virtual RooAbsData* emptyClone(const char* newName=0, const char* newTitl e=0, const RooArgSet* vars=0) const ;	virtual RooAbsData* emptyClone(const char* newName=0, const char* newTitl e=0, const RooArgSet* vars=0) const ;

	RooDataHist* binnedClone(const char* newName=0, const char* newTitle=0) c onst ;	RooDataHist* binnedClone(const char* newName=0, const char* newTitle=0) c onst ;


	virtual Double_t sumEntries(const char* cutSpec=0, const char* cutRange=0	virtual Double_t sumEntries() const ;
	) const ;	virtual Double_t sumEntries(const char* cutSpec, const char* cutRange=0)
		const ;

	virtual RooPlot* plotOnXY(RooPlot* frame,	virtual RooPlot* plotOnXY(RooPlot* frame,
	const RooCmdArg& arg1=RooCmdArg::none(), const R ooCmdArg& arg2=RooCmdArg::none(),	const RooCmdArg& arg1=RooCmdArg::none(), const R ooCmdArg& arg2=RooCmdArg::none(),
	const RooCmdArg& arg3=RooCmdArg::none(), const R ooCmdArg& arg4=RooCmdArg::none(),	const RooCmdArg& arg3=RooCmdArg::none(), const R ooCmdArg& arg4=RooCmdArg::none(),
	const RooCmdArg& arg5=RooCmdArg::none(), const R ooCmdArg& arg6=RooCmdArg::none(),	const RooCmdArg& arg5=RooCmdArg::none(), const R ooCmdArg& arg6=RooCmdArg::none(),
	const RooCmdArg& arg7=RooCmdArg::none(), const R ooCmdArg& arg8=RooCmdArg::none()) const ;	const RooCmdArg& arg7=RooCmdArg::none(), const R ooCmdArg& arg8=RooCmdArg::none()) const ;

	// Read data from a text file and create a dataset from it.	// Read data from a text file and create a dataset from it.
	// The possible options are: (D)ebug, (Q)uiet.	// The possible options are: (D)ebug, (Q)uiet.
	static RooDataSet read(const char filename, const RooArgList &variables ,	static RooDataSet read(const char filename, const RooArgList &variables ,

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

	RooGlobalFunc.h	RooGlobalFunc.h

	skipping to change at line 169	skipping to change at line 169

	// RooAbsReal::fillHistogram arguments	// RooAbsReal::fillHistogram arguments
	RooCmdArg IntegratedObservables(const RooArgSet& intObs) ;	RooCmdArg IntegratedObservables(const RooArgSet& intObs) ;

	// RooAbsData::reduce arguments	// RooAbsData::reduce arguments
	RooCmdArg SelectVars(const RooArgSet& vars) ;	RooCmdArg SelectVars(const RooArgSet& vars) ;
	RooCmdArg EventRange(Int_t nStart, Int_t nStop) ;	RooCmdArg EventRange(Int_t nStart, Int_t nStop) ;

	// RooAbsPdf::fitTo arguments	// RooAbsPdf::fitTo arguments
	RooCmdArg FitOptions(const char* opts) ;	RooCmdArg FitOptions(const char* opts) ;

	RooCmdArg Optimize(Bool_t flag=kTRUE) ;	RooCmdArg Optimize(Int_t flag=2) ;
	RooCmdArg ProjectedObservables(const RooArgSet& set) ; // obsolete, for bac kward compatibility	RooCmdArg ProjectedObservables(const RooArgSet& set) ; // obsolete, for bac kward compatibility
	RooCmdArg ConditionalObservables(const RooArgSet& set) ;	RooCmdArg ConditionalObservables(const RooArgSet& set) ;
	RooCmdArg Verbose(Bool_t flag=kTRUE) ;	RooCmdArg Verbose(Bool_t flag=kTRUE) ;
	RooCmdArg Save(Bool_t flag=kTRUE) ;	RooCmdArg Save(Bool_t flag=kTRUE) ;
	RooCmdArg Timer(Bool_t flag=kTRUE) ;	RooCmdArg Timer(Bool_t flag=kTRUE) ;
	RooCmdArg PrintLevel(Int_t code) ;	RooCmdArg PrintLevel(Int_t code) ;
	RooCmdArg Warnings(Bool_t flag=kTRUE) ;	RooCmdArg Warnings(Bool_t flag=kTRUE) ;
	RooCmdArg Strategy(Int_t code) ;	RooCmdArg Strategy(Int_t code) ;
	RooCmdArg InitialHesse(Bool_t flag=kTRUE) ;	RooCmdArg InitialHesse(Bool_t flag=kTRUE) ;
	RooCmdArg Hesse(Bool_t flag=kTRUE) ;	RooCmdArg Hesse(Bool_t flag=kTRUE) ;

	skipping to change at line 210	skipping to change at line 210
	// RooTreeData::statOn arguments	// RooTreeData::statOn arguments
	RooCmdArg What(const char* str) ;	RooCmdArg What(const char* str) ;

	// RooProdPdf::ctor arguments	// RooProdPdf::ctor arguments
	RooCmdArg Conditional(const RooArgSet& pdfSet, const RooArgSet& depSet, Boo l_t depsAreCond=kFALSE) ;	RooCmdArg Conditional(const RooArgSet& pdfSet, const RooArgSet& depSet, Boo l_t depsAreCond=kFALSE) ;

	// RooAbsPdf::generate arguments	// RooAbsPdf::generate arguments
	RooCmdArg ProtoData(const RooDataSet& protoData, Bool_t randomizeOrder=kFAL SE, Bool_t resample=kFALSE) ;	RooCmdArg ProtoData(const RooDataSet& protoData, Bool_t randomizeOrder=kFAL SE, Bool_t resample=kFALSE) ;
	RooCmdArg NumEvents(Int_t numEvents) ;	RooCmdArg NumEvents(Int_t numEvents) ;
	RooCmdArg NumEvents(Double_t numEvents) ;	RooCmdArg NumEvents(Double_t numEvents) ;

		RooCmdArg AutoBinned(Bool_t flag=kTRUE) ;
		RooCmdArg GenBinned(const char* tag) ;
		RooCmdArg AllBinned() ;
	RooCmdArg ExpectedData(Bool_t flag=kTRUE) ;	RooCmdArg ExpectedData(Bool_t flag=kTRUE) ;
	RooCmdArg Asimov(Bool_t flag=kTRUE) ;	RooCmdArg Asimov(Bool_t flag=kTRUE) ;

	// RooAbsRealLValue::createHistogram arguments	// RooAbsRealLValue::createHistogram arguments
	RooCmdArg YVar(const RooAbsRealLValue& var, const RooCmdArg& arg=RooCmdArg: :none()) ;	RooCmdArg YVar(const RooAbsRealLValue& var, const RooCmdArg& arg=RooCmdArg: :none()) ;
	RooCmdArg ZVar(const RooAbsRealLValue& var, const RooCmdArg& arg=RooCmdArg: :none()) ;	RooCmdArg ZVar(const RooAbsRealLValue& var, const RooCmdArg& arg=RooCmdArg: :none()) ;
	RooCmdArg AxisLabel(const char* name) ;	RooCmdArg AxisLabel(const char* name) ;
	RooCmdArg Scaling(Bool_t flag) ;	RooCmdArg Scaling(Bool_t flag) ;

	// RooAbsReal::createIntegral arguments	// RooAbsReal::createIntegral arguments

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

	RooProdPdf.h	RooProdPdf.h

	skipping to change at line 57	skipping to change at line 57
	RooProdPdf(const char* name, const char* title,	RooProdPdf(const char* name, const char* title,
	const RooCmdArg& arg1, const RooCmdArg& arg2=RooCm dArg(),	const RooCmdArg& arg1, const RooCmdArg& arg2=RooCm dArg(),
	const RooCmdArg& arg3=RooCmdArg(), const RooCmdArg& arg4=RooCm dArg(),	const RooCmdArg& arg3=RooCmdArg(), const RooCmdArg& arg4=RooCm dArg(),
	const RooCmdArg& arg5=RooCmdArg(), const RooCmdArg& arg6=RooCm dArg(),	const RooCmdArg& arg5=RooCmdArg(), const RooCmdArg& arg6=RooCm dArg(),
	const RooCmdArg& arg7=RooCmdArg(), const RooCmdArg& arg8=RooCm dArg()) ;	const RooCmdArg& arg7=RooCmdArg(), const RooCmdArg& arg8=RooCm dArg()) ;

	RooProdPdf(const RooProdPdf& other, const char* name=0) ;	RooProdPdf(const RooProdPdf& other, const char* name=0) ;
	virtual TObject* clone(const char* newname) const { return new RooProdPdf (*this,newname) ; }	virtual TObject* clone(const char* newname) const { return new RooProdPdf (*this,newname) ; }
	virtual ~RooProdPdf() ;	virtual ~RooProdPdf() ;


	virtual Double_t getVal(const RooArgSet* set=0) const ;	virtual Double_t getValV(const RooArgSet* set=0) const ;
	Double_t evaluate() const ;	Double_t evaluate() const ;
	virtual Bool_t checkObservables(const RooArgSet* nset) const ;	virtual Bool_t checkObservables(const RooArgSet* nset) const ;

	virtual Bool_t forceAnalyticalInt(const RooAbsArg& dep) const ;	virtual Bool_t forceAnalyticalInt(const RooAbsArg& dep) const ;
	Int_t getAnalyticalIntegralWN(RooArgSet& allVars, RooArgSet& numVars, con st RooArgSet* normSet, const char* rangeName=0) const ;	Int_t getAnalyticalIntegralWN(RooArgSet& allVars, RooArgSet& numVars, con st RooArgSet* normSet, const char* rangeName=0) const ;
	Double_t analyticalIntegralWN(Int_t code, const RooArgSet* normSet, const char* rangeName=0) const ;	Double_t analyticalIntegralWN(Int_t code, const RooArgSet* normSet, const char* rangeName=0) const ;
	virtual Bool_t selfNormalized() const { return _selfNorm ; }	virtual Bool_t selfNormalized() const { return _selfNorm ; }

	virtual ExtendMode extendMode() const ;	virtual ExtendMode extendMode() const ;
	virtual Double_t expectedEvents(const RooArgSet* nset) const ;	virtual Double_t expectedEvents(const RooArgSet* nset) const ;

	skipping to change at line 81	skipping to change at line 81

	virtual Int_t getGenerator(const RooArgSet& directVars, RooArgSet &genera teVars, Bool_t staticInitOK=kTRUE) const;	virtual Int_t getGenerator(const RooArgSet& directVars, RooArgSet &genera teVars, Bool_t staticInitOK=kTRUE) const;
	virtual void initGenerator(Int_t code) ;	virtual void initGenerator(Int_t code) ;
	virtual void generateEvent(Int_t code);	virtual void generateEvent(Int_t code);
	virtual Bool_t isDirectGenSafe(const RooAbsArg& arg) const ;	virtual Bool_t isDirectGenSafe(const RooAbsArg& arg) const ;

	// Constraint management	// Constraint management
	virtual RooArgSet* getConstraints(const RooArgSet& observables, RooArgSet & constrainedParams, Bool_t stripDisconnected) const ;	virtual RooArgSet* getConstraints(const RooArgSet& observables, RooArgSet & constrainedParams, Bool_t stripDisconnected) const ;

	virtual std::list<Double_t>* plotSamplingHint(RooAbsRealLValue& obs, Doub le_t xlo, Double_t xhi) const ;	virtual std::list<Double_t>* plotSamplingHint(RooAbsRealLValue& obs, Doub le_t xlo, Double_t xhi) const ;

		virtual std::list<Double_t>* binBoundaries(RooAbsRealLValue& /obs/, Dou
		ble_t /xlo/, Double_t /xhi/) const ;
		Bool_t isBinnedDistribution(const RooArgSet& obs) 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/) ;	Bool_t redirectServersHook(const RooAbsCollection& /newServerList/, Boo l_t /mustReplaceAll/, Bool_t /nameChange/, Bool_t /isRecursive/) ;


		RooArgSet* getConnectedParameters(const RooArgSet& observables) const ;

	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. 3 change blocks.
	1 lines changed or deleted	6 lines changed or added

	RooProjectedPdf.h	RooProjectedPdf.h

	skipping to change at line 35	skipping to change at line 35
	RooProjectedPdf(const char name, const char title, RooAbsReal& _intpdf , const RooArgSet& intObs);	RooProjectedPdf(const char name, const char title, RooAbsReal& _intpdf , const RooArgSet& intObs);
	RooProjectedPdf(const RooProjectedPdf& other, const char* name=0) ;	RooProjectedPdf(const RooProjectedPdf& other, const char* name=0) ;
	virtual TObject* clone(const char* newname) const { return new RooProject edPdf(*this,newname); }	virtual TObject* clone(const char* newname) const { return new RooProject edPdf(*this,newname); }
	inline virtual ~RooProjectedPdf() { }	inline virtual ~RooProjectedPdf() { }

	// Analytical integration support	// Analytical integration support
	virtual Int_t getAnalyticalIntegralWN(RooArgSet& allVars, RooArgSet& anal Vars, const RooArgSet* normSet, const char* rangeName=0) const ;	virtual Int_t getAnalyticalIntegralWN(RooArgSet& allVars, RooArgSet& anal Vars, const RooArgSet* normSet, const char* rangeName=0) const ;
	virtual Double_t analyticalIntegralWN(Int_t code, const RooArgSet* normSe t, const char* rangeName=0) const ;	virtual Double_t analyticalIntegralWN(Int_t code, const RooArgSet* normSe t, const char* rangeName=0) const ;
	virtual Bool_t forceAnalyticalInt(const RooAbsArg& dep) const ;	virtual Bool_t forceAnalyticalInt(const RooAbsArg& dep) const ;


	virtual Double_t getVal(const RooArgSet* set=0) const ;	virtual Double_t getValV(const RooArgSet* set=0) const ;

	Int_t getGenerator(const RooArgSet& directVars, RooArgSet &generateVars, Bool_t staticInitOK=kTRUE) const;	Int_t getGenerator(const RooArgSet& directVars, RooArgSet &generateVars, Bool_t staticInitOK=kTRUE) const;
	void initGenerator(Int_t /code/) {} ; // optional pre-generation initia lization	void initGenerator(Int_t /code/) {} ; // optional pre-generation initia lization
	void generateEvent(Int_t code);	void generateEvent(Int_t code);

	virtual Bool_t selfNormalized() const { return kTRUE ; }	virtual Bool_t selfNormalized() const { return kTRUE ; }

	// Handle projection of projection explicitly	// Handle projection of projection explicitly
	virtual RooAbsPdf* createProjection(const RooArgSet& iset) ;	virtual RooAbsPdf* createProjection(const RooArgSet& iset) ;


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

	RooResolutionModel.h	RooResolutionModel.h

	skipping to change at line 34	skipping to change at line 34
	class RooResolutionModel : public RooAbsPdf {	class RooResolutionModel : public RooAbsPdf {
	public:	public:

	// Constructors, assignment etc	// Constructors, assignment etc
	inline RooResolutionModel() : _basis(0) { }	inline RooResolutionModel() : _basis(0) { }
	RooResolutionModel(const char name, const char title, RooRealVar& x) ;	RooResolutionModel(const char name, const char title, RooRealVar& x) ;
	RooResolutionModel(const RooResolutionModel& other, const char* name=0);	RooResolutionModel(const RooResolutionModel& other, const char* name=0);
	virtual TObject* clone(const char* newname) const = 0 ;	virtual TObject* clone(const char* newname) const = 0 ;
	virtual ~RooResolutionModel();	virtual ~RooResolutionModel();


	Double_t getVal(const RooArgSet* nset=0) const ;	Double_t getValV(const RooArgSet* nset=0) const ;
	virtual RooResolutionModel* convolution(RooFormulaVar* basis, RooAbsArg* owner) const ;	virtual RooResolutionModel* convolution(RooFormulaVar* basis, RooAbsArg* owner) const ;
	RooRealVar& convVar() const ;	RooRealVar& convVar() const ;
	const RooRealVar& basisConvVar() const ;	const RooRealVar& basisConvVar() const ;

	inline Bool_t isBasisSupported(const char* name) const { return basisCode (name)?kTRUE:kFALSE ; }	inline Bool_t isBasisSupported(const char* name) const { return basisCode (name)?kTRUE:kFALSE ; }
	virtual Int_t basisCode(const char* name) const = 0 ;	virtual Int_t basisCode(const char* name) const = 0 ;

	virtual void normLeafServerList(RooArgSet& list) const ;	virtual void normLeafServerList(RooArgSet& list) const ;
	Double_t getNorm(const RooArgSet* nset=0) const ;	Double_t getNorm(const RooArgSet* nset=0) const ;


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

	Rtypes.h	Rtypes.h

	/* @(#)root/base:$Id: Rtypes.h 39635 2011-06-09 15:37:27Z pcanal $ */	/* @(#)root/base:$Id: Rtypes.h 39611 2011-06-08 19:35:17Z 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 190	skipping to change at line 190
	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 ) ;	typedef Long64_t (MergeFunc_t)(void , TCollection , TFileMergeInfo ) ;

		typedef void (ResetAfterMergeFunc_t)(void , 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. 2 change blocks.
	1 lines changed or deleted	2 lines changed or added

	TBranch.h	TBranch.h

	// @(#)root/tree:$Id: TBranch.h 42194 2011-11-23 14:02:02Z axel $	// @(#)root/tree:$Id: TBranch.h 40872 2011-09-13 21:33:33Z 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 105	skipping to change at line 105
	char *fAddress; //! Address of 1st leaf (variable or objec t)	char *fAddress; //! Address of 1st leaf (variable or objec t)
	TDirectory *fDirectory; //! Pointer to directory where this branch buffers are stored	TDirectory *fDirectory; //! Pointer to directory where this branch buffers are stored
	TString fFileName; // Name of file where buffers are stored ("" if in same file as Tree header)	TString fFileName; // Name of file where buffers are stored ("" if in same file as Tree header)
	TBuffer *fEntryBuffer; //! Buffer used to directly pass the conte nt without streaming	TBuffer *fEntryBuffer; //! Buffer used to directly pass the conte nt without streaming
	TList *fBrowsables; //! List of TVirtualBranchBrowsables used for Browse()	TList *fBrowsables; //! List of TVirtualBranchBrowsables used for Browse()

	Bool_t fSkipZip; //! After being read, the buffer will not be unziped.	Bool_t fSkipZip; //! After being read, the buffer will not be unziped.

	typedef void (TBranch::*ReadLeaves_t)(TBuffer &b);	typedef void (TBranch::*ReadLeaves_t)(TBuffer &b);
	ReadLeaves_t fReadLeaves; //! Pointer to the ReadLeaves implementati on to use.	ReadLeaves_t fReadLeaves; //! Pointer to the ReadLeaves implementati on to use.

		typedef void (TBranch::*FillLeaves_t)(TBuffer &b);
		FillLeaves_t fFillLeaves; //! Pointer to the FillLeaves implementati
		on to use.
	void ReadLeavesImpl(TBuffer &b);	void ReadLeavesImpl(TBuffer &b);
	void ReadLeaves0Impl(TBuffer &b);	void ReadLeaves0Impl(TBuffer &b);
	void ReadLeaves1Impl(TBuffer &b);	void ReadLeaves1Impl(TBuffer &b);
	void ReadLeaves2Impl(TBuffer &b);	void ReadLeaves2Impl(TBuffer &b);

		void FillLeavesImpl(TBuffer &b);

	void SetSkipZip(Bool_t skip = kTRUE) { fSkipZip = skip; }	void SetSkipZip(Bool_t skip = kTRUE) { fSkipZip = skip; }
	void Init(const char name, const char leaflist, Int_t compress);	void Init(const char name, const char leaflist, Int_t compress);

	TBasket *GetFreshBasket();	TBasket *GetFreshBasket();
	Int_t WriteBasket(TBasket* basket, Int_t where);	Int_t WriteBasket(TBasket* basket, Int_t where);

	TString GetRealFileName() const;	TString GetRealFileName() const;

	private:	private:

		Int_t FillEntryBuffer(TBasket* basket,TBuffer* buf, Int_t& lnew);
	TBranch(const TBranch&); // not implemented	TBranch(const TBranch&); // not implemented
	TBranch& operator=(const TBranch&); // not implemented	TBranch& operator=(const TBranch&); // not implemented

	public:	public:
	TBranch();	TBranch();
	TBranch(TTree tree, const char name, void address, const char leafli st, Int_t basketsize=32000, Int_t compress=-1);	TBranch(TTree tree, const char name, void address, const char leafli st, Int_t basketsize=32000, Int_t compress=-1);
	TBranch(TBranch parent, const char name, void address, const char le aflist, Int_t basketsize=32000, Int_t compress=-1);	TBranch(TBranch parent, const char name, void address, const char le aflist, Int_t basketsize=32000, Int_t compress=-1);
	virtual ~TBranch();	virtual ~TBranch();

	virtual void AddBasket(TBasket &b, Bool_t ondisk, Long64_t startEnt ry);	virtual void AddBasket(TBasket &b, Bool_t ondisk, Long64_t startEnt ry);
	virtual void AddLastBasket(Long64_t startEntry);	virtual void AddLastBasket(Long64_t startEntry);
	virtual void Browse(TBrowser *b);	virtual void Browse(TBrowser *b);
	virtual void DeleteBaskets(Option_t* option="");	virtual void DeleteBaskets(Option_t* option="");
	virtual void DropBaskets(Option_t *option = "");	virtual void DropBaskets(Option_t *option = "");
	void ExpandBasketArrays();	void ExpandBasketArrays();
	virtual Int_t Fill();	virtual Int_t Fill();

	virtual void FillLeaves(TBuffer &b);
	virtual TBranch FindBranch(const char name);	virtual TBranch FindBranch(const char name);
	virtual TLeaf FindLeaf(const char name);	virtual TLeaf FindLeaf(const char name);
	Int_t FlushBaskets();	Int_t FlushBaskets();
	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;

	skipping to change at line 191	skipping to change at line 194
	TBranch *GetMother() const;	TBranch *GetMother() const;
	TBranch GetSubBranch(const TBranch br) const;	TBranch GetSubBranch(const TBranch br) const;
	Bool_t IsAutoDelete() const;	Bool_t IsAutoDelete() const;
	Bool_t IsFolder() const;	Bool_t IsFolder() const;
	virtual void KeepCircular(Long64_t maxEntries);	virtual void KeepCircular(Long64_t maxEntries);
	virtual Int_t LoadBaskets();	virtual Int_t LoadBaskets();
	virtual void Print(Option_t *option="") const;	virtual void Print(Option_t *option="") const;
	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 ResetAfterMerge(TFileMergeInfo *);
	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);
	void SetCompressionAlgorithm(Int_t algorithm=0);	void SetCompressionAlgorithm(Int_t algorithm=0);
	void SetCompressionLevel(Int_t level=1);	void SetCompressionLevel(Int_t level=1);
	void SetCompressionSettings(Int_t settings=1);	void SetCompressionSettings(Int_t settings=1);

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

	TBranchBrowsable.h	TBranchBrowsable.h

	// @(#)root/tree:$Id: TBranchBrowsable.h 20882 2007-11-19 11:31:26Z rdm $	// @(#)root/tree:$Id: TBranchBrowsable.h 40605 2011-08-16 11:52:09Z rdm $
	// Author: Axel Naumann 14/10/2004	// Author: Axel Naumann 14/10/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 94	skipping to change at line 94
	// sets the type of this browsable object	// sets the type of this browsable object
	fClass=type; }	fClass=type; }
	void SetTypeIsPointer(Bool_t set=kTRUE) {	void SetTypeIsPointer(Bool_t set=kTRUE) {
	// sets whether the type of this browsable object is a pointer	// sets whether the type of this browsable object is a pointer
	fTypeIsPointer=set; }	fTypeIsPointer=set; }

	private:	private:
	static void RegisterDefaultGenerators();	static void RegisterDefaultGenerators();
	const TBranch *fBranch; // pointer to the branch element representing the top object	const TBranch *fBranch; // pointer to the branch element representing the top object
	const TVirtualBranchBrowsable *fParent; // parent method if this method is member of a returned class	const TVirtualBranchBrowsable *fParent; // parent method if this method is member of a returned class

	TList *fLeaves; // pointer to laves	TList *fLeaves; // pointer to leaves
	TClass *fClass; // pointer to TClass representing our type (i. e. return type for methods), 0 if basic type	TClass *fClass; // pointer to TClass representing our type (i. e. return type for methods), 0 if basic type
	Bool_t fTypeIsPointer; // return type is pointer to class	Bool_t fTypeIsPointer; // return type is pointer to class
	static std::list<MethodCreateListOfBrowsables_t> fgGenerators; // list o f MethodCreateListOfBrowsables_t called by CreateListOfBrowsables	static std::list<MethodCreateListOfBrowsables_t> fgGenerators; // list o f MethodCreateListOfBrowsables_t called by CreateListOfBrowsables
	static Bool_t fgGeneratorsSet; // have we set the generators yet? em pty is not good enough - user might have removed them	static Bool_t fgGeneratorsSet; // have we set the generators yet? em pty is not good enough - user might have removed them
	ClassDef(TVirtualBranchBrowsable, 0); // Base class for helper objects u sed for browsing	ClassDef(TVirtualBranchBrowsable, 0); // Base class for helper objects u sed for browsing
	};	};

	class TMethodBrowsable: public TVirtualBranchBrowsable {	class TMethodBrowsable: public TVirtualBranchBrowsable {
	public:	public:
	~TMethodBrowsable() {};	~TMethodBrowsable() {};

	skipping to change at line 160	skipping to change at line 160
	const char* GetDraw() const {	const char* GetDraw() const {
	// return the string passed to TTree::Draw	// return the string passed to TTree::Draw
	return fDraw.Data(); }	return fDraw.Data(); }
	static void Register();	static void Register();
	static void Unregister();	static void Unregister();

	protected:	protected:
	TCollectionPropertyBrowsable(const char* name, const char* title,	TCollectionPropertyBrowsable(const char* name, const char* title,
	const char* draw, const TBranch* branch, const TVirtualBranchBrowsabl e* parent=0):	const char* draw, const TBranch* branch, const TVirtualBranchBrowsabl e* parent=0):
	TVirtualBranchBrowsable(branch, 0, kFALSE, parent), fDraw(draw) {	TVirtualBranchBrowsable(branch, 0, kFALSE, parent), fDraw(draw) {

	// contrsuctor, which sets the name and title according to the parame ters	// constructor, which sets the name and title according to the parame ters
	// (and thus differently than our base class TVirtualBranchBrowsable)	// (and thus differently than our base class TVirtualBranchBrowsable)
	SetNameTitle(name, title);	SetNameTitle(name, title);
	}	}

	private:	private:
	TString fDraw; // string to send to TTree::Draw(), NOT by GetScope()!	TString fDraw; // string to send to TTree::Draw(), NOT by GetScope()!
	ClassDef(TCollectionPropertyBrowsable, 0); // Helper object to add brows able collection properties	ClassDef(TCollectionPropertyBrowsable, 0); // Helper object to add brows able collection properties
	};	};

	class TCollectionMethodBrowsable: public TMethodBrowsable {	class TCollectionMethodBrowsable: public TMethodBrowsable {

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

	TBranchElement.h	TBranchElement.h

	// @(#)root/tree:$Id: TBranchElement.h 39635 2011-06-09 15:37:27Z pcanal $	// @(#)root/tree:$Id: TBranchElement.h 40872 2011-09-13 21:33:33Z pcanal $
	// Author: Rene Brun 14/01/2001	// Author: Rene Brun 14/01/2001

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


	skipping to change at line 96	skipping to change at line 96
	Bool_t fInitOffsets; //! Initialization flag to not endlessly recalculate offsets	Bool_t fInitOffsets; //! Initialization flag to not endlessly recalculate offsets
	TClassRef fTargetClass; //! Reference to the target in- memory class	TClassRef fTargetClass; //! Reference to the target in- memory class
	TClassRef fCurrentClass; //! Reference to current (trans ient) class definition	TClassRef fCurrentClass; //! Reference to current (trans ient) class definition
	TClassRef fParentClass; //! Reference to class definiti on in fParentName	TClassRef fParentClass; //! Reference to class definiti on in fParentName
	TClassRef fBranchClass; //! Reference to class definiti on in fClassName	TClassRef fBranchClass; //! Reference to class definiti on in fClassName
	TClassRef fClonesClass; //! Reference to class definiti on in fClonesName	TClassRef fClonesClass; //! Reference to class definiti on in fClonesName
	Int_t *fBranchOffset; //! Sub-Branch offsets with res pect to current transient class	Int_t *fBranchOffset; //! Sub-Branch offsets with res pect to current transient class
	Int_t fBranchID; //! ID number assigned by a TRe fTable.	Int_t fBranchID; //! ID number assigned by a TRe fTable.
	std::vector<Int_t> fIDs; //! List of the serial number o f all the StreamerInfo to be used.	std::vector<Int_t> fIDs; //! List of the serial number o f all the StreamerInfo to be used.
	TStreamerInfoActions::TActionSequence *fReadActionSequence; //! Set of actions to be executed to extract the data from the basket.	TStreamerInfoActions::TActionSequence *fReadActionSequence; //! Set of actions to be executed to extract the data from the basket.

		TStreamerInfoActions::TActionSequence *fFillActionSequence; //! Set of a ctions to be executed to write the data to the basket.
	TVirtualCollectionIterators *fIterators; //! holds the ite rators when the branch is of fType==4.	TVirtualCollectionIterators *fIterators; //! holds the ite rators when the branch is of fType==4.
	TVirtualCollectionPtrIterators *fPtrIterators; //! holds the ite rators when the branch is of fType==4 and it is a split collection of point ers.	TVirtualCollectionPtrIterators *fPtrIterators; //! holds the ite rators when the branch is of fType==4 and it is a split collection of point ers.

	// Not implemented	// Not implemented
	private:	private:
	TBranchElement(const TBranchElement&); // not implemented	TBranchElement(const TBranchElement&); // not implemented
	TBranchElement& operator=(const TBranchElement&); // not implemented	TBranchElement& operator=(const TBranchElement&); // not implemented

	static void SwitchContainer(TObjArray *);	static void SwitchContainer(TObjArray *);


	skipping to change at line 139	skipping to change at line 140
	void ReadLeavesCollectionSplitVectorPtrMember(TBuffer& b);	void ReadLeavesCollectionSplitVectorPtrMember(TBuffer& b);
	void ReadLeavesCollectionMember(TBuffer& b);	void ReadLeavesCollectionMember(TBuffer& b);
	void ReadLeavesClones(TBuffer& b);	void ReadLeavesClones(TBuffer& b);
	void ReadLeavesClonesMember(TBuffer& b);	void ReadLeavesClonesMember(TBuffer& b);
	void ReadLeavesCustomStreamer(TBuffer& b);	void ReadLeavesCustomStreamer(TBuffer& b);
	void ReadLeavesMember(TBuffer& b);	void ReadLeavesMember(TBuffer& b);
	void ReadLeavesMemberBranchCount(TBuffer& b);	void ReadLeavesMemberBranchCount(TBuffer& b);
	void ReadLeavesMemberCounter(TBuffer& b);	void ReadLeavesMemberCounter(TBuffer& b);
	void SetReadLeavesPtr();	void SetReadLeavesPtr();
	void SetReadActionSequence();	void SetReadActionSequence();

		void SetupAddressesImpl();


		void FillLeavesImpl(TBuffer& b);
		void FillLeavesMakeClass(TBuffer& b);
		void FillLeavesCollection(TBuffer& b);
		void FillLeavesCollectionSplitVectorPtrMember(TBuffer& b);
		void FillLeavesCollectionSplitPtrMember(TBuffer& b);
		void FillLeavesCollectionMember(TBuffer& b);
		void FillLeavesClones(TBuffer& b);
		void FillLeavesClonesMember(TBuffer& b);
		void FillLeavesCustomStreamer(TBuffer& b);
		void FillLeavesMemberBranchCount(TBuffer& b);
		void FillLeavesMemberCounter(TBuffer& b);
		void FillLeavesMember(TBuffer& b);
		void SetFillLeavesPtr();
		void SetFillActionSequence();
	// Public Interface.	// Public Interface.
	public:	public:
	TBranchElement();	TBranchElement();
	TBranchElement(TTree tree, const char name, TStreamerInfo* sinfo, Int_ t id, char* pointer, Int_t basketsize = 32000, Int_t splitlevel = 0, Int_t btype = 0);	TBranchElement(TTree tree, const char name, TStreamerInfo* sinfo, Int_ t id, char* pointer, Int_t basketsize = 32000, Int_t splitlevel = 0, Int_t btype = 0);
	TBranchElement(TTree tree, const char name, TClonesArray* clones, Int_ t basketsize = 32000, Int_t splitlevel = 0, Int_t compress = -1);	TBranchElement(TTree tree, const char name, TClonesArray* clones, Int_ t basketsize = 32000, Int_t splitlevel = 0, Int_t compress = -1);
	TBranchElement(TTree tree, const char name, TVirtualCollectionProxy* c ont, Int_t basketsize = 32000, Int_t splitlevel = 0, Int_t compress = -1);	TBranchElement(TTree tree, const char name, TVirtualCollectionProxy* c ont, Int_t basketsize = 32000, Int_t splitlevel = 0, Int_t compress = -1);
	TBranchElement(TBranch parent, const char name, TStreamerInfo* sinfo, Int_t id, char* pointer, Int_t basketsize = 32000, Int_t splitlevel = 0, In t_t btype = 0);	TBranchElement(TBranch parent, const char name, TStreamerInfo* sinfo, Int_t id, char* pointer, Int_t basketsize = 32000, Int_t splitlevel = 0, In t_t btype = 0);
	TBranchElement(TBranch parent, const char name, TClonesArray* clones, Int_t basketsize = 32000, Int_t splitlevel = 0, Int_t compress = -1);	TBranchElement(TBranch parent, const char name, TClonesArray* clones, Int_t basketsize = 32000, Int_t splitlevel = 0, Int_t compress = -1);
	TBranchElement(TBranch parent, const char name, TVirtualCollectionProx y* cont, Int_t basketsize = 32000, Int_t splitlevel = 0, Int_t compress = - 1);	TBranchElement(TBranch parent, const char name, TVirtualCollectionProx y* cont, Int_t basketsize = 32000, Int_t splitlevel = 0, Int_t compress = - 1);

	virtual ~TBranchElement();	virtual ~TBranchElement();

	virtual void Browse(TBrowser* b);	virtual void Browse(TBrowser* b);
	virtual Int_t Fill();	virtual Int_t Fill();

	virtual void FillLeaves(TBuffer& b);
	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 char *GetAddress() const;	virtual char *GetAddress() const;
	TBranchElement *GetBranchCount() const { return fBranchCount; }	TBranchElement *GetBranchCount() const { return fBranchCount; }
	TBranchElement *GetBranchCount2() const { return fBranchCount2; }	TBranchElement *GetBranchCount2() const { return fBranchCount2; }
	Int_t *GetBranchOffset() const { return fBranchOffset; }	Int_t *GetBranchOffset() const { return fBranchOffset; }
	UInt_t GetCheckSum() { return fCheckSum; }	UInt_t GetCheckSum() { return fCheckSum; }
	virtual const char *GetClassName() const { return fClassName.Data() ; }	virtual const char *GetClassName() const { return fClassName.Data() ; }
	virtual TClass *GetClass() const { return fBranchClass; }	virtual TClass *GetClass() const { return fBranchClass; }
	virtual const char *GetClonesName() const { return fClonesName.Data (); }	virtual const char *GetClonesName() const { return fClonesName.Data (); }

	skipping to change at line 190	skipping to change at line 205
	Double_t GetValue(Int_t i, Int_t len, Bool_t subarr = kF ALSE) const;	Double_t GetValue(Int_t i, Int_t len, Bool_t subarr = kF ALSE) const;
	virtual void *GetValuePointer() const;	virtual void *GetValuePointer() const;
	Int_t GetClassVersion() { return fClassVersion; }	Int_t GetClassVersion() { return fClassVersion; }
	Bool_t IsBranchFolder() const { return TestBit(kBranch Folder); }	Bool_t IsBranchFolder() const { return TestBit(kBranch Folder); }
	Bool_t IsFolder() const;	Bool_t IsFolder() const;
	virtual Bool_t IsObjectOwner() const { return TestBit(kDeleteO bject); }	virtual Bool_t IsObjectOwner() const { return TestBit(kDeleteO bject); }
	virtual Bool_t Notify() { if (fAddress) { ResetAddress(); } re turn 1; }	virtual Bool_t Notify() { if (fAddress) { ResetAddress(); } re turn 1; }
	virtual void Print(Option_t* option = "") const;	virtual void Print(Option_t* option = "") const;
	void PrintValue(Int_t i) const;	void PrintValue(Int_t i) const;
	virtual void Reset(Option_t* option = "");	virtual void Reset(Option_t* option = "");

		virtual void ResetAfterMerge(TFileMergeInfo *);
	virtual void ResetAddress();	virtual void ResetAddress();
	virtual void ResetDeleteObject();	virtual void ResetDeleteObject();
	virtual void SetAddress(void* addobj);	virtual void SetAddress(void* addobj);
	virtual Bool_t SetMakeClass(Bool_t decomposeObj = kTRUE);	virtual Bool_t SetMakeClass(Bool_t decomposeObj = kTRUE);
	virtual void SetObject(void *objadd);	virtual void SetObject(void *objadd);
	virtual void SetBasketSize(Int_t buffsize);	virtual void SetBasketSize(Int_t buffsize);
	virtual void SetBranchFolder() { SetBit(kBranchFolder); }	virtual void SetBranchFolder() { SetBit(kBranchFolder); }
	virtual void SetClassName(const char* name) { fClassName = n ame; }	virtual void SetClassName(const char* name) { fClassName = n ame; }
	virtual void SetOffset(Int_t offset);	virtual void SetOffset(Int_t offset);
	inline void SetParentClass(TClass* clparent);	inline void SetParentClass(TClass* clparent);

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

	TBranchObject.h	TBranchObject.h

	// @(#)root/tree:$Id: TBranchObject.h 39635 2011-06-09 15:37:27Z pcanal $	// @(#)root/tree:$Id: TBranchObject.h 39611 2011-06-08 19:35:17Z 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. *
	*************************************************************************/	*************************************************************************/


	skipping to change at line 51	skipping to change at line 51

	virtual void Browse(TBrowser *b);	virtual void Browse(TBrowser *b);
	virtual Int_t Fill();	virtual Int_t Fill();
	virtual const char* GetClassName() const { return fClassName.Data(); };	virtual const char* GetClassName() const { return fClassName.Data(); };
	virtual const char* GetObjClassName() { return fClassName.Data(); };	virtual const char* GetObjClassName() { return fClassName.Data(); };
	virtual Int_t GetEntry(Long64_t entry=0, Int_t getall = 0);	virtual Int_t GetEntry(Long64_t entry=0, Int_t getall = 0);
	virtual Int_t GetExpectedType(TClass *&clptr,EDataType &type);	virtual Int_t GetExpectedType(TClass *&clptr,EDataType &type);
	Bool_t IsFolder() const;	Bool_t IsFolder() const;
	virtual void Print(Option_t *option="") const;	virtual void Print(Option_t *option="") const;
	virtual void Reset(Option_t *option="");	virtual void Reset(Option_t *option="");

		virtual void ResetAfterMerge(TFileMergeInfo *);
	virtual void SetAddress(void *addobj);	virtual void SetAddress(void *addobj);
	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 SetupAddresses();	virtual void SetupAddresses();
	virtual void UpdateAddress();	virtual void UpdateAddress();

	ClassDef(TBranchObject,1); //Branch in case of an object	ClassDef(TBranchObject,1); //Branch in case of an object
	};	};

	#endif	#endif

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 39552 2011-06-03 18:38:52Z pcanal $	// @(#)root/base:$Id: TBuffer.h 40872 2011-09-13 21:33:33Z 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 310	skipping to change at line 310
	virtual Int_t ReadClones (TClonesArray *a, Int_t nobjects, Version_ t objvers) = 0;	virtual Int_t ReadClones (TClonesArray *a, Int_t nobjects, Version_ t objvers) = 0;
	virtual Int_t WriteClones(TClonesArray *a, Int_t nobjects) = 0;	virtual Int_t WriteClones(TClonesArray *a, Int_t nobjects) = 0;

	// Utilities for TClass	// Utilities for TClass
	virtual Int_t ReadClassEmulated(const TClass cl, void object, con st TClass *onfile_class = 0) = 0;	virtual Int_t ReadClassEmulated(const TClass cl, void object, con st TClass *onfile_class = 0) = 0;
	virtual Int_t ReadClassBuffer(const TClass cl, void pointer, cons t TClass *onfile_class = 0) = 0;	virtual Int_t ReadClassBuffer(const TClass cl, void pointer, cons t TClass *onfile_class = 0) = 0;
	virtual Int_t ReadClassBuffer(const TClass cl, void pointer, Int_ t version, UInt_t start, UInt_t count, const TClass *onfile_class = 0) = 0;	virtual Int_t ReadClassBuffer(const TClass cl, void pointer, Int_ t version, UInt_t start, UInt_t count, const TClass *onfile_class = 0) = 0;
	virtual Int_t WriteClassBuffer(const TClass cl, void pointer) = 0 ;	virtual Int_t WriteClassBuffer(const TClass cl, void pointer) = 0 ;

	// Utilites to streamer using sequences.	// Utilites to streamer using sequences.

	virtual Int_t ReadSequence(const TStreamerInfoActions::TActionSequence &	virtual Int_t ApplySequence(const TStreamerInfoActions::TActionSequence
	sequence, void *object) = 0;	&sequence, void *object) = 0;
	virtual Int_t ReadSequenceVecPtr(const TStreamerInfoActions::TActionSequ	virtual Int_t ApplySequenceVecPtr(const TStreamerInfoActions::TActionSeq
	ence &sequence, void start_collection, void end_collection) = 0;	uence &sequence, void start_collection, void end_collection) = 0;
	virtual Int_t ReadSequence(const TStreamerInfoActions::TActionSequence &	virtual Int_t ApplySequence(const TStreamerInfoActions::TActionSequence
	sequence, void start_collection, void end_collection) = 0;	&sequence, void start_collection, void end_collection) = 0;

	static TClass *GetClass(const type_info &typeinfo);	static TClass *GetClass(const type_info &typeinfo);
	static TClass GetClass(const char className);	static TClass GetClass(const char className);

	ClassDef(TBuffer,0) //Buffer base class used for serializing objects	ClassDef(TBuffer,0) //Buffer base class used for serializing objects
	};	};

	//---------------------- TBuffer default external operators --------------- -----	//---------------------- TBuffer default external operators --------------- -----

	inline TBuffer &operator>>(TBuffer &buf, Bool_t &b) { buf.ReadBool(b); return buf; }	inline TBuffer &operator>>(TBuffer &buf, Bool_t &b) { buf.ReadBool(b); return buf; }

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

	TBufferFile.h	TBufferFile.h

	// @(#)root/io:$Id: TBufferFile.h 39549 2011-06-02 21:34:05Z pcanal $	// @(#)root/io:$Id: TBufferFile.h 40872 2011-09-13 21:33:33Z 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 305	skipping to change at line 305
	virtual Int_t ReadClones (TClonesArray *a, Int_t nobjects, Version_t objvers);	virtual Int_t ReadClones (TClonesArray *a, Int_t nobjects, Version_t objvers);
	virtual Int_t WriteClones(TClonesArray *a, Int_t nobjects);	virtual Int_t WriteClones(TClonesArray *a, Int_t nobjects);

	// Utilities for TClass	// Utilities for TClass
	virtual Int_t ReadClassEmulated(const TClass cl, void object, const TClass *onfile_class);	virtual Int_t ReadClassEmulated(const TClass cl, void object, const TClass *onfile_class);
	virtual Int_t ReadClassBuffer(const TClass cl, void pointer, const TClass *onfile_class);	virtual Int_t ReadClassBuffer(const TClass cl, void pointer, const TClass *onfile_class);
	virtual Int_t ReadClassBuffer(const TClass cl, void pointer, Int_t version, UInt_t start, UInt_t count, const TClass *onfile_class);	virtual Int_t ReadClassBuffer(const TClass cl, void pointer, Int_t version, UInt_t start, UInt_t count, const TClass *onfile_class);
	virtual Int_t WriteClassBuffer(const TClass cl, void pointer);	virtual Int_t WriteClassBuffer(const TClass cl, void pointer);

	// Utilites to streamer using sequences.	// Utilites to streamer using sequences.

	Int_t ReadSequence(const TStreamerInfoActions::TActionSequence &sequence	Int_t ApplySequence(const TStreamerInfoActions::TActionSequence &sequenc
	, void *object);	e, void *object);
	Int_t ReadSequenceVecPtr(const TStreamerInfoActions::TActionSequence &se	Int_t ApplySequenceVecPtr(const TStreamerInfoActions::TActionSequence &s
	quence, void start_collection, void end_collection);	equence, void start_collection, void end_collection);
	Int_t ReadSequence(const TStreamerInfoActions::TActionSequence &sequence	Int_t ApplySequence(const TStreamerInfoActions::TActionSequence &sequenc
	, void start_collection, void end_collection);	e, void start_collection, void end_collection);

	static void SetGlobalReadParam(Int_t mapsize);	static void SetGlobalReadParam(Int_t mapsize);
	static void SetGlobalWriteParam(Int_t mapsize);	static void SetGlobalWriteParam(Int_t mapsize);
	static Int_t GetGlobalReadParam();	static Int_t GetGlobalReadParam();
	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 ------------------------------ ---------

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

	TBufferSQL2.h	TBufferSQL2.h

	// @(#)root/sql:$Id: TBufferSQL2.h 36061 2010-10-04 16:05:51Z pcanal $	// @(#)root/sql:$Id: TBufferSQL2.h 40872 2011-09-13 21:33:33Z pcanal $
	// Author: Sergey Linev 20/11/2005	// Author: Sergey Linev 20/11/2005

	#ifndef ROOT_TBufferSQL2	#ifndef ROOT_TBufferSQL2
	#define ROOT_TBufferSQL2	#define ROOT_TBufferSQL2

	/////////////////////////////////////////////////////////////////////////	/////////////////////////////////////////////////////////////////////////
	// //	// //
	// TBufferSQL2 class used in TSQLFile to convert binary object data //	// TBufferSQL2 class used in TSQLFile to convert binary object data //
	// to SQL statements, supplied to DB server //	// to SQL statements, supplied to DB server //
	// //	// //

	skipping to change at line 300	skipping to change at line 300
	virtual void WriteUInt(UInt_t i);	virtual void WriteUInt(UInt_t i);
	virtual void WriteLong(Long_t l);	virtual void WriteLong(Long_t l);
	virtual void WriteULong(ULong_t l);	virtual void WriteULong(ULong_t l);
	virtual void WriteLong64(Long64_t l);	virtual void WriteLong64(Long64_t l);
	virtual void WriteULong64(ULong64_t l);	virtual void WriteULong64(ULong64_t l);
	virtual void WriteFloat(Float_t f);	virtual void WriteFloat(Float_t f);
	virtual void WriteDouble(Double_t d);	virtual void WriteDouble(Double_t d);
	virtual void WriteCharP(const Char_t *c);	virtual void WriteCharP(const Char_t *c);
	virtual void WriteTString(const TString &s);	virtual void WriteTString(const TString &s);


	virtual Int_t ReadSequence(const TStreamerInfoActions::TActionSequence &	virtual Int_t ApplySequence(const TStreamerInfoActions::TActionSequence
	sequence, void *object);	&sequence, void *object);
	virtual Int_t ReadSequenceVecPtr(const TStreamerInfoActions::TActionSequ	virtual Int_t ApplySequenceVecPtr(const TStreamerInfoActions::TActionSeq
	ence &sequence, void start_collection, void end_collection);	uence &sequence, void start_collection, void end_collection);
	virtual Int_t ReadSequence(const TStreamerInfoActions::TActionSequence &	virtual Int_t ApplySequence(const TStreamerInfoActions::TActionSequence
	sequence, void start_collection, void end_collection);	&sequence, void start_collection, void end_collection);

	static void SetFloatFormat(const char* fmt = "%e");	static void SetFloatFormat(const char* fmt = "%e");
	static const char* GetFloatFormat();	static const char* GetFloatFormat();

	// end of redefined virtual functions	// end of redefined virtual functions

	ClassDef(TBufferSQL2,1); //a specialized TBuffer to convert data to SQL statements or read data from SQL tables	ClassDef(TBufferSQL2,1); //a specialized TBuffer to convert data to SQL statements or read data from SQL tables
	};	};

	#endif	#endif

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

	TBufferXML.h	TBufferXML.h

	// @(#)root/xml:$Id: TBufferXML.h 39697 2011-06-13 21:43:43Z pcanal $	// @(#)root/xml:$Id: TBufferXML.h 40872 2011-09-13 21:33:33Z 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 214	skipping to change at line 214
	virtual void WriteUInt(UInt_t i);	virtual void WriteUInt(UInt_t i);
	virtual void WriteLong(Long_t l);	virtual void WriteLong(Long_t l);
	virtual void WriteULong(ULong_t l);	virtual void WriteULong(ULong_t l);
	virtual void WriteLong64(Long64_t l);	virtual void WriteLong64(Long64_t l);
	virtual void WriteULong64(ULong64_t l);	virtual void WriteULong64(ULong64_t l);
	virtual void WriteFloat(Float_t f);	virtual void WriteFloat(Float_t f);
	virtual void WriteDouble(Double_t d);	virtual void WriteDouble(Double_t d);
	virtual void WriteCharP(const Char_t *c);	virtual void WriteCharP(const Char_t *c);
	virtual void WriteTString(const TString &s);	virtual void WriteTString(const TString &s);


	virtual Int_t ReadSequence(const TStreamerInfoActions::TActionSequence &	virtual Int_t ApplySequence(const TStreamerInfoActions::TActionSequence
	sequence, void *object);	&sequence, void *object);
	virtual Int_t ReadSequenceVecPtr(const TStreamerInfoActions::TActionSequ	virtual Int_t ApplySequenceVecPtr(const TStreamerInfoActions::TActionSeq
	ence &sequence, void start_collection, void end_collection);	uence &sequence, void start_collection, void end_collection);
	virtual Int_t ReadSequence(const TStreamerInfoActions::TActionSequence &	virtual Int_t ApplySequence(const TStreamerInfoActions::TActionSequence
	sequence, void start_collection, void end_collection);	&sequence, void start_collection, void end_collection);

	// end of redefined virtual functions	// end of redefined virtual functions

	static void SetFloatFormat(const char* fmt = "%e");	static void SetFloatFormat(const char* fmt = "%e");
	static const char* GetFloatFormat();	static const char* GetFloatFormat();

	protected:	protected:
	TBufferXML();	TBufferXML();

	// redefined protected virtual functions	// redefined protected virtual functions

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

	TChain.h	TChain.h

	// @(#)root/tree:$Id: TChain.h 41076 2011-09-30 15:31:14Z pcanal $	// @(#)root/tree:$Id: TChain.h 40993 2011-09-23 18:54:14Z 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 136	skipping to change at line 136
	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
	virtual void RecursiveRemove(TObject *obj);	virtual void RecursiveRemove(TObject *obj);
	virtual void Reset(Option_t *option="");	virtual void Reset(Option_t *option="");

		virtual void ResetAfterMerge(TFileMergeInfo *);
	virtual void ResetBranchAddress(TBranch *);	virtual void ResetBranchAddress(TBranch *);
	virtual void ResetBranchAddresses();	virtual void ResetBranchAddresses();
	virtual Long64_t Scan(const char varexp="", const char selection="", Option_t option="", Long64_t nentries=1000000000, Long64_t firstentry=0); // MENU*	virtual Long64_t Scan(const char varexp="", const char selection="", Option_t option="", Long64_t nentries=1000000000, Long64_t firstentry=0); // MENU*
	virtual void SetAutoDelete(Bool_t autodel=kTRUE);	virtual void SetAutoDelete(Bool_t autodel=kTRUE);
	virtual Int_t SetBranchAddress(const char bname,void add, TBranch **ptr = 0);	virtual Int_t SetBranchAddress(const char bname,void add, TBranch **ptr = 0);
	virtual Int_t SetBranchAddress(const char bname,void add, TBranch *ptr, TClass realClass, EDataType datatype, Bool_t isptr);	virtual Int_t SetBranchAddress(const char bname,void add, TBranch *ptr, TClass realClass, EDataType datatype, Bool_t isptr);
	virtual Int_t SetBranchAddress(const char bname,void add, TClass * realClass, EDataType datatype, Bool_t isptr);	virtual Int_t SetBranchAddress(const char bname,void add, TClass * realClass, EDataType datatype, Bool_t isptr);

	virtual void SetBranchStatus(const char bname, Bool_t status=1, UI nt_t found=0);	virtual void SetBranchStatus(const char bname, Bool_t status=1, UI nt_t found=0);
	virtual void SetDirectory(TDirectory *dir);	virtual void SetDirectory(TDirectory *dir);

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

	TCint.h	TCint.h

	// @(#)root/meta:$Id: TCint.h 39402 2011-05-26 12:56:31Z axel $	// @(#)root/meta:$Id: TCint.h 40638 2011-08-18 20:24:56Z pcanal $
	// 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 59	skipping to change at line 59
	class TCint : public TInterpreter {	class TCint : public TInterpreter {

	private:	private:
	Int_t fMore; //1 if more input is required	Int_t fMore; //1 if more input is required
	Int_t fExitCode; //value passed to exit() in interprete r	Int_t fExitCode; //value passed to exit() in interprete r
	char fPrompt[64]; //proposed prompt string	char fPrompt[64]; //proposed prompt string
	G__dictposition fDictPos; //CINT dictionary context after init	G__dictposition fDictPos; //CINT dictionary context after init
	G__dictposition fDictPosGlobals; //CINT dictionary context after ResetG lobals()	G__dictposition fDictPosGlobals; //CINT dictionary context after ResetG lobals()
	TString fSharedLibs; //list of shared libraries loaded by G __loadfile	TString fSharedLibs; //list of shared libraries loaded by G __loadfile
	Int_t fSharedLibsSerial;//Indicator of the last time we set fS haredLibs	Int_t fSharedLibsSerial;//Indicator of the last time we set fS haredLibs

		Int_t fGlobalsListSerial;//Indicator of the last time we refre sh the ROOT list of globals.
	TString fIncludePath; //list of CINT include paths	TString fIncludePath; //list of CINT include paths
	TString fRootmapLoadPath; //dynamic load path used for loading r ootmap files	TString fRootmapLoadPath; //dynamic load path used for loading r ootmap files
	TEnv *fMapfile; //map of classes and libraries	TEnv *fMapfile; //map of classes and libraries
	TObjArray *fRootmapFiles; //list of non-default rootmap files lo aded	TObjArray *fRootmapFiles; //list of non-default rootmap files lo aded
	Bool_t fLockProcessLine; //true if ProcessLine should lock gCIN TMutex	Bool_t fLockProcessLine; //true if ProcessLine should lock gCIN TMutex
	static void fgSetOfSpecials; //set of TObjects used in CINT variab les	static void fgSetOfSpecials; //set of TObjects used in CINT variab les

	TCint() : fMore(-1), fExitCode(0), fDictPos(), fDictPosGlobals(),	TCint() : fMore(-1), fExitCode(0), fDictPos(), fDictPosGlobals(),
	fSharedLibs(), fSharedLibsSerial(0), fIncludePath(), fRootmapLoadPath( ), fMapfile(0),	fSharedLibs(), fSharedLibsSerial(0), fIncludePath(), fRootmapLoadPath( ), fMapfile(0),
	fRootmapFiles(0), fLockProcessLine(kFALSE) { } //for Dictionary() onl y	fRootmapFiles(0), fLockProcessLine(kFALSE) { } //for Dictionary() onl y

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

	TClass.h	TClass.h

	// @(#)root/meta:$Id: TClass.h 39695 2011-06-13 21:17:59Z pcanal $	// @(#)root/meta:$Id: TClass.h 39694 2011-06-13 21:10:32Z 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 115	skipping to change at line 115
	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::MergeFunc_t fMerge; //pointer to a function implementin g Merging objects of this class.

		ROOT::ResetAfterMergeFunc_t fResetAfterMerge; //pointer to a function im plementing 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 Int_t fCanSplit; //!Indicates whether this class can be split or not.

	skipping to change at line 288	skipping to change at line 289
	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::MergeFunc_t GetMerge() const;

		ROOT::ResetAfterMergeFunc_t GetResetAfterMerge() 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 340	skipping to change at line 342
	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 SetMerge(ROOT::MergeFunc_t mergeFunc);

		void SetResetAfterMerge(ROOT::ResetAfterMergeFunc_t resetF unc);
	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. 4 change blocks.
	1 lines changed or deleted	4 lines changed or added

	TClonesArray.h	TClonesArray.h

	// @(#)root/cont:$Id: TClonesArray.h 38515 2011-03-18 16:57:21Z rdm $	// @(#)root/cont:$Id: TClonesArray.h 40562 2011-08-11 16:05:17Z 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. *
	*************************************************************************/	*************************************************************************/

	#ifndef ROOT_TClonesArray	#ifndef ROOT_TClonesArray
	#define ROOT_TClonesArray	#define ROOT_TClonesArray

	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////
	// //	// //
	// TClonesArray //	// TClonesArray //
	// //	// //
	// An array of clone TObjects. The array expands automatically when //	// An array of clone TObjects. The array expands automatically when //

	// adding elements (shrinking can be done by hand). //	// adding elements (shrinking can be done explicitly). //
	// //	// //
	//////////////////////////////////////////////////////////////////////////	//////////////////////////////////////////////////////////////////////////

	#ifndef ROOT_TObjArray	#ifndef ROOT_TObjArray
	#include "TObjArray.h"	#include "TObjArray.h"
	#endif	#endif

	class TClass;	class TClass;

	class TClonesArray : public TObjArray {	class TClonesArray : public TObjArray {

	skipping to change at line 67	skipping to change at line 67

	void AddFirst(TObject *) { MayNotUse("AddFirst"); }	void AddFirst(TObject *) { MayNotUse("AddFirst"); }
	void AddLast(TObject *) { MayNotUse("AddLast"); }	void AddLast(TObject *) { MayNotUse("AddLast"); }
	void AddAt(TObject *, Int_t) { MayNotUse("AddAt"); }	void AddAt(TObject *, Int_t) { MayNotUse("AddAt"); }
	void AddAtAndExpand(TObject *, Int_t) { MayNotUse("AddAtAndE xpand"); }	void AddAtAndExpand(TObject *, Int_t) { MayNotUse("AddAtAndE xpand"); }
	Int_t AddAtFree(TObject *) { MayNotUse("AddAtFree"); return 0 ; }	Int_t AddAtFree(TObject *) { MayNotUse("AddAtFree"); return 0 ; }
	void AddAfter(const TObject , TObject ) { MayNotUse("AddAf ter"); }	void AddAfter(const TObject , TObject ) { MayNotUse("AddAf ter"); }
	void AddBefore(const TObject , TObject ) { MayNotUse("AddB efore"); }	void AddBefore(const TObject , TObject ) { MayNotUse("AddB efore"); }
	void BypassStreamer(Bool_t bypass=kTRUE);	void BypassStreamer(Bool_t bypass=kTRUE);
	Bool_t CanBypassStreamer() const { return TestBit(kBypassStrea mer); }	Bool_t CanBypassStreamer() const { return TestBit(kBypassStrea mer); }

		TObject *ConstructedAt(Int_t idx);
		TObject ConstructedAt(Int_t idx, Option_t clear_options);
	void SetClass(const char *classname,Int_t size=1000);	void SetClass(const char *classname,Int_t size=1000);
	void SetClass(const TClass *cl,Int_t size=1000);	void SetClass(const TClass *cl,Int_t size=1000);

	void AbsorbObjects(TClonesArray *tc);	void AbsorbObjects(TClonesArray *tc);
	void AbsorbObjects(TClonesArray *tc, Int_t idx1, Int_t idx2) ;	void AbsorbObjects(TClonesArray *tc, Int_t idx1, Int_t idx2) ;
	void MultiSort(Int_t nTCs, TClonesArray** tcs, Int_t upto = kMaxInt);	void MultiSort(Int_t nTCs, TClonesArray** tcs, Int_t upto = kMaxInt);
	virtual TObject *RemoveAt(Int_t idx);	virtual TObject *RemoveAt(Int_t idx);
	virtual TObject Remove(TObject obj);	virtual TObject Remove(TObject obj);
	virtual void RemoveRange(Int_t idx1, Int_t idx2);	virtual void RemoveRange(Int_t idx1, Int_t idx2);
	virtual void Sort(Int_t upto = kMaxInt);	virtual void Sort(Int_t upto = kMaxInt);

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