Optimize includes in roofit

roofit/histfactory/src/HistFactoryModelUtils.cxx

@@ -1,9 +1,9 @@
 /**
- *  \ingroup HistFactory 
+ *  \ingroup HistFactory
  */
 
 // A set of utils for navegating HistFactory models
-#include <stdexcept>    
+#include <stdexcept>
 #include <typeinfo>
 
 #include "RooStats/HistFactory/ParamHistFunc.h"
@@ -14,6 +14,7 @@
 #include "RooArgList.h"
 #include "RooSimultaneous.h"
 #include "RooCategory.h"
+#include "RooCatType.h"
 #include "RooRealVar.h"
 #include "RooProdPdf.h"
 #include "TH1.h"

roofit/histfactory/src/HistFactoryNavigation.cxx

@@ -1,6 +1,6 @@
 
 /** \class RooStats::HistFactory::HistFactoryNavigation
- *  \ingroup HistFactory 
+ *  \ingroup HistFactory
  */
 
 #include <iomanip>
@@ -16,6 +16,7 @@
 #include "RooProduct.h"
 #include "RooMsgService.h"
 #include "RooCategory.h"
+#include "RooCatType.h"
 #include "RooSimultaneous.h"
 #include "RooWorkspace.h"
 

roofit/histfactory/src/RooBarlowBeestonLL.cxx

@@ -21,14 +21,13 @@
 */
 
 #include <stdexcept>
-#include <math.h>
-
-#include "Riostream.h" 
+#include <cmath>
+#include <iostream>
 
 #include "RooFit.h"
-#include "RooStats/HistFactory/RooBarlowBeestonLL.h" 
-#include "RooAbsReal.h" 
-#include "RooAbsData.h" 
+#include "RooStats/HistFactory/RooBarlowBeestonLL.h"
+#include "RooAbsReal.h"
+#include "RooAbsData.h"
 //#include "RooMinuit.h"
 #include "RooMsgService.h"
 #include "RooRealVar.h"
@@ -37,6 +36,7 @@
 #include "RooStats/RooStatsUtils.h"
 #include "RooProdPdf.h"
 #include "RooCategory.h"
+#include "RooCatType.h"
 #include "RooSimultaneous.h"
 #include "RooArgList.h"
 #include "RooAbsCategoryLValue.h"

roofit/roofit/src/RooLognormal.cxx

@@ -34,6 +34,7 @@ The parameterization here is physics driven and differs from the ROOT::Math::log
 #include "BatchHelpers.h"
 
 #include "TMath.h"
+#include "TClass.h"
 #include <Math/SpecFuncMathCore.h>
 #include <Math/PdfFuncMathCore.h>
 #include <Math/ProbFuncMathCore.h>

roofit/roofitcore/inc/RooAbsArg.h

@@ -17,22 +17,25 @@
 #define ROO_ABS_ARG
 
 #include "TNamed.h"
-#include "THashList.h"
+#include "TObjArray.h"
 #include "TRefArray.h"
 #include "RooPrintable.h"
 #include "RooSTLRefCountList.h"
 #include "RooAbsCache.h"
-#include "RooLinkedListIter.h"
 #include "RooNameReg.h"
+#include "RooLinkedListIter.h"
 #include <map>
 #include <set>
 #include <deque>
 #include <stack>
 
 #include <iostream>
 
-
+#ifndef R__LESS_INCLUDES
 #include "TClass.h"
+#include "THashList.h"
+#endif
+
 
 class TTree ;
 class RooArgSet ;

roofit/roofitcore/inc/RooFitResult.h

@@ -24,7 +24,7 @@
 #include "RVersion.h"
 #include "TMatrixFfwd.h"
 #include "TMatrixDSym.h"
-#include "TRootIOCtor.h"
+#include "TList.h"
 
 #include <vector>
 #include <string>

roofit/roofitcore/inc/RooSimPdfBuilder.h

@@ -18,10 +18,12 @@
 
 #include "Rtypes.h"
 #include "TObject.h"
+#include "TList.h"
 #include "RooArgSet.h"
 #include "RooArgList.h"
 #include "RooAbsData.h"
 #include <list>
+
 class RooSimultaneous ;
 class RooAbsPdf ;
 class RooCategory ;

roofit/roofitcore/src/Roo1DTable.cxx

@@ -23,16 +23,18 @@ Roo1DTable implements a one-dimensional table. A table is the category
 equivalent of a plot. To create a table use the RooDataSet::table method.
 **/
 
+#include "Roo1DTable.h"
+#include "RooMsgService.h"
+#include "RooCatType.h"
 #include "RooFit.h"
 
-#include "Riostream.h"
+#include <iostream>
 #include <iomanip>
 #include "TString.h"
 #include "TMath.h"
