Skip to content

Enable multi-level directories creaton #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lubynets merged 3 commits into from
Feb 14, 2025
Merged

Enable multi-level directories creaton #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5722269
try enable multi-level directories
lubynets Feb 13, 2025
f4f6546
finalize enable multi-level directories
lubynets Feb 14, 2025
5e3b35c
apply clang-format
lubynets Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/BasicQA.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ inline void AddEventHeaderQA(Task* task, const std::string& branch, Cuts* cuts =
task->AddH2({"x_{vertex} (cm)", {branch, "vtx_x"}, {gNbins, -1, 1}}, {"y_{vertex} (cm)", {branch, "vtx_y"}, {gNbins, -1, 1}}, cuts);
}


inline void AddTrackQA(Task* task, const std::string& branch, Cuts* cuts = nullptr) {

task->AddH1({"p_{x}, GeV/c", {branch, "px"}, {gNbins, -3, 3}}, cuts);
Expand Down
33 changes: 17 additions & 16 deletions src/EntryConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,42 +40,42 @@ struct write_struct : public Utils::Visitor<void> {
};

EntryConfig::EntryConfig(const Axis& axis, Variable& weight, const std::string& name, Cuts* cuts, bool is_integral)
: name_(name == "" ? axis.GetName() : name),
type_(is_integral ? PlotType::kIntegral1D : PlotType::kHisto1D),
axes_({axis}),
var4weight_(weight),
entry_cuts_(cuts) {
if(name == "") {
: name_(name == "" ? axis.GetName() : name),
type_(is_integral ? PlotType::kIntegral1D : PlotType::kHisto1D),
axes_({axis}),
var4weight_(weight),
entry_cuts_(cuts) {
if (name == "") {
if (cuts)
name_ += "_" + cuts->GetName();
if (!var4weight_.GetName().empty() && var4weight_.GetFields().at(0).GetName() != "ones") {
name_ += "_weight_" + var4weight_.GetName();
}
if(is_integral){
if (is_integral) {
name_ += "_integral";
}
}
InitPlot();
}

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),
axes_({x, y}),
var4weight_(weight),
entry_cuts_(cuts) {
axes_({x, y}),
var4weight_(weight),
entry_cuts_(cuts) {
Set2DName(name);
InitPlot();
}

EntryConfig::EntryConfig(const Axis& x, Cuts* cuts_x, const Axis& y, Cuts* cuts_y) : type_(PlotType::kIntegral2D),
axes_({x, y}),
entry_cuts_(cuts_x) {
axes_({x, y}),
entry_cuts_(cuts_x) {
Set2DName();
InitPlot();
}

TH1* EntryConfig::CreateHisto1D() const {
auto* ret = new TH1FD(name_.c_str(), title_.c_str(),
axes_.at(0).GetNbins(), axes_.at(0).GetXmin(), axes_.at(0).GetXmax());
axes_.at(0).GetNbins(), axes_.at(0).GetXmin(), axes_.at(0).GetXmax());
ret->SetXTitle(axes_.at(0).GetTitle());
ret->SetYTitle("Entries");
return ret;
Expand All @@ -100,8 +100,8 @@ TProfile* EntryConfig::CreateProfile() const {
TH2* EntryConfig::CreateHisto2D() const {

auto* ret = new TH2FD(name_.c_str(), title_.c_str(),
axes_.at(0).GetNbins(), axes_.at(0).GetXmin(), axes_.at(0).GetXmax(),
axes_.at(1).GetNbins(), axes_.at(1).GetXmin(), axes_.at(1).GetXmax());
axes_.at(0).GetNbins(), axes_.at(0).GetXmin(), axes_.at(0).GetXmax(),
axes_.at(1).GetNbins(), axes_.at(1).GetXmin(), axes_.at(1).GetXmax());
ret->SetXTitle(axes_.at(0).GetTitle());
ret->SetYTitle(axes_.at(1).GetTitle());
ret->SetZTitle("Entries");
Expand Down Expand Up @@ -139,7 +139,7 @@ void EntryConfig::InitPlot() {

void EntryConfig::Set2DName(const std::string& name) {
name_ = name == "" ? Form("%s_%s", axes_[0].GetName(), axes_[1].GetName()) : name;
if(name == "") {
if (name == "") {
if (entry_cuts_ != nullptr)
name_ += "_" + entry_cuts_->GetName();

Expand Down Expand Up @@ -186,6 +186,7 @@ std::string EntryConfig::GetDirectoryName() const {
if (!var4weight_.GetName().empty() && var4weight_.GetFields().at(0).GetName() != "ones") {
name += "_weight_" + var4weight_.GetName();
}
if (!toplevel_dir_name_.empty()) name.insert(0, toplevel_dir_name_ + "/");
return name;
}

Expand Down
9 changes: 6 additions & 3 deletions src/EntryConfig.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ class Axis : public Variable, public TAxis {
Axis() = default;
Axis(const std::string& title, const Variable& var, const TAxis& a) : Variable(var), TAxis(a) {
this->SetTitle(title.c_str());
if(this->GetFields().size() == 1 && this->GetFields().at(0).GetName() == "ones"){
this->lambda_ = [](const std::vector<double>& ){ return 1; };
if (this->GetFields().size() == 1 && this->GetFields().at(0).GetName() == "ones") {
this->lambda_ = [](const std::vector<double>&) { return 1; };
this->name_ = "Ones";
}
}
Expand Down Expand Up @@ -87,14 +87,16 @@ class EntryConfig {

void SetOutDir(TDirectory* out_dir) { out_dir_ = out_dir; }

void SetTopLevelDirName(const std::string& name) { toplevel_dir_name_ = name; }

PlotPointer GetPlot() { return plot_; }

protected:
void InitPlot();
ANALYSISTREE_ATTR_NODISCARD TH1* CreateHisto1D() const;
ANALYSISTREE_ATTR_NODISCARD TH2* CreateHisto2D() const;
ANALYSISTREE_ATTR_NODISCARD TProfile* CreateProfile() const;
void Set2DName(const std::string& name="");
void Set2DName(const std::string& name = "");

PlotPointer plot_;
std::string name_;///< Name of the plot
Expand All @@ -105,6 +107,7 @@ class EntryConfig {
Variable var4weight_{};
Cuts* entry_cuts_{nullptr};
std::vector<std::pair<int, int>> vars_id_{};
std::string toplevel_dir_name_{""};

TDirectory* out_dir_{nullptr};
ClassDef(EntryConfig, 1);
Expand Down
53 changes: 35 additions & 18 deletions src/Task.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace AnalysisTree {
namespace QA {

void Task::FillIntegral(EntryConfig& plot){
void Task::FillIntegral(EntryConfig& plot) {

double integral_x{0.};
double integral_y{0.};
Expand All @@ -12,15 +12,14 @@ void Task::FillIntegral(EntryConfig& plot){
for (const auto& var : this->GetValues(var_ids.at(0).first)) {
integral_x += var[var_ids.at(0).second];
}
if(plot.GetNdimentions() > 1) {
if (plot.GetNdimentions() > 1) {
for (const auto& var : this->GetValues(var_ids.at(1).first)) {
integral_y += var[var_ids.at(1).second];
}
}
if(plot.GetNdimentions() == 1) {
if (plot.GetNdimentions() == 1) {
plot.Fill(integral_x);
}
else{
} else {
plot.Fill(integral_x, integral_y);
}
}
Expand All @@ -31,7 +30,7 @@ void Task::Exec() {

for (auto& plot : entries_) {

if(plot.GetType() == EntryConfig::PlotType::kIntegral1D || plot.GetType() == EntryConfig::PlotType::kIntegral2D){
if (plot.GetType() == EntryConfig::PlotType::kIntegral1D || plot.GetType() == EntryConfig::PlotType::kIntegral2D) {
FillIntegral(plot);
continue;
}
Expand All @@ -41,16 +40,18 @@ void Task::Exec() {
for (auto var : this->GetValues(var_ids.at(0).first)) {
++ivw;
auto weight = weights.at(ivw);
if(std::fabs(weight) < 1e-6) continue;
if (std::fabs(weight) < 1e-6) continue;
switch (plot.GetNdimentions()) {
case 1: {
if(std::fabs(weight - 1) < 1e-4) plot.Fill(var[var_ids.at(0).second]);
else plot.Fill(var[var_ids.at(0).second], weight);
if (std::fabs(weight - 1) < 1e-4) plot.Fill(var[var_ids.at(0).second]);
else
plot.Fill(var[var_ids.at(0).second], weight);
break;
}
case 2: {
if(std::fabs(weight - 1) < 1e-4) plot.Fill(var[var_ids.at(0).second], var[var_ids.at(1).second]);
else plot.Fill(var[var_ids.at(0).second], var[var_ids.at(1).second], weight);
if (std::fabs(weight - 1) < 1e-4) plot.Fill(var[var_ids.at(0).second], var[var_ids.at(1).second]);
else
plot.Fill(var[var_ids.at(0).second], var[var_ids.at(1).second], weight);
break;
}
}
Expand Down Expand Up @@ -78,20 +79,36 @@ void Task::Init() {
out_file_ = new TFile(out_file_name_.c_str(), "recreate");
for (const auto& dir : dirs) {
out_file_->cd();
dir_map_.insert(std::make_pair(dir, out_file_->mkdir(dir.c_str())));
dir_map_.insert(std::make_pair(dir, MkMultiLevelDir(out_file_, dir)));
}
for (auto& entry : entries_) {
entry.SetOutDir(dir_map_.find(entry.GetDirectoryName())->second);
}
}

//size_t Task::AddAnalysisEntry(const Axis& a, Cuts* cuts, bool is_integral){
// entries_.emplace_back(EntryConfig(a, cuts, is_integral));
// auto var_id = AddEntry(AnalysisEntry(entries_.back().GetVariables(), entries_.back().GetEntryCuts()));
// entries_.back().SetVariablesId({{var_id.first, var_id.second.at(0)}});
// return entries_.size() - 1;
//}
TDirectory* Task::MkMultiLevelDir(TFile* file, const std::string& name) const {
auto vDirs = splitBySlash(name);
TDirectory* result;
for (int iDir = 0; iDir < vDirs.size(); iDir++) {
if (iDir == 0) result = MkDirIfNotExists(file, vDirs.at(iDir));
else
result = MkDirIfNotExists(result, vDirs.at(iDir));
}
return result;
}

std::vector<std::string> Task::splitBySlash(const std::string& str) {
std::vector<std::string> result;
std::stringstream ss(str);
std::string item;

// Split the string by slashes
while (std::getline(ss, item, '/')) {
result.push_back(item);
}

return result;
}

}// namespace QA
}// namespace AnalysisTree
25 changes: 21 additions & 4 deletions src/Task.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class Task : public AnalysisTask {
size_t AddH1(const std::string& name, const Axis& x, Cuts* cuts = nullptr, Variable weight = Variable{}) {
weight.IfEmptyVariableConvertToOnes(x);
entries_.emplace_back(EntryConfig(x, weight, name, cuts, false));
entries_.back().SetTopLevelDirName(toplevel_dir_name_);
auto var_id = AddEntry(AnalysisEntry(entries_.back().GetVariables(), entries_.back().GetEntryCuts(), entries_.back().GetVariableForWeight()));
entries_.back().SetVariablesId({{var_id.first, var_id.second.at(0)}});
return entries_.size() - 1;
Expand All @@ -35,8 +36,9 @@ class Task : public AnalysisTask {
size_t AddH2(const std::string& name, const Axis& x, const Axis& y, Cuts* cuts = nullptr, Variable weight = Variable{}) {
weight.IfEmptyVariableConvertToOnes(x);
entries_.emplace_back(EntryConfig(x, y, weight, name, cuts));
entries_.back().SetTopLevelDirName(toplevel_dir_name_);
auto var_id = AddEntry(AnalysisEntry(entries_.back().GetVariables(), entries_.back().GetEntryCuts(), entries_.back().GetVariableForWeight()));
entries_.back().SetVariablesId({ {var_id.first, var_id.second.at(0)}, {var_id.first, var_id.second.at(1)} });
entries_.back().SetVariablesId({{var_id.first, var_id.second.at(0)}, {var_id.first, var_id.second.at(1)}});
return entries_.size() - 1;
}

Expand All @@ -47,8 +49,9 @@ class Task : public AnalysisTask {
size_t AddProfile(const std::string& name, const Axis& x, const Axis& y, Cuts* cuts = nullptr, Variable weight = Variable{}) {
weight.IfEmptyVariableConvertToOnes(x);
entries_.emplace_back(EntryConfig(x, y, weight, name, cuts, true));
entries_.back().SetTopLevelDirName(toplevel_dir_name_);
auto var_id = AddEntry(AnalysisEntry(entries_.back().GetVariables(), entries_.back().GetEntryCuts(), entries_.back().GetVariableForWeight()));
entries_.back().SetVariablesId({ {var_id.first, var_id.second.at(0)}, {var_id.first, var_id.second.at(1)} });
entries_.back().SetVariablesId({{var_id.first, var_id.second.at(0)}, {var_id.first, var_id.second.at(1)}});
return entries_.size() - 1;
}

Expand All @@ -59,6 +62,7 @@ class Task : public AnalysisTask {
size_t AddIntegral(const std::string& name, const Axis& x, Cuts* cuts = nullptr, Variable weight = Variable{}) {
weight.IfEmptyVariableConvertToOnes(x);
entries_.emplace_back(EntryConfig(x, weight, name, cuts, true));
entries_.back().SetTopLevelDirName(toplevel_dir_name_);
auto var_id = AddEntry(AnalysisEntry(entries_.back().GetVariables(), entries_.back().GetEntryCuts(), entries_.back().GetVariableForWeight()));
entries_.back().SetVariablesId({{var_id.first, var_id.second.at(0)}});
return entries_.size() - 1;
Expand All @@ -70,22 +74,35 @@ class Task : public AnalysisTask {

size_t AddIntegral(const Axis& x, const Axis& y, Cuts* cuts_x = nullptr, Cuts* cuts_y = nullptr) {
entries_.emplace_back(EntryConfig(x, cuts_x, y, cuts_y));
entries_.back().SetTopLevelDirName(toplevel_dir_name_);
auto var_id_x = AddEntry(AnalysisEntry({entries_.back().GetVariables()[0]}, cuts_x));
auto var_id_y = AddEntry(AnalysisEntry({entries_.back().GetVariables()[1]}, cuts_y));
entries_.back().SetVariablesId({ {var_id_x.first, var_id_x.second.at(0)}, {var_id_y.first, var_id_y.second.at(0)} });
entries_.back().SetVariablesId({{var_id_x.first, var_id_x.second.at(0)}, {var_id_y.first, var_id_y.second.at(0)}});
return entries_.size() - 1;
}

std::vector<EntryConfig>& Entries() { return entries_; }
void SetOutputFileName(std::string name) { out_file_name_ = std::move(name); }
void SetTopLevelDirName(const std::string& name) { toplevel_dir_name_ = name; }
void ResetTopLevelDirName() { toplevel_dir_name_ = ""; }

private:
void FillIntegral(EntryConfig& plot);
// size_t AddAnalysisEntry(const Axis& a, Cuts* cuts, bool is_integral);
TDirectory* MkMultiLevelDir(TFile* file, const std::string& name) const;

template<typename T>
TDirectory* MkDirIfNotExists(T* fod, std::string name) const {
TDirectory* result = fod->GetDirectory(name.c_str());
if (result == nullptr) result = fod->mkdir(name.c_str());
return result;
}

static std::vector<std::string> splitBySlash(const std::string& str);

std::vector<EntryConfig> entries_{};
std::map<std::string, TDirectory*> dir_map_{};
std::string out_file_name_{"QA.root"};
std::string toplevel_dir_name_{""};
TFile* out_file_{nullptr};

ClassDefOverride(Task, 1);
Expand Down