[RF] do not rely on a backward compatibility header

roofit/histfactory/src/FlexibleInterpVar.cxx

@@ -22,7 +22,6 @@
 
 #include "HistFactoryInterpolationCodeUtils.h"
 
-#include <Riostream.h>
 #include <TMath.h>
 
 

roofit/histfactory/src/PiecewiseInterpolation.cxx

@@ -42,7 +42,6 @@
 
 #include "HistFactoryInterpolationCodeUtils.h"
 
-#include "Riostream.h"
 #include "TBuffer.h"
 
 #include "RooAbsReal.h"

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"

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"

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"

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 <cmath>
 
 #include "RooBreitWigner.h"

roofit/roofit/src/RooCFunction1Binding.cxx

@@ -22,7 +22,6 @@ class cannot be persisted in a RooWorkspace without registering the function
 pointer first using RooCFunction1Binding<T1,T2>::register().
 **/
 
-#include "Riostream.h"
 #include "RooCFunction1Binding.h"
 
 

roofit/roofit/src/RooCFunction2Binding.cxx

@@ -22,7 +22,6 @@ class cannot be persisted in a RooWorkspace without registering the function
 pointer first using RooCFunction2Binding<T1,T2,T3>::register().
 **/
 
-#include "Riostream.h"
 #include "RooCFunction2Binding.h"
 
 

roofit/roofit/src/RooCFunction3Binding.cxx

@@ -22,7 +22,6 @@ class cannot be persisted in a RooWorkspace without registering the function
 pointer first using RooCFunction3Binding<T1,T2,T3,T4>::register().
 **/
 
-#include "Riostream.h"
 #include "RooCFunction3Binding.h"
 
 

roofit/roofit/src/RooCFunction4Binding.cxx

@@ -22,7 +22,6 @@ class cannot be persisted in a RooWorkspace without registering the function
 pointer first using RooCFunction4Binding<T1,T2,T3,T4>::register().
 **/
 
-#include "Riostream.h"
 #include "RooCFunction4Binding.h"
 
 

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"

roofit/roofit/src/RooFunctor1DBinding.cxx

@@ -26,7 +26,6 @@ pointer first using RooCFunction1Binding<T1,T2>::register().
     \ingroup Roofit
 **/
 
-#include "Riostream.h"
 #include "RooFunctor1DBinding.h"
 
 using std::ostream;

roofit/roofit/src/RooFunctorBinding.cxx

@@ -39,8 +39,8 @@ class cannot be persisted in a RooWorkspace without registering the function
 pointer first using RooCFunction1Binding<T1,T2>::register().
 **/
 
-#include "Riostream.h"
 #include "RooFunctorBinding.h"
+#include <iostream>
 
 using std::endl, std::ostream, std::string;
 

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"

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;
 

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 <sstream>
 #include <stdexcept>
 #include <type_traits>
-#include <typeinfo>
 
 using std::string, std::make_unique, std::vector;
 

roofit/roofit/src/RooMathCoreReg.cxx

@@ -15,7 +15,6 @@
 
 **/
 
-#include "Riostream.h"
 #include "RooMathCoreReg.h"
 #include "RooCFunction1Binding.h"
 #include "RooCFunction2Binding.h"

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]

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;
 

roofit/roofit/src/RooMomentMorphFuncND.cxx

@@ -31,13 +31,10 @@
 
 #include "RooFit/Detail/Algorithms.h"
 
-#include <Riostream.h>
-
 #include <TMap.h>
 #include <TMath.h>
 #include <TVector.h>
 
-#include <algorithm>
 #include <map>
 
 using std::string, std::vector;

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"
 
 

roofit/roofit/src/RooTFnBinding.cxx

@@ -15,8 +15,6 @@
   functions RooFit::bindFunction().
 **/
 
-#include "Riostream.h"
-
 #include "RooTFnBinding.h"
 #include "TF3.h"
 

roofit/roofit/src/RooTFnPdfBinding.cxx

@@ -13,10 +13,7 @@
 
 **/
 
-#include "Riostream.h"
-
 #include "RooTFnPdfBinding.h"
-#include "RooAbsCategory.h"
 #include "TF3.h"
 
 using std::ostream;

roofit/roofit/src/RooTMathReg.cxx

@@ -15,7 +15,6 @@
 
 **/
 
-#include "Riostream.h"
 #include "RooTMathReg.h"
 #include "RooCFunction1Binding.h"
 #include "RooCFunction2Binding.h"

roofit/roofitcore/inc/RooAbsSelfCachedReal.h

@@ -36,8 +36,6 @@ input.
 #include <RooMsgService.h>
 #include <RooRealProxy.h>
 
-#include <Riostream.h>
-
 template <class Base_t>
 class RooAbsSelfCached : public Base_t {
 public:

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"

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 <ostream>
 
 using std::ostream;
 
 
-
-
 ////////////////////////////////////////////////////////////////////////////////
 /// Print binning name
 

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 <string>
+#include <ostream>
+ 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)
+{
+}
 
 
 

roofit/roofitcore/src/RooAbsGenContext.cxx

@@ -34,8 +34,7 @@ prototype data etc..
 #include "RooMsgService.h"
 #include "RooGlobalFunc.h"
 
-#include "Riostream.h"
-
+#include <ostream>
 
 using std::ostream;
 

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 <ostream>
+
 using std::ostream, std::istream, std::endl;
 
 

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 <ostream>
 
 using std::endl;
 

roofit/roofitcore/src/RooAbsMoment.cxx

@@ -23,12 +23,6 @@
 #include <RooAbsMoment.h>
 #include <RooRealVar.h>
 
-#include <Riostream.h>
-
-#include <cmath>
-#include <string>
-
-
 ////////////////////////////////////////////////////////////////////////////////
 
 RooAbsMoment::RooAbsMoment(const char* name, const char* title, RooAbsReal& func, RooRealVar& x, Int_t orderIn, bool takeRoot) :

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 <cassert>
+#include <ostream>
 
 using std::endl;