add yaml interface

Author: viktorklochkov

CMakeLists.txt

@@ -13,10 +13,12 @@ set(AnalysisTreeQA_BUILD_TASKS OFF CACHE BOOL "Build user' AnalysisTreeQA tasks
 set(AnalysisTreeQA_BUILD_EXAMPLES ON CACHE BOOL "Build AnalysisTreeQA examples (examples/)")
 set(AnalysisTreeQA_BUILD_TESTS OFF CACHE BOOL "Build tests for AnalysisTreeQA")
 set(AnalysisTreeQA_BUNDLED_AT ON CACHE BOOL "Get and build AnalysisTree")
-set(AnalysisTreeQA_BUNDLED_AT_VERSION "v2.2.5" CACHE STRING "Bundled AnalysisTree version")
+set(AnalysisTreeQA_BUNDLED_AT_VERSION "v2.2.6" CACHE STRING "Bundled AnalysisTree version")
 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)
@@ -46,16 +48,20 @@ message(STATUS "Using CXX flags for ${CMAKE_BUILD_TYPE}: ${CMAKE_CXX_FLAGS_${CMA
 
 list(APPEND CMAKE_PREFIX_PATH $ENV{ROOTSYS})
 list(APPEND CMAKE_PREFIX_PATH ${ROOTSYS})
+
 find_package(ROOT REQUIRED RIO)
 
+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})
 include(${ROOT_USE_FILE})
 
 set(EXTERNAL_DIR ${CMAKE_BINARY_DIR}/external)
 set(EXTERNAL_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/external)
 
-include_directories(${CMAKE_SOURCE_DIR} ${AnalysisTree_INCLUDE_DIR} ${PROJECT_INCLUDE_DIRECTORIES})
+include_directories(${CMAKE_SOURCE_DIR} ${AnalysisTree_INCLUDE_DIR} ${YAML_CPP_INCLUDE_DIR} ${PROJECT_INCLUDE_DIRECTORIES})
 
 add_subdirectory(src)
 

README.md

@@ -30,13 +30,13 @@ To apply the flag use -D{Name}={value}, for example, if you want to compile usin
     cmake -DCMAKE_CXX_STANDARD=11 ../
 
 | Name  | Default value | Possible values |
-| ------------- | ------------- | ---------- |
-| CMAKE_BUILD_TYPE  | RELEASE  | RELEASE/DEBUG |
-| CMAKE_CXX_STANDARD  | 17  | 11/14/17 |
-| AnalysisTreeQA_BUILD_TESTS  | ON  | ON/OFF |
-| AnalysisTreeQA_BUILD_TASKS  | OFF  | ON/OFF |
-| AnalysisTreeQA_BUNDLED_AT  | ON  | ON/OFF |
-| AnalysisTreeQA_BUNDLED_AT_VERSION  | master  | master/v2.0.1/... |
+| ------------- |---------------| ---------- |
+| CMAKE_BUILD_TYPE  | RELEASE       | RELEASE/DEBUG |
+| CMAKE_CXX_STANDARD  | 17            | 11/14/17 |
+| AnalysisTreeQA_BUILD_TESTS  | OFF           | ON/OFF |
+| AnalysisTreeQA_BUILD_TASKS  | OFF           | ON/OFF |
+| AnalysisTreeQA_BUNDLED_AT  | ON            | ON/OFF |
+| AnalysisTreeQA_BUNDLED_AT_VERSION  | master        | master/v2.0.1/... |
 
 ## Usage
 

cmake_modules/YamlCpp.cmake

@@ -0,0 +1,28 @@
+if (yaml-cpp_BUNDLED)
+    message("-- Building bundled yaml-cpp package...")
+    include(ExternalProject)
+
+    ExternalProject_Add(
+            yaml-cpp_Ext
+            GIT_REPOSITORY "https://github.com/jbeder/yaml-cpp.git"
+            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
+    )
+
+    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()
+    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,4 +15,8 @@ add_executable(example example.cpp)
 add_dependencies(example AnalysisTreeQA)
 target_link_libraries(example ${ROOT_LIBRARIES} AnalysisTreeQA AnalysisTreeBase AnalysisTreeInfra)
 
+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/example.cpp

