fixed gfield running

Author: maureeungaro

gemc_options.cc

@@ -14,6 +14,7 @@
 #include "g4display_options.h"
 #include "g4dialog_options.h"
 #include "gsd.h"
+#include "gfield_options.h"
 
 namespace gemc {
 
@@ -71,6 +72,7 @@ namespace gemc {
     	goptions += g4display::defineOptions();
     	goptions += g4dialog::defineOptions();
     	goptions += gsensitivedetector::defineOptions();
+    	goptions += gfields::defineOptions();
 
 
         return goptions;

gfactory/gfactory.h

@@ -68,7 +68,7 @@ class GManager {
 	template <class Derived>
 	void RegisterObjectFactory(std::string_view name);
 
-	/// Create an instance of previously registered factory as @c Base*.
+	/// Create an instance of the previously registered factory
 	template <class Base>
 	[[nodiscard]] Base* CreateObject(std::string_view name) const;
 

gfields/examples/test_gfield_dipole.cc

@@ -8,6 +8,7 @@
 using namespace std;
 
 int main(int argc, char* argv[]) {
+
 	// Initialize GOptions (parsed from YAML or another source)
 	auto gopts = std::make_shared<GOptions>(argc, argv, gfields::defineOptions());
 

gfields/gfield.cc

@@ -16,6 +16,7 @@
 // gfield
 #include "gfield.h"
 #include "gfieldConventions.h"
+#include "gfield_options.h"
 
 
 // notice: we are always using G4Mag_UsualEqRhs here
@@ -66,3 +67,5 @@ G4FieldManager *GField::create_FieldManager() {
     return new G4FieldManager(this, fChordFinder);
 
 }
+
+void GField::set_loggers(const std::shared_ptr<GOptions>& g) { log = std::make_shared<GLogger>(g, GFIELD_LOGGER, "gfields"); }

gfields/gfield.h

@@ -7,8 +7,6 @@
 // gemc
 #include "gfactory.h"
 
-// gfield
-#include "gfieldConventions.h"
 
 /**
  * @brief Utility struct to load GFields from options.
@@ -92,7 +90,7 @@ class GField : public G4MagneticField {
 	int    get_field_parameter_int(const std::string& key) { return stoi(gfield_definitions.field_parameters[key]); }
 	double get_field_parameter_double(const std::string& key) { return stod(gfield_definitions.field_parameters[key]); }
 
-	void set_loggers(const std::shared_ptr<GOptions>& g) { log = std::make_shared<GLogger>(g, GFIELD_LOGGER, "gfield logger"); }
+	void set_loggers(const std::shared_ptr<GOptions>& g);
 
 private:
 	// TODO: make this list automatic

gfields/gfieldConventions.h

@@ -1,6 +1,5 @@
 #pragma once
 
-constexpr const char* GFIELD_LOGGER = "gfield";
 
 #define GFIELD_DEFAULT_INTEGRATION_STEPPER "G4DormandPrince745"
 #define GFIELD_DEFAULT_MINIMUM_STEP "1.0*mm"

gfields/gfieldFactories/multipoles/gfield_multipoles.cc

@@ -6,6 +6,7 @@
 
 // gfields
 #include "gfield_multipoles.h"
+#include "gfieldConventions.h"
 
 // gemv
 #include "gutilities.h"

gfields/gfield_options.h

@@ -6,6 +6,7 @@
 // gfields
 #include "gfield.h"
 
+constexpr const char* GFIELD_LOGGER = "gfield";
 
 namespace gfields {
 

gfields/gmagneto.h

@@ -2,6 +2,7 @@
 
 // gemc
 #include "gfield.h"
+#include "gfield_options.h"
 #include "gfieldConventions.h"
 
 /**

glogging/glogger.h

@@ -12,7 +12,7 @@
 #include <utility>
 
 
-// cross platform function to return the function name
+// cross-platform function to return the function name
 #if defined(__clang__) || defined(__GNUC__)
   #define FUNCTION_NAME __PRETTY_FUNCTION__
 #elif defined(_MSC_VER)
@@ -45,7 +45,7 @@ class GLogger {
 	 * @brief Constructs a GLogger instance.
 	 * @param gopts Shared Pointer to GOptions instance used for verbosity/debug lookup.
 	 * @param vname The verbosity or debug name is a string used to identify the logger and as header for all messages
-	 * @param cc The calling class name, used to identify the source of the log messages.
+	 * @param desc The calling class name, used to identify the source of the log messages.
 	 */
 	explicit GLogger(const std::shared_ptr<GOptions>& gopts, const std::string& vname, const std::string& desc = "")
 	: verbosity_name(vname), description(desc), log_counter{0} {
@@ -106,7 +106,7 @@ class GLogger {
 	 */
 	template <typename... Args>
 	void info(int level, Args&&... args) const {
-		// error if level is not 0, 1 or 2
+		// error if the level is not 0, 1 or 2
 		if (level != 0 && level != 1 && level != 2) {
 			G4cerr << FATALERRORL << header_string() << GWARNING << " Invalid verbosity level requested: " << level <<
 				RST << G4endl;
@@ -121,7 +121,7 @@ class GLogger {
 	}
 
 	/**
-	 * @brief Overloaded version of info() with default level = 0.
+	 * @brief Overloaded version of info() with the default level = 0.
 	 *
 	 * @tparam Args Variadic template parameters for any streamable types.
 	 * @param args Streamable message components.