AsymptoticCalculator.h   AsymptoticCalculator.h 
// @(#)root/roostats:$Id: AsymptoticCalculator.h 44269 2012-05-16 12:53:49Z moneta $ // @(#)root/roostats:$Id: AsymptoticCalculator.h 46082 2012-09-20 13:55:31Z 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_AsymptoticCalculator #ifndef ROOSTATS_AsymptoticCalculator
#define ROOSTATS_AsymptoticCalculator #define ROOSTATS_AsymptoticCalculator
skipping to change at line 108 skipping to change at line 108
static RooAbsData * GenerateAsimovDataSinglePdf(const RooAbsPdf & pdf , const RooArgSet & obs, const RooRealVar & weightVar, static RooAbsData * GenerateAsimovDataSinglePdf(const RooAbsPdf & pdf , const RooArgSet & obs, const RooRealVar & weightVar,
RooCategory * channel Cat = 0); RooCategory * channel Cat = 0);
static RooAbsData * GenerateCountingAsimovData(RooAbsPdf & pdf, const RooArgSet & obs, const RooRealVar & weightVar, static RooAbsData * GenerateCountingAsimovData(RooAbsPdf & pdf, const RooArgSet & obs, const RooRealVar & weightVar,
RooCategory * channel Cat = 0); RooCategory * channel Cat = 0);
static void FillBins(const RooAbsPdf & pdf, const RooArgList &obs, Ro oAbsData & data, int &index, double static void FillBins(const RooAbsPdf & pdf, const RooArgList &obs, Ro oAbsData & data, int &index, double
&binVolume, int &ibin); &binVolume, int &ibin);
static double EvaluateNLL(RooAbsPdf & pdf, RooAbsData& data, const Ro oArgSet *poiSet = 0); static double EvaluateNLL(RooAbsPdf & pdf, RooAbsData& data, const Ro oArgSet * condObs, const RooArgSet *poiSet = 0 );
static bool SetObsToExpected(RooAbsPdf &pdf, const RooArgSet &obs); static bool SetObsToExpected(RooAbsPdf &pdf, const RooArgSet &obs);
static bool SetObsToExpected(RooProdPdf &prod, const RooArgSet &obs); static bool SetObsToExpected(RooProdPdf &prod, const RooArgSet &obs);
protected: protected:
ClassDef(AsymptoticCalculator,1) ClassDef(AsymptoticCalculator,1)
private: private:
bool fOneSided; // for one sided PL test statistic (up per limits) bool fOneSided; // for one sided PL test statistic (up per limits)
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 BayesianCalculator.h   BayesianCalculator.h 
// @(#)root/roostats:$Id: BayesianCalculator.h 44073 2012-05-02 15:11:16Z m oneta $ // @(#)root/roostats:$Id: BayesianCalculator.h 46082 2012-09-20 13:55:31Z m oneta $
// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke // Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
#ifndef ROOSTATS_BayesianCalculator #ifndef ROOSTATS_BayesianCalculator
skipping to change at line 90 skipping to change at line 90
// specify the parameters of interest in the interval // specify the parameters of interest in the interval
virtual void SetParameters(const RooArgSet& set) { fPOI.removeAll(); fPOI.add(set); } virtual void SetParameters(const RooArgSet& set) { fPOI.removeAll(); fPOI.add(set); }
// specify the nuisance parameters (eg. the rest of the parameters) // specify the nuisance parameters (eg. the rest of the parameters)
virtual void SetNuisanceParameters(const RooArgSet& set) {fNuisancePa rameters.removeAll(); fNuisanceParameters.add(set);} virtual void SetNuisanceParameters(const RooArgSet& set) {fNuisancePa rameters.removeAll(); fNuisanceParameters.add(set);}
// Set only the Prior Pdf // Set only the Prior Pdf
virtual void SetPriorPdf(RooAbsPdf& pdf) { fPriorPdf = &pdf; } virtual void SetPriorPdf(RooAbsPdf& pdf) { fPriorPdf = &pdf; }
// set the conditional observables which will be used when creating t
he NLL
// so the pdf's will not be normalized on the conditional observables
when computing the NLL
virtual void SetConditionalObservables(const RooArgSet& set) {fCondit
ionalObs.removeAll(); fConditionalObs.add(set);}
// set the size of the test (rate of Type I error) ( Eg. 0.05 for a 9 5% Confidence Interval) // set the size of the test (rate of Type I error) ( Eg. 0.05 for a 9 5% Confidence Interval)
virtual void SetTestSize( Double_t size ) { virtual void SetTestSize( Double_t size ) {
fSize = size; fSize = size;
fValidInterval = false; fValidInterval = false;
} }
// set the confidence level for the interval (eg. 0.95 for a 95% Conf idence Interval) // set the confidence level for the interval (eg. 0.95 for a 95% Conf idence Interval)
virtual void SetConfidenceLevel( Double_t cl ) { SetTestSize(1.-cl); } virtual void SetConfidenceLevel( Double_t cl ) { SetTestSize(1.-cl); }
// Get the size of the test (eg. rate of Type I error) // Get the size of the test (eg. rate of Type I error)
virtual Double_t Size() const { return fSize; } virtual Double_t Size() const { return fSize; }
// Get the Confidence level for the test // Get the Confidence level for the test
skipping to change at line 161 skipping to change at line 165
// plan to replace the above: return a SimpleInterval integrating // plan to replace the above: return a SimpleInterval integrating
// over all other parameters except the one specified as argument // over all other parameters except the one specified as argument
//virtual SimpleInterval* GetInterval( RooRealVar* parameter ) const { return 0; } //virtual SimpleInterval* GetInterval( RooRealVar* parameter ) const { return 0; }
RooAbsData* fData; // data set RooAbsData* fData; // data set
RooAbsPdf* fPdf; // model pdf (could conta in the nuisance pdf as constraint term) RooAbsPdf* fPdf; // model pdf (could conta in the nuisance pdf as constraint term)
RooArgSet fPOI; // POI RooArgSet fPOI; // POI
RooAbsPdf* fPriorPdf; // prior pdf (typically fo r the POI) RooAbsPdf* fPriorPdf; // prior pdf (typically fo r the POI)
RooAbsPdf* fNuisancePdf; // nuisance pdf (needed wh en using nuisance sampling technique) RooAbsPdf* fNuisancePdf; // nuisance pdf (needed wh en using nuisance sampling technique)
RooArgSet fNuisanceParameters; RooArgSet fNuisanceParameters; // nuisance parameters
RooArgSet fConditionalObs ; // conditional observables
mutable RooAbsPdf* fProductPdf; // internal pointer to m odel * prior mutable RooAbsPdf* fProductPdf; // internal pointer to m odel * prior
mutable RooAbsReal* fLogLike; // internal pointer to l og likelihood function mutable RooAbsReal* fLogLike; // internal pointer to l og likelihood function
mutable RooAbsReal* fLikelihood; // internal pointer to l ikelihood function mutable RooAbsReal* fLikelihood; // internal pointer to l ikelihood function
mutable RooAbsReal* fIntegratedLikelihood; // integrated likelihood function, i.e - unnormalized posterior function mutable RooAbsReal* fIntegratedLikelihood; // integrated likelihood function, i.e - unnormalized posterior function
mutable RooAbsPdf* fPosteriorPdf; // normalized (on the p oi) posterior pdf mutable RooAbsPdf* fPosteriorPdf; // normalized (on the p oi) posterior pdf
mutable ROOT::Math::IGenFunction * fPosteriorFunction; // function representing the posterior mutable ROOT::Math::IGenFunction * fPosteriorFunction; // function representing the posterior
mutable TF1 * fApproxPosterior; // TF1 representing the scanned po sterior function mutable TF1 * fApproxPosterior; // TF1 representing the scanned po sterior function
mutable Double_t fLower; // computer lower interval bound mutable Double_t fLower; // computer lower interval bound
mutable Double_t fUpper; // upper interval bound mutable Double_t fUpper; // upper interval bound
skipping to change at line 184 skipping to change at line 189
double fLeftSideFraction; // fraction of probability content on le ft side of interval double fLeftSideFraction; // fraction of probability content on le ft side of interval
double fBrfPrecision; // root finder precision double fBrfPrecision; // root finder precision
mutable int fNScanBins; // number of bins to scan, if = -1 no scan is done (default) mutable int fNScanBins; // number of bins to scan, if = -1 no scan is done (default)
int fNumIterations; // number of iterations (when using ToyMC) int fNumIterations; // number of iterations (when using ToyMC)
mutable Bool_t fValidInterval; mutable Bool_t fValidInterval;
TString fIntegrationType; TString fIntegrationType;
protected: protected:
ClassDef(BayesianCalculator,1) // BayesianCalculator class ClassDef(BayesianCalculator,2) // BayesianCalculator class
}; };
} }
#endif #endif
 End of changes. 4 change blocks. 
3 lines changed or deleted 11 lines changed or added


 CombinedCalculator.h   CombinedCalculator.h 
// @(#)root/roostats:$Id: CombinedCalculator.h 39391 2011-05-26 09:51:59Z m oneta $ // @(#)root/roostats:$Id: CombinedCalculator.h 46082 2012-09-20 13:55:31Z m oneta $
// Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke // Author: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
#ifndef ROOSTATS_CombinedCalculator #ifndef ROOSTATS_CombinedCalculator
skipping to change at line 135 skipping to change at line 135
virtual void SetData(RooAbsData & data) { virtual void SetData(RooAbsData & data) {
fData = &data; fData = &data;
} }
// set the model (in this case can set only the parameters for the nu ll hypothesis) // set the model (in this case can set only the parameters for the nu ll hypothesis)
virtual void SetModel(const ModelConfig & model) { virtual void SetModel(const ModelConfig & model) {
fPdf = model.GetPdf(); fPdf = model.GetPdf();
if (model.GetParametersOfInterest()) SetParameters(*model.GetParam etersOfInterest()); if (model.GetParametersOfInterest()) SetParameters(*model.GetParam etersOfInterest());
if (model.GetSnapshot()) SetNullParameters(*model.GetSnapshot()); if (model.GetSnapshot()) SetNullParameters(*model.GetSnapshot());
if (model.GetNuisanceParameters()) SetNuisanceParameters(*model.Ge tNuisanceParameters()); if (model.GetNuisanceParameters()) SetNuisanceParameters(*model.Ge tNuisanceParameters());
if (model.GetConditionalObservables()) SetConditionalObservables(* model.GetConditionalObservables());
} }
virtual void SetNullModel( const ModelConfig &) { // to be understoo d what to do virtual void SetNullModel( const ModelConfig &) { // to be understoo d what to do
} }
virtual void SetAlternateModel(const ModelConfig &) { // to be under stood what to do virtual void SetAlternateModel(const ModelConfig &) { // to be under stood what to do
} }
/* specific setting - keep for convenience- some of them could be re moved */ /* specific setting - keep for convenience- some of them could be re moved */
// Set the Pdf // Set the Pdf
skipping to change at line 159 skipping to change at line 160
// specify the nuisance parameters (eg. the rest of the parameters) // specify the nuisance parameters (eg. the rest of the parameters)
virtual void SetNuisanceParameters(const RooArgSet& set) {fNuisParams .removeAll(); fNuisParams.add(set);} virtual void SetNuisanceParameters(const RooArgSet& set) {fNuisParams .removeAll(); fNuisParams.add(set);}
// set parameter values for the null if using a common PDF // set parameter values for the null if using a common PDF
virtual void SetNullParameters(const RooArgSet& set) {fNullParams.rem oveAll(); fNullParams.add(set);} virtual void SetNullParameters(const RooArgSet& set) {fNullParams.rem oveAll(); fNullParams.add(set);}
// set parameter values for the alternate if using a common PDF // set parameter values for the alternate if using a common PDF
virtual void SetAlternateParameters(const RooArgSet& set) {fAlternate Params.removeAll(); fAlternateParams.add(set);} virtual void SetAlternateParameters(const RooArgSet& set) {fAlternate Params.removeAll(); fAlternateParams.add(set);}
// set conditional observables needed for computing the NLL
virtual void SetConditionalObservables(const RooArgSet& set) {fCondit
ionalObs.removeAll(); fConditionalObs.add(set);}
protected: protected:
RooAbsPdf * GetPdf() const { return fPdf; } RooAbsPdf * GetPdf() const { return fPdf; }
RooAbsData * GetData() const { return fData; } RooAbsData * GetData() const { return fData; }
Double_t fSize; // size of the test (eg. specified rate of Type I err or) Double_t fSize; // size of the test (eg. specified rate of Type I err or)
RooAbsPdf * fPdf; RooAbsPdf * fPdf;
RooAbsData * fData; RooAbsData * fData;
RooArgSet fPOI; // RooArgSet specifying parameters of interest for i nterval RooArgSet fPOI; // RooArgSet specifying parameters of interest for i nterval
RooArgSet fNullParams; // RooArgSet specifying null parameters for hy pothesis test RooArgSet fNullParams; // RooArgSet specifying null parameters for hy pothesis test
RooArgSet fAlternateParams; // RooArgSet specifying alternate paramet ers for hypothesis test // Is it used ???? RooArgSet fAlternateParams; // RooArgSet specifying alternate paramet ers for hypothesis test // Is it used ????
RooArgSet fNuisParams;// RooArgSet specifying nuisance parameters fo r interval RooArgSet fNuisParams;// RooArgSet specifying nuisance parameters fo r interval
RooArgSet fConditionalObs; // RooArgSet specifying the conditional ob servables
ClassDef(CombinedCalculator,1) // A base class that is for tools that can be both HypoTestCalculators and IntervalCalculators ClassDef(CombinedCalculator,1) // A base class that is for tools that can be both HypoTestCalculators and IntervalCalculators
}; };
} }
#endif #endif
 End of changes. 4 change blocks. 
1 lines changed or deleted 7 lines changed or added


 HistoToWorkspaceFactoryFast.h   HistoToWorkspaceFactoryFast.h 
skipping to change at line 40 skipping to change at line 40
#include "RooStats/HistFactory/EstimateSummary.h" #include "RooStats/HistFactory/EstimateSummary.h"
#include "RooStats/HistFactory/Measurement.h" #include "RooStats/HistFactory/Measurement.h"
class ParamHistFunc; class ParamHistFunc;
namespace RooStats{ namespace RooStats{
namespace HistFactory{ namespace HistFactory{
class HistoToWorkspaceFactoryFast: public TObject { class HistoToWorkspaceFactoryFast: public TObject {
public: public:
typedef std::map<std::string, double> param_map;
HistoToWorkspaceFactoryFast( std::string, std::string , std::vector<st HistoToWorkspaceFactoryFast( std::string, std::string , std::vector<st
d::string> , double =200, double =20, int =0, int =6, TFile* =NULL); d::string> , double =200, double =20, int =0, int =6, TFile* =NULL, param_m
ap = param_map() );
HistoToWorkspaceFactoryFast( RooStats::HistFactory::Measurement& Meas ); HistoToWorkspaceFactoryFast( RooStats::HistFactory::Measurement& Meas );
static void ConfigureWorkspaceForMeasurement( const std::string& ModelN ame, RooWorkspace* ws_single, Measurement& measurement ); static void ConfigureWorkspaceForMeasurement( const std::string& ModelN ame, RooWorkspace* ws_single, Measurement& measurement );
HistoToWorkspaceFactoryFast(); HistoToWorkspaceFactoryFast();
virtual ~HistoToWorkspaceFactoryFast(); virtual ~HistoToWorkspaceFactoryFast();
RooWorkspace* MakeSingleChannelModel( Measurement& measurement, Channel & channel ); RooWorkspace* MakeSingleChannelModel( Measurement& measurement, Channel & channel );
static RooWorkspace* MakeCombinedModel( Measurement& measurement ); static RooWorkspace* MakeCombinedModel( Measurement& measurement );
void SetFunctionsToPreprocess(std::vector<std::string> lines){ fPreproc essFunctions = lines;} void SetFunctionsToPreprocess(std::vector<std::string> lines){ fPreproc essFunctions = lines;}
skipping to change at line 109 skipping to change at line 109
RooArgList createStatConstraintTerms( RooWorkspace* proto, std::vector< std::string>& constraintTerms, ParamHistFunc& paramHist, TH1* uncertHist, RooArgList createStatConstraintTerms( RooWorkspace* proto, std::vector< std::string>& constraintTerms, ParamHistFunc& paramHist, TH1* uncertHist,
EstimateSummary::ConstraintType ty pe, Double_t minSigma ); EstimateSummary::ConstraintType ty pe, Double_t minSigma );
inline void SetObsNameVec(const std::vector<std::string>& obsNameVec) { fObsNameVec = obsNameVec; } inline void SetObsNameVec(const std::vector<std::string>& obsNameVec) { fObsNameVec = obsNameVec; }
inline void SetObsName(const std::string& obsName) { fObsNameVec.clear( ); fObsNameVec.push_back(obsName); fObsName = obsName; } inline void SetObsName(const std::string& obsName) { fObsNameVec.clear( ); fObsNameVec.push_back(obsName); fObsName = obsName; }
inline void AddObsName(const std::string& obsName) { fObsNameVec.push_b ack(obsName); } inline void AddObsName(const std::string& obsName) { fObsNameVec.push_b ack(obsName); }
//string fFileNamePrefix; //string fFileNamePrefix;
//string fRowTitle; //string fRowTitle;
std::vector<std::string> fSystToFix; std::vector<std::string> fSystToFix;
std::map<std::string, double> fParamValues;
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;
private: private:
void GuessObsNameVec(TH1* hist); void GuessObsNameVec(TH1* hist);
 End of changes. 2 change blocks. 
3 lines changed or deleted 5 lines changed or added


