add logs; improve CMake

Author: viktorklochkov

CMakeLists.txt

@@ -17,6 +17,8 @@ set(AnalysisTreeQA_BUNDLED_AT_VERSION "v2.2.6" CACHE STRING "Bundled AnalysisTre
 set(AnalysisTreeQA_BUNDLED_CUTS ON CACHE BOOL "Get and build AnalysisTreeCuts")
 set(AnalysisTreeQA_BUNDLED_CUTS_VERSION "v0.0.1" CACHE STRING "Bundled AnalysisTreeCuts version")
 
+option(yaml-cpp_BUNDLED "Build bundled yaml-cpp" OFF)
+
 # by default build optimized code
 if(NOT DEFINED CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE RELEASE)
@@ -48,7 +50,9 @@ list(APPEND CMAKE_PREFIX_PATH $ENV{ROOTSYS})
 list(APPEND CMAKE_PREFIX_PATH ${ROOTSYS})
 
 find_package(ROOT REQUIRED RIO)
-find_package(yaml-cpp REQUIRED)
+
+include(cmake_modules/YamlCpp.cmake)
+include(cmake_modules/AnalysisTree.cmake)
 
 message(STATUS "Using ROOT: ${ROOT_VERSION} <${ROOT_CONFIG}>")
 include_directories(${CMAKE_SOURCE_DIR} ${ROOT_INCLUDE_DIR} ${ROOT_INCLUDE_DIRS})

cmake_modules/YamlCpp.cmake

@@ -1,17 +1,28 @@
-if (TRUE)
-    message("-- Building bundled yaml-cpp")
-    include(FetchContent)
+if (yaml-cpp_BUNDLED)
+    message("-- Building bundled yaml-cpp package...")
+    include(ExternalProject)
 
-    FetchContent_Declare(
-            YamlCpp
+    ExternalProject_Add(
+            yaml-cpp_Ext
             GIT_REPOSITORY "https://github.com/jbeder/yaml-cpp.git"
-            GIT_TAG "yaml-cpp-0.7.0"
+            GIT_TAG     yaml-cpp-0.6.3
             GIT_SHALLOW ON
+            CMAKE_ARGS
+            -DYAML_BUILD_SHARED_LIBS=ON
+            -DCMAKE_BUILD_TYPE=Release
+            -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/external/yaml-cpp
+            PREFIX ${CMAKE_BINARY_DIR}/external/yaml-cpp
     )
-    FetchContent_MakeAvailable(YamlCpp)
+
+    execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/external/yaml-cpp/include)
+
+    add_library(yaml-cpp SHARED IMPORTED GLOBAL)
+    set_target_properties(yaml-cpp PROPERTIES IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/external/yaml-cpp/lib/libyaml-cpp.so)
+    target_include_directories(yaml-cpp INTERFACE ${CMAKE_BINARY_DIR}/external/yaml-cpp/include)
+    add_dependencies(yaml-cpp yaml-cpp_Ext yaml-cpp.include)
+
+    set(yaml-cpp_FOUND TRUE)
+    set(yaml-cpp_INCLUDE_DIR ${CMAKE_BINARY_DIR}/external/yaml-cpp/include)
 else()
-    list(APPEND CMAKE_PREFIX_PATH ${ANALYSISTREE_HOME})
-    list(APPEND CMAKE_PREFIX_PATH $ENV{ANALYSISTREE_HOME})
-    find_package(AnalysisTree REQUIRED)
-    list(APPEND PROJECT_INCLUDE_DIRECTORIES ${YAML_CPP_INCLUDE_DIR})
-endif()
+    find_package(yaml-cpp REQUIRED)
+endif ()

examples/CMakeLists.txt

@@ -1,5 +1,3 @@
-include(AnalysisTree)
-
 if(Boost_FOUND)
     include_directories(${PROJECT_INCLUDE_DIRECTORIES} ${CMAKE_CURRENT_SOURCE_DIR} ${Boost_INCLUDE_DIR})
     link_directories(${PROJECT_LINK_DIRECTORIES} ${Boost_LIBRARY_DIRS})
@@ -17,9 +15,8 @@ add_executable(example example.cpp)
 add_dependencies(example AnalysisTreeQA)
 target_link_libraries(example ${ROOT_LIBRARIES} AnalysisTreeQA AnalysisTreeBase AnalysisTreeInfra)
 
-add_executable(test_yaml test_yaml.cpp)
-add_dependencies(test_yaml AnalysisTreeQA)
-target_link_libraries(test_yaml ${ROOT_LIBRARIES} AnalysisTreeQA AnalysisTreeBase AnalysisTreeInfra ${YAML_CPP_LIBRARIES})
-
+add_executable(example_yaml example_yaml.cpp)
+add_dependencies(example_yaml AnalysisTreeQA)
+target_link_libraries(example_yaml ${ROOT_LIBRARIES} AnalysisTreeQA AnalysisTreeBase AnalysisTreeInfra ${YAML_CPP_LIBRARIES})
 
 install (TARGETS example RUNTIME DESTINATION bin)

examples/test_yaml.cpp examples/example_yaml.cppexamples/test_yaml.cpp renamed to examples/example_yaml.cpp

@@ -0,0 +1,20 @@
+#include "Axis.hpp"
+
+namespace AnalysisTree {
+namespace QA {
+
+using std::cout;
+using std::endl;
+using std::setw;
+
+void Axis::Print() const {
+  cout << setw(25) << this->name_ << " ";
+  if (this->IsVariableBinSize()) {
+    cout << setw(4) << this->GetNbins() << setw(6) << this->GetXmin() << " .. " << setw(2) << this->GetXmax();
+  } else {
+    cout << setw(4) << this->GetNbins() << setw(6) << this->GetXmin() << setw(6) << this->GetXmax();
+  }
+}
+
+}
+}

src/Axis.cpp

@@ -0,0 +1,28 @@
+#ifndef ANALYSISTREEQA_AXIS_HPP
+#define ANALYSISTREEQA_AXIS_HPP
+
+#include "TAxis.h"
+#include "AnalysisTree/Variable.hpp"
+
+namespace AnalysisTree {
+namespace QA {
+
+class Axis : public Variable, public TAxis {
+ public:
+  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; };
+      this->name_ = "Ones";
+    }
+  }
+  const char* GetName() const override { return Variable::GetName().c_str(); }
+  void Print() const override ;
+
+ protected:
+  ClassDefOverride(Axis, 1);
+};
+}
+}
+#endif//ANALYSISTREEQA_AXIS_HPP