-#include "Roo1DTable.h"
-#include "RooMsgService.h"
 #include "TClass.h"
 
+
 using namespace std ;
 
 ClassImp(Roo1DTable);

roofit/roofitcore/src/RooAbsCategory.cxx

@@ -51,6 +51,7 @@ the following replacements should be used:
 #include "RooCategory.h"
 #include "RooMsgService.h"
 #include "RooVectorDataStore.h"
+#include "RooLinkedListIter.h"
 #include "RooFitLegacy/RooAbsCategoryLegacyIterator.h"
 
 #include "Compression.h"
@@ -59,6 +60,7 @@ the following replacements should be used:
 #include "TTree.h"
 #include "TLeaf.h"
 #include "ROOT/RMakeUnique.hxx"
+#include "TBranch.h"
 
 using namespace std;
 

roofit/roofitcore/src/RooAbsData.cxx

@@ -26,9 +26,10 @@ points for its contents and provides an iterator over its elements
 **/
 
 #include "RooAbsData.h"
-
 #include "RooFit.h"
-#include "Riostream.h"
+#include "RooCatType.h"
+
+#include <iostream>
 
 #include "TBuffer.h"
 #include "TClass.h"

roofit/roofitcore/src/RooAbsTestStatistic.cxx

@@ -40,6 +40,7 @@ combined in the main thread.
 #include "RooAbsPdf.h"
 #include "RooSimultaneous.h"
 #include "RooAbsData.h"
+#include "RooCatType.h"
 #include "RooArgSet.h"
 #include "RooRealVar.h"
 #include "RooNLLVar.h"
@@ -51,7 +52,7 @@ combined in the main thread.
 #include "RooAbsCategoryLValue.h"
 
 #include "TTimeStamp.h"
-
+#include "TClass.h"
 #include <string>
 
 using namespace std;

roofit/roofitcore/src/RooAddGenContext.cxx

@@ -31,7 +31,7 @@ with a probability proportional to its associated coefficient.
 #include "RooFit.h"
 
 #include "Riostream.h"
-
+#include "TClass.h"
 
 #include "RooMsgService.h"
 #include "RooAddGenContext.h"

roofit/roofitcore/src/RooCategory.cxx

@@ -62,13 +62,19 @@ for advanced uses of categories.
 #include "RooFitLegacy/RooCategorySharedProperties.h"
 #include "RooFitLegacy/RooCatTypeLegacy.h"
 
+#include <iostream>
+#include <cstdlib>
+#include "TTree.h"
+#include "TString.h"
+#include "TH1.h"
+#include "TList.h"
 #include "TBuffer.h"
 #include "TString.h"
 #include "ROOT/RMakeUnique.hxx"
 
 using namespace std;
 
-ClassImp(RooCategory); 
+ClassImp(RooCategory);
 
 std::map<std::string, std::weak_ptr<RooCategory::RangeMap_t>> RooCategory::_uuidToSharedRangeIOHelper; // Helper for restoring shared properties
 std::map<std::string, std::weak_ptr<RooCategory::RangeMap_t>> RooCategory::_sharedRangeIOHelper;

roofit/roofitcore/src/RooChi2Var.cxx

@@ -36,6 +36,7 @@
 #include "RooMsgService.h"
 
 #include "Riostream.h"
+#include "TClass.h"
 
 #include "RooRealVar.h"
 #include "RooAbsDataStore.h"

roofit/roofitcore/src/RooCompositeDataStore.cxx

@@ -28,11 +28,11 @@ dataset to RooFit operations. A category tag will define which dataset has to be
 When iterated from start to finish, datasets will be traversed in the order of the category index.
 **/
 
+#include "RooCompositeDataStore.h"
 #include "RooFit.h"
 #include "RooMsgService.h"
-#include "RooCompositeDataStore.h"
+#include "RooCatType.h"
 
-#include "Riostream.h"
 #include "TTree.h"
 #include "TChain.h"
 #include "TDirectory.h"
@@ -42,7 +42,9 @@ When iterated from start to finish, datasets will be traversed in the order of t
 #include "RooTrace.h"
 #include "RooCategory.h"
 #include <iomanip>
-using namespace std ;
+#include <iostream>
+
+using namespace std;
 
 ClassImp(RooCompositeDataStore);
 ;

roofit/roofitcore/src/RooDataProjBinding.cxx

@@ -30,20 +30,19 @@ constructed from all the categories in the dataset
 **/
 
 #include "RooFit.h"
-#include "Riostream.h"
 
 #include "RooDataProjBinding.h"
 #include "RooAbsReal.h"
 #include "RooAbsData.h"
 #include "Roo1DTable.h"
 #include "RooSuperCategory.h"
 #include "RooCategory.h"