 LikelihoodIntervalPlot.h   LikelihoodIntervalPlot.h 
// @(#)root/roostats:$Id: LikelihoodIntervalPlot.h 39391 2011-05-26 09:51:5 9Z moneta $ // @(#)root/roostats:$Id: LikelihoodIntervalPlot.h 46051 2012-09-19 13:01:2 0Z moneta $
/************************************************************************* /*************************************************************************
* Project: RooStats * * Project: RooStats *
* Package: RooFit/RooStats * * Package: RooFit/RooStats *
* Authors: * * Authors: *
* Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke * * Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke *
************************************************************************* *************************************************************************
* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
skipping to change at line 40 skipping to change at line 40
class LikelihoodIntervalPlot : public TNamed, public RooPrintable { class LikelihoodIntervalPlot : public TNamed, public RooPrintable {
public: public:
LikelihoodIntervalPlot(); LikelihoodIntervalPlot();
LikelihoodIntervalPlot(LikelihoodInterval* theInterval); LikelihoodIntervalPlot(LikelihoodInterval* theInterval);
// Destructor of SamplingDistribution // Destructor of SamplingDistribution
virtual ~LikelihoodIntervalPlot(); virtual ~LikelihoodIntervalPlot();
// returned plotted object (RooPlot or histograms)
TObject * GetPlottedObject() const { return fPlotObject; }
void SetLikelihoodInterval(LikelihoodInterval* theInterval); void SetLikelihoodInterval(LikelihoodInterval* theInterval);
void SetPlotParameters(const RooArgSet *params) ; void SetPlotParameters(const RooArgSet *params) ;
// set plot range (for 1D plot) // set plot range (for 1D plot)
void SetRange(double x1, double x2) { fXmin = x1; fXmax = x2; } void SetRange(double x1, double x2) { fXmin = x1; fXmax = x2; }
// set plot range (for 2D plot) // set plot range (for 2D plot)
void SetRange(double x1, double y1, double x2, double y2) { void SetRange(double x1, double y1, double x2, double y2) {
fXmin = x1; fXmax = x2; fXmin = x1; fXmax = x2;
fYmin = y1; fYmax = y2; fYmin = y1; fYmax = y2;
} }
skipping to change at line 68 skipping to change at line 71
// draw the likelihood interval or contour // draw the likelihood interval or contour
// for the 1D case a RooPlot is drawn by default of the profiled Log-Li kelihood ratio // for the 1D case a RooPlot is drawn by default of the profiled Log-Li kelihood ratio
// if option "TF1" is used the objects is drawn using a TF1 scanning th e LL function in a // if option "TF1" is used the objects is drawn using a TF1 scanning th e LL function in a
// grid of the setetd points (by default // grid of the setetd points (by default
// the TF1 can be costumized by setting maximum and the number of point s to scan // the TF1 can be costumized by setting maximum and the number of point s to scan
void Draw(const Option_t *options=0); void Draw(const Option_t *options=0);
private: private:
Int_t fColor; Int_t fColor; // color for the contour (for 2D) or function (in
Int_t fFillStyle; 1D)
Int_t fLineColor; Int_t fFillStyle; // fill style for contours
Int_t fLineColor; // line color for the interval (1D) or for other
contours (2D)
Int_t fNdimPlot; Int_t fNdimPlot;
Int_t fNPoints; // number of points used to scan the PL Int_t fNPoints; // number of points used to scan the PL
Double_t fMaximum; // function maximum Double_t fMaximum; // function maximum
// ranges for plots // ranges for plots
Double_t fXmin; Double_t fXmin;
Double_t fXmax; Double_t fXmax;
Double_t fYmin; Double_t fYmin;
Double_t fYmax; Double_t fYmax;
Double_t fPrecision; // RooCurve precision Double_t fPrecision; // RooCurve precision
LikelihoodInterval *fInterval; LikelihoodInterval *fInterval;
RooArgSet *fParamsPlot; RooArgSet *fParamsPlot;
TObject * fPlotObject; // plotted object
protected: protected:
ClassDef(LikelihoodIntervalPlot,1) // Class containing the results of the IntervalCalculator ClassDef(LikelihoodIntervalPlot,2) // Class containing the results of the IntervalCalculator
}; };
} }
#endif #endif
 End of changes. 5 change blocks. 
5 lines changed or deleted 11 lines changed or added


 MCMCCalculator.h   MCMCCalculator.h 
// @(#)root/roostats:$Id: MCMCCalculator.h 44368 2012-05-30 15:38:44Z axel $ // @(#)root/roostats:$Id: MCMCCalculator.h 46082 2012-09-20 13:55:31Z monet a $
// Authors: Kevin Belasco 17/06/2009 // Authors: Kevin Belasco 17/06/2009
// Authors: Kyle Cranmer 17/06/2009 // Authors: Kyle Cranmer 17/06/2009
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 92 skipping to change at line 92
// specify the parameters of interest in the interval // specify the parameters of interest in the interval
virtual void SetParameters(const RooArgSet& set) { fPOI.removeAll(); fPOI.add(set); } virtual void SetParameters(const RooArgSet& set) { fPOI.removeAll(); fPOI.add(set); }
// specify the parameters to store in the Markov chain // specify the parameters to store in the Markov chain
// By default all the parameters are stored // By default all the parameters are stored
virtual void SetChainParameters(const RooArgSet & set) { fChainParams .removeAll(); fChainParams.add(set); } virtual void SetChainParameters(const RooArgSet & set) { fChainParams .removeAll(); fChainParams.add(set); }
// specify the nuisance parameters (eg. the rest of the parameters) // specify the nuisance parameters (eg. the rest of the parameters)
virtual void SetNuisanceParameters(const RooArgSet& set) {fNuisParams .removeAll(); fNuisParams.add(set);} virtual void SetNuisanceParameters(const RooArgSet& set) {fNuisParams .removeAll(); fNuisParams.add(set);}
// set the conditional observables which will be used when creating t
he NLL
// so the pdf's will not be normalized on the conditional observables
when computing the NLL
virtual void SetConditionalObservables(const RooArgSet& set) {fCondit
ionalObs.removeAll(); fConditionalObs.add(set);}
// set the size of the test (rate of Type I error) ( Eg. 0.05 for a 9 5% Confidence Interval) // set the size of the test (rate of Type I error) ( Eg. 0.05 for a 9 5% Confidence Interval)
virtual void SetTestSize(Double_t size) {fSize = size;} virtual void SetTestSize(Double_t size) {fSize = size;}
// set the confidence level for the interval (eg. 0.95 for a 95% Conf idence Interval) // set the confidence level for the interval (eg. 0.95 for a 95% Conf idence Interval)
virtual void SetConfidenceLevel(Double_t cl) {fSize = 1.-cl;} virtual void SetConfidenceLevel(Double_t cl) {fSize = 1.-cl;}
// set the proposal function for suggesting new points for the MCMC // set the proposal function for suggesting new points for the MCMC
virtual void SetProposalFunction(ProposalFunction& proposalFunction) virtual void SetProposalFunction(ProposalFunction& proposalFunction)
{ fPropFunc = &proposalFunction; } { fPropFunc = &proposalFunction; }
skipping to change at line 180 skipping to change at line 184
else else
fDelta = delta; fDelta = delta;
} }
protected: protected:
Double_t fSize; // size of the test (eg. specified rate of Type I e rror) Double_t fSize; // size of the test (eg. specified rate of Type I e rror)
RooArgSet fPOI; // parameters of interest for interval RooArgSet fPOI; // parameters of interest for interval
RooArgSet fNuisParams; // nuisance parameters for interval (not rea lly used) RooArgSet fNuisParams; // nuisance parameters for interval (not rea lly used)
RooArgSet fChainParams; // parameters to store in the chain (if not specified they are all of them ) RooArgSet fChainParams; // parameters to store in the chain (if not specified they are all of them )
RooArgSet fConditionalObs; // conditional observables
mutable ProposalFunction* fPropFunc; // Proposal function for MCMC in tegration mutable ProposalFunction* fPropFunc; // Proposal function for MCMC in tegration
RooAbsPdf * fPdf; // pointer to common PDF (owned by the works pace) RooAbsPdf * fPdf; // pointer to common PDF (owned by the works pace)
RooAbsPdf * fPriorPdf; // pointer to prior PDF (owned by the works pace) RooAbsPdf * fPriorPdf; // pointer to prior PDF (owned by the works pace)
RooAbsData * fData; // pointer to the data (owned by the workspac e) RooAbsData * fData; // pointer to the data (owned by the workspac e)
Int_t fNumIters; // number of iterations to run metropolis algorithm Int_t fNumIters; // number of iterations to run metropolis algorithm
Int_t fNumBurnInSteps; // number of iterations to discard as burn-in, starting from the first Int_t fNumBurnInSteps; // number of iterations to discard as burn-in, starting from the first
Int_t fNumBins; // set the number of bins to create for each Int_t fNumBins; // set the number of bins to create for each
// axis when constructing the interval // axis when constructing the interval
RooArgList * fAxes; // which variables to put on each axis RooArgList * fAxes; // which variables to put on each axis
Bool_t fUseKeys; // whether to use kernel estimation to determine int erval Bool_t fUseKeys; // whether to use kernel estimation to determine int erval
skipping to change at line 213 skipping to change at line 218
void SetBins(const RooAbsCollection& coll, Int_t numBins) const void SetBins(const RooAbsCollection& coll, Int_t numBins) const
{ {
TIterator* it = coll.createIterator(); TIterator* it = coll.createIterator();
RooAbsArg* r; RooAbsArg* r;
while ((r = (RooAbsArg*)it->Next()) != NULL) while ((r = (RooAbsArg*)it->Next()) != NULL)
if (dynamic_cast<RooRealVar*>(r)) if (dynamic_cast<RooRealVar*>(r))
((RooRealVar*)r)->setBins(numBins); ((RooRealVar*)r)->setBins(numBins);
delete it; delete it;
} }
ClassDef(MCMCCalculator,2) // Markov Chain Monte Carlo calculator for Bayesian credible intervals ClassDef(MCMCCalculator,3) // Markov Chain Monte Carlo calculator for Bayesian credible intervals
}; };
} }
#endif #endif
 End of changes. 4 change blocks. 
2 lines changed or deleted 10 lines changed or added


 MaxLikelihoodEstimateTestStat.h   MaxLikelihoodEstimateTestStat.h 
skipping to change at line 90 skipping to change at line 90
RooRealVar* mle = (RooRealVar*) res->floatParsFinal().find(fParameter.G etName()); RooRealVar* mle = (RooRealVar*) res->floatParsFinal().find(fParameter.G etName());
double ret = mle->getVal(); double ret = mle->getVal();
delete res; delete res;
return ret; return ret;
*/ */
RooArgSet* allParams = fPdf->getParameters(data); RooArgSet* allParams = fPdf->getParameters(data);
RooStats::RemoveConstantParameters(allParams); RooStats::RemoveConstantParameters(allParams);
// need to call constrain for RooSimultaneous until stripDisconnected p roblem fixed // need to call constrain for RooSimultaneous until stripDisconnected p roblem fixed
RooAbsReal* nll = (RooNLLVar*) fPdf->createNLL(data, RooFit::CloneData( kFALSE),RooFit::Constrain(*allParams)); RooAbsReal* nll = fPdf->createNLL(data, RooFit::CloneData(kFALSE),RooFi t::Constrain(*allParams),RooFit::ConditionalObservables(fConditionalObs));
//RooAbsReal* nll = fPdf->createNLL(data, RooFit::CloneData(false)); //RooAbsReal* nll = fPdf->createNLL(data, RooFit::CloneData(false));
// RooAbsReal* profile = nll->createProfile(RooArgSet()); // RooAbsReal* profile = nll->createProfile(RooArgSet());
// profile->getVal(); // profile->getVal();
// RooArgSet* vars = profile->getVariables(); // RooArgSet* vars = profile->getVariables();
// RooMsgService::instance().setGlobalKillBelow(msglevel); // RooMsgService::instance().setGlobalKillBelow(msglevel);
// double ret = vars->getRealValue(fParameter->GetName()); // double ret = vars->getRealValue(fParameter->GetName());
// delete vars; // delete vars;
// delete nll; // delete nll;
skipping to change at line 145 skipping to change at line 145
} }
virtual const TString GetVarName() const { virtual const TString GetVarName() const {
TString varName = Form("Maximum Likelihood Estimate of %s",fParameter-> GetName()); TString varName = Form("Maximum Likelihood Estimate of %s",fParameter-> GetName());
return varName; return varName;
} }
virtual void PValueIsRightTail(bool isright) { fUpperLimit = isright; } virtual void PValueIsRightTail(bool isright) { fUpperLimit = isright; }
virtual bool PValueIsRightTail(void) const { return fUpperLimit; } virtual bool PValueIsRightTail(void) const { return fUpperLimit; }
// set the conditional observables which will be used when creating the
NLL
// so the pdf's will not be normalized on the conditional observables wh
en computing the NLL
virtual void SetConditionalObservables(const RooArgSet& set) {fCondition
alObs.removeAll(); fConditionalObs.add(set);}
private: private:
RooAbsPdf *fPdf; RooAbsPdf *fPdf;
RooRealVar *fParameter; RooRealVar *fParameter;
RooArgSet fConditionalObs;
bool fUpperLimit; bool fUpperLimit;
TString fMinimizer; TString fMinimizer;
Int_t fStrategy; Int_t fStrategy;
Int_t fPrintLevel; Int_t fPrintLevel;
protected: protected:
ClassDef(MaxLikelihoodEstimateTestStat,1) ClassDef(MaxLikelihoodEstimateTestStat,2)
}; };
} }
#endif #endif
 End of changes. 4 change blocks. 
2 lines changed or deleted 10 lines changed or added


 Measurement.h   Measurement.h 
skipping to change at line 35 skipping to change at line 35
Measurement(const char* Name, const char* Title=""); Measurement(const char* Name, const char* Title="");
// std::string Name; // std::string Name;
void SetOutputFilePrefix( const std::string& prefix ) { fOutputFilePrefix = prefix; } void SetOutputFilePrefix( const std::string& prefix ) { fOutputFilePrefix = prefix; }
std::string GetOutputFilePrefix() { return fOutputFilePrefix; } std::string GetOutputFilePrefix() { return fOutputFilePrefix; }
void SetPOI( const std::string& POI ) { fPOI = POI; } void SetPOI( const std::string& POI ) { fPOI = POI; }
std::string GetPOI() { return fPOI; } std::string GetPOI() { return fPOI; }
void AddConstantParam( const std::string& param ) { fConstantParams.push_ // Add a parameter to be set as constant
back( param ); } // (Similar to ParamSetting method below)
void AddConstantParam( const std::string& param );
void ClearConstantParams() { fConstantParams.clear(); } void ClearConstantParams() { fConstantParams.clear(); }
std::vector< std::string >& GetConstantParams() { return fConstantParams; } std::vector< std::string >& GetConstantParams() { return fConstantParams; }
// Set a parameter to a specific value
// (And optionally fix it)
void SetParamValue( const std::string& param, double value);
std::map<std::string, double>& GetParamValues() { return fParamValues; }
void ClearParamValues() { fParamValues.clear(); }
void AddPreprocessFunction( std::string name, std::string expression, std
::string dependencies );
void AddFunctionObject( const RooStats::HistFactory::PreprocessFunction f unction) { fFunctionObjects.push_back( function ); } void AddFunctionObject( const RooStats::HistFactory::PreprocessFunction f unction) { fFunctionObjects.push_back( function ); }
void SetFunctionObjects( std::vector< RooStats::HistFactory::PreprocessFu nction > objects ) { fFunctionObjects = objects; } void SetFunctionObjects( std::vector< RooStats::HistFactory::PreprocessFu nction > objects ) { fFunctionObjects = objects; }
std::vector< RooStats::HistFactory::PreprocessFunction >& GetFunctionObje cts() { return fFunctionObjects; } std::vector< RooStats::HistFactory::PreprocessFunction >& GetFunctionObje cts() { return fFunctionObjects; }
std::vector< std::string > GetPreprocessFunctions();
void AddPreprocessFunction( const std::string& function ) { fPreprocessFu // Make these dynamically from the list of preprocess functions
nctions.push_back( function ); } // instead of storing them
void SetPreprocessFunctions( std::vector< std::string > functions ) { fPr // void AddPreprocessFunction( const std::string& function ) { fPreproces
eprocessFunctions = functions; } sFunctions.push_back( function ); }
std::vector< std::string >& GetPreprocessFunctions() { return fPreproces // void SetPreprocessFunctions( std::vector< std::string > functions ) {
sFunctions; } fPreprocessFunctions = functions; }
void ClearPreprocessFunctions() { fPreprocessFunctions.clear(); } // std::vector< std::string >& GetPreprocessFunctions() { return fPrepro
cessFunctions; }
// void ClearPreprocessFunctions() { fPreprocessFunctions.clear(); }
/*
<ParamSetting Const=\"True\" Val=\"%g\">%s</ParamSetting>\n" % (setting
[1],param)
<ConstraintTerm Type=\"%s\" RelativeUncertainty=\"%g\">%s</ConstraintTe
rm>\n" % (constraint[0],constraint[1],param)
*/
void SetLumi(double Lumi ) { fLumi = Lumi; } void SetLumi(double Lumi ) { fLumi = Lumi; }
void SetLumiRelErr( double RelErr ) { fLumiRelErr = RelErr; } void SetLumiRelErr( double RelErr ) { fLumiRelErr = RelErr; }
double GetLumi() { return fLumi; } double GetLumi() { return fLumi; }
double GetLumiRelErr() { return fLumiRelErr; } double GetLumiRelErr() { return fLumiRelErr; }
void SetBinLow( int BinLow ) { fBinLow = BinLow; } void SetBinLow( int BinLow ) { fBinLow = BinLow; }
void SetBinHigh ( int BinHigh ) { fBinHigh = BinHigh; } void SetBinHigh ( int BinHigh ) { fBinHigh = BinHigh; }
int GetBinLow() { return fBinLow; } int GetBinLow() { return fBinLow; }
int GetBinHigh() { return fBinHigh; } int GetBinHigh() { return fBinHigh; }
skipping to change at line 73 skipping to change at line 90
std::vector< RooStats::HistFactory::Channel >& GetChannels() { return fCh annels; } std::vector< RooStats::HistFactory::Channel >& GetChannels() { return fCh annels; }
RooStats::HistFactory::Channel& GetChannel( std::string ); RooStats::HistFactory::Channel& GetChannel( std::string );
void AddChannel( RooStats::HistFactory::Channel chan ) { fChannels.push_b ack( chan ); } void AddChannel( RooStats::HistFactory::Channel chan ) { fChannels.push_b ack( chan ); }
bool HasChannel( std::string ); bool HasChannel( std::string );
void writeToFile( TFile* file ); void writeToFile( TFile* file );
void CollectHistograms(); void CollectHistograms();
void AddGammaSyst(std::string syst, double uncert);
void AddLogNormSyst(std::string syst, double uncert);
void AddUniformSyst(std::string syst);
void AddNoSyst(std::string syst);
std::map< std::string, double >& GetGammaSyst() { return fGammaSyst; } std::map< std::string, double >& GetGammaSyst() { return fGammaSyst; }
std::map< std::string, double >& GetUniformSyst() { return fUniformSyst; } std::map< std::string, double >& GetUniformSyst() { return fUniformSyst; }
std::map< std::string, double >& GetLogNormSyst() { return fLogNormSyst; } std::map< std::string, double >& GetLogNormSyst() { return fLogNormSyst; }
std::map< std::string, double >& GetNoSyst() { return fNoSyst; } std::map< std::string, double >& GetNoSyst() { return fNoSyst; }
private: private:
// Configurables of this measurement
std::string fOutputFilePrefix; std::string fOutputFilePrefix;
std::string fPOI; std::string fPOI;
double fLumi;
double fLumiRelErr;
int fBinLow;
int fBinHigh;
bool fExportOnly;
std::string fInterpolationScheme;
// Channels that make up this measurement
std::vector< RooStats::HistFactory::Channel > fChannels; std::vector< RooStats::HistFactory::Channel > fChannels;
// List of Parameters to be set constant
std::vector< std::string > fConstantParams; std::vector< std::string > fConstantParams;
// Map of parameter names to inital values to be set
std::map< std::string, double > fParamValues;
// List of Preprocess Function objects
std::vector< RooStats::HistFactory::PreprocessFunction > fFunctionObjects ; std::vector< RooStats::HistFactory::PreprocessFunction > fFunctionObjects ;
std::vector< std::string > fPreprocessFunctions; // std::vector< std::string > fPreprocessFunctions;
//std::vector< std::string > constraintTerms;
// List of Alternate constraint terms
std::map< std::string, double > fGammaSyst; std::map< std::string, double > fGammaSyst;
std::map< std::string, double > fUniformSyst; std::map< std::string, double > fUniformSyst;
std::map< std::string, double > fLogNormSyst; std::map< std::string, double > fLogNormSyst;
std::map< std::string, double > fNoSyst; std::map< std::string, double > fNoSyst;
double fLumi;
double fLumiRelErr;
int fBinLow;
int fBinHigh;
bool fExportOnly;
// bool fSaveExtra;
std::string fInterpolationScheme;
std::string GetDirPath( TDirectory* dir ); std::string GetDirPath( TDirectory* dir );
ClassDef(RooStats::HistFactory::Measurement, 1); ClassDef(RooStats::HistFactory::Measurement, 1);
}; };
} // namespace HistFactory } // namespace HistFactory
} // namespace RooStats } // namespace RooStats
#endif #endif
 End of changes. 13 change blocks. 
22 lines changed or deleted 50 lines changed or added


 PreprocessFunction.h   PreprocessFunction.h 
skipping to change at line 16 skipping to change at line 16
#include <iostream> #include <iostream>
namespace RooStats{ namespace RooStats{
namespace HistFactory { namespace HistFactory {
class PreprocessFunction { class PreprocessFunction {
public: public:
PreprocessFunction(); PreprocessFunction();
PreprocessFunction(std::string Name, std::string Expression, std::strin
g Dependents);
std::string GetCommand(std::string Name, std::string Expression, std::s
tring Dependents);
void Print(std::ostream& = std::cout); void Print(std::ostream& = std::cout);
void SetName( const std::string& Name) { fName = Name; } void SetName( const std::string& Name) { fName = Name; }
std::string GetName() { return fName; } std::string GetName() { return fName; }
void SetExpression( const std::string& Expression) { fExpression = Expr ession; } void SetExpression( const std::string& Expression) { fExpression = Expr ession; }
std::string GetExpression() { return fExpression; } std::string GetExpression() { return fExpression; }
void SetDependents( const std::string& Dependents) { fDependents = Depe ndents; } void SetDependents( const std::string& Dependents) { fDependents = Depe ndents; }
std::string GetDependents() { return fDependents; } std::string GetDependents() { return fDependents; }
 End of changes. 1 change blocks. 
0 lines changed or deleted 5 lines changed or added


