ROOT: headers diff between 5.34.13 and 5.34.14 versions

	HFitInterface.h	HFitInterface.h

	skipping to change at line 156	skipping to change at line 156
	Set the sigma limits for zero top 10* initial rms values	Set the sigma limits for zero top 10* initial rms values
	Set the initial parameter values in the TF1	Set the initial parameter values in the TF1
	*/	*/
	void Init2DGaus(const ROOT::Fit::BinData & data, TF1 * f1 );	void Init2DGaus(const ROOT::Fit::BinData & data, TF1 * f1 );

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


		/**
		compute the chi2 value for an histogram given a function (see TH1
		::Chisquare for the documentation)
		*/
		double Chisquare(const TH1 & h1, TF1 & f1, bool useRange);

		/**
		compute the chi2 value for a graph given a function (see TGraph::C
		hisquare)
		*/
		double Chisquare(const TGraph & h1, TF1 & f1, bool useRange);

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

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

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

	#endif /* not CINT OR MAKE_CINT */	#endif /* not CINT OR MAKE_CINT */

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

	MConfig.h	MConfig.h
	// @(#)root/smatrix:$Id$	// @(#)root/smatrix:$Id$
	// Authors: T. Glebe, L. Moneta 2005	// Authors: T. Glebe, L. Moneta 2005


	#ifndef ROOT_Math_MConfig_	#ifndef ROOT_Math_MConfig
	#define ROOT_Math_MConfig	#define ROOT_Math_MConfig

	// for alpha streams	// for alpha streams
	#if defined(__alpha) && !defined(linux)	#if defined(__alpha) && !defined(linux)
	# include <standards.h>	# include <standards.h>
	# ifndef __USE_STD_IOSTREAM	# ifndef __USE_STD_IOSTREAM
	# define __USE_STD_IOSTREAM	# define __USE_STD_IOSTREAM
	# endif	# endif
	#endif	#endif


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

	RVersion.h	RVersion.h

	skipping to change at line 17	skipping to change at line 17
	* These macros can be used in the following way:	* These macros can be used in the following way:
	*	*
	* #if ROOT_VERSION_CODE >= ROOT_VERSION(2,23,4)	* #if ROOT_VERSION_CODE >= ROOT_VERSION(2,23,4)
	* #include <newheader.h>	* #include <newheader.h>
	* #else	* #else
	* #include <oldheader.h>	* #include <oldheader.h>
	* #endif	* #endif
	*	*
	*/	*/


	#define ROOT_RELEASE "5.34/13"	#define ROOT_RELEASE "5.34/14"
	#define ROOT_RELEASE_DATE "Nov 30 2013"	#define ROOT_RELEASE_DATE "Dec 16 2013"
	#define ROOT_RELEASE_TIME "23:01:20"	#define ROOT_RELEASE_TIME "11:46:38"
	#define ROOT_SVN_REVISION 49361	#define ROOT_SVN_REVISION 49361

	#define ROOT_GIT_COMMIT "v5-34-12-50-g2a9389b"	#define ROOT_GIT_COMMIT "v5-34-13-131-gd110ad3"
	#define ROOT_GIT_BRANCH "heads/v5-34-00-patches"	#define ROOT_GIT_BRANCH "heads/v5-34-00-patches"

	#define ROOT_VERSION_CODE 336397	#define ROOT_VERSION_CODE 336398
	#define ROOT_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))	#define ROOT_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))

	#endif	#endif

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

	RooAbsArg.h	RooAbsArg.h

	skipping to change at line 31	skipping to change at line 31
	#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 "RooLinkedListIter.h"
	#include "RooNameReg.h"	#include "RooNameReg.h"
	#include <map>	#include <map>
	#include <set>	#include <set>
	#include <deque>	#include <deque>

		#include <stack>

	#include <iostream>	#include <iostream>

	#include "TClass.h"	#include "TClass.h"

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

	skipping to change at line 565	skipping to change at line 566
	// 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

	mutable TNamed* _namePtr ; //! Do not persist. Pointer to global instance of string that matches object named	mutable TNamed* _namePtr ; //! Do not persist. Pointer to global instance of string that matches object named
	Bool_t _isConstant ; //! Cached isConstant status	Bool_t _isConstant ; //! Cached isConstant status


		/* RooArgSet _leafNodeCache ; //! Cached leaf nodes */
		/* RooArgSet _branchNodeCache //! Cached branch nodes */

	public:	public:
	virtual void ioStreamerPass2() ;	virtual void ioStreamerPass2() ;
	static void ioStreamerPass2Finalize() ;	static void ioStreamerPass2Finalize() ;
	static std::map<RooAbsArg,TRefArray> _ioEvoList ; // temporary holding list for proxies needed in schema evolution	static std::map<RooAbsArg,TRefArray> _ioEvoList ; // temporary holding list for proxies needed in schema evolution

		static std::stack<RooAbsArg*> _ioReadStack ; // reading stack

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

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

	#endif	#endif

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

	RooTrace.h	RooTrace.h

	skipping to change at line 31	skipping to change at line 31
	#include "Riosfwd.h"	#include "Riosfwd.h"
	#include "RooLinkedList.h"	#include "RooLinkedList.h"

	#ifndef __CINT__	#ifndef __CINT__
	#define TRACE_CREATE RooTrace::create(this);	#define TRACE_CREATE RooTrace::create(this);
	#define TRACE_DESTROY RooTrace::destroy(this);	#define TRACE_DESTROY RooTrace::destroy(this);
	#endif	#endif

	class RooTrace {	class RooTrace {
	public:	public:

		RooTrace() ;
	virtual ~RooTrace() {} ;	virtual ~RooTrace() {} ;

	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 createSpecial(const char* name, int size) ;	static void createSpecial(const char* name, int size) ;
	static void destroySpecial(const char* name) ;	static void destroySpecial(const char* name) ;

	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(std::ostream& os, Bool_t sinceMarked=kFALSE) ;	static void dump(std::ostream& os, Bool_t sinceMarked=kFALSE) ;
	static void mark() ;	static void mark() ;

	static void printObjectCounts() ;	static void printObjectCounts() ;

	static void callgrind_zero() ;	static void callgrind_zero() ;
	static void callgrind_dump() ;	static void callgrind_dump() ;


		static RooTrace& instance() ;

	protected:	protected:


	static void create2(const TObject* obj) ;	static RooTrace* _instance ;
	static void destroy2(const TObject* obj) ;


	static void create3(const TObject* obj) ;	void dump3(std::ostream&, Bool_t sinceMarked) ;
	static void destroy3(const TObject* obj) ;


	void addPad(const TObject* ref, Bool_t doPad) ;	void mark3() ;
	Bool_t removePad(const TObject* ref) ;	void printObjectCounts3() ;


	static Bool_t _active ;	void create2(const TObject* obj) ;
	static Bool_t _verbose ;	void destroy2(const TObject* obj) ;


	static RooLinkedList _list ;	void create3(const TObject* obj) ;
	static RooLinkedList _markList ;	void destroy3(const TObject* obj) ;


	static std::map<TClass*,int> _objectCount ;	void createSpecial3(const char* name, int size) ;
		void destroySpecial3(const char* name) ;

		void addPad(const TObject* ref, Bool_t doPad) ;
		Bool_t removePad(const TObject* ref) ;


	static std::map<std::string,int> _specialCount ;	Bool_t _active ;
	static std::map<std::string,int> _specialSize ;	Bool_t _verbose ;
		RooLinkedList _list ;
		RooLinkedList _markList ;
		std::map<TClass*,int> _objectCount ;
		std::map<std::string,int> _specialCount ;
		std::map<std::string,int> _specialSize ;

	ClassDef(RooTrace,0) // Memory tracer utility for RooFit objects	ClassDef(RooTrace,0) // Memory tracer utility for RooFit objects
	};	};

	#endif	#endif

