Task: MkDirIfNot[Exists->Yet]

Author: lubynets

src/Task.cpp

@@ -9,7 +9,7 @@ size_t Task::AddH1(const std::string& name, const Axis& x, Cuts* cuts, Variable
   weight.IfEmptyVariableConvertToOnes(x);
   entries_.emplace_back(x, weight, name, cuts, false);
   const std::string dirName = ConstructOutputDirectoryName();
-  TDirectory* dir = MkDirIfNotExists(out_file_, dirName);
+  TDirectory* dir = MkDirIfNotYet(out_file_, dirName);
   ANALYSISTREE_UTILS_VISIT(setdirectory_struct(dir), entries_.back().GetPlot());
   ANALYSISTREE_UTILS_VISIT(setname_struct(entries_.back().GetName()), entries_.back().GetPlot());
   auto var_id = AddEntry(AnalysisEntry(entries_.back().GetVariables(), entries_.back().GetEntryCuts(), entries_.back().GetVariableForWeight()));
@@ -26,7 +26,7 @@ size_t Task::AddH2(const std::string& name, const Axis& x, const Axis& y, Cuts*
   weight.IfEmptyVariableConvertToOnes(x);
   entries_.emplace_back(x, y, weight, name, cuts);
   const std::string dirName = ConstructOutputDirectoryName();
-  TDirectory* dir = MkDirIfNotExists(out_file_, dirName);
+  TDirectory* dir = MkDirIfNotYet(out_file_, dirName);
   ANALYSISTREE_UTILS_VISIT(setdirectory_struct(dir), entries_.back().GetPlot());
   ANALYSISTREE_UTILS_VISIT(setname_struct(entries_.back().GetName()), entries_.back().GetPlot());
   auto var_id = AddEntry(AnalysisEntry(entries_.back().GetVariables(), entries_.back().GetEntryCuts(), entries_.back().GetVariableForWeight()));
@@ -43,7 +43,7 @@ size_t Task::AddProfile(const std::string& name, const Axis& x, const Axis& y, C
   weight.IfEmptyVariableConvertToOnes(x);
   entries_.emplace_back(x, y, weight, name, cuts, true);
   const std::string dirName = ConstructOutputDirectoryName();
-  TDirectory* dir = MkDirIfNotExists(out_file_, dirName);
+  TDirectory* dir = MkDirIfNotYet(out_file_, dirName);
   ANALYSISTREE_UTILS_VISIT(setdirectory_struct(dir), entries_.back().GetPlot());
   ANALYSISTREE_UTILS_VISIT(setname_struct(entries_.back().GetName()), entries_.back().GetPlot());
   auto var_id = AddEntry(AnalysisEntry(entries_.back().GetVariables(), entries_.back().GetEntryCuts(), entries_.back().GetVariableForWeight()));
@@ -60,7 +60,7 @@ size_t Task::AddIntegral(const std::string& name, const Axis& x, Cuts* cuts, Var
   weight.IfEmptyVariableConvertToOnes(x);
   entries_.emplace_back(x, weight, name, cuts, true);
   const std::string dirName = ConstructOutputDirectoryName();
-  TDirectory* dir = MkDirIfNotExists(out_file_, dirName);
+  TDirectory* dir = MkDirIfNotYet(out_file_, dirName);
   ANALYSISTREE_UTILS_VISIT(setdirectory_struct(dir), entries_.back().GetPlot());
   ANALYSISTREE_UTILS_VISIT(setname_struct(entries_.back().GetName()), entries_.back().GetPlot());
   auto var_id = AddEntry(AnalysisEntry(entries_.back().GetVariables(), entries_.back().GetEntryCuts(), entries_.back().GetVariableForWeight()));
@@ -76,7 +76,7 @@ size_t Task::AddIntegral(const Axis& x, const Axis& y, Cuts* cuts_x, Cuts* cuts_
   CreateOutputFileIfNotYet();
   entries_.emplace_back(x, cuts_x, y, cuts_y);
   const std::string dirName = ConstructOutputDirectoryName();
-  TDirectory* dir = MkDirIfNotExists(out_file_, dirName);
+  TDirectory* dir = MkDirIfNotYet(out_file_, dirName);
   ANALYSISTREE_UTILS_VISIT(setdirectory_struct(dir), entries_.back().GetPlot());
   ANALYSISTREE_UTILS_VISIT(setname_struct(entries_.back().GetName()), entries_.back().GetPlot());
   auto var_id_x = AddEntry(AnalysisEntry({entries_.back().GetVariables()[0]}, cuts_x));

src/Task.hpp

@@ -69,8 +69,8 @@ class Task : public AnalysisTask {
   void FillIntegral(EntryConfig& plot);
 
   template<typename T>
-  static TDirectory* MkDirIfNotExists(T* fileOrDirectory, const std::string& name) {
-    if (fileOrDirectory == nullptr) throw std::runtime_error("HelperFunctions::MkDirIfNotExists(): file or directory ptr is null");
+  static TDirectory* MkDirIfNotYet(T* fileOrDirectory, const std::string& name) {
+    if (fileOrDirectory == nullptr) throw std::runtime_error("HelperFunctions::MkDirIfNotYet(): file or directory ptr is null");
     TDirectory* result = fileOrDirectory->GetDirectory(name.c_str());
     if (result == nullptr) fileOrDirectory->mkdir(name.c_str());
     result = fileOrDirectory->GetDirectory(name.c_str());