 ProfileLikelihoodTestStat.h   ProfileLikelihoodTestStat.h 
// @(#)root/roostats:$Id: ProfileLikelihoodTestStat.h 44473 2012-06-01 16:1 2:31Z moneta $ // @(#)root/roostats:$Id: ProfileLikelihoodTestStat.h 46082 2012-09-20 13:5 5:31Z 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 114 skipping to change at line 114
//LM use default copy constructor and assignment copying the pointers. Is this what we want ? //LM use default copy constructor and assignment copying the pointers. Is this what we want ?
void SetOneSided(Bool_t flag=true) {fLimitType = (flag ? oneSided : tw oSided);} void SetOneSided(Bool_t flag=true) {fLimitType = (flag ? oneSided : tw oSided);}
void SetOneSidedDiscovery(Bool_t flag=true) {fLimitType = (flag ? oneS idedDiscovery : twoSided);} void SetOneSidedDiscovery(Bool_t flag=true) {fLimitType = (flag ? oneS idedDiscovery : twoSided);}
void SetSigned(Bool_t flag=true) {fSigned = flag;} // +/- t_mu instea d of t_mu>0 with one-sided settings void SetSigned(Bool_t flag=true) {fSigned = flag;} // +/- t_mu instea d of t_mu>0 with one-sided settings
//void SetOneSidedDiscovery(Bool_t flag=true) {fOneSidedDiscovery = fl ag;} //void SetOneSidedDiscovery(Bool_t flag=true) {fOneSidedDiscovery = fl ag;}
bool IsTwoSided() const { return fLimitType == twoSided; } bool IsTwoSided() const { return fLimitType == twoSided; }
bool IsOneSidedDiscovery() const { return fLimitType == oneSidedDiscov ery; } bool IsOneSidedDiscovery() const { return fLimitType == oneSidedDiscov ery; }
static void SetAlwaysReuseNLL(Bool_t flag) { fgAlwaysReuseNll = flag ; static void SetAlwaysReuseNLL(Bool_t 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 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) {
return EvaluateProfileLikelihood(0, data, paramsOfInterest); return EvaluateProfileLikelihood(0, data, paramsOfInterest);
skipping to change at line 146 skipping to change at line 147
virtual const RooArgSet* GetDetailedOutput(void) const { virtual const RooArgSet* GetDetailedOutput(void) const {
// Returns detailed output. The value returned by this function is updated after each call to Evaluate(). // Returns detailed output. The value returned by this function is updated after each call to Evaluate().
// The returned RooArgSet contains the following: // The returned RooArgSet contains the following:
// <ul> // <ul>
// <li> the minimum nll, fitstatus and convergence quality for each fit </li> // <li> the minimum nll, fitstatus and convergence quality for each fit </li>
// <li> for each fit and for each non-constant parameter, the v alue, error and pull of the parameter are stored </li> // <li> for each fit and for each non-constant parameter, the v alue, error and pull of the parameter are stored </li>
// </ul> // </ul>
return fDetailedOutput; return fDetailedOutput;
} }
// set the conditional observables which will be used when creating th
e NLL
// so the pdf's will not be normalized on the conditional observables
when computing the NLL
virtual void SetConditionalObservables(const RooArgSet& set) {fConditi
onalObs.removeAll(); fConditionalObs.add(set);}
virtual void SetVarName(const char* name) { fVarName = name; } virtual void SetVarName(const char* name) { fVarName = name; }
virtual const TString GetVarName() const {return fVarName;} virtual const TString GetVarName() const {return fVarName;}
virtual RooAbsPdf * GetPdf() const { return fPdf; } virtual RooAbsPdf * GetPdf() const { return fPdf; }
// const bool PValueIsRightTail(void) { return false; } // overw rites default // const bool PValueIsRightTail(void) { return false; } // overw rites default
private: private:
RooFitResult* GetMinNLL(); RooFitResult* GetMinNLL();
private: private:
RooAbsPdf* fPdf; RooAbsPdf* fPdf;
RooNLLVar* fNll; //! RooAbsReal* fNll; //!
const RooArgSet* fCachedBestFitParams; const RooArgSet* fCachedBestFitParams;
RooAbsData* fLastData; RooAbsData* fLastData;
// Double_t fLastMLE; // Double_t fLastMLE;
LimitType fLimitType; LimitType fLimitType;
Bool_t fSigned; Bool_t fSigned;
// this will store a snapshot of the unconditional nuisance // this will store a snapshot of the unconditional nuisance
// parameter fit. // parameter fit.
bool fDetailedOutputEnabled; bool fDetailedOutputEnabled;
bool fDetailedOutputWithErrorsAndPulls; bool fDetailedOutputWithErrorsAndPulls;
RooArgSet* fDetailedOutput; //! RooArgSet* fDetailedOutput; //!
RooArgSet fConditionalObs; // conditional observables
TString fVarName; TString fVarName;
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; Double_t fTolerance;
Int_t fPrintLevel; Int_t fPrintLevel;
 End of changes. 5 change blocks. 
4 lines changed or deleted 12 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.7.4/ i686-slc5-gcc43-opt PYTHONDIR=/afs/cern.ch/sw/lcg/external/Python/2.6.5p2/i 686-slc5-gcc43-opt linux --fail-on-missing --enable-builtin-pcre --enable-c intex --enable-explicitlink --enable-gdml --enable-genvector --enable-krb5 --enable-mathmore --enable-minuit2 --enable-mysql --enable-oracle --enable- python --enable-qt --enable-qtgsi --enable-reflex --enable-roofit --enable- table --enable-unuran --with-castor-incdir=/afs/cern.ch/sw/lcg/external/cas tor/2.1.9-9/i686-slc5-gcc43-opt/usr/include/shift --with-castor-libdir=/afs /cern.ch/sw/lcg/external/castor/2.1.9-9/i686-slc5-gcc43-opt/usr/lib --with- cern-libdir=/afs/cern.ch/sw/lcg/external/cernlib/2006a/i686-slc5-gcc43-opt/ lib --with-dcap-libdir=/afs/cern.ch/sw/lcg/external/dcache_client/2.47.5-0/ i686-slc5-gcc43-opt/dcap/lib --with-dcap-incdir=/afs/cern.ch/sw/lcg/externa l/dcache_client/2.47.5-0/i686-slc5-gcc43-opt/dcap/include --with-fftw3-incd ir=/afs/cern.ch/sw/lcg/external/fftw3/3.1.2/i686-slc5-gcc43-opt/include --w ith-fftw3-libdir=/afs/cern.ch/sw/lcg/external/fftw3/3.1.2/i686-slc5-gcc43-o pt/lib --with-gccxml=/afs/cern.ch/sw/lcg/external/gccxml/0.9.0_20110825/i68 6-slc5-gcc43-opt/bin --with-gfal-libdir=/afs/cern.ch/sw/lcg/external/Grid/g fal/1.11.8-2/i686-slc5-gcc43-opt/lib --with-gfal-incdir=/afs/cern.ch/sw/lcg /external/Grid/gfal/1.11.8-2/i686-slc5-gcc43-opt/include --with-gsl-incdir= /afs/cern.ch/sw/lcg/external/GSL/1.10/i686-slc5-gcc43-opt/include --with-gs l-libdir=/afs/cern.ch/sw/lcg/external/GSL/1.10/i686-slc5-gcc43-opt/lib --wi th-mysql-incdir=/afs/cern.ch/sw/lcg/external/mysql/5.5.14/i686-slc5-gcc43-o pt/include --with-mysql-libdir=/afs/cern.ch/sw/lcg/external/mysql/5.5.14/i6 86-slc5-gcc43-opt/lib --with-oracle-incdir=/afs/cern.ch/sw/lcg/external/ora cle/11.2.0.1.0p3/i686-slc5-gcc43-opt/include --with-oracle-libdir=/afs/cern .ch/sw/lcg/external/oracle/11.2.0.1.0p3/i686-slc5-gcc43-opt/lib --with-rfio -incdir=/afs/cern.ch/sw/lcg/external/castor/2.1.9-9/i686-slc5-gcc43-opt/usr /include/shift --with-rfio-libdir=/afs/cern.ch/sw/lcg/external/castor/2.1.9 -9/i686-slc5-gcc43-opt/usr/lib --with-pythia6-libdir=/afs/cern.ch/sw/lcg/ex ternal/MCGenerators/pythia6/426.2/i686-slc5-gcc43-opt/lib --with-pythia8-in cdir=/afs/cern.ch/sw/lcg/external/MCGenerators/pythia8/160/i686-slc5-gcc43- opt/include --with-pythia8-libdir=/afs/cern.ch/sw/lcg/external/MCGenerators /pythia8/160/i686-slc5-gcc43-opt/lib --with-gviz-incdir=/afs/cern.ch/sw/lcg /external/graphviz/2.28.0/i686-slc5-gcc43-opt/include/graphviz --with-gviz- libdir=/afs/cern.ch/sw/lcg/external/graphviz/2.28.0/i686-slc5-gcc43-opt/lib --with-xrootd=/afs/cern.ch/sw/lcg/external/xrootd/3.2.2/i686-slc5-gcc43-op t" #define R__CONFIGUREOPTIONS "QTDIR=/afs/cern.ch/sw/lcg/external/qt/4.7.4/ i686-slc5-gcc43-opt PYTHONDIR=/afs/cern.ch/sw/lcg/external/Python/2.7.3/i68 6-slc5-gcc43-opt linux --fail-on-missing --enable-builtin-pcre --enable-cin tex --enable-explicitlink --enable-gdml --enable-genvector --enable-krb5 -- enable-mathmore --enable-minuit2 --enable-mysql --enable-oracle --enable-py thon --enable-qt --enable-qtgsi --enable-reflex --enable-roofit --enable-ta ble --enable-unuran --with-castor-incdir=/afs/cern.ch/sw/lcg/external/casto r/2.1.9-9/i686-slc5-gcc43-opt/usr/include/shift --with-castor-libdir=/afs/c ern.ch/sw/lcg/external/castor/2.1.9-9/i686-slc5-gcc43-opt/usr/lib --with-ce rn-libdir=/afs/cern.ch/sw/lcg/external/cernlib/2006a/i686-slc5-gcc43-opt/li b --with-dcap-libdir=/afs/cern.ch/sw/lcg/external/dcache_client/2.47.5-0/i6 86-slc5-gcc43-opt/dcap/lib --with-dcap-incdir=/afs/cern.ch/sw/lcg/external/ dcache_client/2.47.5-0/i686-slc5-gcc43-opt/dcap/include --with-fftw3-incdir =/afs/cern.ch/sw/lcg/external/fftw3/3.1.2/i686-slc5-gcc43-opt/include --wit h-fftw3-libdir=/afs/cern.ch/sw/lcg/external/fftw3/3.1.2/i686-slc5-gcc43-opt /lib --with-gccxml=/afs/cern.ch/sw/lcg/external/gccxml/0.9.0_20110825/i686- slc5-gcc43-opt/bin --with-gfal-libdir=/afs/cern.ch/sw/lcg/external/Grid/gfa l/1.11.8-2/i686-slc5-gcc43-opt/lib --with-gfal-incdir=/afs/cern.ch/sw/lcg/e xternal/Grid/gfal/1.11.8-2/i686-slc5-gcc43-opt/include --with-gsl-incdir=/a fs/cern.ch/sw/lcg/external/GSL/1.10/i686-slc5-gcc43-opt/include --with-gsl- libdir=/afs/cern.ch/sw/lcg/external/GSL/1.10/i686-slc5-gcc43-opt/lib --with -mysql-incdir=/afs/cern.ch/sw/lcg/external/mysql/5.5.14/i686-slc5-gcc43-opt /include --with-mysql-libdir=/afs/cern.ch/sw/lcg/external/mysql/5.5.14/i686 -slc5-gcc43-opt/lib --with-oracle-incdir=/afs/cern.ch/sw/lcg/external/oracl e/11.2.0.1.0p3/i686-slc5-gcc43-opt/include --with-oracle-libdir=/afs/cern.c h/sw/lcg/external/oracle/11.2.0.1.0p3/i686-slc5-gcc43-opt/lib --with-rfio-i ncdir=/afs/cern.ch/sw/lcg/external/castor/2.1.9-9/i686-slc5-gcc43-opt/usr/i nclude/shift --with-rfio-libdir=/afs/cern.ch/sw/lcg/external/castor/2.1.9-9 /i686-slc5-gcc43-opt/usr/lib --with-pythia6-libdir=/afs/cern.ch/sw/lcg/exte rnal/MCGenerators/pythia6/426.2/i686-slc5-gcc43-opt/lib --with-pythia8-incd ir=/afs/cern.ch/sw/lcg/external/MCGenerators/pythia8/160/i686-slc5-gcc43-op t/include --with-pythia8-libdir=/afs/cern.ch/sw/lcg/external/MCGenerators/p ythia8/160/i686-slc5-gcc43-opt/lib --with-gviz-incdir=/afs/cern.ch/sw/lcg/e xternal/graphviz/2.28.0/i686-slc5-gcc43-opt/include/graphviz --with-gviz-li bdir=/afs/cern.ch/sw/lcg/external/graphviz/2.28.0/i686-slc5-gcc43-opt/lib - -with-xrootd=/afs/cern.ch/sw/lcg/external/xrootd/3.2.4/i686-slc5-gcc43-opt"
#define R__CONFIGUREFEATURES "asimage astiff builtin_afterimage builtin_ft gl builtin_glew builtin_pcre builtin_lzma castor cintex dcache explicitlink fftw3 gdml genvector gfal krb5 ldap mathmore memstat minuit2 mysql opengl oracle pythia8 python qt qtgsi reflex roofit rfio shadowpw shared ssl table tmva unuran x11 xft xml xrootd thread" #define R__CONFIGUREFEATURES "asimage astiff builtin_afterimage builtin_ft gl builtin_glew builtin_pcre builtin_lzma castor cintex dcache explicitlink fftw3 gdml genvector gfal krb5 ldap mathmore memstat minuit2 mysql opengl oracle pythia8 python qt qtgsi reflex roofit rfio shadowpw shared ssl table tmva unuran x11 xft xml xrootd thread"
#endif #endif
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 RVersion.h   RVersion.h 
skipping to change at line 17 skipping to change at line 17
* These macros can be used in the following way: * These macros can be used in the following way:
* *
* #if ROOT_VERSION_CODE >= ROOT_VERSION(2,23,4) * #if ROOT_VERSION_CODE >= ROOT_VERSION(2,23,4)
* #include <newheader.h> * #include <newheader.h>
* #else * #else
* #include <oldheader.h> * #include <oldheader.h>
* #endif * #endif
* *
*/ */
#define ROOT_RELEASE "5.34/01" #define ROOT_RELEASE "5.34/02"
#define ROOT_RELEASE_DATE "Jul 13 2012" #define ROOT_RELEASE_DATE "Sep 21 2012"
#define ROOT_RELEASE_TIME "10:49:58" #define ROOT_RELEASE_TIME "15:54:29"
#define ROOT_SVN_REVISION 45034 #define ROOT_SVN_REVISION 46097
#define ROOT_SVN_BRANCH "branches/v5-34-00-patches" #define ROOT_SVN_BRANCH "branches/v5-34-00-patches"
#define ROOT_VERSION_CODE 336385 #define ROOT_VERSION_CODE 336386
#define ROOT_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) #define ROOT_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
#endif #endif
 End of changes. 2 change blocks. 
5 lines changed or deleted 5 lines changed or added


 RatioOfProfiledLikelihoodsTestStat.h   RatioOfProfiledLikelihoodsTestStat.h 
// @(#)root/roostats:$Id: RatioOfProfiledLikelihoodsTestStat.h 44157 2012-0 5-07 16:41:44Z moneta $ // @(#)root/roostats:$Id: RatioOfProfiledLikelihoodsTestStat.h 46082 2012-0 9-20 13:55:31Z 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 102 skipping to change at line 102
fAltPOI = new RooArgSet(); // empty set fAltPOI = new RooArgSet(); // empty set
} }
//__________________________________________ //__________________________________________
~RatioOfProfiledLikelihoodsTestStat(void) { ~RatioOfProfiledLikelihoodsTestStat(void) {
if(fAltPOI) delete fAltPOI; if(fAltPOI) delete fAltPOI;
if(fDetailedOutput) delete fDetailedOutput; if(fDetailedOutput) delete fDetailedOutput;
} }
//__________________________________________ // returns -logL(poi, conditional MLE of nuisance params)
Double_t ProfiledLikelihood(RooAbsData& data, RooArgSet& poi, RooAbsPdf // it does not subtract off the global MLE
& pdf) { // because nuisance parameters of null and alternate may not
// returns -logL(poi, conditonal MLE of nuisance params) // be the same.
// it does not subtract off the global MLE Double_t ProfiledLikelihood(RooAbsData& data, RooArgSet& poi, RooAbsPdf&
// because nuisance parameters of null and alternate may not pdf);
// be the same.
RooAbsReal* nll = pdf.createNLL(data, RooFit::CloneData(kFALSE)); // evaluate the ratio of profile likelihood
RooAbsReal* profile = nll->createProfile(poi); virtual Double_t Evaluate(RooAbsData& data, RooArgSet& nullParamsOfInter
// make sure we set the variables attached to this nll est);
RooArgSet* attachedSet = nll->getVariables();
*attachedSet = poi; virtual void EnableDetailedOutput( bool e=true ) {
// now evaluate profile to set nuisance to conditional MLE values fDetailedOutputEnabled = e;
double nllVal = profile->getVal(); fNullProfile.EnableDetailedOutput(fDetailedOutputEnabled);
// but we may want the nll value without subtracting off the MLE fAltProfile.EnableDetailedOutput(fDetailedOutputEnabled);
if(!fSubtractMLE) nllVal = nll->getVal(); }
delete attachedSet;
delete profile;
delete nll;
return nllVal;
}
//__________________________________________
virtual Double_t Evaluate(RooAbsData& data, RooArgSet& nullParamsOfInte
rest) {
// evaluate the ratio of profile likelihood
int type = (fSubtractMLE) ? 0 : 2;
// null
double nullNLL = fNullProfile.EvaluateProfileLikelihood(type, data,
nullParamsOfInterest);
const RooArgSet *nullset = fNullProfile.GetDetailedOutput();
// alt
double altNLL = fAltProfile.EvaluateProfileLikelihood(type, data, *f
AltPOI);
const RooArgSet *altset = fAltProfile.GetDetailedOutput();
if (fDetailedOutput != NULL) {
delete fDetailedOutput;
fDetailedOutput = NULL;
}
if (fDetailedOutputEnabled) {
fDetailedOutput = new RooArgSet();
RooRealVar* var(0);
for(TIterator *it = nullset->createIterator();(var = dynamic_
cast<RooRealVar*>(it->Next()));) {
RooRealVar* cloneVar = new RooRealVar(TString::Format
("nullprof_%s", var->GetName()),
TString::Format("%s
for null", var->GetTitle()), var->getVal());
fDetailedOutput->addOwned(*cloneVar);
}
for(TIterator *it = altset->createIterator();(var = dynamic_c
ast<RooRealVar*>(it->Next()));) {
RooRealVar* cloneVar = new RooRealVar(TString::Format
("altprof_%s", var->GetName()),
TString::Format("%s
for null", var->GetTitle()), var->getVal());
fDetailedOutput->addOwned(*cloneVar);
}
}
/*
// set variables back to where they were
nullParamsOfInterest = *saveNullPOI;
*allVars = *saveAll;
delete saveAll;
delete allVars;
*/
return nullNLL -altNLL;
}
virtual void EnableDetailedOutput( bool e=true ) {
fDetailedOutputEnabled = e;
fNullProfile.EnableDetailedOutput(fDetailedOutputEnabled);
fAltProfile.EnableDetailedOutput(fDetailedOutputEnabled);
}
static void SetAlwaysReuseNLL(Bool_t flag) { fgAlwaysReuseNll = flag ; } static void SetAlwaysReuseNLL(Bool_t flag);
void SetReuseNLL(Bool_t flag) { void SetReuseNLL(Bool_t flag) {
fNullProfile.SetReuseNLL(flag); fNullProfile.SetReuseNLL(flag);
fAltProfile.SetReuseNLL(flag); fAltProfile.SetReuseNLL(flag);
} }
void SetMinimizer(const char* minimizer){ void SetMinimizer(const char* minimizer){
fNullProfile.SetMinimizer(minimizer); fNullProfile.SetMinimizer(minimizer);
fAltProfile.SetMinimizer(minimizer); fAltProfile.SetMinimizer(minimizer);
} }
skipping to change at line 199 skipping to change at line 141
} }
void SetTolerance(Double_t tol){ void SetTolerance(Double_t tol){
fNullProfile.SetTolerance(tol); fNullProfile.SetTolerance(tol);
fAltProfile.SetTolerance(tol); fAltProfile.SetTolerance(tol);
} }
void SetPrintLevel(Int_t printLevel){ void SetPrintLevel(Int_t printLevel){
fNullProfile.SetPrintLevel(printLevel); fNullProfile.SetPrintLevel(printLevel);
fAltProfile.SetPrintLevel(printLevel); fAltProfile.SetPrintLevel(printLevel);
} }
// set the conditional observables which will be used when creating th
e NLL
// so the pdf's will not be normalized on the conditional observables
when computing the NLL
virtual void SetConditionalObservables(const RooArgSet& set) {
fNullProfile.SetConditionalObservables(set);
fAltProfile.SetConditionalObservables(set);
}
virtual const RooArgSet* GetDetailedOutput(void) const { virtual const RooArgSet* GetDetailedOutput(void) const {
// Returns detailed output. The value returned by this function is updated after each call to Evaluate(). // Returns detailed output. The value returned by this function is updated after each call to Evaluate().
// The returned RooArgSet contains the following for the altern ative and null hypotheses: // The returned RooArgSet contains the following for the altern ative and null hypotheses:
// <ul> // <ul>
// <li> the minimum nll, fitstatus and convergence quality for each fit </li> // <li> the minimum nll, fitstatus and convergence quality for each fit </li>
// <li> for each fit and for each non-constant parameter, the v alue, error and pull of the parameter are stored </li> // <li> for each fit and for each non-constant parameter, the v alue, error and pull of the parameter are stored </li>
// </ul> // </ul>
return fDetailedOutput; return fDetailedOutput;
} }
virtual const TString GetVarName() const { return "log(L(#mu_{1},#hat{#n u}_{1}) / L(#mu_{0},#hat{#nu}_{0}))"; } 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:
ProfileLikelihoodTestStat fNullProfile; ProfileLikelihoodTestStat fNullProfile;
ProfileLikelihoodTestStat fAltProfile; ProfileLikelihoodTestStat fAltProfile;
RooArgSet* fAltPOI; RooArgSet* fAltPOI;
Bool_t fSubtractMLE; Bool_t fSubtractMLE;
static Bool_t fgAlwaysReuseNll ; static Bool_t fgAlwaysReuseNll ;
bool fDetailedOutputEnabled; bool fDetailedOutputEnabled;
RooArgSet* fDetailedOutput; RooArgSet* fDetailedOutput;
protected: protected:
ClassDef(RatioOfProfiledLikelihoodsTestStat,3) ClassDef(RatioOfProfiledLikelihoodsTestStat,3) // implements the ratio of profiled likelihood as test statistic
}; };
} }
#endif #endif
 End of changes. 6 change blocks. 
85 lines changed or deleted 29 lines changed or added


 RooAbsData.h   RooAbsData.h 
skipping to change at line 208 skipping to change at line 208
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} ; enum StorageType { Tree, Vector} ;
static StorageType defaultStorageType ;
static void setDefaultStorageType(StorageType s) ; static void setDefaultStorageType(StorageType s) ;
static StorageType getDefaultStorageType(); static StorageType getDefaultStorageType();
protected: protected:
static StorageType defaultStorageType ;
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 ;
virtual RooPlot *plotAsymOn(RooPlot* frame, const RooAbsCategoryLValue& a symCat, PlotOpt o) const ; virtual RooPlot *plotAsymOn(RooPlot* frame, const RooAbsCategoryLValue& a symCat, PlotOpt o) const ;
virtual RooPlot *plotEffOn(RooPlot* frame, const RooAbsCategoryLValue& ef fCat, PlotOpt o) const ; virtual RooPlot *plotEffOn(RooPlot* frame, const RooAbsCategoryLValue& ef fCat, PlotOpt o) const ;
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added


 RooCFunction1Binding.h   RooCFunction1Binding.h 
/************************************************************************** *** /************************************************************************** ***
* Project: RooFit * * Project: RooFit *
* Package: RooFitCore * * Package: RooFitCore *
* File: $Id: RooCFunction1Binding.h 44982 2012-07-10 08:36:13Z moneta $ * File: $Id: RooCFunction1Binding.h 45780 2012-08-31 15:45:27Z moneta $
* Authors: * * Authors: *
* WV, Wouter Verkerke, NIKHEF, verkerke@nikhef.nl * * WV, Wouter Verkerke, NIKHEF, verkerke@nikhef.nl *
* * * *
* Copyright (c) 2000-2008, NIKHEF, Regents of the University of California * * Copyright (c) 2000-2008, NIKHEF, Regents of the University of California *
* and Stanford University. All rights reserved. * * and Stanford University. All rights reserved. *
* * * *
************************************************************************** ***/ ************************************************************************** ***/
#ifndef ROOCFUNCTION1BINDING #ifndef ROOCFUNCTION1BINDING
#define ROOCFUNCTION1BINDING #define ROOCFUNCTION1BINDING
skipping to change at line 121 skipping to change at line 121
} temp; } temp;
temp._funcptr = _ptr; temp._funcptr = _ptr;
return Form("(%p)",temp._ptr) ; return Form("(%p)",temp._ptr) ;
} }
const char* argName(Int_t iarg) { const char* argName(Int_t iarg) {
// Return suggested name for i-th argument // Return suggested name for i-th argument
return fmap().lookupArgName(_ptr,iarg) ; return fmap().lookupArgName(_ptr,iarg) ;
} }
static RooCFunction1Map<VO,VI>& fmap() { static RooCFunction1Map<VO,VI>& fmap();
// Return reference to function pointer-to-name mapping service
if (!_fmap) {
_fmap = new RooCFunction1Map<VO,VI> ;
}
return *_fmap ;
}
private: private:
static VO dummyFunction(VI) { static VO dummyFunction(VI) {
// Dummy function used when registered function was not // Dummy function used when registered function was not
// found in un-persisting object // found in un-persisting object
return 0 ; return 0 ;
} }
typedef VO (*func_t)(VI); typedef VO (*func_t)(VI);
 End of changes. 2 change blocks. 
8 lines changed or deleted 2 lines changed or added


 SamplingDistPlot.h   SamplingDistPlot.h 
