Generic container (#142)

* bugfix in HelperFunctions sliceCuts name

* enable generic (plain) container, w/o default fields

* avoid deprecated function

* fix Warning: Unused class rule: UserTaskWrite

* init GenericContainerFiller

* dev GenericContainerFiller

* add StringToBool to HelperFunctions

* apply clang-format

* revert include_directories() due to back compatibility

Author: lubynets

core/AnalysisTreeCoreLinkDef.h

@@ -40,6 +40,7 @@
 #pragma link C++ typedef AnalysisTree::ModuleDetector;
 #pragma link C++ typedef AnalysisTree::HitDetector;
 #pragma link C++ typedef AnalysisTree::ModulePositions;
+#pragma link C++ typedef AnalysisTree::GenericDetector;
 
 #pragma link C++ defined_in "Constants.h";
 

core/Constants.hpp

@@ -49,7 +49,8 @@ enum class DetType : ShortInt_t {
   kModule,
   kTrack,
   kEventHeader,
-  kParticle
+  kParticle,
+  kGeneric
 };
 
 enum class Types : ShortInt_t {

examples/AnalysisTreeUserLinkDef.h

@@ -4,7 +4,7 @@
 #pragma link off all functions;
 #pragma link C++ nestedclasses;
 
-//#pragma link C++ class UserTaskRead++;
-#pragma link C++ class UserTaskWrite++;
+#pragma link C++ class UserTaskRead+;
+#pragma link C++ class UserTaskWrite+;
 
 #endif

examples/CMakeLists.txt

@@ -14,7 +14,7 @@ message(STATUS "CMAKE_PROJECT_NAME ${CMAKE_PROJECT_NAME}")
 string(REPLACE ".cpp" ".hpp" HEADERS "${SOURCES}")
 
 include_directories(${CMAKE_SOURCE_DIR}/core ${CMAKE_SOURCE_DIR}/infra ${CMAKE_CURRENT_SOURCE_DIR} $<$<BOOL:${Boost_FOUND}>:${Boost_INCLUDE_DIRS}>)
-add_library(AnalysisTreeUser SHARED ${SOURCES} G__AnalysisTreeUser.cxx)
+add_library(AnalysisTreeUser SHARED ${SOURCES})
 target_compile_definitions(AnalysisTreeUser PUBLIC
         $<$<BOOL:${Boost_FOUND}>:ANALYSISTREE_BOOST_FOUND>)
 
@@ -23,6 +23,7 @@ ROOT_GENERATE_DICTIONARY(G__AnalysisTreeUser ${HEADERS}
         OPTIONS
         -I${CMAKE_BINARY_DIR}/include
         $<$<BOOL:${Boost_FOUND}>:-DANALYSISTREE_BOOST_FOUND>
+        MODULE AnalysisTreeUser
         )
 target_link_libraries(AnalysisTreeUser
         PUBLIC

examples/UserTaskRead.hpp

@@ -1,7 +1,7 @@
 #ifndef ANALYSISTREE_EXAMPLES_USERTASKREAD_HPP_
 #define ANALYSISTREE_EXAMPLES_USERTASKREAD_HPP_
 
-#include <Task.hpp>
+#include <AnalysisTree/Task.hpp>
 
 class UserTaskRead : public AnalysisTree::Task {
 

examples/UserTaskWrite.hpp

@@ -1,9 +1,9 @@
 #ifndef ANALYSISTREE_EXAMPLES_USERTASKWRITE_HPP_
 #define ANALYSISTREE_EXAMPLES_USERTASKWRITE_HPP_
 
-#include <Branch.hpp>
 #include <Detector.hpp>
-#include <Task.hpp>
+#include <AnalysisTree/Branch.hpp>
+#include <AnalysisTree/Task.hpp>
 
 class UserTaskWrite : public AnalysisTree::Task {
 

examples/example.cpp

@@ -33,7 +33,7 @@ void example(const std::string& filename, const std::string& treename){
   data_header->Print();
   config->Print();
 
-  auto rec_particles = chain->GetBranch("VtxTracks");
+  auto rec_particles = chain->GetBranchObject("VtxTracks");
   auto rec2sim_particles = chain->GetMatching("VtxTracks", "SimParticles");
 
   auto rec_pT = rec_particles.GetField("pT");

infra/Branch.cpp

@@ -41,6 +41,10 @@ void Branch::InitDataPtr() {
       data_ = temp;
       break;
     }
+    case DetType::kGeneric: {
+      data_ = new GenericDetector(config_.GetId());
+      break;
+    }
     default: throw std::runtime_error("Branch type is not known!");
   }
 }

infra/CMakeLists.txt

@@ -13,6 +13,7 @@ set(SOURCES
     Branch.cpp
     BranchChannel.cpp
     AnalysisEntry.cpp
+    GenericContainerFiller.cpp
     )
 
 
@@ -22,7 +23,7 @@ string(REPLACE ".cpp" ".hpp" HEADERS "${SOURCES}")
 list(APPEND HEADERS "VariantMagic.hpp" "ToyMC.hpp" "Utils.hpp" "BranchHashHelper.hpp" "HelperFunctions.hpp")
 
 include_directories(${CMAKE_SOURCE_DIR}/core ${CMAKE_CURRENT_SOURCE_DIR} $<$<BOOL:${Boost_FOUND}>:${Boost_INCLUDE_DIRS}>)
-add_library(AnalysisTreeInfra SHARED ${SOURCES} G__AnalysisTreeInfra.cxx)
+add_library(AnalysisTreeInfra SHARED ${SOURCES})
 target_compile_definitions(AnalysisTreeInfra PUBLIC
         $<$<BOOL:${Boost_FOUND}>:ANALYSISTREE_BOOST_FOUND>)
 
@@ -31,6 +32,7 @@ ROOT_GENERATE_DICTIONARY(G__AnalysisTreeInfra ${HEADERS}
         OPTIONS
             -I${CMAKE_BINARY_DIR}/include
             $<$<BOOL:${Boost_FOUND}>:-DANALYSISTREE_BOOST_FOUND>
+        MODULE AnalysisTreeInfra
         )
 target_link_libraries(AnalysisTreeInfra
         PUBLIC

infra/Chain.cpp

@@ -88,6 +88,10 @@ void Chain::InitPointersToBranches(std::set<std::string> names) {
         branch_ptr = new ModuleDetector;
         break;
       }
+      case DetType::kGeneric: {
+        branch_ptr = new GenericDetector;
+        break;
+      }
     }
     branches_.emplace(branch, branch_ptr);
   }