[RF] Remove RooMultiCatIter and comparison with old-style evaluation in RooMultiCategory

README/ReleaseNotes/v628/index.md

@@ -53,6 +53,7 @@ Please use their non-experimental counterparts `ROOT::TBufferMerger` and `ROOT::
   intended. Related to it was the `RooDataHist::cacheValidEntries()` function, which is removed as well.
   The preferred way to reduce RooFit datasets to subranges is [RooAbsData::reduce()](https://root.cern.ch/doc/v628/classRooAbsData.html#acfa7b31e5cd751eec1bc4e95d2796390).
 - The longtime-deprecated `RooStats::HistFactory::EstimateSummary` class is removed, including the functions that use it. The information that it was meant to store is managed by the `RooStats::HistFactory::Measurement` object since many years.
+- The `RooSuperCategory::MakeIterator()` function that was deprecated since 6.22 is now removed. Please use range-based loops to iterate over the category states.
 
 
 ## Core Libraries

roofit/roofitcore/CMakeLists.txt

@@ -461,7 +461,6 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RooFitCore
     src/RooBinWidthFunction.cxx
     src/RooFitLegacy/RooCatTypeLegacy.cxx
     src/RooFitLegacy/RooMinuit.cxx
-    src/RooFitLegacy/RooMultiCatIter.cxx
     src/RunContext.cxx
     src/TestStatistics/ConstantTermsOptimizer.cxx
     src/TestStatistics/LikelihoodGradientWrapper.cxx

roofit/roofitcore/inc/RooSuperCategory.h

@@ -41,8 +41,6 @@ class RooSuperCategory : public RooAbsCategoryLValue {
   // Printing interface (human readable)
   void printMultiline(std::ostream& os, Int_t content, bool verbose=false, TString indent="") const override;
 
-  /// \deprecated Use begin(), end() or range-based for loops to iterate through state names.
-  TIterator* MakeIterator() const ;
   const RooArgSet& inputCatList() const { return _multiCat->inputCatList(); }
 
   bool inRange(const char* rangeName) const override;

roofit/roofitcore/src/RooMultiCategory.cxx

@@ -108,26 +108,6 @@ std::string RooMultiCategory::createLabel() const
 }
 
 
-#ifndef NDEBUG
-
-#include "RooFitLegacy/RooMultiCatIter.h"
-namespace {
-/// Check that root-6.22 redesign of category interfaces yields same labels
-std::string computeLabelOldStyle(const RooArgSet& catSet, unsigned int index) {
-  RooMultiCatIter iter(catSet) ;
-  TObjString* obj ;
-  for (unsigned int i=0; (obj=(TObjString*)iter.Next()); ++i) {
-    if (i == index) {
-      return obj->String().Data();
-    }
-  }
-
-  return {};
-}
-}
-#endif
-
-
 ////////////////////////////////////////////////////////////////////////////////
 /// Calculate the current value.
 /// This enumerates the states of each serving category, and calculates a unique
@@ -148,12 +128,6 @@ RooAbsCategory::value_type RooMultiCategory::evaluate() const
     multiplier *= cat->size();
   }
 
-#ifndef NDEBUG
-  assert(hasIndex(computedStateIndex));
-  _currentIndex = computedStateIndex;
-  assert(createLabel() == computeLabelOldStyle(_catSet, computedStateIndex));
-#endif
-
   return computedStateIndex;
 }
 

roofit/roofitcore/src/RooSuperCategory.cxx

@@ -34,7 +34,6 @@ supercategory will propagate to its input categories.
 #include "Riostream.h"
 #include "RooStreamParser.h"
 #include "RooArgSet.h"
-#include "RooFitLegacy/RooMultiCatIter.h"
 #include "RooAbsCategoryLValue.h"
 #include "RooMsgService.h"
 
@@ -85,16 +84,6 @@ RooSuperCategory::RooSuperCategory(const RooSuperCategory& other, const char *na
 }
 
 
-////////////////////////////////////////////////////////////////////////////////
-/// Make an iterator over all state permutations of
-/// the input categories of this supercategory.
-/// The iterator just generates state names, it does not set them.
-TIterator* RooSuperCategory::MakeIterator() const
-{
-  return new RooMultiCatIter(_multiCat->inputCatList());
-}
-
-
 ////////////////////////////////////////////////////////////////////////////////
 /// Set the value of the super category to the specified index.
 /// This will propagate to the sub-categories, and set their state accordingly.