// @(#)root/roostats:$Id: SamplingDistPlot.h 43068 2012-02-21 16:09:05Z mon eta $ // @(#)root/roostats:$Id: SamplingDistPlot.h 45646 2012-08-17 09:10:26Z mon eta $
// Authors: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke // Authors: Kyle Cranmer, Lorenzo Moneta, Gregory Schott, Wouter Verkerke
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2008, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
#ifndef ROOSTATS_SamplingDistPlot #ifndef ROOSTATS_SamplingDistPlot
skipping to change at line 130 skipping to change at line 130
double fXMin, fXMax, fYMin, fYMax; double fXMin, fXMax, fYMin, fYMax;
Bool_t fApplyStyle; Bool_t fApplyStyle;
Style_t fFillStyle; Style_t fFillStyle;
void SetSampleWeights(const SamplingDistribution *samplingDist); void SetSampleWeights(const SamplingDistribution *samplingDist);
void addObject(TObject *obj, Option_t *drawOptions=0); // for TH1Fs onl y void addObject(TObject *obj, Option_t *drawOptions=0); // for TH1Fs onl y
void addOtherObject(TObject *obj, Option_t *drawOptions=0); void addOtherObject(TObject *obj, Option_t *drawOptions=0);
void GetAbsoluteInterval(Float_t &theMin, Float_t &theMax, Float_t &the YMax) const; void GetAbsoluteInterval(Double_t &theMin, Double_t &theMax, Double_t & theYMax) const;
ClassDef(SamplingDistPlot,1) // Class containing the results of the Hy bridCalculator ClassDef(SamplingDistPlot,1) // Class containing the results of the Hy bridCalculator
}; };
} }
#endif #endif
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 SimpleLikelihoodRatioTestStat.h   SimpleLikelihoodRatioTestStat.h 
// @(#)root/roostats:$Id: SimpleLikelihoodRatioTestStat.h 44982 2012-07-10 08:36:13Z moneta $ // @(#)root/roostats:$Id: SimpleLikelihoodRatioTestStat.h 46082 2012-09-20 13:55:31Z 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 42 skipping to change at line 42
#ifndef ROO_REAL_VAR #ifndef ROO_REAL_VAR
#include "RooRealVar.h" #include "RooRealVar.h"
#endif #endif
#ifndef ROOSTATS_TestStatistic #ifndef ROOSTATS_TestStatistic
#include "RooStats/TestStatistic.h" #include "RooStats/TestStatistic.h"
#endif #endif
namespace RooStats { namespace RooStats {
class SimpleLikelihoodRatioTestStat : public TestStatistic { class SimpleLikelihoodRatioTestStat : public TestStatistic {
public: public:
//__________________________________ //__________________________________
SimpleLikelihoodRatioTestStat() : SimpleLikelihoodRatioTestStat() :
fNullPdf(NULL), fAltPdf(NULL) fNullPdf(NULL), fAltPdf(NULL)
{ {
// Constructor for proof. Do not use. // Constructor for proof. Do not use.
fFirstEval = true; fFirstEval = true;
fDetailedOutputEnabled = false; fDetailedOutputEnabled = false;
skipping to change at line 81 skipping to change at line 81
fAltPdf = &altPdf; fAltPdf = &altPdf;
RooArgSet * allNullVars = fNullPdf->getVariables(); RooArgSet * allNullVars = fNullPdf->getVariables();
fNullParameters = (RooArgSet*) allNullVars->snapshot(); fNullParameters = (RooArgSet*) allNullVars->snapshot();
delete allNullVars; delete allNullVars;
RooArgSet * allAltVars = fAltPdf->getVariables(); RooArgSet * allAltVars = fAltPdf->getVariables();
fAltParameters = (RooArgSet*) allAltVars->snapshot(); fAltParameters = (RooArgSet*) allAltVars->snapshot();
delete allAltVars; delete allAltVars;
fDetailedOutputEnabled = false; fDetailedOutputEnabled = false;
fDetailedOutput = NULL; fDetailedOutput = NULL;
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,
skipping to change at line 105 skipping to change at line 105
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; fNullPdf = &nullPdf;
fAltPdf = &altPdf; fAltPdf = &altPdf;
fNullParameters = (RooArgSet*) nullParameters.snapshot(); fNullParameters = (RooArgSet*) nullParameters.snapshot();
fAltParameters = (RooArgSet*) altParameters.snapshot(); fAltParameters = (RooArgSet*) altParameters.snapshot();
fDetailedOutputEnabled = false; fDetailedOutputEnabled = false;
fDetailedOutput = NULL; fDetailedOutput = NULL;
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 ;
if (fDetailedOutput) delete fDetailedOutput; if (fDetailedOutput) delete fDetailedOutput;
} }
static void SetAlwaysReuseNLL(Bool_t flag) { fAlwaysReuseNll = flag ; static void SetAlwaysReuseNLL(Bool_t 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 160 skipping to change at line 161
TIterator* altIt = fAltParameters->createIterator(); TIterator* altIt = fAltParameters->createIterator();
bool ret = true; bool ret = true;
while ((null = (RooAbsReal*) nullIt->Next()) && (alt = (RooAbsReal *) altIt->Next())) { while ((null = (RooAbsReal*) nullIt->Next()) && (alt = (RooAbsReal *) altIt->Next())) {
if (null->getVal() != alt->getVal()) ret = false; if (null->getVal() != alt->getVal()) ret = false;
} }
delete nullIt; delete nullIt;
delete altIt; delete altIt;
return ret; return ret;
} }
//______________________________ // set the conditional observables which will be used when creating t
virtual Double_t Evaluate(RooAbsData& data, RooArgSet& nullPOI) { he NLL
// so the pdf's will not be normalized on the conditional observables
if (fFirstEval && ParamsAreEqual()) { when computing the NLL
oocoutW(fNullParameters,InputArguments) virtual void SetConditionalObservables(const RooArgSet& set) {fCondit
<< "Same RooArgSet used for null and alternate, so you must ionalObs.removeAll(); fConditionalObs.add(set);}
explicitly SetNullParameters and SetAlternateParameters or the likelihood r
atio will always be 1."
<< std::endl;
}
fFirstEval = false;
RooFit::MsgLevel msglevel = RooMsgService::instance().globalKillBe
low();
RooMsgService::instance().setGlobalKillBelow(RooFit::FATAL);
Bool_t reuse = (fReuseNll || fAlwaysReuseNll) ;
Bool_t created = kFALSE ;
if (!fNllNull) {
RooArgSet* allParams = fNullPdf->getParameters(data);
fNllNull = (RooNLLVar*) fNullPdf->createNLL(data, RooFit::CloneDa
ta(kFALSE),RooFit::Constrain(*allParams));
delete allParams;
created = kTRUE ;
}
if (reuse && !created) {
fNllNull->setData(data, kFALSE) ;
}
// make sure we set the variables attached to this nll
RooArgSet* attachedSet = fNllNull->getVariables();
*attachedSet = *fNullParameters;
*attachedSet = nullPOI;
double nullNLL = fNllNull->getVal();
//std::cout << std::endl << "SLRTS: null params:" << std::endl;
//attachedSet->Print("v");
if (!reuse) { //______________________________
delete fNllNull ; fNllNull = NULL ; virtual Double_t Evaluate(RooAbsData& data, RooArgSet& nullPOI);
}
delete attachedSet;
created = kFALSE ;
if (!fNllAlt) {
RooArgSet* allParams = fAltPdf->getParameters(data);
fNllAlt = (RooNLLVar*) fAltPdf->createNLL(data, RooFit::CloneData
(kFALSE),RooFit::Constrain(*allParams));
delete allParams;
created = kTRUE ;
}
if (reuse && !created) {
fNllAlt->setData(data, kFALSE) ;
}
// make sure we set the variables attached to this nll
attachedSet = fNllAlt->getVariables();
*attachedSet = *fAltParameters;
double altNLL = fNllAlt->getVal();
//std::cout << std::endl << "SLRTS: alt params:" << std::endl;
//attachedSet->Print("v");
//std::cout << std::endl << "SLRTS null NLL: " << nullNLL << "
alt NLL: " << altNLL << std::endl << std::endl;
if (!reuse) {
delete fNllAlt ; fNllAlt = NULL ;
}
delete attachedSet;
// save this snapshot
if( fDetailedOutputEnabled ) {
if( !fDetailedOutput ) {
fDetailedOutput = new RooArgSet( *(new RooRealVar("nullNLL",
"null NLL",0)), "detailedOut_SLRTS" );
fDetailedOutput->add( *(new RooRealVar("altNLL","alternate N
LL",0)) );
}
fDetailedOutput->setRealValue( "nullNLL", nullNLL );
fDetailedOutput->setRealValue( "altNLL", altNLL );
// std::cout << std::endl << "STORING THIS AS DETAILED OUTPUT:"
<< std::endl;
// fDetailedOutput->Print("v");
// std::cout << std::endl;
}
RooMsgService::instance().setGlobalKillBelow(msglevel);
return nullNLL - altNLL;
}
virtual void EnableDetailedOutput( bool e=true ) { fDetailedOutputEna bled = e; fDetailedOutput = NULL; } virtual void EnableDetailedOutput( bool e=true ) { fDetailedOutputEna bled = e; fDetailedOutput = NULL; }
virtual const RooArgSet* GetDetailedOutput(void) const { return fDeta iledOutput; } virtual const RooArgSet* GetDetailedOutput(void) const { return fDeta iledOutput; }
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:
RooAbsPdf* fNullPdf; RooAbsPdf* fNullPdf;
RooAbsPdf* fAltPdf; RooAbsPdf* fAltPdf;
RooArgSet* fNullParameters; RooArgSet* fNullParameters;
RooArgSet* fAltParameters; RooArgSet* fAltParameters;
RooArgSet fConditionalObs;
bool fFirstEval; bool fFirstEval;
bool fDetailedOutputEnabled; bool fDetailedOutputEnabled;
RooArgSet* fDetailedOutput; //! RooArgSet* fDetailedOutput; //!
RooNLLVar* fNllNull ; //! transient copy of the null NLL RooAbsReal* fNllNull ; //! transient copy of the null NLL
RooNLLVar* fNllAlt ; //! transient copy of the alt NLL RooAbsReal* fNllAlt ; //! transient copy of the alt NLL
static Bool_t fAlwaysReuseNll ; static Bool_t fgAlwaysReuseNll ;
Bool_t fReuseNll ; Bool_t fReuseNll ;
protected: protected:
ClassDef(SimpleLikelihoodRatioTestStat,2) ClassDef(SimpleLikelihoodRatioTestStat,3)
}; };
} }
#endif #endif
 End of changes. 10 change blocks. 
103 lines changed or deleted 22 lines changed or added


 TAxis.h   TAxis.h 
// @(#)root/hist:$Id: TAxis.h 43736 2012-04-13 15:16:34Z pcanal $ // @(#)root/hist:$Id: TAxis.h 45109 2012-07-17 13:54:49Z couet $
// Author: Rene Brun 12/12/94 // Author: Rene Brun 12/12/94
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 120 skipping to change at line 120
Int_t GetLast() const; Int_t GetLast() const;
Double_t GetXmin() const {return fXmin;} Double_t GetXmin() const {return fXmin;}
Double_t GetXmax() const {return fXmax;} Double_t GetXmax() const {return fXmax;}
virtual void ImportAttributes(const TAxis *axis); virtual void ImportAttributes(const TAxis *axis);
Bool_t IsVariableBinSize() const { Bool_t IsVariableBinSize() const {
// true if axis has variable bin sizes, false othe rwise // true if axis has variable bin sizes, false othe rwise
return (fXbins.GetSize() != 0); return (fXbins.GetSize() != 0);
} }
virtual void LabelsOption(Option_t *option="h"); // *MENU* virtual void LabelsOption(Option_t *option="h"); // *MENU*
virtual void RotateTitle(Bool_t rotate=kTRUE); // *TOGGLE* *GETTER =GetRotateTitle virtual void RotateTitle(Bool_t rotate=kTRUE); // *TOGGLE* *GETTER =GetRotateTitle
virtual void SaveAttributes(ostream &out, const char *name, const char *subname); virtual void SaveAttributes(std::ostream &out, const char *name, c onst char *subname);
virtual void Set(Int_t nbins, Double_t xmin, Double_t xmax); virtual void Set(Int_t nbins, Double_t xmin, Double_t xmax);
virtual void Set(Int_t nbins, const Float_t *xbins); virtual void Set(Int_t nbins, const Float_t *xbins);
virtual void Set(Int_t nbins, const Double_t *xbins); virtual void Set(Int_t nbins, const Double_t *xbins);
virtual void SetBinLabel(Int_t bin, const char *label); virtual void SetBinLabel(Int_t bin, const char *label);
virtual void SetDefaults(); virtual void SetDefaults();
virtual void SetDrawOption(Option_t * /*option*/ ="") { } virtual void SetDrawOption(Option_t * /*option*/ ="") { }
virtual void SetLimits(Double_t xmin, Double_t xmax); virtual void SetLimits(Double_t xmin, Double_t xmax);
virtual void SetMoreLogLabels(Bool_t more=kTRUE); // *TOGGLE* *GE TTER=GetMoreLogLabels virtual void SetMoreLogLabels(Bool_t more=kTRUE); // *TOGGLE* *GE TTER=GetMoreLogLabels
virtual void SetNoExponent(Bool_t noExponent=kTRUE); // *TOGGLE* *GETTER=GetNoExponent virtual void SetNoExponent(Bool_t noExponent=kTRUE); // *TOGGLE* *GETTER=GetNoExponent
virtual void SetDecimals(Bool_t dot=kTRUE); // *TOGGLE* *GETTER=G etDecimals virtual void SetDecimals(Bool_t dot=kTRUE); // *TOGGLE* *GETTER=G etDecimals
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 TChain.h   TChain.h 
// @(#)root/tree:$Id: TChain.h 42754 2012-01-20 20:13:07Z pcanal $ // @(#)root/tree:$Id: TChain.h 46070 2012-09-19 20:00:06Z 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 void Print(Option_t *option="") const; virtual void Print(Option_t *option="") const;
virtual Long64_t Process(const char *filename, Option_t *option="", Lon g64_t nentries=kBigNumber, Long64_t firstentry=0); // *MENU* virtual Long64_t Process(const char *filename, Option_t *option="", Lon g64_t nentries=kBigNumber, Long64_t firstentry=0); // *MENU*
#if defined(__CINT__) #if defined(__CINT__)
#if defined(R__MANUAL_DICT) #if defined(R__MANUAL_DICT)
virtual Long64_t Process(void* selector, Option_t* option = "", Long64_ t nentries = kBigNumber, Long64_t firstentry = 0); virtual Long64_t Process(void* selector, Option_t* option = "", Long64_ t nentries = kBigNumber, Long64_t firstentry = 0);
#endif #endif
#else #else
virtual Long64_t Process(TSelector* selector, Option_t* option = "", Lo ng64_t nentries = kBigNumber, Long64_t firstentry = 0); virtual Long64_t Process(TSelector* selector, Option_t* option = "", Lo ng64_t nentries = kBigNumber, Long64_t firstentry = 0);
#endif #endif
virtual void RecursiveRemove(TObject *obj); virtual void RecursiveRemove(TObject *obj);
virtual void RemoveFriend(TTree*);
virtual void Reset(Option_t *option=""); virtual void Reset(Option_t *option="");
virtual void ResetAfterMerge(TFileMergeInfo *); 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);
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added


 TEveCalo.h   TEveCalo.h 
// @(#)root/eve:$Id: TEveCalo.h 38721 2011-04-04 13:37:12Z matevz $ // @(#)root/eve:$Id: TEveCalo.h 45881 2012-09-05 22:57:07Z 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 51 skipping to change at line 51
Double_t fEtaMin; Double_t fEtaMin;
Double_t fEtaMax; Double_t fEtaMax;
Double_t fPhi; Double_t fPhi;
Double_t fPhiOffset; // phi range +/- offset Double_t fPhiOffset; // phi range +/- offset
Bool_t fAutoRange; // set eta phi limits on DataChanged() Bool_t fAutoRange; // set eta phi limits on DataChanged()
Float_t fBarrelRadius; // barrel raidus in cm Float_t fBarrelRadius; // barrel raidus in cm
Float_t fEndCapPos; // end cap z coordinate in cm Float_t fEndCapPosF; // forward end cap z coordinate in cm
Float_t fEndCapPosB; // backward end cap z coordinate in cm (s
hould be < 0)
Float_t fPlotEt; // plot E or Et. Float_t fPlotEt; // plot E or Et.
Float_t fMaxTowerH; // bounding box z dimesion Float_t fMaxTowerH; // bounding box z dimesion
Bool_t fScaleAbs; Bool_t fScaleAbs;
Float_t fMaxValAbs; Float_t fMaxValAbs;
Bool_t fValueIsColor; // Interpret signal value as RGBA col or. Bool_t fValueIsColor; // Interpret signal value as RGBA col or.
TEveRGBAPalette* fPalette; // Pointer to signal-color palette. TEveRGBAPalette* fPalette; // Pointer to signal-color palette.
skipping to change at line 99 skipping to change at line 100
Bool_t AssertCellIdCache() const; Bool_t AssertCellIdCache() const;
void InvalidateCellIdCache() { fCellIdCacheOK=kFALSE; ResetBBox(); }; void InvalidateCellIdCache() { fCellIdCacheOK=kFALSE; ResetBBox(); };
Float_t GetDataSliceThreshold(Int_t slice) const; Float_t GetDataSliceThreshold(Int_t slice) const;
void SetDataSliceThreshold(Int_t slice, Float_t val); void SetDataSliceThreshold(Int_t slice, Float_t val);
Color_t GetDataSliceColor(Int_t slice) const; Color_t GetDataSliceColor(Int_t slice) const;
void SetDataSliceColor(Int_t slice, Color_t col); void SetDataSliceColor(Int_t slice, Color_t col);
Float_t GetBarrelRadius() const { return fBarrelRadius; } Float_t GetBarrelRadius() const { return fBarrelRadius; }
void SetBarrelRadius(Float_t r) { fBarrelRadius = r; ResetBBox(); } void SetBarrelRadius(Float_t r) { fBarrelRadius = r; ResetBBox(); }
Float_t GetEndCapPos () const { return fEndCapPos; } Float_t GetEndCapPos () const { return fEndCapPosF; } // get end cap p
void SetEndCapPos (Float_t z) { fEndCapPos = z; ResetBBox(); } osition, assuming fEndCapPosF = -fEndCapPosB
Float_t GetForwardEndCapPos () const { return fEndCapPosF; }
Float_t GetBackwardEndCapPos () const { return fEndCapPosB; }
void SetEndCapPos (Float_t z) { fEndCapPosF = z; fEndCapPosB = -z;
ResetBBox(); }
void SetForwardEndCapPos (Float_t z) { fEndCapPosF = z; ResetBBox();
}
void SetBackwardEndCapPos(Float_t z) { fEndCapPosB = z; ResetBBox();
}
Bool_t GetPlotEt() const { return fPlotEt; } Bool_t GetPlotEt() const { return fPlotEt; }
void SetPlotEt(Bool_t x); void SetPlotEt(Bool_t x);
void SetMaxTowerH(Float_t x) { fMaxTowerH = x; } void SetMaxTowerH(Float_t x) { fMaxTowerH = x; }
Float_t GetMaxTowerH() const { return fMaxTowerH; } Float_t GetMaxTowerH() const { return fMaxTowerH; }
Bool_t GetScaleAbs() const { return fScaleAbs; } Bool_t GetScaleAbs() const { return fScaleAbs; }
void SetMaxValAbs(Float_t x) { fMaxValAbs = x; } void SetMaxValAbs(Float_t x) { fMaxValAbs = x; }
Float_t GetMaxValAbs() const { return fMaxValAbs; } Float_t GetMaxValAbs() const { return fMaxValAbs; }
Float_t GetTransitionEta() const; Float_t GetTransitionEta() const;
Float_t GetTransitionEtaForward() const;
Float_t GetTransitionEtaBackward() const;
Float_t GetTransitionTheta() const; Float_t GetTransitionTheta() const;
Float_t GetTransitionThetaForward() const;
Float_t GetTransitionThetaBackward() const;
TEveRGBAPalette* GetPalette() const { return fPalette; } TEveRGBAPalette* GetPalette() const { return fPalette; }
void SetPalette(TEveRGBAPalette* p); void SetPalette(TEveRGBAPalette* p);
TEveRGBAPalette* AssertPalette(); TEveRGBAPalette* AssertPalette();
Bool_t GetValueIsColor() const { return fValueIsColor;} Bool_t GetValueIsColor() const { return fValueIsColor;}
void SetValueIsColor(Bool_t x) { fValueIsColor = x;} void SetValueIsColor(Bool_t x) { fValueIsColor = x;}
Bool_t GetAutoRange() const { return fAutoRange; } Bool_t GetAutoRange() const { return fAutoRange; }
void SetAutoRange(Bool_t x) { fAutoRange = x; } void SetAutoRange(Bool_t x) { fAutoRange = x; }
 End of changes. 5 change blocks. 
4 lines changed or deleted 18 lines changed or added


 TEventIter.h   TEventIter.h 
// @(#)root/proofplayer:$Id: TEventIter.h 44010 2012-04-29 23:07:48Z ganis $ // @(#)root/proofplayer:$Id: TEventIter.h 45751 2012-08-30 10:28:19Z ganis $
// Author: Maarten Ballintijn 07/01/02 // Author: Maarten Ballintijn 07/01/02
// Modified: Long Tran-Thanh 04/09/07 (Addition of TEventIterUnit) // Modified: Long Tran-Thanh 04/09/07 (Addition of TEventIterUnit)
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2001, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2001, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 75 skipping to change at line 75
TSelector *fSel; // selector to be used TSelector *fSel; // selector to be used
Long64_t fFirst; // first entry to process Long64_t fFirst; // first entry to process
Long64_t fNum; // number of entries to process Long64_t fNum; // number of entries to process
Long64_t fCur; // current entry Long64_t fCur; // current entry
Bool_t fStop; // termination of run requested Bool_t fStop; // termination of run requested
TEventList *fEventList; //! eventList for processing TEventList *fEventList; //! eventList for processing
Int_t fEventListPos; //! current position in the eventList Int_t fEventListPos; //! current position in the eventList
TEntryList *fEntryList; //! entry list for processing TEntryList *fEntryList; //! entry list for processing
Long64_t fEntryListPos; //! current position in the entrylist Long64_t fEntryListPos; //! current position in the entrylist
TList *fPackets; // list of packets processed packets
Int_t LoadDir(); // Load the directory pointed to by fElem Int_t LoadDir(); // Load the directory pointed to by fElem
public: public:
TEventIter(); TEventIter();
TEventIter(TDSet *dset, TSelector *sel, Long64_t first, Long64_t num); TEventIter(TDSet *dset, TSelector *sel, Long64_t first, Long64_t num);
virtual ~TEventIter(); virtual ~TEventIter();
virtual Long64_t GetCacheSize() = 0; virtual Long64_t GetCacheSize() = 0;
virtual Int_t GetLearnEntries() = 0; virtual Int_t GetLearnEntries() = 0;
virtual Long64_t GetNextEvent() = 0; virtual Long64_t GetNextEvent() = 0;
virtual Int_t GetNextPacket(Long64_t &first, Long64_t &num, virtual Int_t GetNextPacket(Long64_t &first, Long64_t &num,
TEntryList **enl = 0, TEventList **evl = 0) = 0; TEntryList **enl = 0, TEventList **evl = 0) = 0;
virtual void InvalidatePacket(); virtual void InvalidatePacket();
virtual void PreProcessEvent(Long64_t) = 0; virtual void PreProcessEvent(Long64_t) = 0;
virtual void StopProcess(Bool_t abort); virtual void StopProcess(Bool_t abort);
TList *GetPackets() { return fPackets; }
static TEventIter *Create(TDSet *dset, TSelector *sel, Long64_t first, L ong64_t num); static TEventIter *Create(TDSet *dset, TSelector *sel, Long64_t first, L ong64_t num);
ClassDef(TEventIter,0) // Event iterator used by TProofPlayer's ClassDef(TEventIter,0) // Event iterator used by TProofPlayer's
}; };
//------------------------------------------------------------------------ //------------------------------------------------------------------------
class TEventIterUnit : public TEventIter { class TEventIterUnit : public TEventIter {
private: private:
 End of changes. 3 change blocks. 
1 lines changed or deleted 5 lines changed or added


