[RF] Remove NormFactor::GetConst() and SetConst() member functions

As printed out by the HistFactory in a warning message for a long time
already, setting the `Const` attribute to the `<NormFactor>` tag is
deprecated and it will be ignored. Instead, add
`<ParamSetting Const="True"> myparam </ParamSetting>`
to your top-level XML's `<Measurement>` entry.

This deprecation implied that the constant parameter flag in the
`RooStats:HistFactory::NormFactor` class had no effect as well. To avoid
ambiguity in the future, the possibility to set and retrieve this flag with
`NormFactor::SetConst()` and `NormFactor::GetConst()` was removed, and the
aforementioned deprecated warning is not printed anymore.

Author: guitargeek

README/ReleaseNotes/v628/index.md

@@ -118,7 +118,9 @@ hfCfg.binnedFitOptimization = false;
 RooStats::HistFactory::MakeModelAndMeasurementFast(measurement, hfCfg);
 ```
 
-### Removal of HistoToWorkspaceFactory (non-Fast)
+### Removal of deprecated HistFactory functionality
+
+#### Removal of HistoToWorkspaceFactory (non-Fast version)
 
 The original `HistoToWorkspaceFactory` produced models that consisted of a
 Poisson term for each bin.  In this "number counting form" the dataset has one
@@ -134,6 +136,19 @@ histogram.
 Therefore, the original `HistoToWorkspaceFactory` is now removed to avoid
 confusion and maintainance burden.
 
+#### Removing constant parameter flag from RooStats:HistFactory::NormFactor
+
+As printed out by the HistFactory in a warning message for a long time already,
+setting the `Const` attribute to the `<NormFactor>` tag is deprecated and it
+will be ignored. Instead, add `<ParamSetting Const="True"> myparam </ParamSetting>` to your top-level XML's `<Measurement>` entry.
+
+This deprecation implied that the constant parameter flag in the
+`RooStats:HistFactory::NormFactor` class had no effect as well. To avoid
+ambiguity in the future, the possibility to set and retrieve this flag with
+`NormFactor::SetConst()` and `NormFactor::GetConst()` was removed, as well as the
+`Sample::AddNormFactor(std::string Name, double Val, double Low, double High, bool Const)`
+overload. Also, the aforementioned deprecation warning is not printed anymore.
+
 ### Removal of `RooAbsMinimizerFcn` and `RooMinimizerFcn` from the public interface
 
 The `RooAbsMinimizerFcn` class and its implementation `RooMinimizerFcn` were removed from the public interface.

roofit/histfactory/inc/RooStats/HistFactory/Sample.h

@@ -56,7 +56,7 @@ class Sample {
   void AddOverallSys( std::string Name, double Low, double High );
   void AddOverallSys( const OverallSys& Sys );
 
-  void AddNormFactor( std::string Name, double Val, double Low, double High, bool Const=false );
+  void AddNormFactor( std::string const& Name, double Val, double Low, double High );
   void AddNormFactor( const NormFactor& Factor );
 
   void AddHistoSys(    std::string Name, std::string HistoNameLow,  std::string HistoFileLow,  std::string HistoPathLow,

roofit/histfactory/inc/RooStats/HistFactory/Systematics.h

@@ -86,9 +86,6 @@ namespace HistFactory {
     void SetVal( double Val ) { fVal = Val; }
     double GetVal() const { return fVal; }
 
-    void SetConst( bool Const=true ) { fConst = Const; }
-    bool GetConst() const { return fConst; }
-
     void SetLow( double Low )   { fLow  = Low; }
     void SetHigh( double High ) { fHigh = High; }
     double GetLow() const { return fLow; }
@@ -103,7 +100,6 @@ namespace HistFactory {
     double fVal;
     double fLow;
     double fHigh;
-    bool fConst;
 
   };
 

roofit/histfactory/src/ConfigParser.cxx

@@ -1026,9 +1026,6 @@ HistFactory::NormFactor ConfigParser::MakeNormFactor( TXMLNode* node ) {
     else if( curAttr->GetName() == TString( "High" ) ) {
       norm.SetHigh( atof(attrVal.c_str()) );
     }
-    else if( curAttr->GetName() == TString( "Const" ) ) {
-      norm.SetConst( CheckTrueFalse(attrVal,"NormFactor") );
-    }
 
     else {
       cxcoutEHF << "Error: Encountered Element in NormFactor with unknown name: "

roofit/histfactory/src/HistoToWorkspaceFactoryFast.cxx

@@ -480,13 +480,6 @@ RooArgList HistoToWorkspaceFactoryFast::createObservables(const TH1 *hist, RooWo
           proto->factory(varname + range.str());
         }
 
-        if(norm.GetConst()) {
-          //     proto->var(varname)->setConstant();
-          //     cout <<"setting " << varname << " constant"<<endl;
-          cxcoutW(HistFactory) << "Const attribute to <NormFactor> tag is deprecated, will ignore." <<
-              " Instead, add \n\t<ParamSetting Const=\"True\"> " << varname << " </ParamSetting>\n" <<
-              " to your top-level XML's <Measurement> entry" << endl;
-        }
         prodNames.push_back(varname);
         rangeNames.push_back(range.str());
         normFactorNames.push_back(varname);

roofit/histfactory/src/Sample.cxx

@@ -245,7 +245,6 @@ void RooStats::HistFactory::Sample::PrintXML( std::ofstream& xml ) const {
    << " Val=\""   << sys.GetVal()   << "\" "
    << " High=\""  << sys.GetHigh()  << "\" "
    << " Low=\""   << sys.GetLow()   << "\" "
-   << " Const=\"" << (sys.GetConst() ? std::string("True") : std::string("False")) << "\" "
    << "  /> " << std::endl;
     */
   }
@@ -350,15 +349,14 @@ void RooStats::HistFactory::Sample::AddOverallSys( const OverallSys& Sys ) {
   fOverallSysList.push_back(Sys);
 }
 
-void RooStats::HistFactory::Sample::AddNormFactor( std::string SysName, double SysVal, double SysLow, double SysHigh, bool SysConst ) {
+void RooStats::HistFactory::Sample::AddNormFactor( std::string const& SysName, double SysVal, double SysLow, double SysHigh ) {
 
   RooStats::HistFactory::NormFactor norm;
 
   norm.SetName( SysName );
   norm.SetVal( SysVal );
   norm.SetLow( SysLow );
   norm.SetHigh( SysHigh );
-  norm.SetConst( SysConst );
 
   fNormFactorList.push_back( norm );
 

roofit/histfactory/src/Systematics.cxx

@@ -55,15 +55,13 @@ RooStats::HistFactory::Constraint::Type RooStats::HistFactory::Constraint::GetTy
 
 // Norm Factor
 RooStats::HistFactory::NormFactor::NormFactor() : fName(""), fVal(1.0),
-                    fLow(1.0), fHigh(1.0),
-                    fConst(true) {;}
+                    fLow(1.0), fHigh(1.0) {}
 
 void RooStats::HistFactory::NormFactor::Print( std::ostream& stream ) const {
   stream << "\t \t Name: " << fName
     << "\t Val: " << fVal
     << "\t Low: " << fLow
     << "\t High: " << fHigh
-    << "\t Const: " << fConst
     << std::endl;
 }
 
@@ -72,7 +70,6 @@ void RooStats::HistFactory::NormFactor::PrintXML( std::ostream& xml ) const {
       << " Val=\""   << GetVal()   << "\" "
       << " High=\""  << GetHigh()  << "\" "
       << " Low=\""   << GetLow()   << "\" "
-      << " Const=\"" << (GetConst() ? std::string("True") : std::string("False")) << "\" "
       << "  /> " << std::endl;
 }
 

roofit/hs3/src/HistFactoryJSONTool.cxx

@@ -178,9 +178,6 @@ void exportMeasurement(RooStats::HistFactory::Measurement &measurement, JSONNode
                v["value"] << norm.GetVal();
                v["min"] << norm.GetLow();
                v["max"] << norm.GetHigh();
-               if (norm.GetConst()) {
-                  v["const"] << true;
-               }
             }
          }
          for (const auto &sys : s.GetOverallSysList()) {