+#include "RooCatType.h"
 #include "RooAbsPdf.h"
 #include "RooMsgService.h"
 
-#include <assert.h>
-
-
+#include <iostream>
+#include <cassert>
 
 using namespace std;
 

roofit/roofitcore/src/RooDataSet.cxx

@@ -50,7 +50,6 @@ For the inverse conversion, see `RooAbsData::convertToVectorStore()`.
 
 #include "RooDataSet.h"
 
-#include "Riostream.h"
 #include "RooPlot.h"
 #include "RooAbsReal.h"
 #include "Roo1DTable.h"
@@ -62,6 +61,7 @@ For the inverse conversion, see `RooAbsData::convertToVectorStore()`.
 #include "RooDataHist.h"
 #include "RooMsgService.h"
 #include "RooCmdConfig.h"
+#include "RooCatType.h"
 #include "RooHist.h"
 #include "RooTreeDataStore.h"
 #include "RooVectorDataStore.h"
@@ -78,6 +78,7 @@ For the inverse conversion, see `RooAbsData::convertToVectorStore()`.
 #include "TBuffer.h"
 #include "ROOT/RMakeUnique.hxx"
 
+#include <iostream>
 #include <fstream>
 
 

roofit/roofitcore/src/RooFormula.cxx

@@ -57,12 +57,13 @@ Check the tutorial rf506_msgservice.C for details.
 
 #include "RooFit.h"
 #include "RooAbsReal.h"
+#include "RooCatType.h"
 #include "RooAbsCategory.h"
 #include "RooArgList.h"
 #include "RooMsgService.h"
 #include "ROOT/RMakeUnique.hxx"
 #include "TObjString.h"
-
+#include "TClass.h"
 
 #include <sstream>
 #include <regex>

roofit/roofitcore/src/RooHelpers.cxx

@@ -17,6 +17,8 @@
 #include "RooHelpers.h"
 #include "RooAbsRealLValue.h"
 
+#include "TClass.h"
+
 namespace RooHelpers {
 
 LocalChangeMsgLevel::LocalChangeMsgLevel(RooFit::MsgLevel lvl,

roofit/roofitcore/src/RooRealIntegral.cxx

@@ -30,14 +30,12 @@ integration is performed in the various implementations of the RooAbsIntegrator
 
 #include "RooFit.h"
 
-#include "TClass.h"
 #include "RooMsgService.h"
-#include "Riostream.h"
-#include "TH1.h"
 #include "RooRealIntegral.h"
 #include "RooArgSet.h"
 #include "RooAbsRealLValue.h"
 #include "RooAbsCategoryLValue.h"
+#include "RooCatType.h"
 #include "RooRealBinding.h"
 #include "RooRealAnalytic.h"
 #include "RooInvTransform.h"
@@ -50,9 +48,14 @@ integration is performed in the various implementations of the RooAbsIntegrator
 #include "RooDouble.h"
 #include "RooTrace.h"
 
+#include "TClass.h"
+#include "TH1.h"
+
+#include <iostream>
+
 using namespace std;
 
-ClassImp(RooRealIntegral); 
+ClassImp(RooRealIntegral);
 
 
 Int_t RooRealIntegral::_cacheAllNDim(2) ;

roofit/roofitcore/src/RooRealSumFunc.cxx

@@ -38,6 +38,7 @@
 
 #include "TIterator.h"
 #include "TList.h"
+#include "TClass.h"
 #include "RooRealSumFunc.h"
 #include "RooRealProxy.h"
 #include "RooPlot.h"

roofit/roofitcore/src/RooRealSumPdf.cxx

@@ -50,6 +50,7 @@ to the fractions of the various functions. **This requires setting the last argu
 #include "TError.h"
 #include "TIterator.h"
 #include "TList.h"
+#include "TClass.h"
 #include "RooRealSumPdf.h"
 #include "RooRealProxy.h"
 #include "RooPlot.h"

roofit/roofitcore/src/RooSimGenContext.cxx

@@ -31,20 +31,21 @@ that an event originates from a certain category.
 **/
 
 #include "RooFit.h"
-#include "Riostream.h"
 
 #include "RooSimGenContext.h"
 #include "RooSimultaneous.h"
 #include "RooRealProxy.h"
+#include "RooCatType.h"
 #include "RooDataSet.h"
 #include "Roo1DTable.h"
 #include "RooCategory.h"
 #include "RooMsgService.h"
 #include "RooRandom.h"
 #include "RooGlobalFunc.h"
 
-using namespace RooFit ;
+using namespace RooFit;
 
+#include <iostream>
 #include <string>
 
 using namespace std;