End of changes. 9 change blocks.
	14 lines changed or deleted	23 lines changed or added

	TVirtualMC.h	TVirtualMC.h

	skipping to change at line 69	skipping to change at line 69
	// Static access method	// Static access method
	static TVirtualMC* GetMC();	static TVirtualMC* GetMC();

	//	//
	// ------------------------------------------------	// ------------------------------------------------
	// methods for building/management of geometry	// methods for building/management of geometry
	// ------------------------------------------------	// ------------------------------------------------
	//	//

	// Info about supporting geometry defined via Root	// Info about supporting geometry defined via Root

	virtual Bool_t IsRootGeometrySupported() const { return kFALSE; }	virtual Bool_t IsRootGeometrySupported() const = 0;
	// make this function =0 with next release

	//	//
	// functions from GCONS	// functions from GCONS
	// ------------------------------------------------	// ------------------------------------------------
	//	//

	// Define a material	// Define a material
	// kmat number assigned to the material	// kmat number assigned to the material
	// name material name	// name material name
	// a atomic mass in au	// a atomic mass in au

	skipping to change at line 371	skipping to change at line 370
	// the path volumePath and the top or master volume.	// the path volumePath and the top or master volume.
	virtual Bool_t GetTransformation(const TString& volumePath,	virtual Bool_t GetTransformation(const TString& volumePath,
	TGeoHMatrix& matrix) = 0;	TGeoHMatrix& matrix) = 0;

	// Return the name of the shape (shapeType) and its parameters par	// Return the name of the shape (shapeType) and its parameters par
	// for the volume specified by the path volumePath .	// for the volume specified by the path volumePath .
	virtual Bool_t GetShape(const TString& volumePath,	virtual Bool_t GetShape(const TString& volumePath,
	TString& shapeType, TArrayD& par) = 0;	TString& shapeType, TArrayD& par) = 0;

	// Return the material parameters for the material specified by	// Return the material parameters for the material specified by

	// the material Id - NEW	// the material Id
	virtual Bool_t GetMaterial(Int_t imat, TString& name,	virtual Bool_t GetMaterial(Int_t imat, TString& name,
	Double_t& a, Double_t& z, Double_t& density,	Double_t& a, Double_t& z, Double_t& density,

	Double_t& radl, Double_t& inter, TArrayD& pa r);	Double_t& radl, Double_t& inter, TArrayD& pa r) = 0;

	// Return the material parameters for the volume specified by	// Return the material parameters for the volume specified by
	// the volumeName.	// the volumeName.
	virtual Bool_t GetMaterial(const TString& volumeName,	virtual Bool_t GetMaterial(const TString& volumeName,
	TString& name, Int_t& imat,	TString& name, Int_t& imat,
	Double_t& a, Double_t& z, Double_t& density,	Double_t& a, Double_t& z, Double_t& density,
	Double_t& radl, Double_t& inter, TArrayD& pa r) = 0;	Double_t& radl, Double_t& inter, TArrayD& pa r) = 0;

	// Return the medium parameters for the volume specified by the	// Return the medium parameters for the volume specified by the
	// volumeName.	// volumeName.

	skipping to change at line 639	skipping to change at line 638

	// Return the current volume off upward in the geometrical tree	// Return the current volume off upward in the geometrical tree
	// name and copy number'	// name and copy number'
	// if name=0 no name is returned	// if name=0 no name is returned
	virtual const char* CurrentVolOffName(Int_t off) const =0;	virtual const char* CurrentVolOffName(Int_t off) const =0;

	// Return the path in geometry tree for the current volume	// Return the path in geometry tree for the current volume
	virtual const char* CurrentVolPath() = 0;	virtual const char* CurrentVolPath() = 0;

	// If track is on a geometry boundary, fill the normal vector of the cro ssing	// If track is on a geometry boundary, fill the normal vector of the cro ssing

	// volume surface and return true, return false otherwise - NEW	// volume surface and return true, return false otherwise
	virtual Bool_t CurrentBoundaryNormal(	virtual Bool_t CurrentBoundaryNormal(

	Double_t &x, Double_t &y, Double_t &z) const;	Double_t &x, Double_t &y, Double_t &z) const = 0;

	// Return the parameters of the current material during transport	// Return the parameters of the current material during transport
	virtual Int_t CurrentMaterial(Float_t &a, Float_t &z,	virtual Int_t CurrentMaterial(Float_t &a, Float_t &z,
	Float_t &dens, Float_t &radl, Float_t &absl) const = 0;	Float_t &dens, Float_t &radl, Float_t &absl) const = 0;

	// Return the number of the current medium	// Return the number of the current medium
	virtual Int_t CurrentMedium() const = 0;	virtual Int_t CurrentMedium() const = 0;
	// new function (to replace GetMedium() const)	// new function (to replace GetMedium() const)

	// Return the number of the current event	// Return the number of the current event

	skipping to change at line 803	skipping to change at line 802

	//	//
	// ------------------------------------------------	// ------------------------------------------------
	// Control methods	// Control methods
	// ------------------------------------------------	// ------------------------------------------------
	//	//

	// Initialize MC	// Initialize MC
	virtual void Init() = 0;	virtual void Init() = 0;


	// Initialize MC in a multi-threaded application
	virtual void InitMT(Int_t threadRank);

	// Initialize MC physics	// Initialize MC physics
	virtual void BuildPhysics() = 0;	virtual void BuildPhysics() = 0;

	// Process one event	// Process one event
	// Deprecated	// Deprecated
	virtual void ProcessEvent() = 0;	virtual void ProcessEvent() = 0;

	// Process one run and return true if run has finished successfully,	// Process one run and return true if run has finished successfully,
	// return false in other cases (run aborted by user)	// return false in other cases (run aborted by user)
	virtual Bool_t ProcessRun(Int_t nevent) = 0;	virtual Bool_t ProcessRun(Int_t nevent) = 0;

	// Set switches for lego transport	// Set switches for lego transport
	virtual void InitLego() = 0;	virtual void InitLego() = 0;

	// (In)Activate collecting TGeo tracks	// (In)Activate collecting TGeo tracks
	virtual void SetCollectTracks(Bool_t collectTracks) = 0;	virtual void SetCollectTracks(Bool_t collectTracks) = 0;

	// Return the info if collecting tracks is activated	// Return the info if collecting tracks is activated
	virtual Bool_t IsCollectTracks() const = 0;	virtual Bool_t IsCollectTracks() const = 0;


		// Return the info if multi-threading is supported/activated
		virtual Bool_t IsMT() const { return kFALSE; }

	//	//
	// ------------------------------------------------	// ------------------------------------------------
	// Set methods	// Set methods
	// ------------------------------------------------	// ------------------------------------------------
	//	//

	// Set the particle stack	// Set the particle stack
	virtual void SetStack(TVirtualMCStack* stack);	virtual void SetStack(TVirtualMCStack* stack);

	// Set the external decayer	// Set the external decayer

	skipping to change at line 883	skipping to change at line 882
	#endif	#endif

	TVirtualMCStack* fStack; //! Particles stack	TVirtualMCStack* fStack; //! Particles stack
	TVirtualMCDecayer* fDecayer; //! External decayer	TVirtualMCDecayer* fDecayer; //! External decayer
	TRandom* fRandom; //! Random number generator	TRandom* fRandom; //! Random number generator
	TVirtualMagField* fMagField;//! Magnetic field	TVirtualMagField* fMagField;//! Magnetic field

	ClassDef(TVirtualMC,1) //Interface to Monte Carlo	ClassDef(TVirtualMC,1) //Interface to Monte Carlo
	};	};


	// new functions

	inline Bool_t TVirtualMC::CurrentBoundaryNormal(
	Double_t& /x/, Double_t& /y/, Double_t& /z/) con
	st {
	// If track is on a geometry boundary, fill the normal vector of the cro
	ssing
	// volume surface and return true, return false otherwise
	Warning("CurrentBoundaryNormal", "New function - not yet implemented.");
	return kFALSE;
	}

	inline Bool_t TVirtualMC::GetMaterial(Int_t /imat/, TString& /name/,
	Double_t& /a/, Double_t& /z/, Double_t& /*density
	*/,
	Double_t& /radl/, Double_t& /inter/, TArrayD& /*p
	ar*/) {
	// Return the material parameters for the material specified by
	// the material Id
	Warning("GetMaterial(Int_t imat, ...)", "New function - not yet implemen
	ted.");
	return kFALSE;
	}

	inline void TVirtualMC::InitMT(Int_t /threadRank/) {
	// Initialize MC in a multi-threaded application
	Warning("InitMT(Int_t threadRank)", "New function - not yet implemented.
	");
	}

	#if defined(__linux__) && !defined(__CINT__)	#if defined(__linux__) && !defined(__CINT__)
	R__EXTERN __thread TVirtualMC *gMC;	R__EXTERN __thread TVirtualMC *gMC;
	#else	#else
	R__EXTERN TVirtualMC *gMC;	R__EXTERN TVirtualMC *gMC;
	#endif	#endif

	#endif //ROOT_TVirtualMC	#endif //ROOT_TVirtualMC

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

	TVirtualMCApplication.h	TVirtualMCApplication.h

	skipping to change at line 101	skipping to change at line 101
	// Define actions at the end of the event	// Define actions at the end of the event
	virtual void FinishEvent() = 0;	virtual void FinishEvent() = 0;

	// Define maximum radius for tracking (optional)	// Define maximum radius for tracking (optional)
	virtual Double_t TrackingRmax() const { return DBL_MAX; }	virtual Double_t TrackingRmax() const { return DBL_MAX; }

	// Define maximum z for tracking (optional)	// Define maximum z for tracking (optional)
	virtual Double_t TrackingZmax() const { return DBL_MAX; }	virtual Double_t TrackingZmax() const { return DBL_MAX; }

	// Calculate user field \a b at point \a x	// Calculate user field \a b at point \a x

	virtual void Field(const Double_t* x, Double_t* b) const;	virtual void Field(const Double_t* x, Double_t* b) const;

	// Define action at each step for Geane	// Define action at each step for Geane
	virtual void GeaneStepping() {;}	virtual void GeaneStepping() {;}


		// New functions for multi-threading applications
		virtual TVirtualMCApplication* CloneForWorker() const { return 0;}
		virtual void InitForWorker() const {}
		virtual void BeginWorkerRun() const {}
		virtual void FinishWorkerRun() const {}
		virtual void Merge(TVirtualMCApplication* /localMCApplication/) {}

	private:	private:
	// static data members	// static data members
	#if defined(__linux__) && !defined(__CINT__)	#if defined(__linux__) && !defined(__CINT__)
	static __thread TVirtualMCApplication* fgInstance; // singleton instance	static __thread TVirtualMCApplication* fgInstance; // singleton instance
	#else	#else
	static TVirtualMCApplication* fgInstance; // singleton instance	static TVirtualMCApplication* fgInstance; // singleton instance
	#endif	#endif

	ClassDef(TVirtualMCApplication,1) //Interface to MonteCarlo application	ClassDef(TVirtualMCApplication,1) //Interface to MonteCarlo application
	};	};

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

	RooRealSumPdf.h	RooRealSumPdf.h

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

	virtual ExtendMode extendMode() const ;	virtual ExtendMode extendMode() 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 {	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) ;
	}	}


	virtual Bool_t selfNormalized() const { return getAttribute("BinnedLikeli hood") ; }	virtual Bool_t selfNormalized() const { return getAttribute("BinnedLikeli hoodActive") ; }

	void printMetaArgs(std::ostream& os) const ;	void printMetaArgs(std::ostream& os) const ;

	virtual std::list<Double_t>* binBoundaries(RooAbsRealLValue& /obs/, Dou ble_t /xlo/, Double_t /xhi/) const ;	virtual std::list<Double_t>* binBoundaries(RooAbsRealLValue& /obs/, Dou ble_t /xlo/, Double_t /xhi/) const ;
	virtual 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 ;
	Bool_t isBinnedDistribution(const RooArgSet& obs) const ;	Bool_t isBinnedDistribution(const RooArgSet& obs) const ;

	void setFloor(Bool_t flag) { _doFloor = flag ; }	void setFloor(Bool_t flag) { _doFloor = flag ; }
	Bool_t getFloor() const { return _doFloor ; }	Bool_t getFloor() const { return _doFloor ; }
	static void setFloorGlobal(Bool_t flag) { _doFloorGlobal = flag ; }	static void setFloorGlobal(Bool_t flag) { _doFloorGlobal = flag ; }

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

	TDataSetManagerAliEn.h	TDataSetManagerAliEn.h

	skipping to change at line 119	skipping to change at line 119
	TString &fileName, TString &anchor, TString &treeName,	TString &fileName, TString &anchor, TString &treeName,
	TString &regexp);	TString &regexp);

	static Bool_t ParseOfficialDataUri(TString &uri, Bool_t sim,	static Bool_t ParseOfficialDataUri(TString &uri, Bool_t sim,
	TString &period, Int_t &year, std::vector<Int_t> *&runList,	TString &period, Int_t &year, std::vector<Int_t> *&runList,
	Bool_t &esd, Int_t &aodNum, TString &pass);	Bool_t &esd, Int_t &aodNum, TString &pass);

	virtual void Init(TString cacheDir, TString urlTpl,	virtual void Init(TString cacheDir, TString urlTpl,
	ULong_t cacheExpire_s);	ULong_t cacheExpire_s);


		virtual TList *GetFindCommandsFromUri(TString &uri, EDataMode &dataMo
		de, Bool_t &forceUpdate);

	public:	public:

	TDataSetManagerAliEn() : TDataSetManager(0, 0, 0) {}	TDataSetManagerAliEn() : TDataSetManager(0, 0, 0) {}
	TDataSetManagerAliEn(const char cacheDir, const char urlTpl,	TDataSetManagerAliEn(const char cacheDir, const char urlTpl,
	ULong_t cacheExpire_s);	ULong_t cacheExpire_s);
	TDataSetManagerAliEn(const char , const char , const char *cfgStr);	TDataSetManagerAliEn(const char , const char , const char *cfgStr);


	virtual TList *GetFindCommandsFromUri(TString &uri, EDataMode &dataMo
	de, Bool_t &forceUpdate);

	virtual ~TDataSetManagerAliEn();	virtual ~TDataSetManagerAliEn();
	virtual TFileCollection GetDataSet(const char uri, const char * = 0 );	virtual TFileCollection GetDataSet(const char uri, const char * = 0 );
	virtual Bool_t ExistsDataSet(const char *uri);	virtual Bool_t ExistsDataSet(const char *uri);

	// Not implemented functionalities	// Not implemented functionalities
	virtual Int_t RegisterDataSet(const char , TFileCollection ,	virtual Int_t RegisterDataSet(const char , TFileCollection ,
	const char *);	const char *);
	virtual TMap GetDataSets(const char , UInt_t);	virtual TMap GetDataSets(const char , UInt_t);
	virtual void ShowDataSets(const char * = "", const char = "");	virtual void ShowDataSets(const char * = "", const char = "");
	virtual Bool_t RemoveDataSet(const char *uri);	virtual Bool_t RemoveDataSet(const char *uri);

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

	TGraph.h	TGraph.h

	skipping to change at line 100	skipping to change at line 100
	TGraph& operator=(const TGraph&);	TGraph& operator=(const TGraph&);
	TGraph(const TVectorF &vx, const TVectorF &vy);	TGraph(const TVectorF &vx, const TVectorF &vy);
	TGraph(const TVectorD &vx, const TVectorD &vy);	TGraph(const TVectorD &vx, const TVectorD &vy);
	TGraph(const TH1 *h);	TGraph(const TH1 *h);
	TGraph(const TF1 f, Option_t option="");	TGraph(const TF1 f, Option_t option="");
	TGraph(const char filename, const char format="%lg %lg", Option_t *opt ion="");	TGraph(const char filename, const char format="%lg %lg", Option_t *opt ion="");
	virtual ~TGraph();	virtual ~TGraph();

	virtual void Apply(TF1 *f);	virtual void Apply(TF1 *f);
	virtual void Browse(TBrowser *b);	virtual void Browse(TBrowser *b);

	virtual Double_t Chisquare(const TF1 *f1) const;	virtual Double_t Chisquare(const TF1 f1, Option_t option="") cons t;
	static Bool_t CompareArg(const TGraph* gr, Int_t left, Int_t rig ht);	static Bool_t CompareArg(const TGraph* gr, Int_t left, Int_t rig ht);
	static Bool_t CompareX(const TGraph* gr, Int_t left, Int_t right );	static Bool_t CompareX(const TGraph* gr, Int_t left, Int_t right );
	static Bool_t CompareY(const TGraph* gr, Int_t left, Int_t right );	static Bool_t CompareY(const TGraph* gr, Int_t left, Int_t right );
	static Bool_t CompareRadius(const TGraph* gr, Int_t left, Int_t right);	static Bool_t CompareRadius(const TGraph* gr, Int_t left, Int_t right);
	virtual void ComputeRange(Double_t &xmin, Double_t &ymin, Doubl e_t &xmax, Double_t &ymax) const;	virtual void ComputeRange(Double_t &xmin, Double_t &ymin, Doubl e_t &xmax, Double_t &ymax) const;
	virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);	virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);
	virtual void Draw(Option_t *chopt="");	virtual void Draw(Option_t *chopt="");
	virtual void DrawGraph(Int_t n, const Int_t x, const Int_t y, Option_t *option="");	virtual void DrawGraph(Int_t n, const Int_t x, const Int_t y, Option_t *option="");
	virtual void DrawGraph(Int_t n, const Float_t x, const Float_t y, Option_t *option="");	virtual void DrawGraph(Int_t n, const Float_t x, const Float_t y, Option_t *option="");
	virtual void DrawGraph(Int_t n, const Double_t x=0, const Doub le_t y=0, Option_t *option="");	virtual void DrawGraph(Int_t n, const Double_t x=0, const Doub le_t y=0, Option_t *option="");

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

	TH1.h	TH1.h

	skipping to change at line 184	skipping to change at line 184
	virtual Bool_t Add(const TH1 *h1, Double_t c1=1);	virtual Bool_t Add(const TH1 *h1, Double_t c1=1);
	virtual Bool_t Add(const TH1 h, const TH1 h2, Double_t c1=1, Double_ t c2=1); // MENU	virtual Bool_t Add(const TH1 h, const TH1 h2, Double_t c1=1, Double_ t c2=1); // MENU
	virtual void AddBinContent(Int_t bin);	virtual void AddBinContent(Int_t bin);
	virtual void AddBinContent(Int_t bin, Double_t w);	virtual void AddBinContent(Int_t bin, Double_t w);
	static void AddDirectory(Bool_t add=kTRUE);	static void AddDirectory(Bool_t add=kTRUE);
	static Bool_t AddDirectoryStatus();	static Bool_t AddDirectoryStatus();
	virtual void Browse(TBrowser *b);	virtual void Browse(TBrowser *b);
	virtual Double_t Chi2Test(const TH1* h2, Option_t option = "UU", Double _t res = 0) const;	virtual Double_t Chi2Test(const TH1* h2, Option_t option = "UU", Double _t res = 0) const;
	virtual Double_t Chi2TestX(const TH1* h2, Double_t &chi2, Int_t &ndf, In t_t &igood,Option_t option = "UU", Double_t res = 0) const;	virtual Double_t Chi2TestX(const TH1* h2, Double_t &chi2, Int_t &ndf, In t_t &igood,Option_t option = "UU", Double_t res = 0) const;


		virtual Double_t Chisquare(TF1 * f1, Option_t *option = "") const;
	virtual Double_t ComputeIntegral();	virtual Double_t ComputeIntegral();
	virtual void DirectoryAutoAdd(TDirectory *);	virtual void DirectoryAutoAdd(TDirectory *);
	virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);	virtual Int_t DistancetoPrimitive(Int_t px, Int_t py);
	virtual Bool_t Divide(TF1 *f1, Double_t c1=1);	virtual Bool_t Divide(TF1 *f1, Double_t c1=1);
	virtual Bool_t Divide(const TH1 *h1);	virtual Bool_t Divide(const TH1 *h1);
	virtual Bool_t Divide(const TH1 h1, const TH1 h2, Double_t c1=1, Dou ble_t c2=1, Option_t option=""); // MENU*	virtual Bool_t Divide(const TH1 h1, const TH1 h2, Double_t c1=1, Dou ble_t c2=1, Option_t option=""); // MENU*
	virtual void Draw(Option_t *option="");	virtual void Draw(Option_t *option="");
	virtual TH1 DrawCopy(Option_t option="") const;	virtual TH1 DrawCopy(Option_t option="") const;
	virtual TH1 DrawNormalized(Option_t option="", Double_t norm=1) co nst;	virtual TH1 DrawNormalized(Option_t option="", Double_t norm=1) co nst;
	virtual void DrawPanel(); // MENU	virtual void DrawPanel(); // MENU

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

	TProfile.h	TProfile.h

	skipping to change at line 130	skipping to change at line 130
	TH1D ProjectionX(const char name="_px", Option_t *option="e ") const;	TH1D ProjectionX(const char name="_px", Option_t *option="e ") const;
	virtual void PutStats(Double_t *stats);	virtual void PutStats(Double_t *stats);
	TH1 Rebin(Int_t ngroup=2, const charnewname="", const Doub le_t *xbins=0);	TH1 Rebin(Int_t ngroup=2, const charnewname="", const Doub le_t *xbins=0);
	virtual void RebinAxis(Double_t x, TAxis *axis);	virtual void RebinAxis(Double_t x, TAxis *axis);
	virtual void Reset(Option_t *option="");	virtual void Reset(Option_t *option="");
	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(ostream &out, Option_t *option = "");
	virtual void Scale(Double_t c1=1, Option_t *option="");	virtual void Scale(Double_t c1=1, Option_t *option="");
	virtual void SetBinEntries(Int_t bin, Double_t w);	virtual void SetBinEntries(Int_t bin, Double_t w);
	virtual void SetBins(Int_t nbins, Double_t xmin, Double_t xmax);	virtual void SetBins(Int_t nbins, Double_t xmin, Double_t xmax);
	virtual void SetBins(Int_t nx, const Double_t *xbins);	virtual void SetBins(Int_t nx, const Double_t *xbins);

		virtual void SetBinsLength(Int_t n=-1);
	virtual void SetBuffer(Int_t buffersize, Option_t *option="");	virtual void SetBuffer(Int_t buffersize, Option_t *option="");
	virtual void SetErrorOption(Option_t option=""); // MENU*	virtual void SetErrorOption(Option_t option=""); // MENU*
	virtual void Sumw2(Bool_t flag = kTRUE);	virtual void Sumw2(Bool_t flag = kTRUE);

	ClassDef(TProfile,6) //Profile histogram class	ClassDef(TProfile,6) //Profile histogram class
	};	};

	#endif	#endif

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

	TProfile2D.h	TProfile2D.h

	skipping to change at line 136	skipping to change at line 136
	virtual void Reset(Option_t *option="");	virtual void Reset(Option_t *option="");
	virtual void RebinAxis(Double_t x, TAxis *axis);	virtual void RebinAxis(Double_t x, TAxis *axis);
	virtual TProfile2D Rebin2D(Int_t nxgroup=2, Int_t nygroup=2, const char newname="");	virtual TProfile2D Rebin2D(Int_t nxgroup=2, Int_t nygroup=2, const char newname="");
	virtual TProfile2D RebinX(Int_t ngroup=2, const char newname="");	virtual TProfile2D RebinX(Int_t ngroup=2, const char newname="");
	virtual TProfile2D RebinY(Int_t ngroup=2, const char newname="");	virtual TProfile2D RebinY(Int_t ngroup=2, const char newname="");
	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(ostream &out, Option_t *option = "");
	virtual void Scale(Double_t c1=1, Option_t *option="");	virtual void Scale(Double_t c1=1, Option_t *option="");
	virtual void SetBinEntries(Int_t bin, Double_t w);	virtual void SetBinEntries(Int_t bin, Double_t w);
	virtual void SetBins(Int_t nbinsx, Double_t xmin, Double_t xmax, In t_t nbinsy, Double_t ymin, Double_t ymax);	virtual void SetBins(Int_t nbinsx, Double_t xmin, Double_t xmax, In t_t nbinsy, Double_t ymin, Double_t ymax);
	virtual void SetBins(Int_t nx, const Double_t xBins, Int_t ny, con st Double_t yBins);	virtual void SetBins(Int_t nx, const Double_t xBins, Int_t ny, con st Double_t yBins);

		virtual void SetBinsLength(Int_t n=-1);
	virtual void SetBuffer(Int_t buffersize, Option_t *option="");	virtual void SetBuffer(Int_t buffersize, Option_t *option="");
	virtual void SetErrorOption(Option_t option=""); // MENU*	virtual void SetErrorOption(Option_t option=""); // MENU*
	virtual void Sumw2(Bool_t flag = kTRUE);	virtual void Sumw2(Bool_t flag = kTRUE);

	ClassDef(TProfile2D,7) //Profile2D histogram class	ClassDef(TProfile2D,7) //Profile2D histogram class
	};	};

	#endif	#endif

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

	TProfile3D.h	TProfile3D.h

	skipping to change at line 135	skipping to change at line 135
	virtual void Reset(Option_t *option="");	virtual void Reset(Option_t *option="");
	virtual void RebinAxis(Double_t x, TAxis *axis);	virtual void RebinAxis(Double_t x, TAxis *axis);
	virtual void SavePrimitive(ostream &out, Option_t *option = "");	virtual void SavePrimitive(ostream &out, Option_t *option = "");
	virtual void Scale(Double_t c1=1, Option_t *option="");	virtual void Scale(Double_t c1=1, Option_t *option="");
	virtual void SetBinEntries(Int_t bin, Double_t w);	virtual void SetBinEntries(Int_t bin, Double_t w);
	virtual void SetBins(Int_t nbinsx, Double_t xmin, Double_t xmax,	virtual void SetBins(Int_t nbinsx, Double_t xmin, Double_t xmax,
	Int_t nbinsy, Double_t ymin, Double_t ymax,	Int_t nbinsy, Double_t ymin, Double_t ymax,
	Int_t nbinsz, Double_t zmin, Double_t zmax);	Int_t nbinsz, Double_t zmin, Double_t zmax);
	virtual void SetBins(Int_t nx, const Double_t xBins, Int_t ny, con st Double_t yBins, Int_t nz,	virtual void SetBins(Int_t nx, const Double_t xBins, Int_t ny, con st Double_t yBins, Int_t nz,
	const Double_t *zBins);	const Double_t *zBins);

		virtual void SetBinsLength(Int_t n=-1);
	virtual void SetBuffer(Int_t buffersize, Option_t *opt="");	virtual void SetBuffer(Int_t buffersize, Option_t *opt="");
	virtual void SetErrorOption(Option_t option=""); // MENU*	virtual void SetErrorOption(Option_t option=""); // MENU*
	virtual void Sumw2(Bool_t flag = kTRUE);	virtual void Sumw2(Bool_t flag = kTRUE);

	ClassDef(TProfile3D,7) //Profile3D histogram class	ClassDef(TProfile3D,7) //Profile3D histogram class
	};	};

	#endif	#endif

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