Improve logic for freezing and unfreezing disassiotiated parameters

This functionality is intended to be upstreamed to RooFit, and therefore
refactored in one portable function that can be moved to the RooFit
helpers.

The major change is that the function that freezes the parameters now
returns a set with all parameters where the constant change was toggled.
This allows us to easily un-freeze these parameters later, without
having to carry around in the global state the full list of original
floating parameters

Author: guitargeek

interface/CascadeMinimizer.h

@@ -5,8 +5,6 @@ class RooAbsReal;
 class RooArgSet;
 class RooRealVar;
 #include <RooArgSet.h>
-#include <RooListProxy.h>
-#include <RooSetProxy.h>
 #include "RooMinimizer.h"
 #include <boost/program_options.hpp>
 
@@ -34,7 +32,6 @@ class CascadeMinimizer {
         static const boost::program_options::options_description & options() { return options_; }
         void trivialMinimize(const RooAbsReal &nll, RooRealVar &r, int points=100) const ;
         //void collectIrrelevantNuisances(RooAbsCollection &irrelevant) const ;
-	bool freezeDiscParams(const bool);
         void setAutoBounds(const RooArgSet *pois) ;
         void setAutoMax(const RooArgSet *pois) ; 
 	double tolerance() {return defaultMinimizerTolerance_;};
@@ -126,7 +123,6 @@ class CascadeMinimizerGlobalConfigs{
 	  RooArgList nuisanceParameters; 
 	  RooArgList allFloatingParameters; 
 	  RooArgList parametersOfInterest; 
-	  RooArgList allRooMultiPdfParams;
 	  RooArgList allRooMultiPdfs;
 
 	  static CascadeMinimizerGlobalConfigs& O(){

interface/utils.h

@@ -121,7 +121,6 @@ namespace utils {
     std::vector<std::vector<int> > generateOrthogonalCombinations(const std::vector<int> &vec);
     int countFloating(const RooArgSet &);
     RooArgSet returnAllVars(RooWorkspace *);
-    bool freezeAllDisassociatedRooMultiPdfParameters(const RooArgSet & multiPdfs, const RooArgSet & allRooMultiPdfParams, bool freeze=true);
 
 }