ML inference

CMakeLists.txt

@@ -115,7 +115,7 @@ message(STATUS "Creating Project")
 project(CROWN CXX)
 message(STATUS "Finding Packages")
 # Find ROOT and print details
-find_package(ROOT 6.26 REQUIRED COMPONENTS ROOTVecOps ROOTDataFrame RooFit GenVector)
+find_package(ROOT 6.28 REQUIRED COMPONENTS ROOTVecOps ROOTDataFrame RooFit GenVector PyMVA)
 # add OpenMP and MPI
 find_package(OpenMP)
 find_package(MPI)
@@ -287,7 +287,7 @@ if(BUILD_CROWNLIB_ONLY)
     message(STATUS "Building only the CROWNLIB library")
     add_library(CROWNLIB SHARED ${SOURCES})
     target_include_directories(CROWNLIB PRIVATE ${CMAKE_SOURCE_DIR} ${ROOT_INCLUDE_DIRS})
-    target_link_libraries(CROWNLIB ROOT::ROOTVecOps ROOT::ROOTDataFrame ROOT::RooFit ROOT::GenVector logging correctionlib nlohmann_json::nlohmann_json)
+    target_link_libraries(CROWNLIB ROOT::ROOTVecOps ROOT::ROOTDataFrame ROOT::RooFit ROOT::GenVector ROOT::PyMVA logging correctionlib nlohmann_json::nlohmann_json)
     install(TARGETS CROWNLIB DESTINATION ${INSTALLDIR}/lib )
     return()
 endif()
@@ -298,7 +298,7 @@ if(NOT CROWNLIB_FOUND OR REBUILD_CROWN_LIB)
     # CROWNLIB not found, build it
     add_library(CROWNLIB SHARED ${SOURCES})
     target_include_directories(CROWNLIB PRIVATE ${CMAKE_SOURCE_DIR} ${ROOT_INCLUDE_DIRS})
-    target_link_libraries(CROWNLIB ROOT::ROOTVecOps ROOT::ROOTDataFrame ROOT::RooFit ROOT::GenVector logging correctionlib nlohmann_json::nlohmann_json)
+    target_link_libraries(CROWNLIB ROOT::ROOTVecOps ROOT::ROOTDataFrame ROOT::RooFit ROOT::GenVector ROOT::PyMVA logging correctionlib nlohmann_json::nlohmann_json)
     install(TARGETS CROWNLIB DESTINATION ${INSTALLDIR}/lib)
 else()
     message(STATUS "Found CROWNLIB in ${CROWNLIB_FOUND}")
@@ -380,7 +380,7 @@ foreach(FILENAME ${FILELIST})
     add_executable(${TARGET_NAME} ${FULL_PATH} ${GENERATED_CXX_FILES})
     # Adds a pre-build event to the Target copying the correctionlib.so file into the /lib folder in the install directory
     target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_SOURCE_DIR} ${ROOT_INCLUDE_DIRS} $ORIGIN/lib/ lib/)
-    target_link_libraries(${TARGET_NAME} ROOT::ROOTVecOps ROOT::ROOTDataFrame ROOT::RooFit ROOT::GenVector logging correctionlib nlohmann_json::nlohmann_json CROWNLIB)
+    target_link_libraries(${TARGET_NAME} ROOT::ROOTVecOps ROOT::ROOTDataFrame ROOT::RooFit ROOT::GenVector ROOT::PyMVA logging correctionlib nlohmann_json::nlohmann_json CROWNLIB)
     add_custom_command(TARGET ${TARGET_NAME} PRE_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
         "${CORRECTION_LIB_PATH}"

code_generation/analysis_template.cxx

@@ -8,6 +8,7 @@
 #include "include/lorentzvectors.hxx"
 #include "include/met.hxx"
 #include "include/metfilter.hxx"
+#include "include/ml.hxx"
 #include "include/pairselection.hxx"
 #include "include/tripleselection.hxx"
 #include "include/physicsobjects.hxx"

code_generation/analysis_template_friends.cxx

@@ -9,6 +9,7 @@
 #include "include/lorentzvectors.hxx"
 #include "include/met.hxx"
 #include "include/metfilter.hxx"
+#include "include/ml.hxx"
 #include "include/pairselection.hxx"
 #include "include/physicsobjects.hxx"
 #include "include/quantities.hxx"

code_generation/code_generation.py

@@ -347,7 +347,6 @@ def write_code(self, calls: str, includes: str, run_commands: str) -> None:
                 )
                 .replace("{ANALYSISTAG}", '"Analysis={}"'.format(self.analysis_name))
                 .replace("{CONFIGTAG}", '"Config={}"'.format(self.config_name))
-                .replace("{PROGRESS_CALLBACK}", self.set_process_tracking())
                 .replace("{OUTPUT_QUANTITIES}", self.set_output_quantities())
                 .replace("{SHIFT_QUANTITIES_MAP}", self.set_shift_quantities_map())
                 .replace("{QUANTITIES_SHIFT_MAP}", self.set_quantities_shift_map())
@@ -548,8 +547,6 @@ def generate_run_commands(self) -> str:
                     outputname=self._outputfiles_generated[scope],
                     outputstring=outputstring,
                 )
-        # add code for tracking the progress
-        runcommands += self.set_process_tracking()
         # add code for the time taken for the dataframe setup
         runcommands += self.set_setup_printout()
         # add trigger of dataframe execution, for nonempty scopes
@@ -684,37 +681,6 @@ def zero_events_fallback(self) -> str:
 
         return printout
 
-    def set_process_tracking(self) -> str:
-        """This function replaces the template placeholder for the process tracking with the correct process tracking.
-
-        Returns:
-            The code to be added to the template
-        """
-        tracking = ""
-        scope = self.scopes[-1]
-        tracking += "        ULong64_t {scope}_processed = 0;\n".format(scope=scope)
-        tracking += "        std::mutex {scope}_bar_mutex;\n".format(scope=scope)
-        tracking += "        auto c_{scope} = df{counter}_{scope}.Count();\n".format(
-            counter=self.main_counter[scope], scope=scope
-        )
-        tracking += "        c_{scope}.OnPartialResultSlot(quantile, [&{scope}_bar_mutex, &{scope}_processed, &quantile, &nevents](unsigned int /*slot*/, ULong64_t /*_c*/) {{".format(
-            scope=scope
-        )
-        tracking += (
-            "\n            std::lock_guard<std::mutex> lg({scope}_bar_mutex);\n".format(
-                scope=scope
-            )
-        )
-        tracking += "            {scope}_processed += quantile;\n".format(scope=scope)
-        tracking += "            float percentage = 100 * (float){scope}_processed / (float)nevents;\n".format(
-            scope=scope
-        )
-        tracking += '            Logger::get("main")->info("{{0:d}} / {{1:d}} ({{2:.2f}} %) Events processed ...", {scope}_processed, nevents, percentage);\n'.format(
-            scope=scope
-        )
-        tracking += "        });\n"
-        return tracking
-
     def set_shift_quantities_map(self) -> str:
         """
         This function is used to generate a mapping of all quantities and the shifts,

code_generation/subset_template.cxx

@@ -9,6 +9,7 @@
 #include "include/lorentzvectors.hxx"
 #include "include/met.hxx"
 #include "include/metfilter.hxx"
+#include "include/ml.hxx"
 #include "include/pairselection.hxx"
 #include "include/tripleselection.hxx"
 #include "include/physicsobjects.hxx"