Skip to content

Commit bacf057

Browse files
lubynetslubynets
committed
clean code
1 parent 90334d1 commit bacf057

File tree

2 files changed

+24
-21
lines changed

2 files changed

+24
-21
lines changed

‎src/Task.cpp‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ size_t Task::AddH1(const std::string& name, const Axis& x, Cuts* cuts, Variable
1313
TDirectory* dir = MkDirIfNotYet(out_file_, dirName);
1414
ANALYSISTREE_UTILS_VISIT(setdirectory_struct(dir), entries_.back().GetPlot());
1515
ANALYSISTREE_UTILS_VISIT(setname_struct(entries_.back().GetName()), entries_.back().GetPlot());
16-
auto var_id = AddEntry(AnalysisEntry(entries_.back().GetVariables(), cuts, entries_.back().GetVariableForWeight()));
16+
const auto var_id = AddEntry(AnalysisEntry(entries_.back().GetVariables(), cuts, entries_.back().GetVariableForWeight()));
1717
entries_.back().SetVariablesId({{var_id.first, var_id.second.at(0)}});
1818
return entries_.size() - 1;
1919
}
@@ -30,7 +30,7 @@ size_t Task::AddH2(const std::string& name, const Axis& x, const Axis& y, Cuts*
3030
TDirectory* dir = MkDirIfNotYet(out_file_, dirName);
3131
ANALYSISTREE_UTILS_VISIT(setdirectory_struct(dir), entries_.back().GetPlot());
3232
ANALYSISTREE_UTILS_VISIT(setname_struct(entries_.back().GetName()), entries_.back().GetPlot());
33-
auto var_id = AddEntry(AnalysisEntry(entries_.back().GetVariables(), cuts, entries_.back().GetVariableForWeight()));
33+
const auto var_id = AddEntry(AnalysisEntry(entries_.back().GetVariables(), cuts, entries_.back().GetVariableForWeight()));
3434
entries_.back().SetVariablesId({{var_id.first, var_id.second.at(0)}, {var_id.first, var_id.second.at(1)}});
3535
return entries_.size() - 1;
3636
}
@@ -47,7 +47,7 @@ size_t Task::AddProfile(const std::string& name, const Axis& x, const Axis& y, C
4747
TDirectory* dir = MkDirIfNotYet(out_file_, dirName);
4848
ANALYSISTREE_UTILS_VISIT(setdirectory_struct(dir), entries_.back().GetPlot());
4949
ANALYSISTREE_UTILS_VISIT(setname_struct(entries_.back().GetName()), entries_.back().GetPlot());
50-
auto var_id = AddEntry(AnalysisEntry(entries_.back().GetVariables(), cuts, entries_.back().GetVariableForWeight()));
50+
const auto var_id = AddEntry(AnalysisEntry(entries_.back().GetVariables(), cuts, entries_.back().GetVariableForWeight()));
5151
entries_.back().SetVariablesId({{var_id.first, var_id.second.at(0)}, {var_id.first, var_id.second.at(1)}});
5252
return entries_.size() - 1;
5353
}
@@ -65,7 +65,7 @@ size_t Task::AddIntegral(const std::string& name, const Axis& x, Cuts* cuts) {
6565
TDirectory* dir = MkDirIfNotYet(out_file_, dirName);
6666
ANALYSISTREE_UTILS_VISIT(setdirectory_struct(dir), entries_.back().GetPlot());
6767
ANALYSISTREE_UTILS_VISIT(setname_struct(entries_.back().GetName()), entries_.back().GetPlot());
68-
auto var_id = AddEntry(AnalysisEntry(entries_.back().GetVariables(), cuts, entries_.back().GetVariableForWeight()));
68+
const auto var_id = AddEntry(AnalysisEntry(entries_.back().GetVariables(), cuts, entries_.back().GetVariableForWeight()));
6969
entries_.back().SetVariablesId({{var_id.first, var_id.second.at(0)}});
7070
return entries_.size() - 1;
7171
}
@@ -81,8 +81,8 @@ size_t Task::AddIntegral(const std::string& name, const Axis& x, const Axis& y,
8181
TDirectory* dir = MkDirIfNotYet(out_file_, dirName);
8282
ANALYSISTREE_UTILS_VISIT(setdirectory_struct(dir), entries_.back().GetPlot());
8383
ANALYSISTREE_UTILS_VISIT(setname_struct(entries_.back().GetName()), entries_.back().GetPlot());
84-
auto var_id_x = AddEntry(AnalysisEntry({entries_.back().GetVariables()[0]}, cuts_x));
85-
auto var_id_y = AddEntry(AnalysisEntry({entries_.back().GetVariables()[1]}, cuts_y));
84+
const auto var_id_x = AddEntry(AnalysisEntry({entries_.back().GetVariables()[0]}, cuts_x));
85+
const auto var_id_y = AddEntry(AnalysisEntry({entries_.back().GetVariables()[1]}, cuts_y));
8686
entries_.back().SetVariablesId({{var_id_x.first, var_id_x.second.at(0)}, {var_id_y.first, var_id_y.second.at(0)}});
8787
return entries_.size() - 1;
8888
}
@@ -115,7 +115,6 @@ void Task::Exec() {
115115
AnalysisTask::Exec();
116116

117117
for (auto& plot : entries_) {
118-
119118
if (plot.GetType() == EntryConfig::PlotType::kIntegral1D || plot.GetType() == EntryConfig::PlotType::kIntegral2D) {
120119
FillIntegral(plot);
121120
continue;
@@ -145,12 +144,24 @@ void Task::CreateOutputFileIfNotYet() {
145144
}
146145

147146
std::string Task::ConstructOutputDirectoryName() const {
148-
const std::string entryName = entries_.back().GetDirectoryName();
147+
const std::string& entryName = entries_.back().GetDirectoryName();
149148
std::string dirName = toplevel_dir_name_.empty() ? entryName : toplevel_dir_name_;
150149
if (is_append_dir_name_with_entry_name_ && !toplevel_dir_name_.empty()) dirName.append("/" + entryName);
151150

152151
return dirName;
153152
}
154153

154+
void Task::SetOutputFileName(std::string name, std::string option) {
155+
out_file_name_ = std::move(name);
156+
out_file_option_ = std::move(option);
157+
}
158+
void Task::SetTopLevelDirName(const std::string& name, bool is_append_dir_name_with_entry_name) {
159+
toplevel_dir_name_ = name;
160+
is_append_dir_name_with_entry_name_ = is_append_dir_name_with_entry_name;
161+
}
162+
void Task::ResetTopLevelDirName() {
163+
SetTopLevelDirName("", false);
164+
}
165+
155166
}// namespace QA
156167
}// namespace AnalysisTree

‎src/Task.hpp‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,10 @@ class Task : public AnalysisTask {
5454
size_t AddIntegral(const Axis& x, const Axis& y, Cuts* cuts_x = nullptr, Cuts* cuts_y = nullptr);
5555

5656
std::vector<EntryConfig>& Entries() { return entries_; }
57-
void SetOutputFileName(std::string name, std::string option = "recreate") {
58-
out_file_name_ = std::move(name);
59-
out_file_option_ = std::move(option);
60-
}
61-
void SetTopLevelDirName(const std::string& name, bool is_append_dir_name_with_entry_name = false) {
62-
toplevel_dir_name_ = name;
63-
is_append_dir_name_with_entry_name_ = is_append_dir_name_with_entry_name;
64-
}
65-
void ResetTopLevelDirName() {
66-
toplevel_dir_name_ = "";
67-
is_append_dir_name_with_entry_name_ = false;
68-
}
57+
58+
void SetOutputFileName(std::string name, std::string option = "recreate");
59+
void SetTopLevelDirName(const std::string& name, bool is_append_dir_name_with_entry_name = false);
60+
void ResetTopLevelDirName();
6961

7062
private:
7163
void FillIntegral(EntryConfig& plot);
@@ -86,7 +78,7 @@ class Task : public AnalysisTask {
8678
std::map<std::string, TDirectory*> dir_map_{};
8779
std::string out_file_name_{"QA.root"};
8880
std::string out_file_option_{"recreate"};
89-
std::string toplevel_dir_name_{""};
81+
std::string toplevel_dir_name_{};
9082
bool is_append_dir_name_with_entry_name_{false};
9183
TFile* out_file_{nullptr};
9284

0 commit comments

Comments
 (0)