@@ -17,7 +17,7 @@ void example(const std::string& filelist){
   task->AddH1({"p_{T}, GeV/c", Variable::FromString("VtxTracks.pT"), {100, 0, 3}});
 
   // 1D histo with cut
-  Cuts* pT_cut =  new Cuts("pT_cut", {RangeCut("VtxTracks.pT", 1, 1.5)});
+  Cuts* pT_cut =  new Cuts("pT_cut", {RangeCut("VtxTracks.pT", 0, 1.5)});
   task->AddH1({"p_{T}, GeV/c", Variable::FromString("VtxTracks.pT"), {100, 0, 3}}, pT_cut);
 
   // AnalysisTree::Variable in case of more complicated plot

examples/example.yaml

@@ -0,0 +1,44 @@
+1D:
+# Simplest way to define plot
+- x_axis:
+    field: "SimParticles.pT"
+    bins: [100, 0, 3]
+# Better way to define plot (cuts are defined in C++ code)
+- name: "sim_pT_y_1.5_3"
+  x_axis: &sim_pT # anchor could be reused later
+   title: "p_{T}, GeV/c"
+   field: "SimParticles.pT"
+   bins: [100, 0, 3]
+  cuts: "sim_y_cut"
+# Plot by variable name (defined in C++ code)
+- name: "pxpy"
+  x_axis:
+    field: "pxpy"
+    bin_edges: [-3, -1.5, -0.5, 0, 0.5, 1.5, 3]
+2D:
+- name: "sim_pT_y"
+  x_axis: &sim_y
+    title: "#it{y}"
+    field: "SimParticles.rapidity"
+    bins: [100, -2, 2]
+  y_axis: *sim_pT
+Profile:
+- name: "pT_y_profile"
+  x_axis: *sim_pT
+  y_axis: *sim_y
+Integral:
+- name: "pT_integral"
+  x_axis: &sim_pT_integral
+    title: "#sum{p_{T}, GeV/c}"
+    field: "SimParticles.pT"
+    bins: [100, 0, 30]
+  cuts: "sim_y_cut"
+Integral2D:
+- name: "pT_M_integral"
+  x_axis:
+    title: "M"
+    field: "SimParticles.ones"
+    bins: [100, 70, 130]
+  y_axis: *sim_pT_integral
+  y_cuts: "sim_y_cut"
+

examples/example_yaml.cpp

@@ -0,0 +1,44 @@
+#include <string>
+
+#include "AnalysisTree/TaskManager.hpp"
+#include "AnalysisTree/Variable.hpp"
+
+#include "Task.hpp"
+#include "YamlReader.hpp"
+
+using namespace AnalysisTree;
+
+void example(const std::string& filelist){
+  auto* man = TaskManager::GetInstance();
+
+  auto* task = new QA::Task;
+  task->SetOutputFileName("cbm_qa.root");
+
+  Variable pxpy("pxpy", {{"RecTracks", "px"}, {"RecTracks", "py"}}, []( std::vector<double>& var ) { return var.at(0)*var.at(1); });
+
+  task->AddCut(new Cuts("sim_y_cut", {RangeCut("SimParticles.rapidity", 1.5, 3)}));
+  task->AddCut(new Cuts("rec_pT_cut", {RangeCut("RecTracks.pT", 1, 1.5)}));
+  task->AddVariable(pxpy);
+
+  QA::YamlReader r("/Users/viktor/Soft/AnalysisTreeQA/examples/example.yaml");
+  r.AddPlotsFromYaml(task);
+
+  man->AddTask(task);
+
+  man->Init({filelist}, {"tTree"});
+  man->Run(-1);
+  man->Finish();
+}
+
+int main(int argc, char* argv[]){
+  if (argc < 2) {
+    std::cout << "Error! Please use " << std::endl;
+    std::cout << " ./example filename" << std::endl;
+    exit(EXIT_FAILURE);
+  }
+
+  const std::string filename = argv[1];
+  example(filename);
+
+  return 0;
+}

src/Axis.cpp

@@ -0,0 +1,16 @@
+#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_ << " ";
+  cout << setw(6) << this->GetNbins() << setw(6) << this->GetXmin() << setw(6) << this->GetXmax();
+}
+
+}
+}

src/Axis.hpp

@@ -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_ = this->GetBranchName() + ".ones";
+    }
+  }
+  const char* GetName() const override { return Variable::GetName().c_str(); }
+  void Print() const override ;
+
+ protected:
+  ClassDefOverride(Axis, 1);
+};
+}
+}
+#endif//ANALYSISTREEQA_AXIS_HPP

src/CMakeLists.txt

@@ -3,7 +3,7 @@ include(AnalysisTree)
 set(SOURCES
     EntryConfig.cpp
     Task.cpp
-)
+    YamlReader.cpp Axis.cpp Axis.hpp)
 
 string(REPLACE ".cpp" ".hpp" HEADERS "${SOURCES}")
 list(APPEND HEADERS "BasicQA.hpp")
@@ -18,7 +18,7 @@ else ()
   link_directories(${PROJECT_LINK_DIRECTORIES})
 endif ()
 
-#add_dependencies(AnalysisTreeQA ${PROJECT_DEPENDENCIES})
+add_dependencies(AnalysisTreeQA AnalysisTreeInfra AnalysisTreeBase)
 
 ROOT_GENERATE_DICTIONARY(G__AnalysisTreeQA
         ${HEADERS}
@@ -29,10 +29,13 @@ target_link_libraries(AnalysisTreeQA
         PUBLIC
         AnalysisTreeBase
         AnalysisTreeInfra
+        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