 TFile.h   TFile.h 
// @(#)root/io:$Id: TFile.h 42754 2012-01-20 20:13:07Z pcanal $ // @(#)root/io:$Id: TFile.h 45321 2012-07-31 21:19:14Z 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 54 skipping to change at line 54
friend class TDirectoryFile; friend class TDirectoryFile;
friend class TFilePrefetch; friend class TFilePrefetch;
public: public:
// Asynchronous open request status // Asynchronous open request status
enum EAsyncOpenStatus { kAOSNotAsync = -1, kAOSFailure = 0, enum EAsyncOpenStatus { kAOSNotAsync = -1, kAOSFailure = 0,
kAOSInProgress = 1, kAOSSuccess = 2 }; kAOSInProgress = 1, kAOSSuccess = 2 };
// Open timeout constants // Open timeout constants
enum EOpenTimeOut { kInstantTimeout = 0, kEternalTimeout = 999999999 }; enum EOpenTimeOut { kInstantTimeout = 0, kEternalTimeout = 999999999 };
// TTreeCache flushing semantics
enum ECacheAction { kDisconnect = 0, kDoNotDisconnect = 1 };
protected: protected:
Double_t fSumBuffer; //Sum of buffer sizes of objects writt en so far Double_t fSumBuffer; //Sum of buffer sizes of objects writt en so far
Double_t fSum2Buffer; //Sum of squares of buffer sizes of ob jects written so far Double_t fSum2Buffer; //Sum of squares of buffer sizes of ob jects written so far
Long64_t fBytesWrite; //Number of bytes written to this file Long64_t fBytesWrite; //Number of bytes written to this file
Long64_t fBytesRead; //Number of bytes read from this file Long64_t fBytesRead; //Number of bytes read from this file
Long64_t fBytesReadExtra; //Number of extra bytes (overhead) rea d by the readahead buffer Long64_t fBytesReadExtra; //Number of extra bytes (overhead) rea d by the readahead buffer
Long64_t fBEGIN; //First used byte in file Long64_t fBEGIN; //First used byte in file
Long64_t fEND; //Last used byte in file Long64_t fEND; //Last used byte in file
Long64_t fSeekFree; //Location on disk of free segments st ructure Long64_t fSeekFree; //Location on disk of free segments st ructure
Long64_t fSeekInfo; //Location on disk of StreamerInfo rec ord Long64_t fSeekInfo; //Location on disk of StreamerInfo rec ord
skipping to change at line 234 skipping to change at line 237
virtual Bool_t ReadBufferAsync(Long64_t offs, Int_t len); virtual Bool_t ReadBufferAsync(Long64_t offs, Int_t len);
virtual Bool_t ReadBuffer(char *buf, Int_t len); virtual Bool_t ReadBuffer(char *buf, Int_t len);
virtual Bool_t ReadBuffer(char *buf, Long64_t pos, Int_t len); virtual Bool_t ReadBuffer(char *buf, Long64_t pos, Int_t len);
virtual Bool_t ReadBuffers(char *buf, Long64_t *pos, Int_t *len, In t_t nbuf); virtual Bool_t ReadBuffers(char *buf, Long64_t *pos, Int_t *len, In t_t nbuf);
virtual void ReadFree(); virtual void ReadFree();
virtual TProcessID *ReadProcessID(UShort_t pidf); virtual TProcessID *ReadProcessID(UShort_t pidf);
virtual void ReadStreamerInfo(); virtual void ReadStreamerInfo();
virtual Int_t Recover(); virtual Int_t Recover();
virtual Int_t ReOpen(Option_t *mode); virtual Int_t ReOpen(Option_t *mode);
virtual void Seek(Long64_t offset, ERelativeTo pos = kBeg); virtual void Seek(Long64_t offset, ERelativeTo pos = kBeg);
virtual void SetCacheRead(TFileCacheRead *cache, TObject* tree = 0); virtual void SetCacheRead(TFileCacheRead *cache, TObject* tree = 0, ECacheAction action = kDisconnect);
virtual void SetCacheWrite(TFileCacheWrite *cache); virtual void SetCacheWrite(TFileCacheWrite *cache);
virtual void SetCompressionAlgorithm(Int_t algorithm=0); virtual void SetCompressionAlgorithm(Int_t algorithm=0);
virtual void SetCompressionLevel(Int_t level=1); virtual void SetCompressionLevel(Int_t level=1);
virtual void SetCompressionSettings(Int_t settings=1); virtual void SetCompressionSettings(Int_t settings=1);
virtual void SetEND(Long64_t last) { fEND = last; } virtual void SetEND(Long64_t last) { fEND = last; }
virtual void SetOffset(Long64_t offset, ERelativeTo pos = kBeg); virtual void SetOffset(Long64_t offset, ERelativeTo pos = kBeg);
virtual void SetOption(Option_t *option=">") { fOption = option; } virtual void SetOption(Option_t *option=">") { fOption = option; }
virtual void SetReadCalls(Int_t readcalls = 0) { fReadCalls = rea dcalls; } virtual void SetReadCalls(Int_t readcalls = 0) { fReadCalls = rea dcalls; }
virtual void ShowStreamerInfo(); virtual void ShowStreamerInfo();
virtual Int_t Sizeof() const; virtual Int_t Sizeof() const;
 End of changes. 3 change blocks. 
2 lines changed or deleted 5 lines changed or added


 TFileCacheRead.h   TFileCacheRead.h 
// @(#)root/io:$Id: TFileCacheRead.h 44849 2012-07-03 13:06:09Z pcanal $ // @(#)root/io:$Id: TFileCacheRead.h 45321 2012-07-31 21:19:14Z pcanal $
// Author: Rene Brun 19/05/2006 // Author: Rene Brun 19/05/2006
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 27 skipping to change at line 27
// TFileCacheRead // // TFileCacheRead //
// // // //
// TFile cache when reading // // TFile cache when reading //
// // // //
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
#ifndef ROOT_TObject #ifndef ROOT_TObject
#include "TObject.h" #include "TObject.h"
#endif #endif
class TFile; #ifndef ROOT_TFile
#include "TFile.h"
#endif
class TBranch; class TBranch;
class TFilePrefetch; class TFilePrefetch;
class TFileCacheRead : public TObject { class TFileCacheRead : public TObject {
protected: protected:
TFilePrefetch* fPrefetch; //!Object that does the asynchronous rea ding in another thread TFilePrefetch* fPrefetch; //!Object that does the asynchronous rea ding in another thread
Int_t fBufferSizeMin; //Original size of fBuffer Int_t fBufferSizeMin; //Original size of fBuffer
Int_t fBufferSize; //Allocated size of fBuffer (at a given t ime) Int_t fBufferSize; //Allocated size of fBuffer (at a given t ime)
Int_t fBufferLen; //Current buffer length (<= fBufferSize) Int_t fBufferLen; //Current buffer length (<= fBufferSize)
skipping to change at line 118 skipping to change at line 121
virtual Bool_t IsAsyncReading() const { return fAsyncReading; }; virtual Bool_t IsAsyncReading() const { return fAsyncReading; };
virtual void SetEnablePrefetching(Bool_t setPrefetching = kFALSE) ; virtual void SetEnablePrefetching(Bool_t setPrefetching = kFALSE) ;
virtual Bool_t IsEnablePrefetching() const { return fEnablePrefetch ing; }; virtual Bool_t IsEnablePrefetching() const { return fEnablePrefetch ing; };
virtual Bool_t IsLearning() const {return kFALSE;} virtual Bool_t IsLearning() const {return kFALSE;}
virtual void Prefetch(Long64_t pos, Int_t len); virtual void Prefetch(Long64_t pos, Int_t len);
virtual void Print(Option_t *option="") const; virtual void Print(Option_t *option="") const;
virtual Int_t ReadBufferExt(char *buf, Long64_t pos, Int_t len, In t_t &loc); virtual Int_t ReadBufferExt(char *buf, Long64_t pos, Int_t len, In t_t &loc);
virtual Int_t ReadBufferExtNormal(char *buf, Long64_t pos, Int_t l en, Int_t &loc); virtual Int_t ReadBufferExtNormal(char *buf, Long64_t pos, Int_t l en, Int_t &loc);
virtual Int_t ReadBufferExtPrefetch(char *buf, Long64_t pos, Int_t len, Int_t &loc); virtual Int_t ReadBufferExtPrefetch(char *buf, Long64_t pos, Int_t len, Int_t &loc);
virtual Int_t ReadBuffer(char *buf, Long64_t pos, Int_t len); virtual Int_t ReadBuffer(char *buf, Long64_t pos, Int_t len);
virtual void SetFile(TFile *file); virtual void SetFile(TFile *file, TFile::ECacheAction action = TF ile::kDisconnect);
virtual void SetSkipZip(Bool_t /*skip*/ = kTRUE) {} // This funct ion is only used by TTreeCacheUnzip (ignore it) virtual void SetSkipZip(Bool_t /*skip*/ = kTRUE) {} // This funct ion is only used by TTreeCacheUnzip (ignore it)
virtual void Sort(); virtual void Sort();
virtual void SecondSort(); //Method used to sort and merge the chunks in the second block virtual void SecondSort(); //Method used to sort and merge the chunks in the second block
virtual void SecondPrefetch(Long64_t, Int_t); //Used to add chunks to the second block virtual void SecondPrefetch(Long64_t, Int_t); //Used to add chunks to the second block
virtual TFilePrefetch* GetPrefetchObj(); virtual TFilePrefetch* GetPrefetchObj();
ClassDef(TFileCacheRead,2) //TFile cache when reading ClassDef(TFileCacheRead,2) //TFile cache when reading
}; };
#endif #endif
 End of changes. 3 change blocks. 
3 lines changed or deleted 6 lines changed or added


 TGaxis.h   TGaxis.h 
// @(#)root/graf:$Id: TGaxis.h 20882 2007-11-19 11:31:26Z rdm $ // @(#)root/graf:$Id: TGaxis.h 45109 2012-07-17 13:54:49Z couet $
// Author: Rene Brun, Olivier Couet 12/12/94 // Author: Rene Brun, Olivier Couet 12/12/94
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 107 skipping to change at line 107
Double_t GetWmax() const {return fWmax;} Double_t GetWmax() const {return fWmax;}
Float_t GetTickSize() const {return fTickSize;} Float_t GetTickSize() const {return fTickSize;}
virtual void ImportAxisAttributes(TAxis *axis); virtual void ImportAxisAttributes(TAxis *axis);
void LabelsLimits(const char *label, Int_t &first, Int_t &last); void LabelsLimits(const char *label, Int_t &first, Int_t &last);
virtual void Paint(Option_t *chopt=""); virtual void Paint(Option_t *chopt="");
virtual void PaintAxis(Double_t xmin,Double_t ymin,Double_t xmax, Double_t ymax, virtual void PaintAxis(Double_t xmin,Double_t ymin,Double_t xmax, Double_t ymax,
Double_t &wmin,Double_t &wmax,Int_t &ndiv, Option_t *chopt="", Double_t &wmin,Double_t &wmax,Int_t &ndiv, Option_t *chopt="",
Double_t gridlength = 0, Bool_t drawGridOn ly = kFALSE); Double_t gridlength = 0, Bool_t drawGridOn ly = kFALSE);
virtual void Rotate(Double_t X, Double_t Y, Double_t CFI, Doubl e_t SFI virtual void Rotate(Double_t X, Double_t Y, Double_t CFI, Doubl e_t SFI
,Double_t XT, Double_t YT, Double_t &U, Doub le_t &V); ,Double_t XT, Double_t YT, Double_t &U, Doub le_t &V);
virtual void SavePrimitive(ostream &out, Option_t *option = ""); virtual void SavePrimitive(std::ostream &out, Option_t *option = "");
void SetFunction(const char *funcname=""); void SetFunction(const char *funcname="");
void SetOption(Option_t *option=""); void SetOption(Option_t *option="");
void SetLabelColor(Int_t labelcolor) {fLabelColor = label color;} // *MENU* void SetLabelColor(Int_t labelcolor) {fLabelColor = label color;} // *MENU*
void SetLabelFont(Int_t labelfont) {fLabelFont = labelfon t;} // *MENU* void SetLabelFont(Int_t labelfont) {fLabelFont = labelfon t;} // *MENU*
void SetLabelOffset(Float_t labeloffset) {fLabelOffset = labeloffset;} // *MENU* void SetLabelOffset(Float_t labeloffset) {fLabelOffset = labeloffset;} // *MENU*
void SetLabelSize(Float_t labelsize) {fLabelSize = labels ize;} // *MENU* void SetLabelSize(Float_t labelsize) {fLabelSize = labels ize;} // *MENU*
static void SetMaxDigits(Int_t maxd=5); static void SetMaxDigits(Int_t maxd=5);
virtual void SetName(const char *name); // *MENU* virtual void SetName(const char *name); // *MENU*
virtual void SetNdivisions(Int_t ndiv) {fNdiv = ndiv;} // *MENU* virtual void SetNdivisions(Int_t ndiv) {fNdiv = ndiv;} // *MENU*
virtual void SetMoreLogLabels(Bool_t more=kTRUE); // *MENU* virtual void SetMoreLogLabels(Bool_t more=kTRUE); // *MENU*
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 TPacketizerUnit.h   TPacketizerUnit.h 
// @(#)root/proofplayer:$Id: TPacketizerUnit.h 39088 2011-05-04 11:10:47Z g anis $ // @(#)root/proofplayer:$Id: TPacketizerUnit.h 45751 2012-08-30 10:28:19Z g anis $
// Author: Long Tran-Thanh 22/07/07 // Author: Long Tran-Thanh 22/07/07
// Revised: G. Ganis, May 2011 // Revised: G. Ganis, May 2011
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2002, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2002, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 57 skipping to change at line 57
private: private:
TList *fPackets; // All processed packets TList *fPackets; // All processed packets
TMap *fWrkStats; // Worker status, keyed by correspondig TS lave TMap *fWrkStats; // Worker status, keyed by correspondig TS lave
TStopwatch *fStopwatch; // For measuring the start time of each pa cket TStopwatch *fStopwatch; // For measuring the start time of each pa cket
Long64_t fProcessing; // Event being processed Long64_t fProcessing; // Event being processed
Long64_t fAssigned; // Entries processed or being processed. Long64_t fAssigned; // Entries processed or being processed.
Double_t fCalibFrac; // Size of the calibrating packet as fract ion of Ntot/Nwrk Double_t fCalibFrac; // Size of the calibrating packet as fract ion of Ntot/Nwrk
Long64_t fNumPerWorker; // Number of cycles per worker, if this op tion Long64_t fNumPerWorker; // Number of cycles per worker, if this op tion
// is chosen // is chosen
Long64_t fPacketSeq; // Sequential number of the last packet as
signed
TPacketizerUnit(); TPacketizerUnit();
TPacketizerUnit(const TPacketizerUnit&); // no implementation, will generate TPacketizerUnit(const TPacketizerUnit&); // no implementation, will generate
void operator=(const TPacketizerUnit&); // error on accidental usage void operator=(const TPacketizerUnit&); // error on accidental usage
public: public:
TPacketizerUnit(TList *slaves, Long64_t num, TList *input, TProofProgres sStatus *st = 0); TPacketizerUnit(TList *slaves, Long64_t num, TList *input, TProofProgres sStatus *st = 0);
virtual ~TPacketizerUnit(); virtual ~TPacketizerUnit();
TDSetElement *GetNextPacket(TSlave *sl, TMessage *r); TDSetElement *GetNextPacket(TSlave *sl, TMessage *r);
 End of changes. 2 change blocks. 
1 lines changed or deleted 4 lines changed or added


