Skip to content

Commit ddae29e

Browse files
lubynetslubynets
committed
remove entry_cuts_ from EntryConfig, leave their name only
1 parent 6a13cad commit ddae29e

File tree

3 files changed

+16
-15
lines changed

3 files changed

+16
-15
lines changed

‎src/EntryConfig.cpp‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ EntryConfig::EntryConfig(const Axis& axis, Variable& weight, const std::string&
3636
type_(is_integral ? PlotType::kIntegral1D : PlotType::kHisto1D),
3737
axes_({axis}),
3838
var4weight_(weight),
39-
entry_cuts_(cuts) {
39+
entry_cuts_name_(cuts != nullptr ? cuts->GetName() : "") {
4040
if (name == "") {
4141
if (cuts)
4242
name_ += "_" + cuts->GetName();
@@ -53,14 +53,18 @@ EntryConfig::EntryConfig(const Axis& axis, Variable& weight, const std::string&
5353
EntryConfig::EntryConfig(const Axis& x, const Axis& y, Variable& weight, const std::string& name, Cuts* cuts, bool is_profile) : type_(is_profile ? PlotType::kProfile : PlotType::kHisto2D),
5454
axes_({x, y}),
5555
var4weight_(weight),
56-
entry_cuts_(cuts) {
56+
entry_cuts_name_(cuts != nullptr ? cuts->GetName() : "") {
5757
Set2DName(name);
5858
InitPlot();
5959
}
6060

6161
EntryConfig::EntryConfig(const Axis& x, Cuts* cuts_x, const Axis& y, Cuts* cuts_y) : type_(PlotType::kIntegral2D),
62-
axes_({x, y}),
63-
entry_cuts_(cuts_x) {
62+
axes_({x, y}) {
63+
const std::string cutNameX = cuts_x != nullptr ? cuts_x->GetName() : "";
64+
const std::string cutNameY = cuts_y != nullptr ? cuts_y->GetName() : "";
65+
const std::string cutNameSeparator = cuts_x != nullptr && cuts_y != nullptr ? "_" : "";
66+
entry_cuts_name_ = cutNameX + cutNameSeparator + cutNameY;
67+
6468
Set2DName();
6569
InitPlot();
6670
}
@@ -172,8 +176,7 @@ void EntryConfig::InitPlot() {
172176
void EntryConfig::Set2DName(const std::string& name) {
173177
name_ = name.empty() ? Form("%s_%s", axes_[0].GetName(), axes_[1].GetName()) : name;
174178
if (name.empty()) {
175-
if (entry_cuts_ != nullptr)
176-
name_ += "_" + entry_cuts_->GetName();
179+
name_ += "_" + entry_cuts_name_;
177180

178181
if (!var4weight_.GetName().empty() && var4weight_.GetFields().at(0).GetName() != "ones") {
179182
name_ += "_weight_" + var4weight_.GetName();
@@ -206,9 +209,7 @@ std::string EntryConfig::GetDirectoryName() const {
206209
for (auto it = ++branches.begin(); it != branches.end(); ++it) {
207210
name += "_" + *it;
208211
}
209-
if (entry_cuts_) {
210-
name += "_" + entry_cuts_->GetName();
211-
}
212+
name += "_" + entry_cuts_name_;
212213
if (!var4weight_.GetName().empty() && var4weight_.GetFields().at(0).GetName() != "ones") {
213214
name += "_weight_" + var4weight_.GetName();
214215
}

‎src/EntryConfig.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class EntryConfig {
5959
void Fill(double value1, double value2, double value3);
6060

6161
ANALYSISTREE_ATTR_NODISCARD unsigned int GetNdimensions() const { return axes_.size(); }
62-
ANALYSISTREE_ATTR_NODISCARD Cuts* GetEntryCuts() const { return entry_cuts_; }
62+
ANALYSISTREE_ATTR_NODISCARD const std::string& GetEntryCutsName() const { return entry_cuts_name_; }
6363
ANALYSISTREE_ATTR_NODISCARD PlotType GetType() const { return type_; }
6464

6565
ANALYSISTREE_ATTR_NODISCARD std::vector<std::pair<int, int>> GetVariablesId() const { return vars_id_; }
@@ -97,7 +97,7 @@ class EntryConfig {
9797

9898
std::vector<Axis> axes_{};
9999
Variable var4weight_{};
100-
Cuts* entry_cuts_{nullptr};
100+
std::string entry_cuts_name_{};
101101
std::vector<std::pair<int, int>> vars_id_{};
102102

103103
ClassDef(EntryConfig, 1);

‎src/Task.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ size_t Task::AddH1(const std::string& name, const Axis& x, Cuts* cuts, Variable
1212
TDirectory* dir = MkDirIfNotYet(out_file_, dirName);
1313
ANALYSISTREE_UTILS_VISIT(setdirectory_struct(dir), entries_.back().GetPlot());
1414
ANALYSISTREE_UTILS_VISIT(setname_struct(entries_.back().GetName()), entries_.back().GetPlot());
15-
auto var_id = AddEntry(AnalysisEntry(entries_.back().GetVariables(), entries_.back().GetEntryCuts(), entries_.back().GetVariableForWeight()));
15+
auto var_id = AddEntry(AnalysisEntry(entries_.back().GetVariables(), cuts, entries_.back().GetVariableForWeight()));
1616
entries_.back().SetVariablesId({{var_id.first, var_id.second.at(0)}});
1717
return entries_.size() - 1;
1818
}
@@ -29,7 +29,7 @@ size_t Task::AddH2(const std::string& name, const Axis& x, const Axis& y, Cuts*
2929
TDirectory* dir = MkDirIfNotYet(out_file_, dirName);
3030
ANALYSISTREE_UTILS_VISIT(setdirectory_struct(dir), entries_.back().GetPlot());
3131
ANALYSISTREE_UTILS_VISIT(setname_struct(entries_.back().GetName()), entries_.back().GetPlot());
32-
auto var_id = AddEntry(AnalysisEntry(entries_.back().GetVariables(), entries_.back().GetEntryCuts(), entries_.back().GetVariableForWeight()));
32+
auto var_id = AddEntry(AnalysisEntry(entries_.back().GetVariables(), cuts, entries_.back().GetVariableForWeight()));
3333
entries_.back().SetVariablesId({{var_id.first, var_id.second.at(0)}, {var_id.first, var_id.second.at(1)}});
3434
return entries_.size() - 1;
3535
}
@@ -46,7 +46,7 @@ size_t Task::AddProfile(const std::string& name, const Axis& x, const Axis& y, C
4646
TDirectory* dir = MkDirIfNotYet(out_file_, dirName);
4747
ANALYSISTREE_UTILS_VISIT(setdirectory_struct(dir), entries_.back().GetPlot());
4848
ANALYSISTREE_UTILS_VISIT(setname_struct(entries_.back().GetName()), entries_.back().GetPlot());
49-
auto var_id = AddEntry(AnalysisEntry(entries_.back().GetVariables(), entries_.back().GetEntryCuts(), entries_.back().GetVariableForWeight()));
49+
auto var_id = AddEntry(AnalysisEntry(entries_.back().GetVariables(), cuts, entries_.back().GetVariableForWeight()));
5050
entries_.back().SetVariablesId({{var_id.first, var_id.second.at(0)}, {var_id.first, var_id.second.at(1)}});
5151
return entries_.size() - 1;
5252
}
@@ -63,7 +63,7 @@ size_t Task::AddIntegral(const std::string& name, const Axis& x, Cuts* cuts, Var
6363
TDirectory* dir = MkDirIfNotYet(out_file_, dirName);
6464
ANALYSISTREE_UTILS_VISIT(setdirectory_struct(dir), entries_.back().GetPlot());
6565
ANALYSISTREE_UTILS_VISIT(setname_struct(entries_.back().GetName()), entries_.back().GetPlot());
66-
auto var_id = AddEntry(AnalysisEntry(entries_.back().GetVariables(), entries_.back().GetEntryCuts(), entries_.back().GetVariableForWeight()));
66+
auto var_id = AddEntry(AnalysisEntry(entries_.back().GetVariables(), cuts, entries_.back().GetVariableForWeight()));
6767
entries_.back().SetVariablesId({{var_id.first, var_id.second.at(0)}});
6868
return entries_.size() - 1;
6969
}

0 commit comments

Comments
 (0)