stashing gbase before new branch

Author: maureeungaro

ci/build.sh

@@ -94,12 +94,12 @@ if [[ $1 != @(address|thread|undefined|memory|leak) ]]; then
 fi
 
 echo
-echo " ldd of $GEMC/bin/gemc:"
+echo " ldd of $GEMC/bin/gemc:" >> $compile_log | tee -a
 
 # if on unix, use ldd , if on mac, use otool -L
 if [[ "$(uname)" == "Darwin" ]]; then
   otool -L $GEMC/bin/gemc || exit 1
 else
-  ldd $GEMC/bin/gemc || exit 1
+  ldd $GEMC/bin/gemc || exit 1  >> $compile_log | tee -a
 fi
 

gbase/examples/test_gbase.cc

@@ -1,11 +1,15 @@
 
 #include "gbase.h"
 
+constexpr const char* G1_LOGGER = "g1";
+
+
 class g1 : public GBase<g1> {
 public:
+
 	int object1 = 2;
 
-	explicit g1(std::shared_ptr<GOptions> gopt) : GBase(gopt) {
+	explicit g1(std::shared_ptr<GOptions> gopt) : GBase(gopt, G1_LOGGER) {
 		log->info(0, "hello derived class ", SFUNCTION_NAME);
 	}
 
@@ -15,7 +19,7 @@ class g1 : public GBase<g1> {
 // returns this example options
 GOptions defineOptions() {
 
-	GOptions goptions("g1");
+	GOptions goptions(G1_LOGGER);
 
 	// command line switch
 	goptions.defineSwitch("light", "a switch, this is just an example.");
@@ -27,7 +31,6 @@ int main(int argc, char *argv[]) {
 
 	auto gopts = std::make_shared<GOptions>(argc, argv, defineOptions());
 
-
 	g1 obj(gopts);
 
 	return EXIT_SUCCESS;

gbase/gbase.cc

@@ -29,8 +29,8 @@ std::string demangle(const char* name) {
 template <typename Derived>
 class GBase {
 public:
-	explicit GBase(std::shared_ptr<GOptions> gopt) {
-		log = std::make_shared<GLogger>(gopt, getDerivedName(), SDERIVED_NAME);
+	explicit GBase(std::shared_ptr<GOptions> gopt, std::string option_name = "") {
+		log = std::make_shared<GLogger>(gopt, SDERIVED_NAME, option_name);
 		log->debug(CONSTRUCTOR, getDerivedName());
 	}
 

gbase/gbase.h

@@ -84,14 +84,14 @@ class GLogger {
 
 		switch (type) {
 		case NORMAL:
-			G4cout << KCYN << header_string() << "DEBUG " << oss.str() << RST << G4endl;
+			G4cout << KCYN << header_string() << "DEBUG: " << oss.str() << RST << G4endl;
 			break;
 		case CONSTRUCTOR:
-			G4cout << KCYN << header_string() << "DEBUG " <<
+			G4cout << KCYN << header_string() << "DEBUG: " <<
 				CONSTRUCTORLOG << " " << oss.str() << " " << CONSTRUCTORLOG << RST << G4endl;
 			break;
 		case DESTRUCTOR:
-			G4cout << KCYN << header_string() << "DEBUG " <<
+			G4cout << KCYN << header_string() << "DEBUG: " <<
 				DESTRUCTORLOG << " " << oss.str() << " " << DESTRUCTORLOG << RST << G4endl;
 			break;
 		}
@@ -118,7 +118,7 @@ class GLogger {
 		if (level == 0 || (level == 1 && verbosity_level > 0) || (level == 2 && verbosity_level > 1)) {
 			std::ostringstream oss;
 			(oss << ... << std::forward<Args>(args));
-			G4cout << header_string() << "INFO L" << level << " " << oss.str() << G4endl;
+			G4cout << header_string() << "INFO L" << level << ": " << oss.str() << G4endl;
 		}
 	}
 
@@ -197,6 +197,6 @@ class GLogger {
 	 */
 	[[nodiscard]] std::string header_string() const {
 		log_counter++;
-		return " [" + description + "]" + " (" + std::to_string(log_counter.load()) + "): ";
+		return " [ " + description +  " - " + std::to_string(log_counter.load()) + " ] ";
 	}
 };