[RF][HF] Unify errors and warnings in HistFactory workspace creation

Replace printing directly to `std::cout` with HistFactory printing
macros, for consistent logging.

Author: guitargeek

roofit/histfactory/src/HistoToWorkspaceFactoryFast.cxx

@@ -94,14 +94,13 @@ std::vector<double> histToVector(TH1 const &hist)
 
 // use this order for safety on library loading
 using namespace RooStats;
-using std::string, std::vector, std::make_unique, std::pair, std::unique_ptr, std::map;
+using std::string, std::vector;
 
 using namespace RooStats::HistFactory::Detail;
 using namespace RooStats::HistFactory::Detail::MagicConstants;
 
 
-namespace RooStats{
-namespace HistFactory{
+namespace RooStats::HistFactory {
 
   HistoToWorkspaceFactoryFast::HistoToWorkspaceFactoryFast(RooStats::HistFactory::Measurement& measurement) :
     HistoToWorkspaceFactoryFast{measurement, Configuration{}} {}
@@ -130,8 +129,7 @@ namespace HistFactory{
     // Make a ModelConfig and configure it
     ModelConfig * proto_config = static_cast<ModelConfig *>(ws_single->obj("ModelConfig"));
     if( proto_config == nullptr ) {
-      std::cout << "Error: Did not find 'ModelConfig' object in file: " << ws_single->GetName()
-      << std::endl;
+      cxcoutFHF << "Error: Did not find 'ModelConfig' object in file: " << ws_single->GetName() << std::endl;
       throw hf_exc();
     }
 
@@ -153,7 +151,7 @@ namespace HistFactory{
         params.add(*poi);
       }
       else {
-   std::cout << "WARNING: Can't find parameter of interest: " << poi_name
+   cxcoutWHF << "WARNING: Can't find parameter of interest: " << poi_name
         << " in Workspace. Not setting in ModelConfig." << std::endl;
    //throw hf_exc();
       }
@@ -196,9 +194,8 @@ namespace HistFactory{
       cxcoutPHF << "Importing Asimov dataset" << std::endl;
       bool failure = ws_single->import(*asimov_dataset, RooFit::Rename(AsimovName.c_str()));
       if( failure ) {
-        std::cout << "Error: Failed to import Asimov dataset: " << AsimovName
-        << std::endl;
-   throw hf_exc();
+        cxcoutFHF << "Error: Failed to import Asimov dataset: " << AsimovName << std::endl;
+        throw hf_exc();
       }
 
       // Load the snapshot at the end of every loop iteration
@@ -229,7 +226,7 @@ namespace HistFactory{
     // Create a workspace for a SingleChannel from the Measurement Object
     std::unique_ptr<RooWorkspace> ws_single{this->MakeSingleChannelWorkspace(measurement, channel)};
     if( ws_single == nullptr ) {
-      cxcoutF(HistFactory) << "Error: Failed to make Single-Channel workspace for channel: " << ch_name
+      cxcoutFHF << "Error: Failed to make Single-Channel workspace for channel: " << ch_name
       << " and measurement: " << measurement.GetName() << std::endl;
       throw hf_exc();
     }
@@ -277,8 +274,8 @@ namespace HistFactory{
     HistoToWorkspaceFactoryFast histFactory(measurement, config);
 
     // Loop over the channels and create the individual workspaces
-    vector<std::unique_ptr<RooWorkspace>> channel_workspaces;
-    vector<string>        channel_names;
+    std::vector<std::unique_ptr<RooWorkspace>> channel_workspaces;
+    std::vector<std::string> channel_names;
 
     for(HistFactory::Channel& channel : measurement.GetChannels()) {
 
@@ -748,7 +745,7 @@ RooArgList HistoToWorkspaceFactoryFast::createObservables(const TH1 *hist, RooWo
     }
 
     if( ! channel.CheckHistograms() ) {
-      std::cout << "MakeSingleChannelWorkspace: Channel: " << channel.GetName()
+      cxcoutFHF << "MakeSingleChannelWorkspace: Channel: " << channel.GetName()
                       << " has uninitialized histogram pointers" << std::endl;
       throw hf_exc();
     }
@@ -796,7 +793,7 @@ RooArgList HistoToWorkspaceFactoryFast::createObservables(const TH1 *hist, RooWo
     //
     auto protoOwner = std::make_unique<RooWorkspace>(channel_name.c_str(), (channel_name+" workspace").c_str());
     RooWorkspace &proto = *protoOwner;
-    auto proto_config = make_unique<ModelConfig>("ModelConfig", &proto);
+    auto proto_config = std::make_unique<ModelConfig>("ModelConfig", &proto);
 
     // preprocess functions
     for(auto const& func : fPreprocessFunctions){
@@ -814,8 +811,8 @@ RooArgList HistoToWorkspaceFactoryFast::createObservables(const TH1 *hist, RooWo
     std::vector<std::vector<RooAbsArg*>> allSampleHistFuncs;
     std::vector<RooProduct*> sampleScaleFactors;
 
-    std::vector< pair<string,string> >   statNamePairs;
-    std::vector< pair<const TH1*, std::unique_ptr<TH1>> > statHistPairs; // <nominal, error>
+    std::vector<std::pair<string,string> >   statNamePairs;
+    std::vector<std::pair<const TH1*, std::unique_ptr<TH1>> > statHistPairs; // <nominal, error>
     const std::string statFuncName = "mc_stat_" + channel_name;
 
     string prefix;
@@ -918,7 +915,7 @@ RooArgList HistoToWorkspaceFactoryFast::createObservables(const TH1 *hist, RooWo
       if( sample.GetStatError().GetActivate() ) {
 
         if( fObsNameVec.size() > 3 ) {
-          cxcoutF(HistFactory) << "Cannot include Stat Error for histograms of more than 3 dimensions."
+          cxcoutFHF << "Cannot include Stat Error for histograms of more than 3 dimensions."
               << std::endl;
           throw hf_exc();
         } else {
@@ -1018,7 +1015,7 @@ RooArgList HistoToWorkspaceFactoryFast::createObservables(const TH1 *hist, RooWo
       if( !sample.GetShapeFactorList().empty() ) {
 
         if( fObsNameVec.size() > 3 ) {
-          cxcoutF(HistFactory) << "Cannot include Stat Error for histograms of more than 3 dimensions."
+          cxcoutFHF << "Cannot include Stat Error for histograms of more than 3 dimensions."
               << std::endl;
           throw hf_exc();
         } else {
@@ -1086,8 +1083,7 @@ RooArgList HistoToWorkspaceFactoryFast::createObservables(const TH1 *hist, RooWo
       if( !sample.GetShapeSysList().empty() ) {
 
         if( fObsNameVec.size() > 3 ) {
-          cxcoutF(HistFactory) << "Cannot include Stat Error for histograms of more than 3 dimensions."
-              << std::endl;
+          cxcoutFHF << "Cannot include Stat Error for histograms of more than 3 dimensions.\n";
           throw hf_exc();
         }
 
@@ -1210,10 +1206,10 @@ RooArgList HistoToWorkspaceFactoryFast::createObservables(const TH1 *hist, RooWo
 
       // Create the histogram of (binwise)
       // stat uncertainties:
-      unique_ptr<TH1> fracStatError( MakeScaledUncertaintyHist( channel_name + "_StatUncert" + "_RelErr", statHistPairs) );
+      std::unique_ptr<TH1> fracStatError( MakeScaledUncertaintyHist( channel_name + "_StatUncert" + "_RelErr", statHistPairs) );
       if( fracStatError == nullptr ) {
-        cxcoutE(HistFactory) << "Error: Failed to make ScaledUncertaintyHist for: "
-            << channel_name + "_StatUncert" + "_RelErr" << std::endl;
+        cxcoutFHF << "Error: Failed to make ScaledUncertaintyHist for: "
+            << channel_name + "_StatUncert" + "_RelErr\n";
         throw hf_exc();
       }
 
@@ -1281,7 +1277,7 @@ RooArgList HistoToWorkspaceFactoryFast::createObservables(const TH1 *hist, RooWo
     for(unsigned int i=0; i<constraintTermNames.size(); ++i){
       RooAbsArg* proto_arg = proto.arg(constraintTermNames[i]);
       if( proto_arg==nullptr ) {
-        cxcoutF(HistFactory) << "Error: Cannot find arg set: " << constraintTermNames.at(i)
+        cxcoutFHF << "Error: Cannot find arg set: " << constraintTermNames.at(i)
             << " in workspace: " << proto.GetName() << std::endl;
         throw hf_exc();
       }
@@ -1291,7 +1287,7 @@ RooArgList HistoToWorkspaceFactoryFast::createObservables(const TH1 *hist, RooWo
     for(unsigned int i=0; i<likelihoodTermNames.size(); ++i){
       RooAbsArg* proto_arg = (proto.arg(likelihoodTermNames[i]));
       if( proto_arg==nullptr ) {
-        cxcoutF(HistFactory) << "Error: Cannot find arg set: " << likelihoodTermNames.at(i)
+        cxcoutFHF << "Error: Cannot find arg set: " << likelihoodTermNames.at(i)
             << " in workspace: " << proto.GetName() << std::endl;
         throw hf_exc();
       }
@@ -1322,7 +1318,7 @@ RooArgList HistoToWorkspaceFactoryFast::createObservables(const TH1 *hist, RooWo
         << "\timport model into workspace"
         << "\n-----------------------------------------\n" << std::endl;
 
-    auto model = make_unique<RooProdPdf>(
+    auto model = std::make_unique<RooProdPdf>(
         ("model_"+channel_name).c_str(),    // MB : have changed this into conditional pdf. Much faster for toys!
         "product of Poissons across bins for a single channel",
         constraintTerms, RooFit::Conditional(likelihoodTerms,observables));
@@ -1355,7 +1351,7 @@ RooArgList HistoToWorkspaceFactoryFast::createObservables(const TH1 *hist, RooWo
       // actually create the files with the stored per-channel workspaces.
       // Otherwise, we just spend time calculating something that gets thrown
       // away anyway (for the combined workspace, we'll create a new Asimov).
-      unique_ptr<RooAbsData> asimov_dataset(AsymptoticCalculator::GenerateAsimovData(*model, observables));
+      std::unique_ptr<RooAbsData> asimov_dataset(AsymptoticCalculator::GenerateAsimovData(*model, observables));
       proto.import(*asimov_dataset, RooFit::Rename("asimovData"));
     }
 
@@ -1378,16 +1374,16 @@ RooArgList HistoToWorkspaceFactoryFast::createObservables(const TH1 *hist, RooWo
 
     for(auto const& data : channel.GetAdditionalData()) {
       if(data.GetName().empty()) {
-        cxcoutF(HistFactory) << "Error: Additional Data histogram for channel: " << channel.GetName()
+        cxcoutFHF << "Error: Additional Data histogram for channel: " << channel.GetName()
                 << " has no name! The name always needs to be set for additional datasets, "
-                << "either via the \"Name\" tag in the XML or via RooStats::HistFactory::Data::SetName()." << std::endl;
+                << "either via the \"Name\" tag in the XML or via RooStats::HistFactory::Data::SetName().\n";
         throw hf_exc();
       }
       std::string const& dataName = data.GetName();
       TH1 const* mnominal = data.GetHisto();
       if( !mnominal ) {
-        cxcoutF(HistFactory) << "Error: Additional Data histogram for channel: " << channel.GetName()
-                << " with name: " << dataName << " is nullptr" << std::endl;
+        cxcoutFHF << "Error: Additional Data histogram for channel: " << channel.GetName()
+                << " with name: " << dataName << " is nullptr\n";
         throw hf_exc();
       }
 
@@ -1488,7 +1484,7 @@ RooArgList HistoToWorkspaceFactoryFast::createObservables(const TH1 *hist, RooWo
     /// These things were used for debugging. Maybe useful in the future
     //
 
-    map<string, RooAbsPdf*> pdfMap;
+    std::map<string, RooAbsPdf*> pdfMap;
     vector<RooAbsPdf*> models;
 
     RooArgList obsList;
@@ -1512,8 +1508,10 @@ RooArgList HistoToWorkspaceFactoryFast::createObservables(const TH1 *hist, RooWo
       RooWorkspace * ch=chs[i].get();
 
       RooAbsPdf* model = ch->pdf("model_"+channel_name);
-      if(!model) std::cout <<"failed to find model for channel"<< std::endl;
-      //      std::cout << "int = " << model->createIntegral(*obsN)->getVal() << std::endl;
+      if(!model) {
+         cxcoutFHF << "failed to find model for channel\n";
+         throw hf_exc();
+      }
       models.push_back(model);
       globalObs.add(*ch->set("globalObservables"), /*silent=*/true); // silent because observables might exist in other channel.
 
@@ -1621,7 +1619,7 @@ RooArgList HistoToWorkspaceFactoryFast::createObservables(const TH1 *hist, RooWo
       combined->import( *asimov_combined, RooFit::Rename("asimovData"));
     }
     else {
-      std::cout << "Error: Failed to create combined asimov dataset" << std::endl;
+      cxcoutFHF << "Error: Failed to create combined asimov dataset\n";
       throw hf_exc();
     }
 
@@ -1654,18 +1652,17 @@ RooArgList HistoToWorkspaceFactoryFast::createObservables(const TH1 *hist, RooWo
 
       // Check that histError != NAN
       if( histError != histError ) {
-   std::cout << "Warning: In histogram " << Nominal->GetName()
+   cxcoutFHF << "Warning: In histogram " << Nominal->GetName()
         << " bin error for bin " << i_bin
-        << " is NAN.  Not using Error!!!"
-        << std::endl;
+        << " is NAN.  Not using Error!!!\n";
    throw hf_exc();
    //histError = sqrt( histContent );
    //histError = 0;
       }
 
       // Check that histError ! < 0
       if( histError < 0  ) {
-   std::cout << "Warning: In histogram " << Nominal->GetName()
+   cxcoutWHF << "Warning: In histogram " << Nominal->GetName()
         << " bin error for bin " << binNumber
         << " is < 0.  Setting Error to 0"
         << std::endl;
@@ -1743,7 +1740,7 @@ RooArgList HistoToWorkspaceFactoryFast::createObservables(const TH1 *hist, RooWo
       double histError  = error->GetBinContent( binNumber );
 
       if( histError != histError ) {
-        cxcoutE(HistFactory) << "In histogram " << error->GetName()
+        cxcoutFHF << "In histogram " << error->GetName()
         << " bin error for bin " << binNumber
         << " is NAN.  Not using error!!";
         throw hf_exc();
@@ -1813,6 +1810,4 @@ RooArgList HistoToWorkspaceFactoryFast::createObservables(const TH1 *hist, RooWo
 }
 
 
-} // namespace RooStats
-} // namespace HistFactory
-
+} // namespace RooStats::HistFactory