diff --git a/roofit/histfactory/src/FlexibleInterpVar.cxx b/roofit/histfactory/src/FlexibleInterpVar.cxx index 44e8db6347a98..8c8790cef061f 100644 --- a/roofit/histfactory/src/FlexibleInterpVar.cxx +++ b/roofit/histfactory/src/FlexibleInterpVar.cxx @@ -22,7 +22,6 @@ #include "HistFactoryInterpolationCodeUtils.h" -#include #include diff --git a/roofit/histfactory/src/PiecewiseInterpolation.cxx b/roofit/histfactory/src/PiecewiseInterpolation.cxx index 77188f99eb477..00278203c4046 100644 --- a/roofit/histfactory/src/PiecewiseInterpolation.cxx +++ b/roofit/histfactory/src/PiecewiseInterpolation.cxx @@ -42,7 +42,6 @@ #include "HistFactoryInterpolationCodeUtils.h" -#include "Riostream.h" #include "TBuffer.h" #include "RooAbsReal.h" diff --git a/roofit/roofit/src/RooBCPEffDecay.cxx b/roofit/roofit/src/RooBCPEffDecay.cxx index 5bff2fc361bf5..2280073666d31 100644 --- a/roofit/roofit/src/RooBCPEffDecay.cxx +++ b/roofit/roofit/src/RooBCPEffDecay.cxx @@ -22,7 +22,6 @@ This function can be analytically convolved with any RooResolutionModel implemen */ -#include "Riostream.h" #include "RooRealVar.h" #include "RooRandom.h" #include "RooBCPEffDecay.h" diff --git a/roofit/roofit/src/RooBDecay.cxx b/roofit/roofit/src/RooBDecay.cxx index 2d2705286cb3d..01003d6241cdb 100644 --- a/roofit/roofit/src/RooBDecay.cxx +++ b/roofit/roofit/src/RooBDecay.cxx @@ -24,8 +24,6 @@ of CP violation, mixing and life time differences. This function can be analytically convolved with any RooResolutionModel implementation. **/ -#include "Riostream.h" -#include "TMath.h" #include "RooBDecay.h" #include "RooRealVar.h" #include "RooRandom.h" diff --git a/roofit/roofit/src/RooBMixDecay.cxx b/roofit/roofit/src/RooBMixDecay.cxx index 4197a60f7df4b..dc5c7ecb3e834 100644 --- a/roofit/roofit/src/RooBMixDecay.cxx +++ b/roofit/roofit/src/RooBMixDecay.cxx @@ -22,8 +22,6 @@ the decay of B mesons with the effects of B0/B0bar mixing. This function can be analytically convolved with any RooResolutionModel implementation **/ -#include "Riostream.h" -#include "TMath.h" #include "RooRealVar.h" #include "RooBMixDecay.h" #include "RooRealIntegral.h" diff --git a/roofit/roofit/src/RooBreitWigner.cxx b/roofit/roofit/src/RooBreitWigner.cxx index 94275433d1b0e..13c1877f60fa0 100644 --- a/roofit/roofit/src/RooBreitWigner.cxx +++ b/roofit/roofit/src/RooBreitWigner.cxx @@ -22,7 +22,6 @@ Class RooBreitWigner is a RooAbsPdf implementation that models a non-relativistic Breit-Wigner shape **/ -#include "Riostream.h" #include #include "RooBreitWigner.h" diff --git a/roofit/roofit/src/RooCFunction1Binding.cxx b/roofit/roofit/src/RooCFunction1Binding.cxx index 2f6dbc075e0d9..a73530da02f28 100644 --- a/roofit/roofit/src/RooCFunction1Binding.cxx +++ b/roofit/roofit/src/RooCFunction1Binding.cxx @@ -22,7 +22,6 @@ class cannot be persisted in a RooWorkspace without registering the function pointer first using RooCFunction1Binding::register(). **/ -#include "Riostream.h" #include "RooCFunction1Binding.h" diff --git a/roofit/roofit/src/RooCFunction2Binding.cxx b/roofit/roofit/src/RooCFunction2Binding.cxx index d88ebcb6eb92e..58e35567c73b8 100644 --- a/roofit/roofit/src/RooCFunction2Binding.cxx +++ b/roofit/roofit/src/RooCFunction2Binding.cxx @@ -22,7 +22,6 @@ class cannot be persisted in a RooWorkspace without registering the function pointer first using RooCFunction2Binding::register(). **/ -#include "Riostream.h" #include "RooCFunction2Binding.h" diff --git a/roofit/roofit/src/RooCFunction3Binding.cxx b/roofit/roofit/src/RooCFunction3Binding.cxx index cc87ec2586364..2975b41da3600 100644 --- a/roofit/roofit/src/RooCFunction3Binding.cxx +++ b/roofit/roofit/src/RooCFunction3Binding.cxx @@ -22,7 +22,6 @@ class cannot be persisted in a RooWorkspace without registering the function pointer first using RooCFunction3Binding::register(). **/ -#include "Riostream.h" #include "RooCFunction3Binding.h" diff --git a/roofit/roofit/src/RooCFunction4Binding.cxx b/roofit/roofit/src/RooCFunction4Binding.cxx index c98c3bebdba61..d1349bb436efd 100644 --- a/roofit/roofit/src/RooCFunction4Binding.cxx +++ b/roofit/roofit/src/RooCFunction4Binding.cxx @@ -22,7 +22,6 @@ class cannot be persisted in a RooWorkspace without registering the function pointer first using RooCFunction4Binding::register(). **/ -#include "Riostream.h" #include "RooCFunction4Binding.h" diff --git a/roofit/roofit/src/RooChi2MCSModule.cxx b/roofit/roofit/src/RooChi2MCSModule.cxx index f8bdfe08e544f..6631b7f9904ef 100644 --- a/roofit/roofit/src/RooChi2MCSModule.cxx +++ b/roofit/roofit/src/RooChi2MCSModule.cxx @@ -24,8 +24,6 @@ the number of degrees of freedom and the probability of the chi-squared is store in the summary dataset. **/ -#include "Riostream.h" - #include "RooAbsPdf.h" #include "RooDataSet.h" #include "RooRealVar.h" diff --git a/roofit/roofit/src/RooFunctor1DBinding.cxx b/roofit/roofit/src/RooFunctor1DBinding.cxx index a2f557a5af3da..957471a4b2c68 100644 --- a/roofit/roofit/src/RooFunctor1DBinding.cxx +++ b/roofit/roofit/src/RooFunctor1DBinding.cxx @@ -26,7 +26,6 @@ pointer first using RooCFunction1Binding::register(). \ingroup Roofit **/ -#include "Riostream.h" #include "RooFunctor1DBinding.h" using std::ostream; diff --git a/roofit/roofit/src/RooFunctorBinding.cxx b/roofit/roofit/src/RooFunctorBinding.cxx index 1b6c0127239f2..935b6d38ddaa6 100644 --- a/roofit/roofit/src/RooFunctorBinding.cxx +++ b/roofit/roofit/src/RooFunctorBinding.cxx @@ -39,8 +39,8 @@ class cannot be persisted in a RooWorkspace without registering the function pointer first using RooCFunction1Binding::register(). **/ -#include "Riostream.h" #include "RooFunctorBinding.h" +#include using std::endl, std::ostream, std::string; diff --git a/roofit/roofit/src/RooGaussModel.cxx b/roofit/roofit/src/RooGaussModel.cxx index 6e14797c0d538..d83a55025df94 100644 --- a/roofit/roofit/src/RooGaussModel.cxx +++ b/roofit/roofit/src/RooGaussModel.cxx @@ -23,7 +23,6 @@ for analytical convolutions with classes inheriting from RooAbsAnaConvPdf **/ #include "TMath.h" -#include "Riostream.h" #include "RooGaussModel.h" #include "RooMath.h" #include "RooRealConstant.h" diff --git a/roofit/roofit/src/RooIntegralMorph.cxx b/roofit/roofit/src/RooIntegralMorph.cxx index 65ed26ac66cb7..d92b92c25c01e 100644 --- a/roofit/roofit/src/RooIntegralMorph.cxx +++ b/roofit/roofit/src/RooIntegralMorph.cxx @@ -79,15 +79,12 @@ in calculation speed. **/ -#include "Riostream.h" - #include "RooIntegralMorph.h" #include "RooAbsCategory.h" #include "RooBrentRootFinder.h" #include "RooAbsFunc.h" #include "RooRealVar.h" #include "RooDataHist.h" -#include "TH1.h" using std::flush, std::endl; diff --git a/roofit/roofit/src/RooLagrangianMorphFunc.cxx b/roofit/roofit/src/RooLagrangianMorphFunc.cxx index b7a5807f3d346..4bdbc63796888 100644 --- a/roofit/roofit/src/RooLagrangianMorphFunc.cxx +++ b/roofit/roofit/src/RooLagrangianMorphFunc.cxx @@ -34,8 +34,6 @@ describe the same process or not. // #define USE_UBLAS 1 // #undef USE_UBLAS -#include "Riostream.h" - #include "RooAbsCollection.h" #include "RooArgList.h" #include "RooArgProxy.h" @@ -71,7 +69,6 @@ describe the same process or not. #include #include #include -#include using std::string, std::make_unique, std::vector; diff --git a/roofit/roofit/src/RooMathCoreReg.cxx b/roofit/roofit/src/RooMathCoreReg.cxx index 304c79f21be43..3bd7c6a8bdf7f 100644 --- a/roofit/roofit/src/RooMathCoreReg.cxx +++ b/roofit/roofit/src/RooMathCoreReg.cxx @@ -15,7 +15,6 @@ **/ -#include "Riostream.h" #include "RooMathCoreReg.h" #include "RooCFunction1Binding.h" #include "RooCFunction2Binding.h" diff --git a/roofit/roofit/src/RooMomentMorph.cxx b/roofit/roofit/src/RooMomentMorph.cxx index dd83dedbded18..9a3e2ac33af39 100644 --- a/roofit/roofit/src/RooMomentMorph.cxx +++ b/roofit/roofit/src/RooMomentMorph.cxx @@ -13,10 +13,7 @@ **/ -#include "Riostream.h" - #include "RooMomentMorph.h" -#include "RooAbsCategory.h" #include "RooRealConstant.h" #include "RooRealVar.h" #include "RooFormulaVar.h" @@ -28,8 +25,6 @@ #include "RooChangeTracker.h" #include "TMath.h" -#include "TH1.h" - //////////////////////////////////////////////////////////////////////////////// /// coverity[UNINIT_CTOR] diff --git a/roofit/roofit/src/RooMomentMorphFunc.cxx b/roofit/roofit/src/RooMomentMorphFunc.cxx index 710d25a58f4d6..2dc53a0c40152 100644 --- a/roofit/roofit/src/RooMomentMorphFunc.cxx +++ b/roofit/roofit/src/RooMomentMorphFunc.cxx @@ -13,10 +13,7 @@ **/ -#include "Riostream.h" - #include "RooMomentMorphFunc.h" -#include "RooAbsCategory.h" #include "RooRealConstant.h" #include "RooRealVar.h" #include "RooFormulaVar.h" @@ -28,7 +25,6 @@ #include "RooChangeTracker.h" #include "TMath.h" -#include "TH1.h" using std::string, std::vector; diff --git a/roofit/roofit/src/RooMomentMorphFuncND.cxx b/roofit/roofit/src/RooMomentMorphFuncND.cxx index 0a992d308e3c8..dc1b23ddfdafd 100644 --- a/roofit/roofit/src/RooMomentMorphFuncND.cxx +++ b/roofit/roofit/src/RooMomentMorphFuncND.cxx @@ -31,13 +31,10 @@ #include "RooFit/Detail/Algorithms.h" -#include - #include #include #include -#include #include using std::string, std::vector; diff --git a/roofit/roofit/src/RooNonCPEigenDecay.cxx b/roofit/roofit/src/RooNonCPEigenDecay.cxx index 0d6ae2a1c3432..7f165c5898d45 100644 --- a/roofit/roofit/src/RooNonCPEigenDecay.cxx +++ b/roofit/roofit/src/RooNonCPEigenDecay.cxx @@ -43,11 +43,9 @@ get the parameters used here you have to change the sign of both where Q denotes the charge of the \f$\rho\f$ meson. **/ -#include "Riostream.h" #include "RooRealVar.h" #include "RooRandom.h" #include "RooNonCPEigenDecay.h" -#include "TMath.h" #include "RooRealIntegral.h" diff --git a/roofit/roofit/src/RooTFnBinding.cxx b/roofit/roofit/src/RooTFnBinding.cxx index 8fe4962446d68..63d4add624b15 100644 --- a/roofit/roofit/src/RooTFnBinding.cxx +++ b/roofit/roofit/src/RooTFnBinding.cxx @@ -15,8 +15,6 @@ functions RooFit::bindFunction(). **/ -#include "Riostream.h" - #include "RooTFnBinding.h" #include "TF3.h" diff --git a/roofit/roofit/src/RooTFnPdfBinding.cxx b/roofit/roofit/src/RooTFnPdfBinding.cxx index 74c6f877cf82c..ba217c1899d8e 100644 --- a/roofit/roofit/src/RooTFnPdfBinding.cxx +++ b/roofit/roofit/src/RooTFnPdfBinding.cxx @@ -13,10 +13,7 @@ **/ -#include "Riostream.h" - #include "RooTFnPdfBinding.h" -#include "RooAbsCategory.h" #include "TF3.h" using std::ostream; diff --git a/roofit/roofit/src/RooTMathReg.cxx b/roofit/roofit/src/RooTMathReg.cxx index e678cce47c973..c673b1177abbc 100644 --- a/roofit/roofit/src/RooTMathReg.cxx +++ b/roofit/roofit/src/RooTMathReg.cxx @@ -15,7 +15,6 @@ **/ -#include "Riostream.h" #include "RooTMathReg.h" #include "RooCFunction1Binding.h" #include "RooCFunction2Binding.h" diff --git a/roofit/roofitcore/inc/RooAbsSelfCachedReal.h b/roofit/roofitcore/inc/RooAbsSelfCachedReal.h index 8de58a75e22bb..284063089a2e1 100644 --- a/roofit/roofitcore/inc/RooAbsSelfCachedReal.h +++ b/roofit/roofitcore/inc/RooAbsSelfCachedReal.h @@ -36,8 +36,6 @@ input. #include #include -#include - template class RooAbsSelfCached : public Base_t { public: diff --git a/roofit/roofitcore/src/RooAbsAnaConvPdf.cxx b/roofit/roofitcore/src/RooAbsAnaConvPdf.cxx index 3de92c7878e8d..f59d2612e9b1d 100644 --- a/roofit/roofitcore/src/RooAbsAnaConvPdf.cxx +++ b/roofit/roofitcore/src/RooAbsAnaConvPdf.cxx @@ -99,7 +99,6 @@ #include "RooFit/Detail/RooNormalizedPdf.h" #include "RooMsgService.h" -#include "Riostream.h" #include "RooResolutionModel.h" #include "RooRealVar.h" #include "RooFormulaVar.h" diff --git a/roofit/roofitcore/src/RooAbsBinning.cxx b/roofit/roofitcore/src/RooAbsBinning.cxx index ff5900f0d2ed6..edac2808d7ce2 100644 --- a/roofit/roofitcore/src/RooAbsBinning.cxx +++ b/roofit/roofitcore/src/RooAbsBinning.cxx @@ -31,13 +31,11 @@ This class defines the interface to retrieve bin boundaries, ranges etc. #include "TBuffer.h" #include "TClass.h" -#include "Riostream.h" +#include using std::ostream; - - //////////////////////////////////////////////////////////////////////////////// /// Print binning name diff --git a/roofit/roofitcore/src/RooAbsCachedReal.cxx b/roofit/roofitcore/src/RooAbsCachedReal.cxx index e37486296e4fb..93c0fe1f51577 100644 --- a/roofit/roofitcore/src/RooAbsCachedReal.cxx +++ b/roofit/roofitcore/src/RooAbsCachedReal.cxx @@ -28,8 +28,9 @@ by the user to getVal() and on which parameters need to be tracked for changes to trigger a refilling of the cache histogram. **/ -#include "Riostream.h" -using std::string, std::endl, std::ostream; +#include +#include + using std::string, std::endl, std::ostream; #include "TString.h" #include "RooAbsCachedReal.h" @@ -40,19 +41,13 @@ using std::string, std::endl, std::ostream; #include "RooChangeTracker.h" #include "RooExpensiveObjectCache.h" - - - //////////////////////////////////////////////////////////////////////////////// /// Constructor -RooAbsCachedReal::RooAbsCachedReal(const char *name, const char *title, Int_t ipOrder) : - RooAbsReal(name,title), - _cacheMgr(this,10), - _ipOrder(ipOrder), - _disableCache(false) - { - } +RooAbsCachedReal::RooAbsCachedReal(const char *name, const char *title, Int_t ipOrder) + : RooAbsReal(name, title), _cacheMgr(this, 10), _ipOrder(ipOrder), _disableCache(false) +{ +} diff --git a/roofit/roofitcore/src/RooAbsGenContext.cxx b/roofit/roofitcore/src/RooAbsGenContext.cxx index c3865cbf785d5..eaf57be38b177 100644 --- a/roofit/roofitcore/src/RooAbsGenContext.cxx +++ b/roofit/roofitcore/src/RooAbsGenContext.cxx @@ -34,8 +34,7 @@ prototype data etc.. #include "RooMsgService.h" #include "RooGlobalFunc.h" -#include "Riostream.h" - +#include using std::ostream; diff --git a/roofit/roofitcore/src/RooAbsHiddenReal.cxx b/roofit/roofitcore/src/RooAbsHiddenReal.cxx index 6981e6a2da76e..c3888cc17b6f1 100644 --- a/roofit/roofitcore/src/RooAbsHiddenReal.cxx +++ b/roofit/roofitcore/src/RooAbsHiddenReal.cxx @@ -26,13 +26,12 @@ printing methods with versions that do not reveal the objects value and it has a protected version of getVal() **/ -#include "Riostream.h" - -#include "RooArgSet.h" #include "RooAbsHiddenReal.h" #include "RooCategory.h" #include "RooMsgService.h" +#include + using std::ostream, std::istream, std::endl; diff --git a/roofit/roofitcore/src/RooAbsIntegrator.cxx b/roofit/roofitcore/src/RooAbsIntegrator.cxx index 8b21f1c18ae28..44194c0e36b81 100644 --- a/roofit/roofitcore/src/RooAbsIntegrator.cxx +++ b/roofit/roofitcore/src/RooAbsIntegrator.cxx @@ -23,11 +23,10 @@ Abstract interface for integrators of real-valued functions that implement the RooAbsFunc interface. **/ -#include "Riostream.h" - #include "RooAbsIntegrator.h" #include "RooMsgService.h" -#include "TClass.h" + +#include using std::endl; diff --git a/roofit/roofitcore/src/RooAbsMoment.cxx b/roofit/roofitcore/src/RooAbsMoment.cxx index 3433f09a5a71c..e393b8098b8ca 100644 --- a/roofit/roofitcore/src/RooAbsMoment.cxx +++ b/roofit/roofitcore/src/RooAbsMoment.cxx @@ -23,12 +23,6 @@ #include #include -#include - -#include -#include - - //////////////////////////////////////////////////////////////////////////////// RooAbsMoment::RooAbsMoment(const char* name, const char* title, RooAbsReal& func, RooRealVar& x, Int_t orderIn, bool takeRoot) : diff --git a/roofit/roofitcore/src/RooAbsNumGenerator.cxx b/roofit/roofitcore/src/RooAbsNumGenerator.cxx index b18745a3557a5..0d220bf43ad4c 100644 --- a/roofit/roofitcore/src/RooAbsNumGenerator.cxx +++ b/roofit/roofitcore/src/RooAbsNumGenerator.cxx @@ -25,20 +25,18 @@ Abstract base class for MC event generator implementations like RooAcceptReject and RooFoam **/ -#include "Riostream.h" - #include "RooAbsNumGenerator.h" #include "RooAbsReal.h" #include "RooCategory.h" #include "RooRealVar.h" #include "RooDataSet.h" -#include "RooRandom.h" #include "RooErrorHandler.h" #include "RooMsgService.h" #include "RooRealBinding.h" #include +#include using std::endl; diff --git a/roofit/roofitcore/src/RooAbsOptTestStatistic.cxx b/roofit/roofitcore/src/RooAbsOptTestStatistic.cxx index 3870ec8fca329..fd7c55788a3cb 100644 --- a/roofit/roofitcore/src/RooAbsOptTestStatistic.cxx +++ b/roofit/roofitcore/src/RooAbsOptTestStatistic.cxx @@ -39,18 +39,12 @@ parallelized calculation of test statistics. #include "RooAbsOptTestStatistic.h" -#include "Riostream.h" -#include "TClass.h" -#include - #include "RooAbsData.h" #include "RooAbsDataStore.h" #include "RooAbsPdf.h" -#include "RooAddPdf.h" #include "RooArgSet.h" #include "RooBinSamplingPdf.h" #include "RooBinning.h" -#include "RooCategory.h" #include "RooDataHist.h" #include "RooDataSet.h" #include "RooErrorHandler.h" @@ -59,12 +53,14 @@ parallelized calculation of test statistics. #include "RooMsgService.h" #include "RooProdPdf.h" #include "RooProduct.h" -#include "RooRealSumPdf.h" #include "RooRealVar.h" #include "RooVectorDataStore.h" #include "ROOT/StringUtils.hxx" +#include +#include + using std::ostream; //////////////////////////////////////////////////////////////////////////////// diff --git a/roofit/roofitcore/src/RooAbsProxy.cxx b/roofit/roofitcore/src/RooAbsProxy.cxx index b3fb4e9cacdad..fa1d1d0a7f6a6 100644 --- a/roofit/roofitcore/src/RooAbsProxy.cxx +++ b/roofit/roofitcore/src/RooAbsProxy.cxx @@ -14,10 +14,11 @@ * listed in LICENSE (http://roofit.sourceforge.net/license.txt) * *****************************************************************************/ -#include "Riostream.h" #include "RooAbsProxy.h" #include "RooArgSet.h" +#include + /** \file RooAbsProxy.cxx \class RooAbsProxy diff --git a/roofit/roofitcore/src/RooAbsStudy.cxx b/roofit/roofitcore/src/RooAbsStudy.cxx index 19727444ba4cb..1a8845ff15f81 100644 --- a/roofit/roofitcore/src/RooAbsStudy.cxx +++ b/roofit/roofitcore/src/RooAbsStudy.cxx @@ -23,13 +23,13 @@ Abstract base class for RooStudyManager modules **/ -#include "Riostream.h" - #include "RooAbsStudy.h" #include "RooMsgService.h" #include "RooDataSet.h" #include "TList.h" +#include + using std::endl; diff --git a/roofit/roofitcore/src/RooAcceptReject.cxx b/roofit/roofitcore/src/RooAcceptReject.cxx index 40bcafb65d3fc..92e6d77d28ab3 100644 --- a/roofit/roofitcore/src/RooAcceptReject.cxx +++ b/roofit/roofitcore/src/RooAcceptReject.cxx @@ -28,24 +28,18 @@ classes to take care of generation of observables for which p.d.fs do not define internal methods **/ -#include "Riostream.h" - #include "RooAcceptReject.h" #include "RooAbsReal.h" #include "RooCategory.h" #include "RooRealVar.h" #include "RooDataSet.h" #include "RooRandom.h" -#include "RooErrorHandler.h" #include "RooPrintable.h" #include "RooMsgService.h" #include "RooRealBinding.h" #include "RooNumGenFactory.h" #include "RooNumGenConfig.h" -#include "TFoam.h" -#include "TNamed.h" - #include diff --git a/roofit/roofitcore/src/RooAdaptiveIntegratorND.cxx b/roofit/roofitcore/src/RooAdaptiveIntegratorND.cxx index 353bc70dcad56..0bf4a20339754 100644 --- a/roofit/roofitcore/src/RooAdaptiveIntegratorND.cxx +++ b/roofit/roofitcore/src/RooAdaptiveIntegratorND.cxx @@ -24,21 +24,18 @@ Adaptive one-dimensional numerical integration algorithm. **/ - -#include "Riostream.h" - -#include "TClass.h" #include "RooAdaptiveIntegratorND.h" #include "RooFunctor.h" #include "RooArgSet.h" #include "RooRealVar.h" -#include "RooNumber.h" #include "RooMsgService.h" #include "RooNumIntFactory.h" #include "Math/AdaptiveIntegratorMultiDim.h" #include "Math/Functor.h" #include +#include +#include using std::endl, std::string; diff --git a/roofit/roofitcore/src/RooAddGenContext.cxx b/roofit/roofitcore/src/RooAddGenContext.cxx index d41fdfec03bd2..093970730fe78 100644 --- a/roofit/roofitcore/src/RooAddGenContext.cxx +++ b/roofit/roofitcore/src/RooAddGenContext.cxx @@ -29,17 +29,12 @@ with a probability proportional to its associated coefficient. #include "RooAddGenContext.h" -#include "Riostream.h" -#include "TClass.h" - #include "RooDataSet.h" #include "RooRandom.h" #include - - //////////////////////////////////////////////////////////////////////////////// /// Constructor diff --git a/roofit/roofitcore/src/RooAddition.cxx b/roofit/roofitcore/src/RooAddition.cxx index b2cdf90911c81..de750ae6bd532 100644 --- a/roofit/roofitcore/src/RooAddition.cxx +++ b/roofit/roofitcore/src/RooAddition.cxx @@ -24,10 +24,7 @@ when constructed with two sets, it sums the product of the terms in the two sets. **/ - -#include "Riostream.h" #include "RooAddition.h" -#include "RooRealSumFunc.h" #include "RooRealSumPdf.h" #include "RooProduct.h" #include "RooErrorHandler.h" @@ -42,10 +39,7 @@ in the two sets. #include "RooChi2Var.h" #endif -#include -#include - - +#include //////////////////////////////////////////////////////////////////////////////// /// Constructor with a single set consisting of RooAbsReal. diff --git a/roofit/roofitcore/src/RooBinnedGenContext.cxx b/roofit/roofitcore/src/RooBinnedGenContext.cxx index e844a59dc6148..293f4d36c10ab 100644 --- a/roofit/roofitcore/src/RooBinnedGenContext.cxx +++ b/roofit/roofitcore/src/RooBinnedGenContext.cxx @@ -22,9 +22,6 @@ Efficient implementation of the generator context specific for binned pdfs. **/ -#include "Riostream.h" - - #include "RooMsgService.h" #include "RooBinnedGenContext.h" #include "RooAbsPdf.h" @@ -33,8 +30,10 @@ Efficient implementation of the generator context specific for binned pdfs. #include "RooDataSet.h" #include "RooRandom.h" -using std::endl, std::vector, std::ostream; +#include +#include +using std::endl, std::vector, std::ostream; //////////////////////////////////////////////////////////////////////////////// diff --git a/roofit/roofitcore/src/RooBinning.cxx b/roofit/roofitcore/src/RooBinning.cxx index 5b5a70cfb246f..07581997450ed 100644 --- a/roofit/roofitcore/src/RooBinning.cxx +++ b/roofit/roofitcore/src/RooBinning.cxx @@ -26,7 +26,6 @@ the user to add single bin boundaries, mirrored pairs, or sets of uniformly spaced boundaries. **/ -#include #include #include #include @@ -41,6 +40,7 @@ uniformly spaced boundaries. #include #include +#include using std::endl; diff --git a/roofit/roofitcore/src/RooBinningCategory.cxx b/roofit/roofitcore/src/RooBinningCategory.cxx index 508c0ab900535..3a8a18b021aad 100644 --- a/roofit/roofitcore/src/RooBinningCategory.cxx +++ b/roofit/roofitcore/src/RooBinningCategory.cxx @@ -28,9 +28,7 @@ the inputVar. The name of this binning is passed in the constructor. #include "RooBinningCategory.h" -#include "Riostream.h" -#include "RooStreamParser.h" - +#include //////////////////////////////////////////////////////////////////////////////// /// Constructor with input function to be mapped and name and index of default diff --git a/roofit/roofitcore/src/RooBrentRootFinder.cxx b/roofit/roofitcore/src/RooBrentRootFinder.cxx index 0f422a0fab2fb..5aead43d9055b 100644 --- a/roofit/roofitcore/src/RooBrentRootFinder.cxx +++ b/roofit/roofitcore/src/RooBrentRootFinder.cxx @@ -26,10 +26,11 @@ in the GNU scientific library (v0.99). #include "RooBrentRootFinder.h" #include "RooAbsFunc.h" -#include -#include "Riostream.h" #include "RooMsgService.h" +#include +#include + using std::endl; diff --git a/roofit/roofitcore/src/RooCachedPdf.cxx b/roofit/roofitcore/src/RooCachedPdf.cxx index 7d344fb6a71bc..fe3a67ef6256a 100644 --- a/roofit/roofitcore/src/RooCachedPdf.cxx +++ b/roofit/roofitcore/src/RooCachedPdf.cxx @@ -18,8 +18,6 @@ Implementation of RooAbsCachedPdf that can cache any external RooAbsPdf input function provided in the constructor. **/ -#include "Riostream.h" - #include "RooAbsPdf.h" #include "RooCachedPdf.h" #include "RooAbsReal.h" @@ -29,7 +27,7 @@ any external RooAbsPdf input function provided in the constructor. using std::endl; - +#include //////////////////////////////////////////////////////////////////////////////// /// Constructor taking name, title and function to be cached. To control diff --git a/roofit/roofitcore/src/RooCachedReal.cxx b/roofit/roofitcore/src/RooCachedReal.cxx index 00c1f98c1e917..94ce2cbbb4319 100644 --- a/roofit/roofitcore/src/RooCachedReal.cxx +++ b/roofit/roofitcore/src/RooCachedReal.cxx @@ -18,8 +18,6 @@ Implementation of RooAbsCachedReal that can cache any external RooAbsReal input function provided in the constructor. **/ -#include "Riostream.h" - #include "RooAbsPdf.h" #include "RooCachedReal.h" #include "RooAbsReal.h" @@ -29,25 +27,21 @@ any external RooAbsReal input function provided in the constructor. #include "RooHistPdf.h" #include "RooChangeTracker.h" -using std::endl; - +#include +using std::endl; //////////////////////////////////////////////////////////////////////////////// /// Constructor taking name, title and function to be cached. To control /// granularity of the binning of the cache histogram set the desired properties /// in the binning named "cache" in the observables of the function -RooCachedReal::RooCachedReal(const char *name, const char *title, RooAbsReal& _func) : - RooAbsCachedReal(name,title), - func("func","func",this,_func), - _useCdfBoundaries(false), - _cacheSource(false) - { +RooCachedReal::RooCachedReal(const char *name, const char *title, RooAbsReal &_func) + : RooAbsCachedReal(name, title), func("func", "func", this, _func), _useCdfBoundaries(false), _cacheSource(false) +{ // Choose same expensive object cache as input function setExpensiveObjectCache(_func.expensiveObjectCache()) ; - } - +} diff --git a/roofit/roofitcore/src/RooChangeTracker.cxx b/roofit/roofitcore/src/RooChangeTracker.cxx index 9c3b418f2af23..e59bfe9071775 100644 --- a/roofit/roofitcore/src/RooChangeTracker.cxx +++ b/roofit/roofitcore/src/RooChangeTracker.cxx @@ -30,15 +30,10 @@ observable propagates a valueDirty flag when an event is loaded even though usually only one observable actually changes. **/ - -#include "Riostream.h" -#include - #include "RooChangeTracker.h" #include "RooAbsReal.h" #include "RooAbsCategory.h" #include "RooArgSet.h" -#include "RooMsgService.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/roofit/roofitcore/src/RooChi2Var.cxx b/roofit/roofitcore/src/RooChi2Var.cxx index 89020e32ece56..9161d79ca63a2 100644 --- a/roofit/roofitcore/src/RooChi2Var.cxx +++ b/roofit/roofitcore/src/RooChi2Var.cxx @@ -23,15 +23,13 @@ #include "RooAbsPdf.h" #include "RooCmdConfig.h" #include "RooMsgService.h" - -#include "Riostream.h" -#include "TClass.h" - #include "RooRealVar.h" #include "RooAbsDataStore.h" #include +#include + RooChi2Var::RooChi2Var(const char *name, const char *title, RooAbsReal &func, RooDataHist &data, bool extended, RooDataHist::ErrorType etype, RooAbsTestStatistic::Configuration const &cfg) : RooAbsOptTestStatistic(name, title, func, data, RooArgSet{}, cfg), diff --git a/roofit/roofitcore/src/RooClassFactory.cxx b/roofit/roofitcore/src/RooClassFactory.cxx index 65e4179edc037..95c329200df77 100644 --- a/roofit/roofitcore/src/RooClassFactory.cxx +++ b/roofit/roofitcore/src/RooClassFactory.cxx @@ -601,11 +601,18 @@ void codegenImpl(CLASS_NAME &arg, CodegenContext &ctx); #include #include -#include #include #include - +#ifdef __APPLE__ +// Workaround for https://github.com/llvm/llvm-project/issues/138683 +// Include before to ensure _FilesystemClock is defined +// Can be removed once the upstream issue is fixed. +#include +#endif +#include +#include +#include CLASS_NAME::CLASS_NAME(const char *name, const char *title, )"; diff --git a/roofit/roofitcore/src/RooCmdArg.cxx b/roofit/roofitcore/src/RooCmdArg.cxx index 5783b354f716a..607218ca625e3 100644 --- a/roofit/roofitcore/src/RooCmdArg.cxx +++ b/roofit/roofitcore/src/RooCmdArg.cxx @@ -28,10 +28,7 @@ created using global helper functions defined in RooGlobalFunc.h that create and fill these generic containers **/ - - #include "RooCmdArg.h" -#include "Riostream.h" #include "RooArgSet.h" #include "RooFitImplHelpers.h" diff --git a/roofit/roofitcore/src/RooConvGenContext.cxx b/roofit/roofitcore/src/RooConvGenContext.cxx index 185c0e90352fc..9a1bd37fd6bdb 100644 --- a/roofit/roofitcore/src/RooConvGenContext.cxx +++ b/roofit/roofitcore/src/RooConvGenContext.cxx @@ -32,12 +32,11 @@ subsequently explicitly smeared with the resolution model distribution. #include "RooAbsAnaConvPdf.h" #include "RooNumConvPdf.h" #include "RooFFTConvPdf.h" -#include "RooProdPdf.h" #include "RooDataSet.h" #include "RooArgSet.h" #include "RooTruthModel.h" -#include "Riostream.h" +#include using std::ostream; diff --git a/roofit/roofitcore/src/RooCurve.cxx b/roofit/roofitcore/src/RooCurve.cxx index ee6b70e08c75c..d8d96939d4e0b 100644 --- a/roofit/roofitcore/src/RooCurve.cxx +++ b/roofit/roofitcore/src/RooCurve.cxx @@ -46,15 +46,19 @@ To retrieve a RooCurve from a RooPlot, use RooPlot::getCurve(). #include "RooProduct.h" #include "RooConstVar.h" -#include "Riostream.h" #include "TMath.h" #include "TAxis.h" #include "TMatrixD.h" #include "TVectorD.h" #include "Math/Util.h" + #include #include #include +#include +#include +#include +#include using std::ostream, std::list, std::vector, std::min; diff --git a/roofit/roofitcore/src/RooDLLSignificanceMCSModule.cxx b/roofit/roofitcore/src/RooDLLSignificanceMCSModule.cxx index f0d54faf2ceb7..4acf3f705b198 100644 --- a/roofit/roofitcore/src/RooDLLSignificanceMCSModule.cxx +++ b/roofit/roofitcore/src/RooDLLSignificanceMCSModule.cxx @@ -30,8 +30,6 @@ on underlying normal sampling distributions and a MC study is a good way to test that assumption. **/ -#include "Riostream.h" - #include "RooDataSet.h" #include "RooRealVar.h" #include "TString.h" @@ -39,7 +37,7 @@ to test that assumption. #include "RooDLLSignificanceMCSModule.h" #include "RooMsgService.h" - +#include using std::endl; diff --git a/roofit/roofitcore/src/RooDataHist.cxx b/roofit/roofitcore/src/RooDataHist.cxx index 6eebe3f85b45f..83ead17f4a7bd 100644 --- a/roofit/roofitcore/src/RooDataHist.cxx +++ b/roofit/roofitcore/src/RooDataHist.cxx @@ -44,7 +44,6 @@ See RooAbsDataHelper, rf408_RDataFrameToRooFit.C #include "RooDataHist.h" -#include "Riostream.h" #include "RooMsgService.h" #include "RooDataHistSliceIter.h" #include "RooAbsLValue.h" @@ -72,9 +71,11 @@ See RooAbsDataHelper, rf408_RDataFrameToRooFit.C #include "TH1.h" #include "TTree.h" #include "TBuffer.h" -#include "TMath.h" #include "Math/Util.h" +#include +#include + using std::string, std::ostream; diff --git a/roofit/roofitcore/src/RooDerivative.cxx b/roofit/roofitcore/src/RooDerivative.cxx index 18ff527a65431..b6381a4803587 100644 --- a/roofit/roofitcore/src/RooDerivative.cxx +++ b/roofit/roofitcore/src/RooDerivative.cxx @@ -24,13 +24,11 @@ of any RooAbsReal as calculated (numerically) by the MathCore Richardson derivator class. **/ -#include "Riostream.h" #include #include "RooDerivative.h" #include "RooAbsReal.h" #include "RooAbsPdf.h" -#include "RooErrorHandler.h" #include "RooArgSet.h" #include "RooMsgService.h" #include "RooRealVar.h" @@ -39,8 +37,7 @@ derivator class. #include "Math/WrappedFunction.h" #include "Math/RichardsonDerivator.h" - - +#include //////////////////////////////////////////////////////////////////////////////// /// Default constructor diff --git a/roofit/roofitcore/src/RooEllipse.cxx b/roofit/roofitcore/src/RooEllipse.cxx index 86993a5e09c1f..ebe48e9e78994 100644 --- a/roofit/roofitcore/src/RooEllipse.cxx +++ b/roofit/roofitcore/src/RooEllipse.cxx @@ -26,10 +26,8 @@ Two-dimensional ellipse that can be used to represent an error contour. #include "TMath.h" #include "RooMsgService.h" -#include "Riostream.h" -#include "TClass.h" #include - +#include //////////////////////////////////////////////////////////////////////////////// /// Create a 2-dimensional ellipse centered at `(x1,x2)` that represents the confidence diff --git a/roofit/roofitcore/src/RooExtendPdf.cxx b/roofit/roofitcore/src/RooExtendPdf.cxx index 60ebfada4c233..74e5a0e6ba631 100644 --- a/roofit/roofitcore/src/RooExtendPdf.cxx +++ b/roofit/roofitcore/src/RooExtendPdf.cxx @@ -35,8 +35,6 @@ is the set of remaining dependents. the nominal integration range \f$ \mathrm{normRegion}[x] \f$. */ -#include "Riostream.h" - #include "RooArgList.h" #include "RooConstVar.h" #include "RooExtendPdf.h" @@ -51,6 +49,8 @@ the nominal integration range \f$ \mathrm{normRegion}[x] \f$. #include +#include + using std::endl; diff --git a/roofit/roofitcore/src/RooFirstMoment.cxx b/roofit/roofitcore/src/RooFirstMoment.cxx index 791ab366b85ba..3780e33d10bf9 100644 --- a/roofit/roofitcore/src/RooFirstMoment.cxx +++ b/roofit/roofitcore/src/RooFirstMoment.cxx @@ -31,9 +31,6 @@ #include #include -#include - -#include #include diff --git a/roofit/roofitcore/src/RooFormulaVar.cxx b/roofit/roofitcore/src/RooFormulaVar.cxx index ca740c48e6dc9..b12c76c2065ba 100644 --- a/roofit/roofitcore/src/RooFormulaVar.cxx +++ b/roofit/roofitcore/src/RooFormulaVar.cxx @@ -43,8 +43,6 @@ /// the names of the arguments are not hard coded. /// -#include "Riostream.h" - #include "RooFormulaVar.h" #include "RooStreamParser.h" #include "RooMsgService.h" @@ -58,6 +56,9 @@ #include "RooChi2Var.h" #endif +#include +#include + using std::ostream, std::istream, std::list; diff --git a/roofit/roofitcore/src/RooFracRemainder.cxx b/roofit/roofitcore/src/RooFracRemainder.cxx index b00bdb24b6987..19ef2a13f9eab 100644 --- a/roofit/roofitcore/src/RooFracRemainder.cxx +++ b/roofit/roofitcore/src/RooFracRemainder.cxx @@ -27,9 +27,6 @@ a constrained split **/ -#include "Riostream.h" -#include - #include "RooFracRemainder.h" #include "RooAbsReal.h" #include "RooAbsPdf.h" @@ -37,9 +34,9 @@ a constrained split #include "RooArgSet.h" #include "RooMsgService.h" -using std::endl; - +#include +using std::endl; //////////////////////////////////////////////////////////////////////////////// /// Constructor with given set of input fractions. All arguments in sumSet must be of type RooAbsReal. diff --git a/roofit/roofitcore/src/RooFunctor.cxx b/roofit/roofitcore/src/RooFunctor.cxx index 88b14f8067f7e..8f4585a2565ff 100644 --- a/roofit/roofitcore/src/RooFunctor.cxx +++ b/roofit/roofitcore/src/RooFunctor.cxx @@ -22,9 +22,6 @@ Lightweight interface adaptor that exports a RooAbsPdf as a functor. **/ - -#include "Riostream.h" - #include "RooFunctor.h" #include "RooRealBinding.h" #include "RooAbsReal.h" @@ -34,7 +31,6 @@ Lightweight interface adaptor that exports a RooAbsPdf as a functor. #include - //////////////////////////////////////////////////////////////////////////////// RooFunctor::RooFunctor(const RooAbsFunc &func) diff --git a/roofit/roofitcore/src/RooGenContext.cxx b/roofit/roofitcore/src/RooGenContext.cxx index a92ca8e227806..0de6bd4188d42 100644 --- a/roofit/roofitcore/src/RooGenContext.cxx +++ b/roofit/roofitcore/src/RooGenContext.cxx @@ -28,7 +28,6 @@ use a RooAcceptReject sampling technique. **/ #include "RooMsgService.h" -#include "Riostream.h" #include "RooGenContext.h" #include "RooAbsPdf.h" @@ -43,6 +42,8 @@ use a RooAcceptReject sampling technique. #include "TString.h" +#include +#include using std::endl, std::string, std::ostream; diff --git a/roofit/roofitcore/src/RooGenFitStudy.cxx b/roofit/roofitcore/src/RooGenFitStudy.cxx index c52083ea74a08..0ea6468ca3342 100644 --- a/roofit/roofitcore/src/RooGenFitStudy.cxx +++ b/roofit/roofitcore/src/RooGenFitStudy.cxx @@ -22,8 +22,6 @@ Abstract base class for RooStudyManager modules **/ -#include "Riostream.h" - #include "RooGenFitStudy.h" #include "RooWorkspace.h" #include "RooMsgService.h" @@ -33,7 +31,7 @@ Abstract base class for RooStudyManager modules #include "RooGlobalFunc.h" #include "RooFitResult.h" - +#include //////////////////////////////////////////////////////////////////////////////// /// Constructor diff --git a/roofit/roofitcore/src/RooGenProdProj.cxx b/roofit/roofitcore/src/RooGenProdProj.cxx index c4fa9bbb34849..de186b88f2041 100644 --- a/roofit/roofitcore/src/RooGenProdProj.cxx +++ b/roofit/roofitcore/src/RooGenProdProj.cxx @@ -32,17 +32,11 @@ Partial integrals, which factorise and can be calculated, are calculated analytically. Remaining non-factorising observables are integrated numerically. **/ - -#include "Riostream.h" -#include - #include "RooGenProdProj.h" #include "RooAbsReal.h" #include "RooAbsPdf.h" -#include "RooErrorHandler.h" #include "RooProduct.h" - //////////////////////////////////////////////////////////////////////////////// /// Constructor for a normalization projection of the product of p.d.f.s _prodSet /// integrated over _intSet in range isetRangeName while normalized over _normSet diff --git a/roofit/roofitcore/src/RooGenericPdf.cxx b/roofit/roofitcore/src/RooGenericPdf.cxx index 549c293995f1b..a5275b1d4d51b 100644 --- a/roofit/roofitcore/src/RooGenericPdf.cxx +++ b/roofit/roofitcore/src/RooGenericPdf.cxx @@ -28,8 +28,6 @@ class documentation. **/ #include "RooGenericPdf.h" -#include "Riostream.h" -#include "RooStreamParser.h" #include "RooMsgService.h" #include "RooArgList.h" #include "RooFormulaUtils.h" @@ -37,6 +35,7 @@ class documentation. #include "TFormula.h" +#include using std::istream, std::ostream, std::endl; diff --git a/roofit/roofitcore/src/RooGrid.cxx b/roofit/roofitcore/src/RooGrid.cxx index 1e2871048fcaf..ebabf9652988e 100644 --- a/roofit/roofitcore/src/RooGrid.cxx +++ b/roofit/roofitcore/src/RooGrid.cxx @@ -30,14 +30,11 @@ integration, following the VEGAS algorithm. #include "RooAbsFunc.h" #include "RooNumber.h" #include "RooRandom.h" -#include "TMath.h" #include "RooMsgService.h" #include -#include "Riostream.h" #include - - +#include //////////////////////////////////////////////////////////////////////////////// /// Constructor with given function binding diff --git a/roofit/roofitcore/src/RooHist.cxx b/roofit/roofitcore/src/RooHist.cxx index 9d12d66dc53a8..09fc2b12a6a0f 100644 --- a/roofit/roofitcore/src/RooHist.cxx +++ b/roofit/roofitcore/src/RooHist.cxx @@ -36,10 +36,9 @@ a RooPlot. #include "RooConstVar.h" #include "TH1.h" -#include "Riostream.h" -#include - +#include +#include //////////////////////////////////////////////////////////////////////////////// /// Create an empty histogram that can be filled with the addBin() diff --git a/roofit/roofitcore/src/RooHistError.cxx b/roofit/roofitcore/src/RooHistError.cxx index bc6296c8d9d63..f6299507a607d 100644 --- a/roofit/roofitcore/src/RooHistError.cxx +++ b/roofit/roofitcore/src/RooHistError.cxx @@ -30,10 +30,9 @@ a specified area of a Poisson or Binomail error distribution. #include "Math/QuantFuncMathCore.h" // ROOT::Math::chisquared_quantile, chisquared_quantile_c -#include "Riostream.h" - #include #include +#include using std::endl; diff --git a/roofit/roofitcore/src/RooHistPdf.cxx b/roofit/roofitcore/src/RooHistPdf.cxx index c2aee28ba16e2..64855f7fe3543 100644 --- a/roofit/roofitcore/src/RooHistPdf.cxx +++ b/roofit/roofitcore/src/RooHistPdf.cxx @@ -29,8 +29,6 @@ negative content, the bin contents are clipped to zero and the bin errors are ke The input histogram is not modified. **/ -#include "Riostream.h" - #include "RooCategory.h" #include "RooCurve.h" #include "RooDataHist.h" @@ -39,7 +37,6 @@ The input histogram is not modified. #include "RooHistPdf.h" #include "RooMsgService.h" #include "RooRealVar.h" -#include "RooUniformBinning.h" #include "RooWorkspace.h" #include "TError.h" @@ -47,6 +44,7 @@ The input histogram is not modified. #include #include +#include //////////////////////////////////////////////////////////////////////////////// /// Constructor from a RooDataHist. RooDataHist dimensions diff --git a/roofit/roofitcore/src/RooImproperIntegrator1D.cxx b/roofit/roofitcore/src/RooImproperIntegrator1D.cxx index 9aee7fa58eda3..424ebb7e8c59f 100644 --- a/roofit/roofitcore/src/RooImproperIntegrator1D.cxx +++ b/roofit/roofitcore/src/RooImproperIntegrator1D.cxx @@ -34,11 +34,7 @@ and the outer two pieces, if required are calculated using a 1/x transform #include "RooArgSet.h" #include "RooMsgService.h" -#include "Riostream.h" -#include -#include "TClass.h" - - +#include // Register this class with RooNumIntConfig diff --git a/roofit/roofitcore/src/RooInvTransform.cxx b/roofit/roofitcore/src/RooInvTransform.cxx index e72ff6b6d5747..c4baba07c6f0b 100644 --- a/roofit/roofitcore/src/RooInvTransform.cxx +++ b/roofit/roofitcore/src/RooInvTransform.cxx @@ -28,11 +28,6 @@ range cannot include zero. #include "RooInvTransform.h" -#include "Riostream.h" -#include - -; - //////////////////////////////////////////////////////////////////////////////// /// Constructor. diff --git a/roofit/roofitcore/src/RooLinkedList.cxx b/roofit/roofitcore/src/RooLinkedList.cxx index 9765489a5a0f9..9dc21257a1afc 100644 --- a/roofit/roofitcore/src/RooLinkedList.cxx +++ b/roofit/roofitcore/src/RooLinkedList.cxx @@ -34,7 +34,6 @@ Use RooAbsCollection derived objects for public use #include "RooAbsData.h" #include "RooMsgService.h" -#include "Riostream.h" #include "TBuffer.h" #include "TROOT.h" @@ -42,7 +41,7 @@ Use RooAbsCollection derived objects for public use #include #include #include - +#include /// \cond ROOFIT_INTERNAL diff --git a/roofit/roofitcore/src/RooMCIntegrator.cxx b/roofit/roofitcore/src/RooMCIntegrator.cxx index 7a1cc6b41a0d7..e2787c02314ac 100644 --- a/roofit/roofitcore/src/RooMCIntegrator.cxx +++ b/roofit/roofitcore/src/RooMCIntegrator.cxx @@ -27,19 +27,15 @@ in G. P. Lepage, J. Comp. Phys. 27, 192(1978). This implementation is based on a C version from the 0.9 beta release of the GNU scientific library. **/ -#include "Riostream.h" - -#include "TMath.h" #include "RooMCIntegrator.h" #include "RooArgSet.h" -#include "RooNumber.h" #include "RooNumIntFactory.h" #include "RooRealVar.h" #include "RooCategory.h" #include "RooMsgService.h" #include - +#include using std::endl; diff --git a/roofit/roofitcore/src/RooMappedCategory.cxx b/roofit/roofitcore/src/RooMappedCategory.cxx index e3529665cab18..2ed76148221e0 100644 --- a/roofit/roofitcore/src/RooMappedCategory.cxx +++ b/roofit/roofitcore/src/RooMappedCategory.cxx @@ -26,13 +26,13 @@ #include "RooStreamParser.h" #include "RooMsgService.h" -#include "Riostream.h" #include "RooAbsCache.h" #include "TBuffer.h" #include "TString.h" #include "TRegexp.h" +#include class RooMappedCategoryCache : public RooAbsCache { public: diff --git a/roofit/roofitcore/src/RooMoment.cxx b/roofit/roofitcore/src/RooMoment.cxx index d0f3506506b38..a219cb019149e 100644 --- a/roofit/roofitcore/src/RooMoment.cxx +++ b/roofit/roofitcore/src/RooMoment.cxx @@ -20,10 +20,6 @@ \ingroup Roofitcore **/ - -#include "Riostream.h" -#include - #include "RooMoment.h" #include "RooAbsReal.h" #include "RooAbsPdf.h" @@ -37,8 +33,9 @@ #include "RooConstVar.h" #include "RooRealIntegral.h" #include "RooNumIntConfig.h" -#include +#include +#include //////////////////////////////////////////////////////////////////////////////// diff --git a/roofit/roofitcore/src/RooMultiVarGaussian.cxx b/roofit/roofitcore/src/RooMultiVarGaussian.cxx index 34484f6d3a6af..f8344696528b0 100644 --- a/roofit/roofitcore/src/RooMultiVarGaussian.cxx +++ b/roofit/roofitcore/src/RooMultiVarGaussian.cxx @@ -22,19 +22,21 @@ Multivariate Gaussian p.d.f. with correlations **/ -#include "Riostream.h" -#include - #include "RooMultiVarGaussian.h" #include "RooAbsReal.h" #include "RooRealVar.h" #include "RooRandom.h" -#include "RooMath.h" #include "RooGlobalFunc.h" #include "RooConstVar.h" #include "TDecompChol.h" #include "RooFitResult.h" +#include +#include +#include +#include +#include + using std::string, std::list, std::map, std::vector; diff --git a/roofit/roofitcore/src/RooNumCdf.cxx b/roofit/roofitcore/src/RooNumCdf.cxx index 1ed2746808878..2a3b6da539463 100644 --- a/roofit/roofitcore/src/RooNumCdf.cxx +++ b/roofit/roofitcore/src/RooNumCdf.cxx @@ -24,17 +24,12 @@ upper bound is guaranteed to converge to exactly one, at all interpolation orders. **/ -#include "Riostream.h" - #include "RooAbsPdf.h" #include "RooNumCdf.h" #include "RooAbsReal.h" -#include "RooMsgService.h" -#include "RooDataHist.h" #include "RooHistPdf.h" #include "RooRealVar.h" - //////////////////////////////////////////////////////////////////////////////// /// Construct a cumulative distribution function from given input p.d.f over observable x. /// using a numeric sampling algorithm. Use binning named 'bname' to control sampling diff --git a/roofit/roofitcore/src/RooNumConvPdf.cxx b/roofit/roofitcore/src/RooNumConvPdf.cxx index 978ba15068cc0..c1f9f28961ac0 100644 --- a/roofit/roofitcore/src/RooNumConvPdf.cxx +++ b/roofit/roofitcore/src/RooNumConvPdf.cxx @@ -58,25 +58,19 @@ calls that MINUIT needs to fit your function as function of the convolution precision. **/ -#include "Riostream.h" #include "RooNumConvPdf.h" -#include "RooArgList.h" #include "RooRealVar.h" #include "RooFormulaVar.h" #include "RooCustomizer.h" #include "RooConvIntegrandBinding.h" -#include "RooNumIntFactory.h" #include "RooGenContext.h" #include "RooConvGenContext.h" - +#include using std::ostream; - - - //////////////////////////////////////////////////////////////////////////////// RooNumConvPdf::RooNumConvPdf() {} diff --git a/roofit/roofitcore/src/RooNumConvolution.cxx b/roofit/roofitcore/src/RooNumConvolution.cxx index 6e300a8c3f7f2..0c505850c9c6b 100644 --- a/roofit/roofitcore/src/RooNumConvolution.cxx +++ b/roofit/roofitcore/src/RooNumConvolution.cxx @@ -56,10 +56,8 @@ calls that MINUIT needs to fit your function as function of the convolution precision. **/ -#include "Riostream.h" #include "TH2F.h" #include "RooNumConvolution.h" -#include "RooArgList.h" #include "RooRealVar.h" #include "RooCustomizer.h" #include "RooConvIntegrandBinding.h" @@ -68,6 +66,7 @@ convolution precision. #include "RooConvGenContext.h" #include "RooMsgService.h" +#include using std::endl, std::ostream; diff --git a/roofit/roofitcore/src/RooNumGenConfig.cxx b/roofit/roofitcore/src/RooNumGenConfig.cxx index 5180c91838c2d..11c10a681e7e2 100644 --- a/roofit/roofitcore/src/RooNumGenConfig.cxx +++ b/roofit/roofitcore/src/RooNumGenConfig.cxx @@ -24,14 +24,13 @@ numeric integrators used by RooRealIntegral. RooRealIntegral and RooAbsPdf use this class in the (normalization) integral configuration interface **/ -#include "Riostream.h" - #include "RooNumGenConfig.h" #include "RooArgSet.h" #include "RooAbsNumGenerator.h" #include "RooNumGenFactory.h" #include "RooMsgService.h" +#include using std::endl, std::ostream; diff --git a/roofit/roofitcore/src/RooNumGenFactory.cxx b/roofit/roofitcore/src/RooNumGenFactory.cxx index 7d6348d63e7ab..d18692fc52d9b 100644 --- a/roofit/roofitcore/src/RooNumGenFactory.cxx +++ b/roofit/roofitcore/src/RooNumGenFactory.cxx @@ -30,21 +30,14 @@ the nature of the integration limits (closed or open ended) and the preference of the caller as encoded in the configuration object. **/ -#include "TClass.h" -#include "Riostream.h" - #include "RooNumGenFactory.h" #include "RooArgSet.h" -#include "RooAbsFunc.h" #include "RooNumGenConfig.h" -#include "RooNumber.h" - #include "RooAcceptReject.h" #include "RooFoamGenerator.h" - - #include "RooMsgService.h" +#include //////////////////////////////////////////////////////////////////////////////// /// Constructor. Register all known integrators by calling diff --git a/roofit/roofitcore/src/RooNumIntConfig.cxx b/roofit/roofitcore/src/RooNumIntConfig.cxx index b5094344421f2..952ad6826b370 100644 --- a/roofit/roofitcore/src/RooNumIntConfig.cxx +++ b/roofit/roofitcore/src/RooNumIntConfig.cxx @@ -24,14 +24,12 @@ numeric integrators used by RooRealIntegral. RooRealIntegral and RooAbsPdf use this class in the (normalization) integral configuration interface **/ -#include "Riostream.h" - #include "RooNumIntConfig.h" #include "RooArgSet.h" -#include "RooAbsIntegrator.h" #include "RooNumIntFactory.h" #include "RooMsgService.h" +#include using std::endl, std::ostream; diff --git a/roofit/roofitcore/src/RooNumIntFactory.cxx b/roofit/roofitcore/src/RooNumIntFactory.cxx index cd0e38fcd0f9a..52300efc5288c 100644 --- a/roofit/roofitcore/src/RooNumIntFactory.cxx +++ b/roofit/roofitcore/src/RooNumIntFactory.cxx @@ -28,24 +28,21 @@ the nature of the integration limits (closed or open ended) and the preference of the caller as encoded in the configuration object. **/ -#include "TClass.h" #include "TSystem.h" -#include "Riostream.h" #include "RooNumIntFactory.h" #include "RooArgSet.h" #include "RooAbsFunc.h" #include "RooNumIntConfig.h" #include "RooNumber.h" - #include "RooRombergIntegrator.h" #include "RooBinIntegrator.h" #include "RooImproperIntegrator1D.h" #include "RooMCIntegrator.h" #include "RooAdaptiveIntegratorND.h" - #include "RooMsgService.h" +#include //////////////////////////////////////////////////////////////////////////////// /// Register all known integrators by calling diff --git a/roofit/roofitcore/src/RooNumRunningInt.cxx b/roofit/roofitcore/src/RooNumRunningInt.cxx index 59d61e8ccddf1..ff192f5a7eebb 100644 --- a/roofit/roofitcore/src/RooNumRunningInt.cxx +++ b/roofit/roofitcore/src/RooNumRunningInt.cxx @@ -25,16 +25,15 @@ cached in a histogram. The cache histogram is automatically recalculated when any of the parameters of the input p.d.f. has changed. **/ -#include "Riostream.h" - #include "RooAbsPdf.h" #include "RooNumRunningInt.h" #include "RooAbsReal.h" -#include "RooMsgService.h" #include "RooDataHist.h" #include "RooHistPdf.h" #include "RooRealVar.h" +#include + //////////////////////////////////////////////////////////////////////////////// /// Construct running integral of function '_func' over x_print from /// the lower bound on _x to the present value of _x using a numeric @@ -42,14 +41,15 @@ when any of the parameters of the input p.d.f. has changed. /// binning named 'bname' and a default second order interpolation /// is applied to smooth the histogram-based c.d.f. -RooNumRunningInt::RooNumRunningInt(const char *name, const char *title, RooAbsReal& _func, RooRealVar& _x, const char* bname) : - RooAbsCachedReal(name,title), - func("func","func",this,_func), - x("x","x",this,_x), - _binningName(bname?bname:"cache") - { +RooNumRunningInt::RooNumRunningInt(const char *name, const char *title, RooAbsReal &_func, RooRealVar &_x, + const char *bname) + : RooAbsCachedReal(name, title), + func("func", "func", this, _func), + x("x", "x", this, _x), + _binningName(bname ? bname : "cache") +{ setInterpolationOrder(2) ; - } +} diff --git a/roofit/roofitcore/src/RooObjCacheManager.cxx b/roofit/roofitcore/src/RooObjCacheManager.cxx index cb5748950abb3..d0c6b09b419cc 100644 --- a/roofit/roofitcore/src/RooObjCacheManager.cxx +++ b/roofit/roofitcore/src/RooObjCacheManager.cxx @@ -28,11 +28,11 @@ by forwarding these calls to the RooAbsCacheElement interface functions, which have a sensible default implementation. **/ -#include "Riostream.h" -#include #include "RooObjCacheManager.h" #include "RooMsgService.h" +#include +#include bool RooObjCacheManager::_clearObsList(false) ; diff --git a/roofit/roofitcore/src/RooParamBinning.cxx b/roofit/roofitcore/src/RooParamBinning.cxx index 482c14904e732..f9de0269efeba 100644 --- a/roofit/roofitcore/src/RooParamBinning.cxx +++ b/roofit/roofitcore/src/RooParamBinning.cxx @@ -30,8 +30,7 @@ by the RooRealVar::setRange() that takes RooAbsReal references as arguments #include "RooParamBinning.h" #include "RooMsgService.h" -#include "Riostream.h" - +#include using std::endl, std::ostream; diff --git a/roofit/roofitcore/src/RooPlotable.cxx b/roofit/roofitcore/src/RooPlotable.cxx index 7e107564f9311..d0aefc3f7f8a8 100644 --- a/roofit/roofitcore/src/RooPlotable.cxx +++ b/roofit/roofitcore/src/RooPlotable.cxx @@ -26,10 +26,10 @@ most useful implementation of RooPlotable are RooHist and RooCurve. #include "RooPlotable.h" #include "TObject.h" -#include "Riostream.h" -using std::endl, std::ostream; +#include +using std::endl, std::ostream; //////////////////////////////////////////////////////////////////////////////// diff --git a/roofit/roofitcore/src/RooPrintable.cxx b/roofit/roofitcore/src/RooPrintable.cxx index d22d83843b114..8fecb1ae9650e 100644 --- a/roofit/roofitcore/src/RooPrintable.cxx +++ b/roofit/roofitcore/src/RooPrintable.cxx @@ -34,11 +34,12 @@ given a Print() option string. #include "RooPrintable.h" -#include "Riostream.h" -#include #include "TNamed.h" #include "TClass.h" +#include +#include + using std::ostream, std::setw; diff --git a/roofit/roofitcore/src/RooProdGenContext.cxx b/roofit/roofitcore/src/RooProdGenContext.cxx index 3c0503bcf69b6..bc9d8e8a3d89f 100644 --- a/roofit/roofitcore/src/RooProdGenContext.cxx +++ b/roofit/roofitcore/src/RooProdGenContext.cxx @@ -25,16 +25,14 @@ component generator contexts that are used to generate the dependents for each component PDF sequentially. **/ -#include "Riostream.h" #include "RooMsgService.h" - #include "RooProdGenContext.h" #include "RooProdPdf.h" #include "RooDataSet.h" #include "RooRealVar.h" #include "RooGlobalFunc.h" - +#include using std::endl, std::ostream; diff --git a/roofit/roofitcore/src/RooProfileLL.cxx b/roofit/roofitcore/src/RooProfileLL.cxx index 2c8e506ba8a9e..b45077a65495c 100644 --- a/roofit/roofitcore/src/RooProfileLL.cxx +++ b/roofit/roofitcore/src/RooProfileLL.cxx @@ -22,15 +22,13 @@ the -log(L) of the best fit. Note that this function is slow to evaluate as a MIGRAD minimization step is executed for each function evaluation **/ -#include "Riostream.h" - #include "RooProfileLL.h" #include "RooAbsReal.h" #include "RooMinimizer.h" #include "RooMsgService.h" #include "RooRealVar.h" - +#include //////////////////////////////////////////////////////////////////////////////// /// Constructor of profile likelihood given input likelihood nll w.r.t @@ -38,16 +36,15 @@ as a MIGRAD minimization step is executed for each function evaluation /// to all other variables of the likelihood at each evaluation and the /// value of the global log likelihood minimum is always subtracted. -RooProfileLL::RooProfileLL(const char *name, const char *title, - RooAbsReal& nllIn, const RooArgSet& observables) : - RooAbsReal(name,title), - _nll("input","-log(L) function",this,nllIn), - _obs("paramOfInterest","Parameters of interest",this), - _par("nuisanceParam","Nuisance parameters",this,false,false) +RooProfileLL::RooProfileLL(const char *name, const char *title, RooAbsReal &nllIn, const RooArgSet &observables) + : RooAbsReal(name, title), + _nll("input", "-log(L) function", this, nllIn), + _obs("paramOfInterest", "Parameters of interest", this), + _par("nuisanceParam", "Nuisance parameters", this, false, false) { - // Determine actual parameters and observables - nllIn.getObservables(&observables, _obs) ; - nllIn.getParameters(&observables, _par) ; + // Determine actual parameters and observables + nllIn.getObservables(&observables, _obs); + nllIn.getParameters(&observables, _par); } diff --git a/roofit/roofitcore/src/RooProjectedPdf.cxx b/roofit/roofitcore/src/RooProjectedPdf.cxx index 9099397ad5714..50aa1a1ac80e9 100644 --- a/roofit/roofitcore/src/RooProjectedPdf.cxx +++ b/roofit/roofitcore/src/RooProjectedPdf.cxx @@ -27,8 +27,6 @@ The performance of 
f->createProjection(x)->createProjection(y)
is therefore identical to that of 
f->createProjection(RooArgSet(x,y))
**/ -#include "Riostream.h" - #include "RooProjectedPdf.h" #include "RooMsgService.h" #include "RooAbsReal.h" @@ -38,6 +36,8 @@ is therefore identical to that of 
f->createProjection(RooArgSet(x,y))
#include "RooWrapperPdf.h" #include "RooFitImplHelpers.h" +#include + //////////////////////////////////////////////////////////////////////////////// /// Default constructor diff --git a/roofit/roofitcore/src/RooRandomizeParamMCSModule.cxx b/roofit/roofitcore/src/RooRandomizeParamMCSModule.cxx index 559b538a9475a..e17a9f4f74099 100644 --- a/roofit/roofitcore/src/RooRandomizeParamMCSModule.cxx +++ b/roofit/roofitcore/src/RooRandomizeParamMCSModule.cxx @@ -34,7 +34,6 @@ number of expected events of an extended p.d.f **/ -#include "Riostream.h" #include "RooDataSet.h" #include "RooRealVar.h" #include "RooRandom.h" @@ -44,6 +43,8 @@ number of expected events of an extended p.d.f #include "RooMsgService.h" #include "RooRandomizeParamMCSModule.h" +#include + using std::endl; diff --git a/roofit/roofitcore/src/RooRangeBinning.cxx b/roofit/roofitcore/src/RooRangeBinning.cxx index ef1caa8307981..a21a542a49ce4 100644 --- a/roofit/roofitcore/src/RooRangeBinning.cxx +++ b/roofit/roofitcore/src/RooRangeBinning.cxx @@ -26,10 +26,11 @@ the RooRealVar::setRange() method. #include "RooNumber.h" #include "RooMsgService.h" -#include "Riostream.h" #include "RooRangeBinning.h" +#include + using std::endl; diff --git a/roofit/roofitcore/src/RooRangeBoolean.cxx b/roofit/roofitcore/src/RooRangeBoolean.cxx index db220742c3034..eafc92d574b83 100644 --- a/roofit/roofitcore/src/RooRangeBoolean.cxx +++ b/roofit/roofitcore/src/RooRangeBoolean.cxx @@ -22,15 +22,8 @@ Returns `1.0` if variable is within given a range and `0.0` otherwise. **/ -#include "Riostream.h" -#include - #include "RooRangeBoolean.h" #include "RooAbsReal.h" -#include "RooRealVar.h" -#include "RooArgList.h" -#include "RooMsgService.h" - //////////////////////////////////////////////////////////////////////////////// diff --git a/roofit/roofitcore/src/RooRatio.cxx b/roofit/roofitcore/src/RooRatio.cxx index e13249f68786f..b112eeab26dd7 100644 --- a/roofit/roofitcore/src/RooRatio.cxx +++ b/roofit/roofitcore/src/RooRatio.cxx @@ -28,12 +28,8 @@ Represents the ratio of two RooAbsReal objects. #include "RooFit/Detail/MathFuncs.h" -#include - #include -#include - RooRatio::RooRatio() { diff --git a/roofit/roofitcore/src/RooRealMPFE.cxx b/roofit/roofitcore/src/RooRealMPFE.cxx index 3289c709f2eb2..51e29c0ad8662 100644 --- a/roofit/roofitcore/src/RooRealMPFE.cxx +++ b/roofit/roofitcore/src/RooRealMPFE.cxx @@ -46,8 +46,6 @@ For general multiprocessing in ROOT, please refer to the TProcessExecutor class. **/ -#include "Riostream.h" - #ifndef _WIN32 #include "BidirMMapPipe.h" #endif @@ -63,9 +61,9 @@ For general multiprocessing in ROOT, please refer to the TProcessExecutor class. #include "RooMsgService.h" #include "RooNLLVar.h" -#include "Rtypes.h" #include "TSystem.h" +#include class RooRealMPFE ; diff --git a/roofit/roofitcore/src/RooRecursiveFraction.cxx b/roofit/roofitcore/src/RooRecursiveFraction.cxx index a59d0bac40607..e3c830940ee4d 100644 --- a/roofit/roofitcore/src/RooRecursiveFraction.cxx +++ b/roofit/roofitcore/src/RooRecursiveFraction.cxx @@ -25,18 +25,15 @@ from a set of recursive fractions: for a given set of input fractions \f$ {a_i} \f$, it returns \f$ a_n * \prod_{i=0}^{n-1} (1 - a_i) \f$. **/ -#include "Riostream.h" -#include - #include "RooRecursiveFraction.h" #include "RooAbsReal.h" #include "RooAbsPdf.h" -#include "RooErrorHandler.h" #include "RooArgSet.h" #include "RooMsgService.h" #include +#include //////////////////////////////////////////////////////////////////////////////// /// Constructor of plain RooAddPdf fraction from list of recursive fractions diff --git a/roofit/roofitcore/src/RooResolutionModel.cxx b/roofit/roofitcore/src/RooResolutionModel.cxx index f13c43960b7f3..7d15f291fecd1 100644 --- a/roofit/roofitcore/src/RooResolutionModel.cxx +++ b/roofit/roofitcore/src/RooResolutionModel.cxx @@ -62,12 +62,11 @@ * */ -#include "TClass.h" -#include "TMath.h" -#include "Riostream.h" #include "RooResolutionModel.h" #include "RooMsgService.h" +#include + using std::endl, std::ostream; diff --git a/roofit/roofitcore/src/RooRombergIntegrator.cxx b/roofit/roofitcore/src/RooRombergIntegrator.cxx index df4c21c8c44a6..2d7c8d1e19b2a 100644 --- a/roofit/roofitcore/src/RooRombergIntegrator.cxx +++ b/roofit/roofitcore/src/RooRombergIntegrator.cxx @@ -34,9 +34,6 @@ apply a five-point series acceleration, and successively add more steps until th desired precision is reached. **/ -#include "Riostream.h" - -#include "TClass.h" #include "RooRombergIntegrator.h" #include "RooArgSet.h" #include "RooRealVar.h" @@ -46,6 +43,7 @@ desired precision is reached. #include "RooMsgService.h" #include +#include namespace { diff --git a/roofit/roofitcore/src/RooSecondMoment.cxx b/roofit/roofitcore/src/RooSecondMoment.cxx index 312c044b607cc..8f47a7ff021ca 100644 --- a/roofit/roofitcore/src/RooSecondMoment.cxx +++ b/roofit/roofitcore/src/RooSecondMoment.cxx @@ -20,17 +20,11 @@ \ingroup Roofitcore **/ -#include "Riostream.h" -#include - #include "RooSecondMoment.h" #include "RooAbsReal.h" #include "RooAbsPdf.h" -#include "RooErrorHandler.h" #include "RooArgSet.h" -#include "RooMsgService.h" #include "RooRealVar.h" -#include "RooFunctor.h" #include "RooGlobalFunc.h" #include "RooConstVar.h" #include "RooRealIntegral.h" @@ -38,10 +32,12 @@ #include "RooFormulaVar.h" #include "RooLinearVar.h" #include "RooProduct.h" -#include -using std::string; +#include +#include +#include +using std::string; //////////////////////////////////////////////////////////////////////////////// diff --git a/roofit/roofitcore/src/RooSharedProperties.cxx b/roofit/roofitcore/src/RooSharedProperties.cxx index 2d37212bc4150..528acd7a41c19 100644 --- a/roofit/roofitcore/src/RooSharedProperties.cxx +++ b/roofit/roofitcore/src/RooSharedProperties.cxx @@ -24,11 +24,8 @@ that can be stored in RooSharedPropertiesList. **/ #include "RooSharedProperties.h" -#include "RooMsgService.h" - -#include "Riostream.h" - +#include //////////////////////////////////////////////////////////////////////////////// /// Default constructor diff --git a/roofit/roofitcore/src/RooStreamParser.cxx b/roofit/roofitcore/src/RooStreamParser.cxx index 0b04203041b0e..d5b70ff4a1419 100644 --- a/roofit/roofitcore/src/RooStreamParser.cxx +++ b/roofit/roofitcore/src/RooStreamParser.cxx @@ -33,19 +33,17 @@ // from the context. The definition of what is punctuation can be redefined. // - -#include "Riostream.h" -#include - #ifndef _WIN32 #include #endif #include "RooStreamParser.h" #include "RooMsgService.h" -#include "RooNumber.h" #include "RooFitImplHelpers.h" +#include +#include + using std::istream, std::endl; diff --git a/roofit/roofitcore/src/RooStringVar.cxx b/roofit/roofitcore/src/RooStringVar.cxx index 57f46488181bc..4a561648d2d67 100644 --- a/roofit/roofitcore/src/RooStringVar.cxx +++ b/roofit/roofitcore/src/RooStringVar.cxx @@ -24,12 +24,12 @@ A RooAbsArg implementing string values. #include "RooStringVar.h" -#include "Riostream.h" #include "TTree.h" #include "RooStreamParser.h" #include "RooMsgService.h" #include "TBranch.h" +#include //////////////////////////////////////////////////////////////////////////////// /// Constructor with initial value. The size argument is ignored. diff --git a/roofit/roofitcore/src/RooStudyManager.cxx b/roofit/roofitcore/src/RooStudyManager.cxx index ec3013041d58d..8439964f0df82 100644 --- a/roofit/roofitcore/src/RooStudyManager.cxx +++ b/roofit/roofitcore/src/RooStudyManager.cxx @@ -24,9 +24,6 @@ repeated applications of generate-and-fit operations on a workspace **/ - -#include "Riostream.h" - #include "RooStudyManager.h" #include "RooWorkspace.h" #include "RooAbsStudy.h" @@ -37,10 +34,12 @@ repeated applications of generate-and-fit operations on a workspace #include "TObjString.h" #include "TRegexp.h" #include "TKey.h" -#include #include "TROOT.h" #include "TSystem.h" +#include +#include + //////////////////////////////////////////////////////////////////////////////// RooStudyManager::RooStudyManager(RooWorkspace &w) : _pkg(new RooStudyPackage(w)) {} diff --git a/roofit/roofitcore/src/RooStudyPackage.cxx b/roofit/roofitcore/src/RooStudyPackage.cxx index 95f12ef753257..c24e466197818 100644 --- a/roofit/roofitcore/src/RooStudyPackage.cxx +++ b/roofit/roofitcore/src/RooStudyPackage.cxx @@ -25,9 +25,6 @@ repeated applications of generate-and-fit operations on a workspace **/ - -#include "Riostream.h" - #include "RooStudyPackage.h" #include "RooWorkspace.h" #include "RooAbsStudy.h" @@ -37,7 +34,10 @@ repeated applications of generate-and-fit operations on a workspace #include "TRandom2.h" #include "RooRandom.h" #include "TMath.h" -#include "TEnv.h" + +#include +#include +#include using std::list, std::string; diff --git a/roofit/roofitcore/src/RooSuperCategory.cxx b/roofit/roofitcore/src/RooSuperCategory.cxx index e8fcbe5df667a..cac2b1ba5eeec 100644 --- a/roofit/roofitcore/src/RooSuperCategory.cxx +++ b/roofit/roofitcore/src/RooSuperCategory.cxx @@ -31,8 +31,6 @@ supercategory will propagate to its input categories. #include "RooSuperCategory.h" -#include "Riostream.h" -#include "RooStreamParser.h" #include "RooArgSet.h" #include "RooAbsCategoryLValue.h" #include "RooMsgService.h" @@ -40,6 +38,7 @@ supercategory will propagate to its input categories. #include "TString.h" #include "TClass.h" +#include using std::endl, std::ostream; diff --git a/roofit/roofitcore/src/RooTrace.cxx b/roofit/roofitcore/src/RooTrace.cxx index bffa423953976..2bdb9d9a97721 100644 --- a/roofit/roofitcore/src/RooTrace.cxx +++ b/roofit/roofitcore/src/RooTrace.cxx @@ -90,12 +90,13 @@ and there is no guarantee that this works. #include "RooTrace.h" #include "RooAbsArg.h" -#include "Riostream.h" #include "RooMsgService.h" - -#include #include "TClass.h" +#include +#include +#include +#include using std::ostream, std::setw, std::hex, std::dec, std::map, std::string; diff --git a/roofit/roofitcore/src/RooTruthModel.cxx b/roofit/roofitcore/src/RooTruthModel.cxx index b7d91ea52525b..a704723c95b30 100644 --- a/roofit/roofitcore/src/RooTruthModel.cxx +++ b/roofit/roofitcore/src/RooTruthModel.cxx @@ -33,8 +33,6 @@ functions used in D mixing have been hand coded for increased execution speed. #include -#include - #include #include diff --git a/roofit/roofitcore/src/RooUniformBinning.cxx b/roofit/roofitcore/src/RooUniformBinning.cxx index 6829f67678b04..19fb052bc443a 100644 --- a/roofit/roofitcore/src/RooUniformBinning.cxx +++ b/roofit/roofitcore/src/RooUniformBinning.cxx @@ -30,8 +30,7 @@ e.g. the binning of class RooBinning. #include #include -#include - +#include using std::endl; diff --git a/roofit/roofitmore/src/RooAdaptiveGaussKronrodIntegrator1D.cxx b/roofit/roofitmore/src/RooAdaptiveGaussKronrodIntegrator1D.cxx index 8a9a1c3c03f10..f5602fd49a018 100644 --- a/roofit/roofitmore/src/RooAdaptiveGaussKronrodIntegrator1D.cxx +++ b/roofit/roofitmore/src/RooAdaptiveGaussKronrodIntegrator1D.cxx @@ -43,10 +43,7 @@ For integrands with integrable singularities the Wynn epsilon rule can be selected to speed up the convergence of these integrals. **/ -#include -#include #include "TClass.h" -#include "Riostream.h" #include "RooAdaptiveGaussKronrodIntegrator1D.h" #include "RooArgSet.h" #include "RooRealVar.h" @@ -55,6 +52,9 @@ can be selected to speed up the convergence of these integrals. #include "TMath.h" #include "RooMsgService.h" +#include +#include +#include using std::endl; diff --git a/roofit/roofitmore/src/RooGaussKronrodIntegrator1D.cxx b/roofit/roofitmore/src/RooGaussKronrodIntegrator1D.cxx index c06428cd6359e..8a0598166129a 100644 --- a/roofit/roofitmore/src/RooGaussKronrodIntegrator1D.cxx +++ b/roofit/roofitmore/src/RooGaussKronrodIntegrator1D.cxx @@ -47,8 +47,6 @@ reached #include #include -#include - #include #include @@ -56,6 +54,7 @@ reached #include #include #include +#include using std::endl; diff --git a/roofit/roofitmore/src/RooMathMoreReg.cxx b/roofit/roofitmore/src/RooMathMoreReg.cxx index e1e5fb1c57fcf..e3d339cb51502 100644 --- a/roofit/roofitmore/src/RooMathMoreReg.cxx +++ b/roofit/roofitmore/src/RooMathMoreReg.cxx @@ -15,7 +15,6 @@ **/ -#include "Riostream.h" #include "RooMathMoreReg.h" #include "RooCFunction1Binding.h" #include "RooCFunction2Binding.h" diff --git a/roofit/roofitmore/src/RooNonCentralChiSquare.cxx b/roofit/roofitmore/src/RooNonCentralChiSquare.cxx index 6a9e3622e2ff1..83d6a1ab53838 100644 --- a/roofit/roofitmore/src/RooNonCentralChiSquare.cxx +++ b/roofit/roofitmore/src/RooNonCentralChiSquare.cxx @@ -38,8 +38,6 @@ This implementation could be improved. BOOST has a nice implementation: http://wesnoth.repositoryhosting.com/trac/wesnoth_wesnoth/browser/trunk/include/boost/math/distributions/non_central_chi_squared.hpp?rev=6 **/ -#include "Riostream.h" - #include "RooNonCentralChiSquare.h" #include "RooAbsReal.h" #include "RooAbsCategory.h" @@ -48,11 +46,12 @@ This implementation could be improved. BOOST has a nice implementation: //#include "RooNumber.h" #include "Math/DistFunc.h" - #include "RooMsgService.h" #include "TError.h" +#include + using std::endl; diff --git a/roofit/roofitmore/src/RooSpHarmonic.cxx b/roofit/roofitmore/src/RooSpHarmonic.cxx index 06a7619456797..76de502c32bef 100644 --- a/roofit/roofitmore/src/RooSpHarmonic.cxx +++ b/roofit/roofitmore/src/RooSpHarmonic.cxx @@ -46,13 +46,11 @@ integrals, using the orthogonality properties of \f$Y_l^m\f$... **/ -#include "Riostream.h" -#include - #include "RooSpHarmonic.h" #include "Math/SpecFunc.h" #include "TMath.h" +#include //////////////////////////////////////////////////////////////////////////////// diff --git a/roofit/roostats/src/UpperLimitMCSModule.cxx b/roofit/roostats/src/UpperLimitMCSModule.cxx index ca8c7f0313be1..001fcbddf4669 100644 --- a/roofit/roostats/src/UpperLimitMCSModule.cxx +++ b/roofit/roostats/src/UpperLimitMCSModule.cxx @@ -16,19 +16,16 @@ upper limit for each toy-MC sample generated */ -#include "Riostream.h" - #include "RooDataSet.h" #include "RooFitResult.h" #include "RooStats/UpperLimitMCSModule.h" #include "RooMsgService.h" #include "RooStats/ConfInterval.h" -#include "RooStats/PointSetInterval.h" #include "RooStats/LikelihoodInterval.h" -#include "RooStats/LikelihoodIntervalPlot.h" #include "RooStats/ProfileLikelihoodCalculator.h" #include "RooRealVar.h" +#include using namespace RooStats ;