src/Axis.hpp

@@ -1,10 +1,9 @@
 include(AnalysisTree)
-#include(YamlCpp)
 
 set(SOURCES
     EntryConfig.cpp
     Task.cpp
-    YamlReader.cpp)
+    YamlReader.cpp Axis.cpp Axis.hpp)
 
 string(REPLACE ".cpp" ".hpp" HEADERS "${SOURCES}")
 list(APPEND HEADERS "BasicQA.hpp")
@@ -30,12 +29,13 @@ target_link_libraries(AnalysisTreeQA
         PUBLIC
         AnalysisTreeBase
         AnalysisTreeInfra
-#        ${YAML_CPP_LIBRARIES}
+        yaml-cpp
         )
 target_include_directories(AnalysisTreeQA
         PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
         ${YAML_CPP_INCLUDE_DIR}
+        ${yaml-cpp_INCLUDE_DIR}
         )
 
 install(TARGETS AnalysisTreeQA EXPORT AnalysisTreeQATargets

src/CMakeLists.txt

@@ -34,6 +34,7 @@ EntryConfig::EntryConfig(const Axis& axis, Cuts* cuts, bool is_integral, const s
     name_ += "_integral";
   }
   InitPlot();
+  Print();
 }
 
 EntryConfig::EntryConfig(const Axis& x, const Axis& y, Cuts* cuts, bool is_profile, const std::string& name)
@@ -43,6 +44,7 @@ EntryConfig::EntryConfig(const Axis& x, const Axis& y, Cuts* cuts, bool is_profi
 {
   name_ = name.empty() ? Construct2DName() : name;
   InitPlot();
+  Print();
 }
 
 EntryConfig::EntryConfig(const Axis& x, Cuts* cuts_x, const Axis& y, Cuts* cuts_y, const std::string& name)
@@ -52,6 +54,7 @@ EntryConfig::EntryConfig(const Axis& x, Cuts* cuts_x, const Axis& y, Cuts* cuts_
 {
   name_ = name.empty() ? Construct2DName() : name;
   InitPlot();
+  Print();
 }
 
 TH1* EntryConfig::CreateHisto1D() const {
@@ -158,5 +161,26 @@ std::string EntryConfig::GetDirectoryName() const {
   return name;
 }
 
+void EntryConfig::Print() const {
+  using std::cout;
+  using std::endl;
+  using std::setw;
+
+  switch (type_) {
+    case PlotType::kHisto1D : cout << setw(12) << "1D histo"; break;
+    case PlotType::kHisto2D : cout << setw(12) << "2D histo"; break;
+    case PlotType::kProfile : cout << setw(12) << "Profile"; break;
+    case PlotType::kIntegral1D : cout << setw(12) << "Integral"; break;
+    case PlotType::kIntegral2D : cout << setw(12) << "2D integral"; break;
+  }
+  for(const auto& axis : axes_){
+    axis.Print();
+  }
+  if(entry_cuts_){
+    cout << setw(15) << entry_cuts_->GetName();
+  }
+  cout << endl;
+}
+
 }// namespace QA
 }// namespace AnalysisTree

src/EntryConfig.cpp

@@ -4,34 +4,18 @@
 #include <string>
 #include <vector>
 
-#include <TAxis.h>
-
 #include "AnalysisTree/Cuts.hpp"
 #include "AnalysisTree/Utils.hpp"
 
+#include <Axis.hpp>
+
 class TH1;
 class TH2;
 class TProfile;
 
 namespace AnalysisTree {
 namespace QA {
 
-class Axis : public Variable, public TAxis {
- public:
-  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; };
-      this->name_ = "Ones";
-    }
-  }
-  const char* GetName() const override { return Variable::GetName().c_str(); }
-
- protected:
-  ClassDefOverride(Axis, 1);
-};
-
 class EntryConfig {
 
   using PlotPointer = ANALYSISTREE_UTILS_VARIANT<TH1*, TH2*, TProfile*>;
@@ -84,6 +68,8 @@ class EntryConfig {
 
   PlotPointer GetPlot() { return plot_; }
 
+  void Print() const;
+
  protected:
   void InitPlot();
   ANALYSISTREE_ATTR_NODISCARD TH1* CreateHisto1D() const;