 TProof.h   TProof.h 
// @(#)root/proof:$Id: TProof.h 44046 2012-05-01 11:34:04Z ganis $ // @(#)root/proof:$Id: TProof.h 45751 2012-08-30 10:28:19Z ganis $
// Author: Fons Rademakers 13/02/97 // Author: Fons Rademakers 13/02/97
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 35 skipping to change at line 35
#ifndef ROOT_TProofMgr #ifndef ROOT_TProofMgr
#include "TProofMgr.h" #include "TProofMgr.h"
#endif #endif
#ifndef ROOT_TProofDebug #ifndef ROOT_TProofDebug
#include "TProofDebug.h" #include "TProofDebug.h"
#endif #endif
#ifndef ROOT_TString #ifndef ROOT_TString
#include "TString.h" #include "TString.h"
#endif #endif
#ifndef ROOT_TMacro
#include "TMacro.h"
#endif
#ifndef ROOT_MessageTypes #ifndef ROOT_MessageTypes
#include "MessageTypes.h" #include "MessageTypes.h"
#endif #endif
#ifndef ROOT_TMD5 #ifndef ROOT_TMD5
#include "TMD5.h" #include "TMD5.h"
#endif #endif
#ifndef ROOT_TRegexp #ifndef ROOT_TRegexp
#include "TRegexp.h" #include "TRegexp.h"
#endif #endif
#ifndef ROOT_TSysEvtHandler #ifndef ROOT_TSysEvtHandler
skipping to change at line 489 skipping to change at line 492
TString fMaster; //master server ("" if a master); used in the browser TString fMaster; //master server ("" if a master); used in the browser
TString fWorkDir; //current work directory on remote ser vers TString fWorkDir; //current work directory on remote ser vers
TString fGroup; //PROOF group of this user TString fGroup; //PROOF group of this user
Int_t fLogLevel; //server debug logging level Int_t fLogLevel; //server debug logging level
Int_t fStatus; //remote return status (part of kPROOF _LOGDONE) Int_t fStatus; //remote return status (part of kPROOF _LOGDONE)
Int_t fCheckFileStatus; //remote return status after kPROOF_CH ECKFILE Int_t fCheckFileStatus; //remote return status after kPROOF_CH ECKFILE
TList *fRecvMessages; //Messages received during collect not yet processed TList *fRecvMessages; //Messages received during collect not yet processed
TList *fSlaveInfo; //!list returned by kPROOF_GETSLAVEINF O TList *fSlaveInfo; //!list returned by kPROOF_GETSLAVEINF O
Bool_t fSendGroupView; //if true send new group view Bool_t fSendGroupView; //if true send new group view
TList *fActiveSlaves; //list of active slaves (subset of all slaves) TList *fActiveSlaves; //list of active slaves (subset of all slaves)
TString fActiveSlavesSaved;// comma-separated list of active sla
ves (before last call to
// SetParallel or Activate/Deactivate
Workers)
TList *fInactiveSlaves; //list of inactive slaves (good but no t used for processing) TList *fInactiveSlaves; //list of inactive slaves (good but no t used for processing)
TList *fUniqueSlaves; //list of all active slaves with uniqu e file systems TList *fUniqueSlaves; //list of all active slaves with uniqu e file systems
TList *fAllUniqueSlaves; //list of all active slaves with uniq ue file systems, including all submasters TList *fAllUniqueSlaves; //list of all active slaves with uniq ue file systems, including all submasters
TList *fNonUniqueMasters; //list of all active masters with a n onunique file system TList *fNonUniqueMasters; //list of all active masters with a n onunique file system
TMonitor *fActiveMonitor; //monitor activity on all active slave sockets TMonitor *fActiveMonitor; //monitor activity on all active slave sockets
TMonitor *fUniqueMonitor; //monitor activity on all unique slave sockets TMonitor *fUniqueMonitor; //monitor activity on all unique slave sockets
TMonitor *fAllUniqueMonitor; //monitor activity on all unique slav e sockets, including all submasters TMonitor *fAllUniqueMonitor; //monitor activity on all unique slav e sockets, including all submasters
TMonitor *fCurrentMonitor; //currently active monitor TMonitor *fCurrentMonitor; //currently active monitor
Long64_t fBytesRead; //bytes read by all slaves during the session Long64_t fBytesRead; //bytes read by all slaves during the session
Float_t fRealTime; //realtime spent by all slaves during the session Float_t fRealTime; //realtime spent by all slaves during the session
skipping to change at line 525 skipping to change at line 530
Bool_t fSync; //true if type of currently processed query is sync Bool_t fSync; //true if type of currently processed query is sync
ERunStatus fRunStatus; //run status ERunStatus fRunStatus; //run status
Bool_t fIsWaiting; //true if queries have been enqueued Bool_t fIsWaiting; //true if queries have been enqueued
Bool_t fRedirLog; //redirect received log info Bool_t fRedirLog; //redirect received log info
TString fLogFileName; //name of the temp file for redirected logs TString fLogFileName; //name of the temp file for redirected logs
FILE *fLogFileW; //temp file to redirect logs FILE *fLogFileW; //temp file to redirect logs
FILE *fLogFileR; //temp file to read redirected logs FILE *fLogFileR; //temp file to read redirected logs
Bool_t fLogToWindowOnly; //send log to window only Bool_t fLogToWindowOnly; //send log to window only
Bool_t fSaveLogToMacro; // Whether to save received logs to TM
acro fMacroLog (use with care)
TMacro fMacroLog; // Macro with the saved (last) log
TProofMergePrg fMergePrg; //Merging progress TProofMergePrg fMergePrg; //Merging progress
TList *fWaitingSlaves; //stores a TPair of the slaves's TSock et and TMessage TList *fWaitingSlaves; //stores a TPair of the slaves's TSock et and TMessage
TList *fQueries; //list of TProofQuery objects TList *fQueries; //list of TProofQuery objects
Int_t fOtherQueries; //number of queries in list from previ ous sessions Int_t fOtherQueries; //number of queries in list from previ ous sessions
Int_t fDrawQueries; //number of draw queries during this s essions Int_t fDrawQueries; //number of draw queries during this s essions
Int_t fMaxDrawQueries; //max number of draw queries kept Int_t fMaxDrawQueries; //max number of draw queries kept
Int_t fSeqNum; //Remote sequential # of the last quer y submitted Int_t fSeqNum; //Remote sequential # of the last quer y submitted
Int_t fSessionID; //remote ID of the session Int_t fSessionID; //remote ID of the session
skipping to change at line 671 skipping to change at line 679
TList *GetListOfInactiveSlaves() const { return fInactiveSlaves; } TList *GetListOfInactiveSlaves() const { return fInactiveSlaves; }
TList *GetListOfUniqueSlaves() const { return fUniqueSlaves; } TList *GetListOfUniqueSlaves() const { return fUniqueSlaves; }
TList *GetListOfBadSlaves() const { return fBadSlaves; } TList *GetListOfBadSlaves() const { return fBadSlaves; }
Int_t GetNumberOfSlaves() const; Int_t GetNumberOfSlaves() const;
Int_t GetNumberOfActiveSlaves() const; Int_t GetNumberOfActiveSlaves() const;
Int_t GetNumberOfInactiveSlaves() const; Int_t GetNumberOfInactiveSlaves() const;
Int_t GetNumberOfUniqueSlaves() const; Int_t GetNumberOfUniqueSlaves() const;
Int_t GetNumberOfBadSlaves() const; Int_t GetNumberOfBadSlaves() const;
Bool_t IsEndMaster() const { return fEndMaster; } Bool_t IsEndMaster() const { return fEndMaster; }
Int_t ModifyWorkerLists(const char *ord, Bool_t add); Int_t ModifyWorkerLists(const char *ord, Bool_t add, Bool_t save);
void RestoreActiveList();
void SaveActiveList();
Bool_t IsSync() const { return fSync; } Bool_t IsSync() const { return fSync; }
void InterruptCurrentMonitor(); void InterruptCurrentMonitor();
void SetRunStatus(ERunStatus rst) { fRunStatus = rst; } void SetRunStatus(ERunStatus rst) { fRunStatus = rst; }
void MarkBad(TSlave *wrk, const char *reason = 0); void MarkBad(TSlave *wrk, const char *reason = 0);
void MarkBad(TSocket *s, const char *reason = 0); void MarkBad(TSocket *s, const char *reason = 0);
void TerminateWorker(TSlave *wrk); void TerminateWorker(TSlave *wrk);
void TerminateWorker(const char *ord); void TerminateWorker(const char *ord);
skipping to change at line 740 skipping to change at line 750
const char *image, const char *msd); const char *image, const char *msd);
virtual void SaveWorkerInfo(); virtual void SaveWorkerInfo();
Int_t Collect(ESlaves list = kActive, Long_t timeout = -1, Int_t endt ype = -1, Bool_t deactonfail = kFALSE); Int_t Collect(ESlaves list = kActive, Long_t timeout = -1, Int_t endt ype = -1, Bool_t deactonfail = kFALSE);
Int_t Collect(TList *slaves, Long_t timeout = -1, Int_t endtype = -1, Bool_t deactonfail = kFALSE); Int_t Collect(TList *slaves, Long_t timeout = -1, Int_t endtype = -1, Bool_t deactonfail = kFALSE);
void SetDSet(TDSet *dset) { fDSet = dset; } void SetDSet(TDSet *dset) { fDSet = dset; }
virtual void ValidateDSet(TDSet *dset); virtual void ValidateDSet(TDSet *dset);
Int_t VerifyDataSetParallel(const char *uri, const char *optStr);
TPluginHandler *GetProgressDialog() const { return fProgressDialog; } TPluginHandler *GetProgressDialog() const { return fProgressDialog; }
Int_t AssertPath(const char *path, Bool_t writable); Int_t AssertPath(const char *path, Bool_t writable);
Int_t GetSandbox(TString &sb, Bool_t assert = kFALSE, const char *rc = 0 ); Int_t GetSandbox(TString &sb, Bool_t assert = kFALSE, const char *rc = 0 );
void PrepareInputDataFile(TString &dataFile); void PrepareInputDataFile(TString &dataFile);
virtual void SendInputDataFile(); virtual void SendInputDataFile();
Int_t SendFile(const char *file, Int_t opt = (kBinary | kForward | kCp | kCpBin), Int_t SendFile(const char *file, Int_t opt = (kBinary | kForward | kCp | kCpBin),
const char *rfile = 0, TSlave *sl = 0); const char *rfile = 0, TSlave *sl = 0);
// Fast enable/disable feedback from Process // Fast enable/disable feedback from Process
void SetFeedback(TString &opt, TString &optfb, Int_t action); void SetFeedback(TString &opt, TString &optfb, Int_t action);
// Output file handling during Process
Int_t HandleOutputOptions(TString &opt, TString &target, Int_t action);
static void *SlaveStartupThread(void *arg); static void *SlaveStartupThread(void *arg);
static Int_t AssertDataSet(TDSet *dset, TList *input, static Int_t AssertDataSet(TDSet *dset, TList *input,
TDataSetManager *mgr, TString &emsg); TDataSetManager *mgr, TString &emsg);
// Input data handling // Input data handling
static Int_t GetInputData(TList *input, const char *cachedir, TString &e msg); static Int_t GetInputData(TList *input, const char *cachedir, TString &e msg);
static Int_t SaveInputData(TQueryResult *qr, const char *cachedir, TStri ng &emsg); static Int_t SaveInputData(TQueryResult *qr, const char *cachedir, TStri ng &emsg);
static Int_t SendInputData(TQueryResult *qr, TProof *p, TString &emsg); static Int_t SendInputData(TQueryResult *qr, TProof *p, TString &emsg);
skipping to change at line 779 skipping to change at line 793
TProof(const char *masterurl, const char *conffile = kPROOF_ConfFile, TProof(const char *masterurl, const char *conffile = kPROOF_ConfFile,
const char *confdir = kPROOF_ConfDir, Int_t loglevel = 0, const char *confdir = kPROOF_ConfDir, Int_t loglevel = 0,
const char *alias = 0, TProofMgr *mgr = 0); const char *alias = 0, TProofMgr *mgr = 0);
virtual ~TProof(); virtual ~TProof();
void cd(Int_t id = -1); void cd(Int_t id = -1);
Int_t Ping(); Int_t Ping();
void Touch(); void Touch();
Int_t Exec(const char *cmd, Bool_t plusMaster = kFALSE); Int_t Exec(const char *cmd, Bool_t plusMaster = kFALSE);
Int_t Exec(const char *cmd, const char *ord, Bool_t logtomacro = k
FALSE);
TString Getenv(const char *env, const char *ord = "0");
Int_t GetRC(const char *RCenv, Int_t &env, const char *ord = "0");
Int_t GetRC(const char *RCenv, Double_t &env, const char *ord = "0
");
Int_t GetRC(const char *RCenv, TString &env, const char *ord = "0"
);
virtual Long64_t Process(TDSet *dset, const char *selector, virtual Long64_t Process(TDSet *dset, const char *selector,
Option_t *option = "", Long64_t nentries = -1, Option_t *option = "", Long64_t nentries = -1,
Long64_t firstentry = 0); Long64_t firstentry = 0);
virtual Long64_t Process(TFileCollection *fc, const char *selector, virtual Long64_t Process(TFileCollection *fc, const char *selector,
Option_t *option = "", Long64_t nentries = -1, Option_t *option = "", Long64_t nentries = -1,
Long64_t firstentry = 0); Long64_t firstentry = 0);
virtual Long64_t Process(const char *dsetname, const char *selector, virtual Long64_t Process(const char *dsetname, const char *selector,
Option_t *option = "", Long64_t nentries = -1, Option_t *option = "", Long64_t nentries = -1,
Long64_t firstentry = 0, TObject *enl = 0); Long64_t firstentry = 0, TObject *enl = 0);
skipping to change at line 941 skipping to change at line 961
void SetParameter(const char *par, Double_t value); void SetParameter(const char *par, Double_t value);
TObject *GetParameter(const char *par) const; TObject *GetParameter(const char *par) const;
void DeleteParameters(const char *wildcard); void DeleteParameters(const char *wildcard);
void ShowParameters(const char *wildcard = "PROOF_*") const; void ShowParameters(const char *wildcard = "PROOF_*") const;
void AddInput(TObject *obj); void AddInput(TObject *obj);
void ClearInput(); void ClearInput();
TList *GetInputList(); TList *GetInputList();
TObject *GetOutput(const char *name); TObject *GetOutput(const char *name);
TList *GetOutputList(); TList *GetOutputList();
static TObject *GetOutput(const char *name, TList *out);
void ShowMissingFiles(TQueryResult *qr = 0); void ShowMissingFiles(TQueryResult *qr = 0);
TFileCollection *GetMissingFiles(TQueryResult *qr = 0); TFileCollection *GetMissingFiles(TQueryResult *qr = 0);
void AddInputData(TObject *obj, Bool_t push = kFALSE); void AddInputData(TObject *obj, Bool_t push = kFALSE);
void SetInputDataFile(const char *datafile); void SetInputDataFile(const char *datafile);
void ClearInputData(TObject *obj = 0); void ClearInputData(TObject *obj = 0);
void ClearInputData(const char *name); void ClearInputData(const char *name);
void AddFeedback(const char *name); void AddFeedback(const char *name);
skipping to change at line 998 skipping to change at line 1019
void SendDataSetStatus(const char *msg, UInt_t n, UInt_t tot, Boo l_t st); void SendDataSetStatus(const char *msg, UInt_t n, UInt_t tot, Boo l_t st);
void GetLog(Int_t start = -1, Int_t end = -1); void GetLog(Int_t start = -1, Int_t end = -1);
TMacro *GetLastLog(); TMacro *GetLastLog();
void PutLog(TQueryResult *qr); void PutLog(TQueryResult *qr);
void ShowLog(Int_t qry = -1); void ShowLog(Int_t qry = -1);
void ShowLog(const char *queryref); void ShowLog(const char *queryref);
Bool_t SendingLogToWindow() const { return fLogToWindowOnly; } Bool_t SendingLogToWindow() const { return fLogToWindowOnly; }
void SendLogToWindow(Bool_t mode) { fLogToWindowOnly = mode; } void SendLogToWindow(Bool_t mode) { fLogToWindowOnly = mode; }
TMacro *GetMacroLog() { return &fMacroLog; }
void ResetProgressDialogStatus() { fProgressDialogStarted = kFALS E; } void ResetProgressDialogStatus() { fProgressDialogStarted = kFALS E; }
virtual TTree *GetTreeHeader(TDSet *tdset); virtual TTree *GetTreeHeader(TDSet *tdset);
TList *GetOutputNames(); TList *GetOutputNames();
void AddChain(TChain *chain); void AddChain(TChain *chain);
void RemoveChain(TChain *chain); void RemoveChain(TChain *chain);
TDrawFeedback *CreateDrawFeedback(); TDrawFeedback *CreateDrawFeedback();
void SetDrawFeedbackOption(TDrawFeedback *f, Option_t *opt); void SetDrawFeedbackOption(TDrawFeedback *f, Option_t *opt);
void DeleteDrawFeedback(TDrawFeedback *f); void DeleteDrawFeedback(TDrawFeedback *f);
void Detach(Option_t *opt = ""); void Detach(Option_t *opt = "");
virtual void SetAlias(const char *alias=""); virtual void SetAlias(const char *alias="");
TProofMgr *GetManager() { return fManager; } TProofMgr *GetManager() { return fManager; }
void SetManager(TProofMgr *mgr); void SetManager(TProofMgr *mgr);
Int_t ActivateWorker(const char *ord); Int_t ActivateWorker(const char *ord, Bool_t save = kTRUE);
Int_t DeactivateWorker(const char *ord); Int_t DeactivateWorker(const char *ord, Bool_t save = kTRUE);
const char *GetDataPoolUrl() const { return fManager ? fManager->GetMssU rl() : 0; } const char *GetDataPoolUrl() const { return fManager ? fManager->GetMssU rl() : 0; }
void SetDataPoolUrl(const char *url) { if (fManager) fManager->Se tMssUrl(url); } void SetDataPoolUrl(const char *url) { if (fManager) fManager->Se tMssUrl(url); }
void SetPrintProgress(PrintProgress_t pp) { fPrintProgress = pp; } void SetPrintProgress(PrintProgress_t pp) { fPrintProgress = pp; }
void SetProgressDialog(Bool_t on = kTRUE); void SetProgressDialog(Bool_t on = kTRUE);
// Enable the performance tree // Enable the performance tree
Int_t SavePerfTree(const char *pf = 0, const char *qref = 0); Int_t SavePerfTree(const char *pf = 0, const char *qref = 0);
 End of changes. 11 change blocks. 
4 lines changed or deleted 33 lines changed or added


 TProofLite.h   TProofLite.h 
// @(#)root/proof:$Id: TProofLite.h 43044 2012-02-17 14:34:52Z ganis $ // @(#)root/proof:$Id: TProofLite.h 45751 2012-08-30 10:28:19Z ganis $
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
#ifndef ROOT_TProofLite #ifndef ROOT_TProofLite
#define ROOT_TProofLite #define ROOT_TProofLite
skipping to change at line 72 skipping to change at line 72
TProofLite(const TProofLite &); // not implemented TProofLite(const TProofLite &); // not implemented
void operator=(const TProofLite &); // idem void operator=(const TProofLite &); // idem
Int_t CleanupSandbox(); Int_t CleanupSandbox();
Int_t CreateSandbox(); Int_t CreateSandbox();
void FindUniqueSlaves(); void FindUniqueSlaves();
void NotifyStartUp(const char *action, Int_t done, Int_t tot); void NotifyStartUp(const char *action, Int_t done, Int_t tot);
Int_t SetProofServEnv(const char *ord); Int_t SetProofServEnv(const char *ord);
Int_t InitDataSetManager(); Int_t InitDataSetManager();
Int_t RegisterDataSets(TList *in, TList *out);
void ResolveKeywords(TString &s, const char *logfile); void ResolveKeywords(TString &s, const char *logfile);
void SendInputDataFile(); void SendInputDataFile();
protected: protected:
TProofLite() : TProof() { } // For derived classes to use TProofLite() : TProof() { } // For derived classes to use
Int_t CreateSymLinks(TList *files); Int_t CreateSymLinks(TList *files);
Int_t Init(const char *masterurl, const char *conffile, Int_t Init(const char *masterurl, const char *conffile,
const char *confdir, Int_t loglevel, const char *confdir, Int_t loglevel,
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 TProofOutputFile.h   TProofOutputFile.h 
// @(#)root/proof:$Id: TProofOutputFile.h 43251 2012-03-06 10:01:34Z ganis $ // @(#)root/proof:$Id: TProofOutputFile.h 45751 2012-08-30 10:28:19Z ganis $
// Author: Long Tran-Thanh 14/09/07 // Author: Long Tran-Thanh 14/09/07
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2002, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2002, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 28 skipping to change at line 28
// // // //
// Small class to steer the merging of files produced on workers // // Small class to steer the merging of files produced on workers //
// // // //
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
#ifndef ROOT_TNamed #ifndef ROOT_TNamed
#include "TNamed.h" #include "TNamed.h"
#endif #endif
class TCollection; class TCollection;
class TProofOutputFile;
class TString; class TString;
class TList; class TList;
class TFile; class TFile;
class TFileCollection; class TFileCollection;
class TFileMerger; class TFileMerger;
class TProofOutputFile : public TNamed { class TProofOutputFile : public TNamed {
friend class TProof; friend class TProof;
friend class TProofPlayer; friend class TProofPlayer;
skipping to change at line 84 skipping to change at line 83
void SetMerged(Bool_t merged = kTRUE) { fMerged = merged; } void SetMerged(Bool_t merged = kTRUE) { fMerged = merged; }
void SetWorkerOrdinal(const char* ordinal) { fWorkerOrdinal = ordinal; } void SetWorkerOrdinal(const char* ordinal) { fWorkerOrdinal = ordinal; }
void AddFile(TFileMerger *merger, const char *path); void AddFile(TFileMerger *merger, const char *path);
void NotifyError(const char *errmsg); void NotifyError(const char *errmsg);
void Unlink(const char *path); void Unlink(const char *path);
protected: protected:
public: public:
enum EStatusBits { kOutputFileNameSet = BIT(16)}; enum EStatusBits {
kOutputFileNameSet = BIT(16),
kRetrieve = BIT(17), // If set, the file is copied to the fi
nal destination via the client
kSwapFile = BIT(18) // Set when the represented file is the
result of the automatic
// save-to-file functionality
};
TProofOutputFile() : fDir(), fRawDir(), fFileName(), fOptionsAnchor(), f OutputFileName(), TProofOutputFile() : fDir(), fRawDir(), fFileName(), fOptionsAnchor(), f OutputFileName(),
fWorkerOrdinal(), fLocalHost(), fIsLocal(kFALSE), f Merged(kFALSE), fWorkerOrdinal(), fLocalHost(), fIsLocal(kFALSE), f Merged(kFALSE),
fRunType(kMerge), fTypeOpt(kRemote), fMergeHistosOn eGo(kFALSE), fRunType(kMerge), fTypeOpt(kRemote), fMergeHistosOn eGo(kFALSE),
fDataSet(0), fMerger(0) { } fDataSet(0), fMerger(0) { }
TProofOutputFile(const char *path, const char *option = "M", const char *dsname = 0); TProofOutputFile(const char *path, const char *option = "M", const char *dsname = 0);
TProofOutputFile(const char *path, ERunType type, UInt_t opt = kRemote, const char *dsname = 0); TProofOutputFile(const char *path, ERunType type, UInt_t opt = kRemote, const char *dsname = 0);
virtual ~TProofOutputFile(); virtual ~TProofOutputFile();
const char *GetDir(Bool_t raw = kFALSE) const { return (raw) ? fRawDir : fDir; } const char *GetDir(Bool_t raw = kFALSE) const { return (raw) ? fRawDir : fDir; }
TFileCollection *GetFileCollection(); TFileCollection *GetFileCollection();
skipping to change at line 108 skipping to change at line 112
const char *GetOptionsAnchor() const { return fOptionsAnchor; } const char *GetOptionsAnchor() const { return fOptionsAnchor; }
const char *GetOutputFileName() const { return fOutputFileName; } const char *GetOutputFileName() const { return fOutputFileName; }
const char *GetWorkerOrdinal() const { return fWorkerOrdinal; } const char *GetWorkerOrdinal() const { return fWorkerOrdinal; }
ERunType GetRunType() const { return fRunType; } ERunType GetRunType() const { return fRunType; }
UInt_t GetTypeOpt() const { return fTypeOpt; } UInt_t GetTypeOpt() const { return fTypeOpt; }
Bool_t IsMerge() const { return (fRunType == kMerge) ? kTRUE : kFAL SE; } Bool_t IsMerge() const { return (fRunType == kMerge) ? kTRUE : kFAL SE; }
Bool_t IsMerged() const { return fMerged; } Bool_t IsMerged() const { return fMerged; }
Bool_t IsRegister() const { return ((fTypeOpt & kRegister) || (fTyp eOpt & kVerify)) ? kTRUE : kFALSE; } Bool_t IsRegister() const { return ((fTypeOpt & kRegister) || (fTyp eOpt & kVerify)) ? kTRUE : kFALSE; }
Bool_t IsRetrieve() const { return (TestBit(TProofOutputFile::kRetr
ieve)) ? kTRUE : kFALSE; }
void SetRetrieve(Bool_t on = kTRUE) { if (on) { SetBit(TProofOutp
utFile::kRetrieve);
} else { ResetBit(T
ProofOutputFile::kRetrieve); }}
Int_t AdoptFile(TFile *f); // Adopt a TFile already o pen Int_t AdoptFile(TFile *f); // Adopt a TFile already o pen
TFile* OpenFile(const char *opt); // Open a file with the sp ecified name in fFileName1 TFile* OpenFile(const char *opt); // Open a file with the sp ecified name in fFileName1
Long64_t Merge(TCollection *list); Long64_t Merge(TCollection *list);
void Print(Option_t *option = "") const; void Print(Option_t *option = "") const;
void SetOutputFileName(const char *name); void SetOutputFileName(const char *name);
void ResetFileCollection() { fDataSet = 0; } void ResetFileCollection() { fDataSet = 0; }
static Int_t AssertDir(const char *dirpath); static Int_t AssertDir(const char *dirpath);
ClassDef(TProofOutputFile,4) // Wrapper class to steer the merging of fi les produced on workers ClassDef(TProofOutputFile,5) // Wrapper class to steer the merging of fi les produced on workers
}; };
#endif #endif
 End of changes. 5 change blocks. 
4 lines changed or deleted 17 lines changed or added


 TProofPlayer.h   TProofPlayer.h 
// @(#)root/proofplayer:$Id: TProofPlayer.h 44401 2012-05-31 13:44:58Z gani s $ // @(#)root/proofplayer:$Id: TProofPlayer.h 45751 2012-08-30 10:28:19Z gani s $
// Author: Maarten Ballintijn 07/01/02 // Author: Maarten Ballintijn 07/01/02
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2001, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2001, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 71 skipping to change at line 71
class TSocket; class TSocket;
class TVirtualPacketizer; class TVirtualPacketizer;
class TSlave; class TSlave;
class TEventIter; class TEventIter;
class TProofStats; class TProofStats;
class TMutex; class TMutex;
class TStatus; class TStatus;
class TTimer; class TTimer;
class THashList; class THashList;
class TH1; class TH1;
class TFile;
//------------------------------------------------------------------------ //------------------------------------------------------------------------
class TProofPlayer : public TVirtualProofPlayer { class TProofPlayer : public TVirtualProofPlayer {
private: private:
TList *fAutoBins; // Map of min/max values by name for slaves TList *fAutoBins; // Map of min/max values by name for slaves
protected: protected:
TList *fInput; //-> list with input objects TList *fInput; //-> list with input objects
skipping to change at line 108 skipping to change at line 109
TQueryResult *fQuery; //Instance of TQueryResult currently pro cessed TQueryResult *fQuery; //Instance of TQueryResult currently pro cessed
TQueryResult *fPreviousQuery; //Previous instance of TQueryResult proc essed TQueryResult *fPreviousQuery; //Previous instance of TQueryResult proc essed
Int_t fDrawQueries; //Number of Draw queries in the list Int_t fDrawQueries; //Number of Draw queries in the list
Int_t fMaxDrawQueries; //Max number of Draw queries kept Int_t fMaxDrawQueries; //Max number of Draw queries kept
TTimer *fStopTimer; //Timer associated with a stop request TTimer *fStopTimer; //Timer associated with a stop request
TMutex *fStopTimerMtx; //To protect the stop timer TMutex *fStopTimerMtx; //To protect the stop timer
TTimer *fDispatchTimer; //Dispatch pending events while process ing TTimer *fDispatchTimer; //Dispatch pending events while process ing
TString fOutputFilePath; //Path to file with (partial) results o
f the query
TFile *fOutputFile; //TFile object attached to fOutputFileP
ath
Long_t fSaveMemThreshold; //Threshold for saving output to file
Bool_t fSavePartialResults; //Whether to save the partial results
Bool_t fSaveResultsPerPacket; //Whether to save partial results a
fter each packet
static THashList *fgDrawInputPars; // List of input parameters to be ke pt on drawing actions static THashList *fgDrawInputPars; // List of input parameters to be ke pt on drawing actions
void *GetSender() { return this; } //used to set gTQSender void *GetSender() { return this; } //used to set gTQSender
virtual Int_t DrawCanvas(TObject *obj); // Canvas drawing via libProofDr aw virtual Int_t DrawCanvas(TObject *obj); // Canvas drawing via libProofDr aw
virtual void SetupFeedback(); // specialized setup virtual void SetupFeedback(); // specialized setup
virtual void MergeOutput(); virtual void MergeOutput();
skipping to change at line 220 skipping to change at line 227
void AddEventsProcessed(Long64_t ev) { fProgressStatus->IncEntrie s(ev); } void AddEventsProcessed(Long64_t ev) { fProgressStatus->IncEntrie s(ev); }
void SetDispatchTimer(Bool_t on = kTRUE); void SetDispatchTimer(Bool_t on = kTRUE);
void SetStopTimer(Bool_t on = kTRUE, void SetStopTimer(Bool_t on = kTRUE,
Bool_t abort = kFALSE, Int_t timeout = 0); Bool_t abort = kFALSE, Int_t timeout = 0);
virtual void SetInitTime() { } virtual void SetInitTime() { }
Long64_t GetCacheSize(); Long64_t GetCacheSize();
Int_t GetLearnEntries(); Int_t GetLearnEntries();
void SetOutputFilePath(const char *fp) { fOutputFilePath = fp; }
Int_t SavePartialResults(Bool_t queryend = kFALSE, Bool_t force = kF
ALSE);
void SetProcessing(Bool_t on = kTRUE); void SetProcessing(Bool_t on = kTRUE);
TProofProgressStatus *GetProgressStatus() const { return fProgressStatu s; } TProofProgressStatus *GetProgressStatus() const { return fProgressStatu s; }
void UpdateProgressInfo(); void UpdateProgressInfo();
ClassDef(TProofPlayer,0) // Basic PROOF player ClassDef(TProofPlayer,0) // Basic PROOF player
}; };
//------------------------------------------------------------------------ //------------------------------------------------------------------------
 End of changes. 4 change blocks. 
1 lines changed or deleted 15 lines changed or added


 TProofServ.h   TProofServ.h 
// @(#)root/proof:$Id: TProofServ.h 44010 2012-04-29 23:07:48Z ganis $ // @(#)root/proof:$Id: TProofServ.h 45751 2012-08-30 10:28:19Z ganis $
// Author: Fons Rademakers 16/02/97 // Author: Fons Rademakers 16/02/97
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 98 skipping to change at line 98
TString fImage; //image name of the session TString fImage; //image name of the session
TString fSessionTag; //tag for the server session TString fSessionTag; //tag for the server session
TString fTopSessionTag; //tag for the global session TString fTopSessionTag; //tag for the global session
TString fSessionDir; //directory containing session dependen t files TString fSessionDir; //directory containing session dependen t files
TString fPackageDir; //directory containing packages and use r libs TString fPackageDir; //directory containing packages and use r libs
THashList *fGlobalPackageDirList; //list of directories containing g lobal packages libs THashList *fGlobalPackageDirList; //list of directories containing g lobal packages libs
TString fCacheDir; //directory containing cache of user fi les TString fCacheDir; //directory containing cache of user fi les
TString fQueryDir; //directory containing query results an d status TString fQueryDir; //directory containing query results an d status
TString fDataSetDir; //directory containing info about known data sets TString fDataSetDir; //directory containing info about known data sets
TString fDataDir; //directory containing data files produ ced during queries TString fDataDir; //directory containing data files produ ced during queries
TString fDataDirOpts; //Url type options for fDataDir
TString fAdminPath; //admin path for this session TString fAdminPath; //admin path for this session
TString fOutputFile; //path with the temporary results of th e current or last query
TProofLockPath *fPackageLock; //package dir locker TProofLockPath *fPackageLock; //package dir locker
TProofLockPath *fCacheLock; //cache dir locker TProofLockPath *fCacheLock; //cache dir locker
TProofLockPath *fQueryLock; //query dir locker TProofLockPath *fQueryLock; //query dir locker
TString fArchivePath; //default archive path TString fArchivePath; //default archive path
TSocket *fSocket; //socket connection to client TSocket *fSocket; //socket connection to client
TProof *fProof; //PROOF talking to slave servers TProof *fProof; //PROOF talking to slave servers
TVirtualProofPlayer *fPlayer; //actual player TVirtualProofPlayer *fPlayer; //actual player
FILE *fLogFile; //log file FILE *fLogFile; //log file
Int_t fLogFileDes; //log file descriptor Int_t fLogFileDes; //log file descriptor
Long64_t fLogFileMaxSize; //max size for log files (enabled if > 0) Long64_t fLogFileMaxSize; //max size for log files (enabled if > 0)
skipping to change at line 123 skipping to change at line 125
Int_t fGroupSize; //size of the active slave group Int_t fGroupSize; //size of the active slave group
Int_t fLogLevel; //debug logging level Int_t fLogLevel; //debug logging level
Int_t fNcmd; //command history number Int_t fNcmd; //command history number
Int_t fGroupPriority; //priority of group the user belongs to (0 - 100) Int_t fGroupPriority; //priority of group the user belongs to (0 - 100)
Bool_t fEndMaster; //true for a master in direct contact o nly with workers Bool_t fEndMaster; //true for a master in direct contact o nly with workers
Bool_t fMasterServ; //true if we are a master server Bool_t fMasterServ; //true if we are a master server
Bool_t fInterrupt; //if true macro execution will be stopp ed Bool_t fInterrupt; //if true macro execution will be stopp ed
Float_t fRealTime; //real time spent executing commands Float_t fRealTime; //real time spent executing commands
Float_t fCpuTime; //CPU time spent executing commands Float_t fCpuTime; //CPU time spent executing commands
TStopwatch fLatency; //measures latency of packet requests TStopwatch fLatency; //measures latency of packet requests
TStopwatch fCompute; //measures time spend processing a pack TStopwatch fCompute; //measures time spent processing a pack
et et
TStopwatch fSaveOutput; //measures time spent saving the partia
l result
Int_t fQuerySeqNum; //sequential number of the current or l ast query Int_t fQuerySeqNum; //sequential number of the current or l ast query
Int_t fTotSessions; //Total number of PROOF sessions on the cluster Int_t fTotSessions; //Total number of PROOF sessions on the cluster
Int_t fActSessions; //Total number of active PROOF sessions on the cluster Int_t fActSessions; //Total number of active PROOF sessions on the cluster
Float_t fEffSessions; //Effective Number of PROOF sessions on the assigned machines Float_t fEffSessions; //Effective Number of PROOF sessions on the assigned machines
TFileHandler *fInputHandler; //Input socket handler TFileHandler *fInputHandler; //Input socket handler
TQueryResultManager *fQMgr; //Query-result manager TQueryResultManager *fQMgr; //Query-result manager
skipping to change at line 202 skipping to change at line 205
// Query handlers // Query handlers
TProofQueryResult *MakeQueryResult(Long64_t nentries, const char *opt, TProofQueryResult *MakeQueryResult(Long64_t nentries, const char *opt,
TList *inl, Long64_t first, TDSet *ds et, TList *inl, Long64_t first, TDSet *ds et,
const char *selec, TObject *elist); const char *selec, TObject *elist);
void SetQueryRunning(TProofQueryResult *pq); void SetQueryRunning(TProofQueryResult *pq);
// Results handling // Results handling
Int_t SendResults(TSocket *sock, TList *outlist = 0, TQueryResul t *pq = 0); Int_t SendResults(TSocket *sock, TList *outlist = 0, TQueryResul t *pq = 0);
Bool_t AcceptResults(Int_t connections, TVirtualProofPlayer *merg erPlayer); Bool_t AcceptResults(Int_t connections, TVirtualProofPlayer *merg erPlayer);
TMap *GetDataSetNodeMap(const char *dsn, TString &emsg);
Int_t RegisterDataSets(TList *in, TList *out);
// Waiting queries handlers // Waiting queries handlers
void SetIdle(Bool_t st = kTRUE); void SetIdle(Bool_t st = kTRUE);
Bool_t IsWaiting(); Bool_t IsWaiting();
Int_t WaitingQueries(); Int_t WaitingQueries();
Int_t QueueQuery(TProofQueryResult *pq); Int_t QueueQuery(TProofQueryResult *pq);
TProofQueryResult *NextQuery(); TProofQueryResult *NextQuery();
Int_t CleanupWaitingQueries(Bool_t del = kTRUE, TList *qls = 0); Int_t CleanupWaitingQueries(Bool_t del = kTRUE, TList *qls = 0);
protected: protected:
virtual void HandleArchive(TMessage *mess, TString *slb = 0); virtual void HandleArchive(TMessage *mess, TString *slb = 0);
skipping to change at line 255 skipping to change at line 255
virtual Int_t CreateServer(); virtual Int_t CreateServer();
TProof *GetProof() const { return fProof; } TProof *GetProof() const { return fProof; }
const char *GetService() const { return fService; } const char *GetService() const { return fService; }
const char *GetConfDir() const { return fConfDir; } const char *GetConfDir() const { return fConfDir; }
const char *GetConfFile() const { return fConfFile; } const char *GetConfFile() const { return fConfFile; }
const char *GetUser() const { return fUser; } const char *GetUser() const { return fUser; }
const char *GetGroup() const { return fGroup; } const char *GetGroup() const { return fGroup; }
const char *GetWorkDir() const { return fWorkDir; } const char *GetWorkDir() const { return fWorkDir; }
const char *GetImage() const { return fImage; } const char *GetImage() const { return fImage; }
const char *GetSessionTag() const { return fTopSessionTag; } const char *GetSessionTag() const { return fSessionTag; }
const char *GetTopSessionTag() const { return fTopSessionTag; }
const char *GetSessionDir() const { return fSessionDir; } const char *GetSessionDir() const { return fSessionDir; }
const char *GetPackageDir() const { return fPackageDir; } const char *GetPackageDir() const { return fPackageDir; }
const char *GetDataDir() const { return fDataDir; } const char *GetDataDir() const { return fDataDir; }
const char *GetDataDirOpts() const { return fDataDirOpts; }
Int_t GetProtocol() const { return fProtocol; } Int_t GetProtocol() const { return fProtocol; }
const char *GetOrdinal() const { return fOrdinal; } const char *GetOrdinal() const { return fOrdinal; }
Int_t GetGroupId() const { return fGroupId; } Int_t GetGroupId() const { return fGroupId; }
Int_t GetGroupSize() const { return fGroupSize; } Int_t GetGroupSize() const { return fGroupSize; }
Int_t GetLogLevel() const { return fLogLevel; } Int_t GetLogLevel() const { return fLogLevel; }
TSocket *GetSocket() const { return fSocket; } TSocket *GetSocket() const { return fSocket; }
Float_t GetRealTime() const { return fRealTime; } Float_t GetRealTime() const { return fRealTime; }
Float_t GetCpuTime() const { return fCpuTime; } Float_t GetCpuTime() const { return fCpuTime; }
Int_t GetQuerySeqNum() const { return fQuerySeqNum; } Int_t GetQuerySeqNum() const { return fQuerySeqNum; }
skipping to change at line 344 skipping to change at line 346
static FILE *SetErrorHandlerFile(FILE *ferr); static FILE *SetErrorHandlerFile(FILE *ferr);
static void ErrorHandler(Int_t level, Bool_t abort, const char *locat ion, static void ErrorHandler(Int_t level, Bool_t abort, const char *locat ion,
const char *msg); const char *msg);
static void ResolveKeywords(TString &fname, const char *path = 0); static void ResolveKeywords(TString &fname, const char *path = 0);
static void SetLastMsg(const char *lastmsg); static void SetLastMsg(const char *lastmsg);
static void SetLastEntry(Long64_t lastentry); static void SetLastEntry(Long64_t lastentry);
// To handle local data server related paths
static void FilterLocalroot(TString &path, const char *url = "root://
dum/");
static void GetLocalServer(TString &dsrv);
// To prepara ethe map of files to process
static TMap *GetDataSetNodeMap(TFileCollection *fc, TString &emsg);
static Int_t RegisterDataSets(TList *in, TList *out, TDataSetManager *
dsm, TString &e);
static Bool_t IsActive(); static Bool_t IsActive();
static TProofServ *This(); static TProofServ *This();
ClassDef(TProofServ,0) //PROOF Server Application Interface ClassDef(TProofServ,0) //PROOF Server Application Interface
}; };
R__EXTERN TProofServ *gProofServ; R__EXTERN TProofServ *gProofServ;
class TProofLockPath : public TNamed { class TProofLockPath : public TNamed {
private: private:
 End of changes. 8 change blocks. 
7 lines changed or deleted 20 lines changed or added


 TRootBrowser.h   TRootBrowser.h 
// @(#)root/gui:$Id: TRootBrowser.h 37996 2011-02-07 15:33:10Z rdm $ // @(#)root/gui:$Id: TRootBrowser.h 45594 2012-08-14 07:27:16Z 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 101 skipping to change at line 101
TList fBrowsers; // List of (sub)browsers TList fBrowsers; // List of (sub)browsers
TList fPlugins; // List of plugins TList fPlugins; // List of plugins
TGStatusBar *fStatusBar; // Status bar TGStatusBar *fStatusBar; // Status bar
Int_t fNbInitPlugins; // Number of initial plu gins (from .rootrc) Int_t fNbInitPlugins; // Number of initial plu gins (from .rootrc)
Int_t fNbTab[3]; // Number of tab element s (for each Tab) Int_t fNbTab[3]; // Number of tab element s (for each Tab)
Int_t fCrTab[3]; // Actual (active) tab e lements (for each Tab) Int_t fCrTab[3]; // Actual (active) tab e lements (for each Tab)
Int_t fPid; // Current process id Int_t fPid; // Current process id
Bool_t fShowCloseTab; // kTRUE to show close i con on tab elements Bool_t fShowCloseTab; // kTRUE to show close i con on tab elements
public: public:
enum ENewBrowserMessages {
kBrowse = 11011,
kOpenFile,
kClone,
kHelpAbout,
kHelpOnBrowser,
kHelpOnCanvas,
kHelpOnMenus,
kHelpOnGraphicsEd,
kHelpOnObjects,
kHelpOnPS,
kHelpOnRemote,
kNewEditor,
kNewCanvas,
kNewHtml,
kExecPluginMacro,
kExecPluginCmd,
kCloseTab,
kCloseWindow,
kQuitRoot
};
enum EInsertPosition { enum EInsertPosition {
kLeft, kRight, kBottom kLeft, kRight, kBottom
}; };
TRootBrowser(TBrowser *b = 0, const char *name = "ROOT Browser", UInt_t width = 800, UInt_t height = 500, Option_t *opt="", Bool_t initshow=kTRUE); TRootBrowser(TBrowser *b = 0, const char *name = "ROOT Browser", UInt_t width = 800, UInt_t height = 500, Option_t *opt="", Bool_t initshow=kTRUE);
TRootBrowser(TBrowser *b, const char *name, Int_t x, Int_t y, UInt_t wid th, UInt_t height, Option_t *opt="", Bool_t initshow=kTRUE); TRootBrowser(TBrowser *b, const char *name, Int_t x, Int_t y, UInt_t wid th, UInt_t height, Option_t *opt="", Bool_t initshow=kTRUE);
virtual ~TRootBrowser(); virtual ~TRootBrowser();
void InitPlugins(Option_t *opt=""); void InitPlugins(Option_t *opt="");
void CreateBrowser(const char *name); void CreateBrowser(const char *name);
void CloneBrowser(); void CloneBrowser();
void CloseWindow(); virtual void CloseWindow();
void CloseTab(Int_t id); virtual void CloseTab(Int_t id);
virtual void CloseTabs(); virtual void CloseTabs();
void DoTab(Int_t id); void DoTab(Int_t id);
TGFrame *GetActFrame() const { return (TGFrame *)fEditFrame; } TGFrame *GetActFrame() const { return (TGFrame *)fEditFrame; }
TGFrame *GetToolbarFrame() const { return (TGFrame *)fToolbarFr ame; } TGFrame *GetToolbarFrame() const { return (TGFrame *)fToolbarFr ame; }
TGStatusBar *GetStatusBar() const { return fStatusBar; } TGStatusBar *GetStatusBar() const { return fStatusBar; }
TGTab *GetTabLeft() const { return fTabLeft; } TGTab *GetTabLeft() const { return fTabLeft; }
TGTab *GetTabRight() const { return fTabRight; } TGTab *GetTabRight() const { return fTabRight; }
TGTab *GetTabBottom() const { return fTabBottom; } TGTab *GetTabBottom() const { return fTabBottom; }
TGTab *GetTab(Int_t pos) const; TGTab *GetTab(Int_t pos) const;
void SetTab(Int_t pos = kRight, Int_t subpos = -1); void SetTab(Int_t pos = kRight, Int_t subpos = -1);
 End of changes. 3 change blocks. 
3 lines changed or deleted 25 lines changed or added


 TTreeCache.h   TTreeCache.h 
// @(#)root/tree:$Id: TTreeCache.h 44680 2012-06-13 18:24:26Z pcanal $ // @(#)root/tree:$Id: TTreeCache.h 45944 2012-09-12 09:53:23Z pcanal $
// Author: Rene Brun 04/06/2006 // Author: Rene Brun 04/06/2006
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 35 skipping to change at line 35
#endif #endif
#ifndef ROOT_TObjArray #ifndef ROOT_TObjArray
#include "TObjArray.h" #include "TObjArray.h"
#endif #endif
class TTree; class TTree;
class TBranch; class TBranch;
class TTreeCache : public TFileCacheRead { class TTreeCache : public TFileCacheRead {
public:
enum EPrefillType { kNoPrefill, kAllBranches };
protected: protected:
Long64_t fEntryMin; //! first entry in the cache Long64_t fEntryMin; //! first entry in the cache
Long64_t fEntryMax; //! last entry in the cache Long64_t fEntryMax; //! last entry in the cache
Long64_t fEntryCurrent;//! current lowest entry number in the cac he Long64_t fEntryCurrent;//! current lowest entry number in the cac he
Long64_t fEntryNext; //! next entry number where cache must be filled Long64_t fEntryNext; //! next entry number where cache must be filled
Int_t fNbranches; //! Number of branches in the cache Int_t fNbranches; //! Number of branches in the cache
Int_t fNReadOk; //Number of blocks read and found in the c ache Int_t fNReadOk; //Number of blocks read and found in the c ache
Int_t fNReadMiss; //Number of blocks read and not found in t he chache Int_t fNReadMiss; //Number of blocks read and not found in t he chache
Int_t fNReadPref; //Number of blocks that were prefetched Int_t fNReadPref; //Number of blocks that were prefetched
TObjArray *fBranches; //! List of branches to be stored in the c ache TObjArray *fBranches; //! List of branches to be stored in the c ache
skipping to change at line 56 skipping to change at line 59
TTree *fTree; //! pointer to the current Tree TTree *fTree; //! pointer to the current Tree
Bool_t fIsLearning; //! true if cache is in learning mode Bool_t fIsLearning; //! true if cache is in learning mode
Bool_t fIsManual; //! true if cache is StopLearningPhase was used Bool_t fIsManual; //! true if cache is StopLearningPhase was used
Bool_t fFirstBuffer; //! true if first buffer is used for prefe tching Bool_t fFirstBuffer; //! true if first buffer is used for prefe tching
Bool_t fOneTime; //! used in the learning phase Bool_t fOneTime; //! used in the learning phase
Bool_t fReverseRead; //! reading in reverse mode Bool_t fReverseRead; //! reading in reverse mode
Int_t fFillTimes; //! how many times we can fill the curren t buffer Int_t fFillTimes; //! how many times we can fill the curren t buffer
Bool_t fFirstTime; //! save the fact that we processes the fi rst entry Bool_t fFirstTime; //! save the fact that we processes the fi rst entry
Long64_t fFirstEntry; //! save the value of the first entry Long64_t fFirstEntry; //! save the value of the first entry
Bool_t fReadDirectionSet; //! read direction established Bool_t fReadDirectionSet; //! read direction established
Bool_t fEnabled; //! cache enabled for cached reading
EPrefillType fPrefillType; // Whether a prefilling is enabled (and if
applicable which type)
static Int_t fgLearnEntries; // number of entries used for learning m ode static Int_t fgLearnEntries; // number of entries used for learning m ode
private: private:
TTreeCache(const TTreeCache &); //this class cannot be copied TTreeCache(const TTreeCache &); //this class cannot be copied
TTreeCache& operator=(const TTreeCache &); TTreeCache& operator=(const TTreeCache &);
public: public:
TTreeCache(); TTreeCache();
TTreeCache(TTree *tree, Int_t buffersize=0); TTreeCache(TTree *tree, Int_t buffersize=0);
virtual ~TTreeCache(); virtual ~TTreeCache();
virtual void AddBranch(TBranch *b, Bool_t subgbranches = kFALSE); virtual void AddBranch(TBranch *b, Bool_t subgbranches = kFALSE)
virtual void AddBranch(const char *branch, Bool_t subbranches = k ;
FALSE); virtual void AddBranch(const char *branch, Bool_t subbranches =
virtual void DropBranch(TBranch *b, Bool_t subbranches = kFALSE); kFALSE);
virtual void DropBranch(const char *branch, Bool_t subbranches = virtual void DropBranch(TBranch *b, Bool_t subbranches = kFALSE)
kFALSE); ;
const TObjArray *GetCachedBranches() const { return fBranches; } virtual void DropBranch(const char *branch, Bool_t subbranches =
Double_t GetEfficiency() const; kFALSE);
Double_t GetEfficiencyRel() const; virtual void Disable() {fEnabled = kFALSE;}
static Int_t GetLearnEntries(); virtual void Enable() {fEnabled = kTRUE;}
const TObjArray *GetCachedBranches() const { return fBranches; }
virtual Bool_t FillBuffer(); Double_t GetEfficiency() const;
TTree *GetTree() const; Double_t GetEfficiencyRel() const;
virtual Bool_t IsLearning() const {return fIsLearning;} virtual Int_t GetEntryMin() const {return fEntryMin;}
virtual void Print(Option_t *option="") const; virtual Int_t GetEntryMax() const {return fEntryMax;}
virtual Int_t ReadBuffer(char *buf, Long64_t pos, Int_t len); static Int_t GetLearnEntries();
virtual Int_t ReadBufferNormal(char *buf, Long64_t pos, Int_t len) virtual EPrefillType GetLearnPrefill() const {return fPrefillType;}
; TTree *GetTree() const;
virtual Int_t ReadBufferPrefetch(char *buf, Long64_t pos, Int_t le virtual Bool_t IsEnabled() const {return fEnabled;}
n); virtual Bool_t IsLearning() const {return fIsLearning;}
virtual void ResetCache();
virtual void SetEntryRange(Long64_t emin, Long64_t emax); virtual Bool_t FillBuffer();
virtual void SetFile(TFile *file); virtual void LearnPrefill();
static void SetLearnEntries(Int_t n = 10);
void StartLearningPhase(); virtual void Print(Option_t *option="") const;
virtual void StopLearningPhase(); virtual Int_t ReadBuffer(char *buf, Long64_t pos, Int_t len);
virtual void UpdateBranches(TTree *tree); virtual Int_t ReadBufferNormal(char *buf, Long64_t pos, Int_t len
);
virtual Int_t ReadBufferPrefetch(char *buf, Long64_t pos, Int_t l
en);
virtual void ResetCache();
virtual void SetEntryRange(Long64_t emin, Long64_t emax);
virtual void SetFile(TFile *file, TFile::ECacheAction action=TFi
le::kDisconnect);
virtual void SetLearnPrefill(EPrefillType type = kNoPrefill);
static void SetLearnEntries(Int_t n = 10);
void StartLearningPhase();
virtual void StopLearningPhase();
virtual void UpdateBranches(TTree *tree);
ClassDef(TTreeCache,2) //Specialization of TFileCacheRead for a TTree ClassDef(TTreeCache,2) //Specialization of TFileCacheRead for a TTree
}; };
#endif #endif
 End of changes. 5 change blocks. 
28 lines changed or deleted 47 lines changed or added


 TUnixSystem.h   TUnixSystem.h 
// @(#)root/unix:$Id: TUnixSystem.h 42099 2011-11-17 19:16:32Z rdm $ // @(#)root/unix:$Id: TUnixSystem.h 45109 2012-07-17 13:54:49Z couet $
// Author: Fons Rademakers 15/09/95 // Author: Fons Rademakers 15/09/95
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 176 skipping to change at line 176
Int_t GetEffectiveUid(); Int_t GetEffectiveUid();
Int_t GetEffectiveGid(); Int_t GetEffectiveGid();
UserGroup_t *GetUserInfo(Int_t uid); UserGroup_t *GetUserInfo(Int_t uid);
UserGroup_t *GetUserInfo(const char *user = 0); UserGroup_t *GetUserInfo(const char *user = 0);
UserGroup_t *GetGroupInfo(Int_t gid); UserGroup_t *GetGroupInfo(Int_t gid);
UserGroup_t *GetGroupInfo(const char *group = 0); UserGroup_t *GetGroupInfo(const char *group = 0);
//---- Environment Manipulation ----------------------------- //---- Environment Manipulation -----------------------------
const char *Getenv(const char *name); const char *Getenv(const char *name);
void Setenv(const char *name, const char *value); void Setenv(const char *name, const char *value);
void Unsetenv(const char *name);
//---- System Logging --------------------------------------- //---- System Logging ---------------------------------------
void Openlog(const char *name, Int_t options, ELogFacility facility); void Openlog(const char *name, Int_t options, ELogFacility facility);
void Syslog(ELogLevel level, const char *mess); void Syslog(ELogLevel level, const char *mess);
void Closelog(); void Closelog();
//---- Standard Output redirection -------------------------- //---- Standard Output redirection --------------------------
Int_t RedirectOutput(const char *name, const char *mode = "a ", Int_t RedirectOutput(const char *name, const char *mode = "a ",
RedirectHandle_t *h = 0); RedirectHandle_t *h = 0);
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added


 TVirtualProofPlayer.h   TVirtualProofPlayer.h 
// @(#)root/proof:$Id: TVirtualProofPlayer.h 44010 2012-04-29 23:07:48Z gan is $ // @(#)root/proof:$Id: TVirtualProofPlayer.h 45751 2012-08-30 10:28:19Z gan is $
// Author: Fons Rademakers 15/03/07 // Author: Fons Rademakers 15/03/07
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2007, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
* For the licensing terms see $ROOTSYS/LICENSE. * * For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
skipping to change at line 136 skipping to change at line 136
virtual void SetStopTimer(Bool_t on = kTRUE, virtual void SetStopTimer(Bool_t on = kTRUE,
Bool_t abort = kFALSE, Int_t timeout = 0) = 0; Bool_t abort = kFALSE, Int_t timeout = 0) = 0;
virtual void SetInitTime() = 0; virtual void SetInitTime() = 0;
virtual Long64_t GetCacheSize() = 0; virtual Long64_t GetCacheSize() = 0;
virtual Int_t GetLearnEntries() = 0; virtual Int_t GetLearnEntries() = 0;
virtual void UpdateProgressInfo() = 0; virtual void UpdateProgressInfo() = 0;
virtual TVirtualPacketizer *GetPacketizer() const { return 0; } virtual TVirtualPacketizer *GetPacketizer() const { return 0; }
virtual void SetOutputFilePath(const char *fp) = 0;
virtual Int_t SavePartialResults(Bool_t queryend = kFALSE, Bool_t fo
rce = kFALSE) = 0;
static TVirtualProofPlayer *Create(const char *player, TProof *p, TSocke t *s = 0); static TVirtualProofPlayer *Create(const char *player, TProof *p, TSocke t *s = 0);
ClassDef(TVirtualProofPlayer,0) // Abstract PROOF player ClassDef(TVirtualProofPlayer,0) // Abstract PROOF player
}; };
#endif #endif
 End of changes. 2 change blocks. 
1 lines changed or deleted 5 lines changed or added


 TVirtualX.h   TVirtualX.h 
// @(#)root/base:$Id: TVirtualX.h 43914 2012-04-23 22:08:24Z rdm $ // @(#)root/base:$Id: TVirtualX.h 45299 2012-07-30 16:12:56Z rdm $
// Author: Fons Rademakers 3/12/95 // Author: Fons Rademakers 3/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 26 skipping to change at line 26
// // // //
// TVirtualX // // TVirtualX //
// // // //
// Semi-Abstract base class defining a generic interface to the // // Semi-Abstract base class defining a generic interface to the //
// underlying, low level, graphics system (X11, Win32, MacOS). // // underlying, low level, graphics system (X11, Win32, MacOS). //
// An instance of TVirtualX itself defines a batch interface to the // // An instance of TVirtualX itself defines a batch interface to the //
// graphics system. // // graphics system. //
// // // //
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
#include <utility>
#include <vector>
#ifndef ROOT_TNamed #ifndef ROOT_TNamed
#include "TNamed.h" #include "TNamed.h"
#endif #endif
#ifndef ROOT_TAttLine #ifndef ROOT_TAttLine
#include "TAttLine.h" #include "TAttLine.h"
#endif #endif
#ifndef ROOT_TAttFill #ifndef ROOT_TAttFill
#include "TAttFill.h" #include "TAttFill.h"
#endif #endif
#ifndef ROOT_TAttText #ifndef ROOT_TAttText
skipping to change at line 88 skipping to change at line 91
TVirtualX(const char *name, const char *title); TVirtualX(const char *name, const char *title);
virtual ~TVirtualX() { } virtual ~TVirtualX() { }
virtual Bool_t Init(void *display=0); virtual Bool_t Init(void *display=0);
virtual void ClearWindow(); virtual void ClearWindow();
virtual void ClosePixmap(); virtual void ClosePixmap();
virtual void CloseWindow(); virtual void CloseWindow();
virtual void CopyPixmap(Int_t wid, Int_t xpos, Int_t ypos); virtual void CopyPixmap(Int_t wid, Int_t xpos, Int_t ypos);
virtual void CreateOpenGLContext(Int_t wid=0); virtual void CreateOpenGLContext(Int_t wid=0);
virtual void DeleteOpenGLContext(Int_t wid=0); virtual void DeleteOpenGLContext(Int_t wid=0);
//---- OpenGL related stuff, required only with R__HAS_COCOA ----
virtual Window_t CreateOpenGLWindow(Window_t parentID, UInt_t width, UI
nt_t height, const std::vector<std::pair<UInt_t, Int_t> > &format);
virtual Handle_t CreateOpenGLContext(Window_t windowID, Handle_t shared
Context);
virtual Bool_t MakeOpenGLContextCurrent(Handle_t ctx, Window_t window
ID);
virtual Handle_t GetCurrentOpenGLContext();
virtual void FlushOpenGLBuffer(Handle_t ctx);
virtual void DrawBox(Int_t x1, Int_t y1, Int_t x2, Int_t y2, EBoxMo de mode); virtual void DrawBox(Int_t x1, Int_t y1, Int_t x2, Int_t y2, EBoxMo de mode);
virtual void DrawCellArray(Int_t x1, Int_t y1, Int_t x2, Int_t y2, virtual void DrawCellArray(Int_t x1, Int_t y1, Int_t x2, Int_t y2,
Int_t nx, Int_t ny, Int_t *ic); Int_t nx, Int_t ny, Int_t *ic);
virtual void DrawFillArea(Int_t n, TPoint *xy); virtual void DrawFillArea(Int_t n, TPoint *xy);
virtual void DrawLine(Int_t x1, Int_t y1, Int_t x2, Int_t y2); virtual void DrawLine(Int_t x1, Int_t y1, Int_t x2, Int_t y2);
virtual void DrawPolyLine(Int_t n, TPoint *xy); virtual void DrawPolyLine(Int_t n, TPoint *xy);
virtual void DrawPolyMarker(Int_t n, TPoint *xy); virtual void DrawPolyMarker(Int_t n, TPoint *xy);
virtual void DrawText(Int_t x, Int_t y, Float_t angle, Float_t mgn, const char *text, virtual void DrawText(Int_t x, Int_t y, Float_t angle, Float_t mgn, const char *text,
ETextMode mode); ETextMode mode);
virtual UInt_t ExecCommand(TGWin32Command *code); virtual UInt_t ExecCommand(TGWin32Command *code);
 End of changes. 3 change blocks. 
1 lines changed or deleted 15 lines changed or added


 TVirtualX.interface.h   TVirtualX.interface.h 
// @(#)root/base:$Id: TVirtualX.interface.h 33707 2010-06-02 06:27:34Z brun $ // @(#)root/base:$Id: TVirtualX.interface.h 45302 2012-07-31 08:05:22Z tpoc hep $
// Author: Valeri Fine 28/07/2004 // Author: Valeri Fine 28/07/2004
// //
// This is a copy of the all "abstract" TVirtualX methods to make sure // This is a copy of the all "abstract" TVirtualX methods to make sure
// we don't miss it with the implementation // we don't miss it with the implementation
// //
/************************************************************************* /*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. * * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. * * All rights reserved. *
* * * *
skipping to change at line 23 skipping to change at line 23
* For the list of contributors see $ROOTSYS/README/CREDITS. * * For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/ *************************************************************************/
public: public:
virtual Bool_t Init(void *display=0); virtual Bool_t Init(void *display=0);
virtual void ClearWindow(); virtual void ClearWindow();
virtual void ClosePixmap(); virtual void ClosePixmap();
virtual void CloseWindow(); virtual void CloseWindow();
virtual void CopyPixmap(Int_t wid, Int_t xpos, Int_t ypos); virtual void CopyPixmap(Int_t wid, Int_t xpos, Int_t ypos);
//-Woverloaded-virtual
using TVirtualX::CreateOpenGLContext;
virtual void CreateOpenGLContext(Int_t wid=0); virtual void CreateOpenGLContext(Int_t wid=0);
virtual void DeleteOpenGLContext(Int_t wid=0); virtual void DeleteOpenGLContext(Int_t wid=0);
virtual void DrawBox(Int_t x1, Int_t y1, Int_t x2, Int_t y2, EBoxMo de mode); virtual void DrawBox(Int_t x1, Int_t y1, Int_t x2, Int_t y2, EBoxMo de mode);
virtual void DrawCellArray(Int_t x1, Int_t y1, Int_t x2, Int_t y2, virtual void DrawCellArray(Int_t x1, Int_t y1, Int_t x2, Int_t y2,
Int_t nx, Int_t ny, Int_t *ic); Int_t nx, Int_t ny, Int_t *ic);
virtual void DrawFillArea(Int_t n, TPoint *xy); virtual void DrawFillArea(Int_t n, TPoint *xy);
virtual void DrawLine(Int_t x1, Int_t y1, Int_t x2, Int_t y2); virtual void DrawLine(Int_t x1, Int_t y1, Int_t x2, Int_t y2);
virtual void DrawPolyLine(Int_t n, TPoint *xy); virtual void DrawPolyLine(Int_t n, TPoint *xy);
virtual void DrawPolyMarker(Int_t n, TPoint *xy); virtual void DrawPolyMarker(Int_t n, TPoint *xy);
virtual void DrawText(Int_t x, Int_t y, Float_t angle, Float_t mgn, const char *text, virtual void DrawText(Int_t x, Int_t y, Float_t angle, Float_t mgn, const char *text,
 End of changes. 2 change blocks. 
1 lines changed or deleted 5 lines changed or added


 ToyMCImportanceSampler.h   ToyMCImportanceSampler.h 
skipping to change at line 160 skipping to change at line 160
} }
} }
// When set to true, this sets the weight of all toys to zero that // When set to true, this sets the weight of all toys to zero that
// do not have the largest likelihood under the density it was genera ted // do not have the largest likelihood under the density it was genera ted
// compared to the other densities. // compared to the other densities.
void SetApplyVeto(bool b = true) { fApplyVeto = b; } void SetApplyVeto(bool b = true) { fApplyVeto = b; }
void SetReuseNLL(bool r = true) { fReuseNLL = r; } void SetReuseNLL(bool r = true) { fReuseNLL = r; }
// set the conditional observables which will be used when creating th
e NLL
// so the pdf's will not be normalized on the conditional observables
when computing the NLL
// Since the class use a NLL we need to set the ocnditional onservable
s if they exist in the model
virtual void SetConditionalObservables(const RooArgSet& set) {fConditi
onalObs.removeAll(); fConditionalObs.add(set);}
int CreateNImpDensitiesForOnePOI( int CreateNImpDensitiesForOnePOI(
RooAbsPdf& pdf, RooAbsPdf& pdf,
const RooArgSet& allPOI, const RooArgSet& allPOI,
RooRealVar& poi, RooRealVar& poi,
int n, int n,
double poiValueForBackground = 0.0 double poiValueForBackground = 0.0
); );
int CreateImpDensitiesForOnePOIAdaptively( int CreateImpDensitiesForOnePOIAdaptively(
RooAbsPdf& pdf, RooAbsPdf& pdf,
const RooArgSet& allPOI, const RooArgSet& allPOI,
skipping to change at line 187 skipping to change at line 192
protected: protected:
// helper method for clearing the cache // helper method for clearing the cache
virtual void ClearCache(); virtual void ClearCache();
unsigned int fIndexGenDensity; unsigned int fIndexGenDensity;
bool fGenerateFromNull; bool fGenerateFromNull;
bool fApplyVeto; bool fApplyVeto;
RooArgSet fConditionalObs; // set of conditional observables
// support multiple null densities // support multiple null densities
std::vector<RooAbsPdf*> fNullDensities; std::vector<RooAbsPdf*> fNullDensities;
mutable std::vector<const RooArgSet*> fNullSnapshots; mutable std::vector<const RooArgSet*> fNullSnapshots;
// densities and snapshots to generate from // densities and snapshots to generate from
std::vector<RooAbsPdf*> fImportanceDensities; std::vector<RooAbsPdf*> fImportanceDensities;
std::vector<const RooArgSet*> fImportanceSnapshots; std::vector<const RooArgSet*> fImportanceSnapshots;
bool fReuseNLL; bool fReuseNLL;
toysStrategies fToysStrategy; toysStrategies fToysStrategy;
mutable std::vector<RooAbsReal*> fNullNLLs; //! mutable std::vector<RooAbsReal*> fNullNLLs; //!
mutable std::vector<RooAbsReal*> fImpNLLs; //! mutable std::vector<RooAbsReal*> fImpNLLs; //!
protected: protected:
ClassDef(ToyMCImportanceSampler,1) // An implementation of importance sa mpling ClassDef(ToyMCImportanceSampler,2) // An implementation of importance sa mpling
}; };
} }
#endif #endif
 End of changes. 3 change blocks. 
