foresee weight==1 when filling, deprecate IfEmptyVariableConvertToOnes

Author: lubynets

infra/AnalysisEntry.cpp

@@ -83,6 +83,10 @@ double AnalysisEntry::FillVariable(const Variable& var, std::vector<const Branch
   return result;
 }
 
+double AnalysisEntry::FillWeight(const Variable& var, std::vector<const Branch*>& br, std::vector<int>& id) {
+  return var.GetNumberOfBranches() > 0 ? FillVariable(var, br, id) : 1.;
+}
+
 double AnalysisEntry::FillVariable(const Variable& var, const Branch& br1, int ch1, const Branch& br2, int ch2) {
   Branch* br1_ptr = new Branch(std::move(br1));
   Branch* br2_ptr = new Branch(std::move(br2));
@@ -132,7 +136,7 @@ void AnalysisEntry::FillFromEveHeaders() {
     i_var++;
   }//variables
   values_.emplace_back(temp_vars);
-  weights_.emplace_back(FillVariable(var4weight_, br_vec, id_vec));
+  weights_.emplace_back(FillWeight(var4weight_, br_vec, id_vec));
 }
 
 /**
@@ -168,7 +172,7 @@ void AnalysisEntry::FillFromOneChannalizedBranch() {
       i_var++;
     }//variables
     values_.emplace_back(temp_vars);
-    weights_.emplace_back(FillVariable(var4weight_, br_vec, id_vec));
+    weights_.emplace_back(FillWeight(var4weight_, br_vec, id_vec));
   }// channels
 }
 
@@ -211,7 +215,7 @@ void AnalysisEntry::FillFromTwoChannalizedBranches() {
       i_var++;
     }//variables
     values_.emplace_back(temp_vars);
-    weights_.emplace_back(FillVariable(var4weight_, br_vec, id_vec));
+    weights_.emplace_back(FillWeight(var4weight_, br_vec, id_vec));
   }// channels
 }
 

infra/AnalysisEntry.hpp

@@ -29,7 +29,6 @@ class AnalysisEntry {
   explicit AnalysisEntry(std::vector<Variable> vars, Cuts* cuts = nullptr, Variable vars4weight = {}) : vars_(std::move(vars)),
                                                                                                         var4weight_(std::move(vars4weight)),
                                                                                                         cuts_(cuts) {
-    var4weight_.IfEmptyVariableConvertToOnes(vars_.at(0));
     FillBranchNames();
   };
 
@@ -62,6 +61,7 @@ class AnalysisEntry {
   ANALYSISTREE_ATTR_NODISCARD bool ApplyCutOnBranches(std::vector<const Branch*>& br, std::vector<Cuts*>& cuts, std::vector<int>& ch) const;
   [[deprecated]] ANALYSISTREE_ATTR_NODISCARD bool ApplyCutOnBranches(const Branch& br1, Cuts* cuts1, int ch1, const Branch& br2, Cuts* cuts2, int ch2) const;
   static double FillVariable(const Variable& var, std::vector<const Branch*>& br, std::vector<int>& id);
+  static double FillWeight(const Variable& var, std::vector<const Branch*>& br, std::vector<int>& id);
   [[deprecated]] static double FillVariable(const Variable& var, const Branch& br1, int ch1, const Branch& br2, int ch2);
 
   std::vector<Variable> vars_{};

infra/Variable.hpp

@@ -82,7 +82,7 @@ class Variable {
 
   void Print() const;
 
-  void IfEmptyVariableConvertToOnes(const Variable& var);
+  ANALYSISTREE_ATTR_DEPRECATED() void IfEmptyVariableConvertToOnes(const Variable& var);
 
  protected:
   std::string name_;