Some code modernization in CMSHistFunc and CMSHistErrorPropagator

Author: guitargeek

interface/CMSHistErrorPropagator.h

@@ -33,7 +33,7 @@ class CMSHistErrorPropagator : public RooAbsReal {
     std::vector<RooRealVar*> push_res;
   };
 public:
-  CMSHistErrorPropagator();
+  CMSHistErrorPropagator() = default;
 
   CMSHistErrorPropagator(const char* name, const char* title, RooRealVar& x,
                          RooArgList const& funcs, RooArgList const& coeffs);
@@ -44,8 +44,6 @@ class CMSHistErrorPropagator : public RooAbsReal {
     return new CMSHistErrorPropagator(*this, newname);
   }
 
-  ~CMSHistErrorPropagator() override {;}
-
   void applyErrorShifts(unsigned idx, FastHisto const& nominal, FastHisto & result);
 
   Double_t evaluate() const override;
@@ -101,7 +99,7 @@ class CMSHistErrorPropagator : public RooAbsReal {
 
   mutable BarlowBeeston bb_; //!
 
-  mutable bool initialized_; //! not to be serialized
+  mutable bool initialized_ = false; //! not to be serialized
 
   mutable int last_eval_; //! not to be serialized
 

interface/CMSHistFunc.h

@@ -175,8 +175,8 @@ class CMSHistFunc : public RooAbsReal {
   mutable std::vector<Cache> mcache_;  //! not to be serialized
 
   unsigned morph_strategy_;
-  mutable bool initialized_; //! not to be serialized
-  bool rebin_;
+  mutable bool initialized_ = false; //! not to be serialized
+  bool rebin_ = false;
   std::vector<unsigned> rebin_scheme_;
   HorizontalType htype_;
   MomentSetting mtype_;
@@ -186,7 +186,7 @@ class CMSHistFunc : public RooAbsReal {
 
   double vsmooth_par_;
 
-  mutable bool fast_vertical_; //! not to be serialized
+  mutable bool fast_vertical_ = false; //! not to be serialized
   mutable std::vector<double> vertical_prev_vals_; //! not to be serialized
   mutable std::vector<RooAbsReal*> vmorphs_vec_; //! not to be serialized
 

src/CMSHistErrorPropagator.cc

@@ -17,8 +17,6 @@
 
 #define HFVERBOSE 0
 
-CMSHistErrorPropagator::CMSHistErrorPropagator() : initialized_(false) {}
-
 CMSHistErrorPropagator::CMSHistErrorPropagator(const char* name,
                                                const char* title,
                                                RooRealVar& x,
@@ -31,7 +29,6 @@ CMSHistErrorPropagator::CMSHistErrorPropagator(const char* name,
       binpars_("binpars", "", this),
       sentry_(TString(name) + "_sentry", ""),
       binsentry_(TString(name) + "_binsentry", ""),
-      initialized_(false),
       last_eval_(-1) {
   funcs_.add(funcs);
   coeffs_.add(coeffs);
@@ -47,7 +44,6 @@ CMSHistErrorPropagator::CMSHistErrorPropagator(
       bintypes_(other.bintypes_),
       sentry_(name ? TString(name) + "_sentry" : TString(other.GetName())+"_sentry", ""),
       binsentry_(name ? TString(name) + "_binsentry" : TString(other.GetName())+"_binsentry", ""),
-      initialized_(false),
       last_eval_(-1) {
 }
 

src/CMSHistFunc.cc

@@ -20,14 +20,11 @@ bool CMSHistFunc::enable_fast_vertical_ = false;
 
 CMSHistFunc::CMSHistFunc() {
   morph_strategy_ = 0;
-  initialized_ = false;
   htype_ = HorizontalType::Integral;
   mtype_ = MomentSetting::NonLinearPosFractions;
   vtype_ = VerticalSetting::QuadLinear;
   divide_by_width_ = true;
-  rebin_ = false;
   vsmooth_par_ = 1.0;
-  fast_vertical_ = false;
 }
 
 CMSHistFunc::CMSHistFunc(const char* name, const char* title, RooRealVar& x,
@@ -41,14 +38,11 @@ CMSHistFunc::CMSHistFunc(const char* name, const char* title, RooRealVar& x,
       cache_(hist),
       binerrors_(FastTemplate(hist.GetNbinsX())),
       morph_strategy_(0),
-      initialized_(false),
-      rebin_(false),
       htype_(HorizontalType::Integral),
       mtype_(MomentSetting::Linear),
       vtype_(VerticalSetting::QuadLinear),
       divide_by_width_(divide_by_width),
       vsmooth_par_(1.0),
-      fast_vertical_(false),
       external_morph_("external_morph", "", this) {
   if (divide_by_width_) {
     for (unsigned i = 0; i < cache_.size(); ++i) {
@@ -113,15 +107,13 @@ CMSHistFunc::CMSHistFunc(CMSHistFunc const& other, const char* name)
       binerrors_(other.binerrors_),
       storage_(other.storage_),
       morph_strategy_(other.morph_strategy_),
-      initialized_(false),
       rebin_(other.rebin_),
       rebin_scheme_(other.rebin_scheme_),
       htype_(other.htype_),
       mtype_(other.mtype_),
       vtype_(other.vtype_),
       divide_by_width_(other.divide_by_width_),
       vsmooth_par_(other.vsmooth_par_),
-      fast_vertical_(false),
       external_morph_("external_morph", this, other.external_morph_)
 {
   // initialize();