1 lines changed or deleted 12 lines changed or added


 ToyMCSampler.h   ToyMCSampler.h 
// @(#)root/roostats:$Id: ToyMCSampler.h 44473 2012-06-01 16:12:31Z moneta $ // @(#)root/roostats:$Id: ToyMCSampler.h 46084 2012-09-20 13:57:53Z 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 101 skipping to change at line 101
}; };
class ToyMCSampler: public TestStatSampler { class ToyMCSampler: public TestStatSampler {
public: public:
ToyMCSampler(); ToyMCSampler();
ToyMCSampler(TestStatistic &ts, Int_t ntoys); ToyMCSampler(TestStatistic &ts, Int_t ntoys);
virtual ~ToyMCSampler(); virtual ~ToyMCSampler();
static void SetAlwaysUseMultiGen(Bool_t flag) { fgAlwaysUseMultiGen = static void SetAlwaysUseMultiGen(Bool_t flag);
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);
virtual RooDataSet* GetSamplingDistributions(RooArgSet& paramPoint); virtual RooDataSet* GetSamplingDistributions(RooArgSet& paramPoint);
virtual RooDataSet* GetSamplingDistributionsSingleWorker(RooArgSet& p aramPoint); virtual RooDataSet* GetSamplingDistributionsSingleWorker(RooArgSet& p aramPoint);
virtual SamplingDistribution* AppendSamplingDistribution( virtual SamplingDistribution* AppendSamplingDistribution(
RooArgSet& allParameters, RooArgSet& allParameters,
SamplingDistribution* last, SamplingDistribution* last,
skipping to change at line 180 skipping to change at line 181
// Set the Pdf, add to the the workspace if not already there // Set the Pdf, add to the the workspace if not already there
virtual void SetParametersForTestStat(const RooArgSet& nullpoi) { virtual void SetParametersForTestStat(const RooArgSet& nullpoi) {
if( fParametersForTestStat ) delete fParametersForTestStat; if( fParametersForTestStat ) delete fParametersForTestStat;
fParametersForTestStat = (const RooArgSet*)nullpoi.snapshot(); fParametersForTestStat = (const RooArgSet*)nullpoi.snapshot();
} }
virtual void SetPdf(RooAbsPdf& pdf) { fPdf = &pdf; ClearCache(); } virtual void SetPdf(RooAbsPdf& pdf) { fPdf = &pdf; ClearCache(); }
// How to randomize the prior. Set to NULL to deactivate randomizatio n. // How to randomize the prior. Set to NULL to deactivate randomizatio n.
virtual void SetPriorNuisance(RooAbsPdf* pdf) { fPriorNuisance = pdf; virtual void SetPriorNuisance(RooAbsPdf* pdf) {
} fPriorNuisance = pdf;
if (fNuisanceParametersSampler) {
delete fNuisanceParametersSampler;
fNuisanceParametersSampler = NULL;
}
}
// specify the nuisance parameters (eg. the rest of the parameters) // specify the nuisance parameters (eg. the rest of the parameters)
virtual void SetNuisanceParameters(const RooArgSet& np) { fNuisancePa rs = &np; } virtual void SetNuisanceParameters(const RooArgSet& np) { fNuisancePa rs = &np; }
// specify the observables in the dataset (needed to evaluate the tes t statistic) // specify the observables in the dataset (needed to evaluate the tes t statistic)
virtual void SetObservables(const RooArgSet& o) { fObservables = &o; } virtual void SetObservables(const RooArgSet& o) { fObservables = &o; }
// specify the conditional observables // specify the conditional observables
virtual void SetGlobalObservables(const RooArgSet& o) { fGlobalObserv ables = &o; } virtual void SetGlobalObservables(const RooArgSet& o) { fGlobalObserv ables = &o; }
// set the size of the test (rate of Type I error) ( Eg. 0.05 for a 9 5% Confidence Interval) // set the size of the test (rate of Type I error) ( Eg. 0.05 for a 9 5% Confidence Interval)
virtual void SetTestSize(Double_t size) { fSize = size; } virtual void SetTestSize(Double_t size) { fSize = size; }
// set the confidence level for the interval (eg. 0.95 for a 95% Conf idence Interval) // set the confidence level for the interval (eg. 0.95 for a 95% Conf idence Interval)
 End of changes. 3 change blocks. 
5 lines changed or deleted 10 lines changed or added


 mmalloc.h   mmalloc.h 
/* @(#)root/clib:$Id: mmalloc.h 20882 2007-11-19 11:31:26Z rdm $ */ /* @(#)root/clib:$Id: mmalloc.h 45875 2012-09-05 20:37:53Z rdm $ */
/* Author: */ /* Author: */
/************************************************************************* /*************************************************************************
* 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
#endif #endif
#ifdef R__HAVE_STDDEF_H #ifdef R__HAVE_STDDEF_H
# include <stddef.h> # include <stddef.h>
#endif #endif
#define PTR void * #define PTR void *
#define PARAMS(paramlist) paramlist #define PARAMS(paramlist) paramlist
#ifdef WIN32 #ifdef WIN32
/* problem with VC++ 6.0 if extern "C". It does not like the return type */
extern struct mstats mmstats PARAMS ((PTR)); extern struct mstats mmstats PARAMS ((PTR));
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/* Allocate SIZE bytes of memory. */ /* Allocate SIZE bytes of memory. */
extern PTR mmalloc PARAMS ((PTR, size_t)); extern PTR mmalloc PARAMS ((PTR, size_t));
skipping to change at line 70 skipping to change at line 69
extern PTR mmemalign PARAMS ((PTR, size_t, size_t)); extern PTR mmemalign PARAMS ((PTR, size_t, size_t));
/* Allocate SIZE bytes on a page boundary. */ /* Allocate SIZE bytes on a page boundary. */
extern PTR mvalloc PARAMS ((PTR, size_t)); extern PTR mvalloc PARAMS ((PTR, size_t));
/* Activate a standard collection of debugging hooks. */ /* Activate a standard collection of debugging hooks. */
extern int mmcheck PARAMS ((PTR, void (*) (void))); extern int mmcheck PARAMS ((PTR, void (*) (void)));
/* Pick up the current statistics. (see FIXME elsewhere) */ /* Pick up the current statistics is no longer supported via mmstats. (see
#ifndef WIN32 FIXME elsewhere) */
extern struct mstats mmstats PARAMS ((PTR)); /* This cause a problem with VC++ (warning C4190) if extern "C" and with cl
#endif ang:
include/mmalloc.h:73:25: warning: 'mmstats' has C-linkage specified, but re
turns user-defined type 'struct mstats' which is incompatible with C [-Wret
urn-type-c-linkage]
This is because mstats is only (intentionally see the FIXME) declared in
mmprivate.h
and C (or just VC++ and clang in extern "C" mode) requires the struct to
be fully
declared before it is used (likely so that it can know whether it is a P
OD or not).
Since mmprivate.h first include mmalloc.h, even including expliclty mmpr
ivate.h
we still can not get in a position where struct mstats is fully declared
before
the next line is parsed ... Since the FIXME in mmprivate.h says that any
how
the data should not be provided using this struct mstats ... we just com
ment
this comment it out.
*/
// extern struct mstats mmstats PARAMS ((PTR));
#ifndef WIN32 #ifndef WIN32
extern PTR mmalloc_attach PARAMS ((int, PTR, int)); extern PTR mmalloc_attach PARAMS ((int, PTR, int));
#else #else
extern PTR mmalloc_attach PARAMS ((HANDLE, PTR, int)); extern PTR mmalloc_attach PARAMS ((HANDLE, PTR, int));
#endif #endif
extern PTR mmalloc_detach PARAMS ((PTR)); extern PTR mmalloc_detach PARAMS ((PTR));
extern int mmalloc_update_mapping PARAMS ((PTR)); extern int mmalloc_update_mapping PARAMS ((PTR));
 End of changes. 3 change blocks. 
6 lines changed or deleted 25 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/