Merge remote-tracking branch 'origin/main'

nadrino · Dec 4, 2024 · a729315 · a729315
2 parents 37e2bf7 + afcb2e0
commit a729315
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,8 +2,10 @@ cmake_minimum_required (VERSION 3.5 FATAL_ERROR)
 
 project(cpp-generic-toolbox)
 
-# This toolbox is written in C++11
-set (CMAKE_CXX_STANDARD 11)
+# This toolbox is written in C++14
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
 
 # Include the header folder
 include_directories(./include)

diff --git a/example/main.cpp b/example/main.cpp
@@ -14,9 +14,9 @@
 #include "GenericToolbox.Thread.h" // extension
 #include "GenericToolbox.Utils.h" // extension
 
-//#ifdef ENABLE_ROOT_EXTENSION
-//#include <GenericToolbox.Root.h>
-//#endif
+#ifdef ENABLE_ROOT_EXTENSION
+#include <GenericToolbox.Root.h>
+#endif
 
 #include "classExample.h"
 

diff --git a/include/GenericToolbox.Log.h b/include/GenericToolbox.Log.h
@@ -9,20 +9,42 @@
 
 #include <iostream>
 #include <exception>
+#include <sstream>
+#include <string>
+#include <iomanip>
 
 
 // a very simple logger
+namespace GenericToolbox{
+  namespace LoggerUtils{
+
+    inline std::string getTimeStr(){
+      std::stringstream ss;
+      time_t rawTime = std::time(nullptr);
+      struct tm timeInfo = *localtime(&rawTime);
+#if defined(__GNUC__) && !defined(__clang__) && (__GNUC__ <= 4)
+      char buffer[128];
+      std::strftime(buffer, sizeof(buffer), "%Y.%m.%d %H:%M:%S", &timeInfo);
+      ss << buffer;
+#else
+      ss << std::put_time(&timeInfo, "%Y.%m.%d %H:%M:%S");
+#endif
+      return ss.str();
+    }
+
+  }
+}
 
 // internals
-#define GTLogBase std::string(__FILENAME__) + ":" + std::to_string(__LINE__) + ": "
+#define GTLogBase std::string(__FILENAME__) + ":" + std::to_string(__LINE__) + "/" + __func__ + ": "
 
 // basics
-#define GTLogError   std::cout << "[ERROR] " << GTLogBase
-#define GTLogAlert   std::cout << "[ALERT] " << GTLogBase
-#define GTLogWarning std::cout << "[ WARN] " << GTLogBase
-#define GTLogInfo    std::cout << "[ INFO] " << GTLogBase
-#define GTLogDebug   std::cout << "[DEBUG] " << GTLogBase
-#define GTLogTrace   std::cout << "[TRACE] " << GTLogBase
+#define GTLogError   std::cout << GenericToolbox::LoggerUtils::getTimeStr() << " ERROR " << GTLogBase
+#define GTLogAlert   std::cout << GenericToolbox::LoggerUtils::getTimeStr() << " ALERT " << GTLogBase
+#define GTLogWarning std::cout << GenericToolbox::LoggerUtils::getTimeStr() << "  WARN " << GTLogBase
+#define GTLogInfo    std::cout << GenericToolbox::LoggerUtils::getTimeStr() << "  INFO " << GTLogBase
+#define GTLogDebug   std::cout << GenericToolbox::LoggerUtils::getTimeStr() << " DEBUG " << GTLogBase
+#define GTLogTrace   std::cout << GenericToolbox::LoggerUtils::getTimeStr() << " TRACE " << GTLogBase
 
 // throw
 #define GTLogThrow(message_) GTLogError << message_ << std::endl; throw std::runtime_error("exception thrown by the logger.")

diff --git a/include/GenericToolbox.Root.h b/include/GenericToolbox.Root.h
@@ -72,6 +72,25 @@ namespace GenericToolbox{
 // Function header
 namespace GenericToolbox{
 
+  inline TMatrixD* toTMatrixD(TH2D* input_){
+    if( input_ == nullptr ){
+      GTLogError << "input TH2D is nullptr." << std::endl;
+      return nullptr;
+    }
+
+    std::unique_ptr<TMatrixD> out{nullptr};
+
+    out = std::make_unique<TMatrixD>(input_->GetNbinsX(), input_->GetNbinsY());
+
+    for( int iCol = 0 ; iCol < input_->GetNbinsX() ; iCol++ ){
+      for( int iRow = 0 ; iRow < input_->GetNbinsY() ; iRow++ ){
+        (*out)[iCol][iRow] = input_->GetBinContent(iCol, iRow);
+      }
+    }
+
+    return out.release();
+  }
+
   //! Conversion Tools
   inline TH1D* convertToTH1D(const TVectorD *yValuesPtr_, const std::string &histTitle_ = "", const std::string &yTitle_ = "", const std::string &xTitle_ = "Entry #", TVectorD *yErrorsPtr_ = nullptr);
   inline TH1D* convertToTH1D(const std::vector<double> &Y_values_, const std::string &histTitle_ = "", const std::string &Y_title_ = "", const std::string &X_title_ = "Entry #", TVectorD *Y_errors_ = nullptr);

diff --git a/include/GenericToolbox.Wrappers.h b/include/GenericToolbox.Wrappers.h
@@ -91,6 +91,14 @@ namespace GenericToolbox{
 
     // core
     void waitUntilEqual(const T& val_) const;
+    template <typename U = T, typename = std::enable_if_t<std::is_same<U, bool>::value>> void waitUntilEqualThenToggle( bool val_){
+      waitUntilEqual(val_);
+      setValue(!val_);
+    }
+    template <typename U = T, typename = std::enable_if_t<std::is_same<U, bool>::value>> void toggleThenWaitUntilEqual( bool val_){
+      setValue(!val_);
+      waitUntilEqual(val_);
+    }
 
     // Define operator++ (post-increment) using SFINAE
     // Using operator++(int) and not operator++(T) to stay consistent with C++ conventions */