better logging

Author: maureeungaro

.github/workflows/build_gemc_almalinux.yml

@@ -16,7 +16,7 @@ on:
 jobs:
   build-on-almalinux:
     runs-on: ubuntu-latest
-    container: jeffersonlab/geant4:g4v11.3.0-almalinux94
+    container: jeffersonlab/geant4:g4v11.3.1-almalinux94
 
     steps:
       - name: Checkout

.github/workflows/build_gemc_fedora.yml

@@ -16,7 +16,7 @@ on:
 jobs:
   build-on-fedora:
     runs-on: ubuntu-latest
-    container:  jeffersonlab/geant4:g4v11.3.0-fedora36
+    container:  jeffersonlab/geant4:g4v11.3.1-fedora36
 
     steps:
       - name: Checkout

.github/workflows/build_gemc_ubuntu.yml

@@ -16,7 +16,7 @@ on:
 jobs:
   build-on-ubuntu:
     runs-on: ubuntu-latest
-    container:  jeffersonlab/geant4:g4v11.3.0-ubuntu24
+    container:  jeffersonlab/geant4:g4v11.3.1-ubuntu24
 
     steps:
       - name: Checkout

.github/workflows/sanitize.yaml

@@ -20,11 +20,11 @@ jobs:
       matrix:
         container:
           - name: ubuntu24
-            image: jeffersonlab/geant4:g4v11.3.0-ubuntu24
+            image: jeffersonlab/geant4:g4v11.3.1-ubuntu24
           - name: fedora36
-            image: jeffersonlab/geant4:g4v11.3.0-fedora36
+            image: jeffersonlab/geant4:g4v11.3.1-fedora36
           - name: almalinux93
-            image: jeffersonlab/geant4:g4v11.3.0-almalinux94
+            image: jeffersonlab/geant4:g4v11.3.1-almalinux94
         # to be revisited
         # NOTE1: `b_sanitize=memory` is not used because `libc++` needs to be re-compiled with `-fsanitize=memory`, otherwise
         #        we are bothered by false positives (e.g., from `std::map` insertion)

eventDispenser/eventDispenser.cc

@@ -41,7 +41,7 @@ using namespace std;
 // GDynamicDigitization plugins map.
 //
 EventDispenser::EventDispenser(GOptions *gopt, map<string, GDynamicDigitization *> *gDDGlobal)
-		: log(std::make_shared<GLogger>(gopt, EVENTDISPENSER_LOGGER)) , gDigitizationGlobal(gDDGlobal) {
+		: log(std::make_shared<GLogger>(gopt, EVENTDISPENSER_LOGGER, "EventDispenser")) , gDigitizationGlobal(gDDGlobal) {
 
 	log->debug(CONSTRUCTOR, "EventDispenser");
 

eventDispenser/examples/event_dispenser_example.cc

@@ -24,9 +24,7 @@
 #include "eventDispenser.h"
 #include "eventDispenser_options.h"
 #include "goptions.h"
-#include "glogger.h"
 
-#include <iostream>
 #include <map>
 #include <string>
 
@@ -37,7 +35,7 @@ int main(int argc, char *argv[]) {
 	auto gopts = new GOptions(argc, argv, eventDispenser::defineOptions());
 
 	// Create a logger for the EventDispenser module.
-	auto log = new GLogger(gopts, EVENTDISPENSER_LOGGER);
+	auto log = std::make_unique<GLogger>(gopts, EVENTDISPENSER_LOGGER, "eventDispenser example");
 
 	// For demonstration, create an empty global map of dynamic digitization plugins.
 	// In a full simulation, this map would be populated with actual GDynamicDigitization plugins.
@@ -54,7 +52,6 @@ int main(int argc, char *argv[]) {
 
 	// Cleanup: delete dynamically allocated objects.
 	delete gopts;
-	delete log;
 	delete gDynamicMap;
 
 	return EXIT_SUCCESS;

g4dialog/examples/g4dialog_example.cc

@@ -1,17 +1,10 @@
 // geant4
 #include "G4VisExecutive.hh"
 #include "G4RunManagerFactory.hh"
-#include "FTFP_BERT.hh"
-#include "G4StepLimiterPhysics.hh"
 
 // g4dialog
 #include "g4dialog.h"
 #include "g4dialog_options.h"
-#include "gui_session.h"
-
-// c++
-#include <iostream>
-using namespace std;
 
 // qt
 #include <QApplication>
@@ -20,7 +13,7 @@ using namespace std;
 int main(int argc, char* argv[]) {
 
 	auto gopts = new GOptions(argc, argv, g4dialog::defineOptions());
-	auto log = new GLogger(gopts, G4DIALOG_LOGGER);
+	auto log = std::make_shared<GLogger>(gopts, G4DIALOG_LOGGER, "g4dialog example");
 
 	QApplication app(argc, argv);
 
@@ -47,5 +40,7 @@ int main(int argc, char* argv[]) {
 	delete window;
 	delete visManager;
 	delete gopts;
+
 	return EXIT_SUCCESS;
+
 }

g4dialog/g4dialog.cc

@@ -8,7 +8,7 @@
 #include "G4UImanager.hh"
 
 
-G4Dialog::G4Dialog(GOptions *gopt, QWidget *parent) : QWidget(parent), log(new GLogger(gopt, G4DIALOG_LOGGER)) {
+G4Dialog::G4Dialog(GOptions *gopt, QWidget *parent) : QWidget(parent), log(std::make_shared<GLogger>(gopt, G4DIALOG_LOGGER, "G4Dialog")) {
 
     log->debug(CONSTRUCTOR, "G4Dialog");
 

g4dialog/g4dialog.h

@@ -1,5 +1,4 @@
-#ifndef  G4DIALOG_H
-#define  G4DIALOG_H  1
+#pragma once
 
 // g4dialog
 #include "tabs/gboard.h"
@@ -19,14 +18,11 @@ class G4Dialog : public QWidget {
     ~G4Dialog() override {
 		log->debug(DESTRUCTOR, "G4Dialog");
 		delete gboard;
-		delete log;
 	}
 
 private:
-	GLogger * const log;
+	std::shared_ptr<GLogger> log;
 	GBoard* gboard;
 	GUI_Session *gui_session;
 };
 
-
-#endif

g4dialog/gui_session.cc

@@ -3,7 +3,7 @@
 
 #include <QRegularExpression>
 
-GUI_Session::GUI_Session(GOptions *gopt, GBoard* b) : board(b), log(new GLogger(gopt, G4DIALOG_LOGGER)) {
+GUI_Session::GUI_Session(GOptions *gopt, GBoard* b) : board(b), log(new GLogger(gopt, G4DIALOG_LOGGER, "GUI_Session")) {
 
   	log->debug(CONSTRUCTOR, "GUI_Session");
 	log->info(0, " g4 dialog : GUI_Session created");