Fix reporting of specs settings in tracefile

- Seems like an `(int&)` cast was necessary to correctly trace the value
of the enum ?
- pyspecs was updated to use the available top-level values instead of
  convoluted checks

2 files changed, 10 insertions, 10 deletions

diff --git a/src/specs.cpp b/src/specs.cpp
index 2b9727d..c58fd10 100644
--- a/src/specs.cpp
+++ b/src/specs.cpp
@@ -374,10 +374,10 @@ inline void sc_trace(sc_trace_file *tf, const SPECSConfig &s, string parent_tree
     parent_tree += (parent_tree.size() ? "." : "");
     sc_trace(tf, s.default_abstol, parent_tree + "abstol");
     sc_trace(tf, s.default_reltol, parent_tree + "reltol");
-    sc_trace(tf, s.default_resolution_multiplier, parent_tree + "resolution_multiplier");
-    sc_trace(tf, s.engine_timescale, parent_tree + "engine_timescale");
-    sc_trace(tf, s.simulation_mode, parent_tree + "simulation_mode");
-    sc_trace(tf, s.analysis_type, parent_tree + "analysis_type");
+    sc_trace(tf, (int&)s.default_resolution_multiplier, parent_tree + "resolution_multiplier");
+    sc_trace(tf, (int&)s.engine_timescale, parent_tree + "engine_timescale");
+    sc_trace(tf, (int&)s.simulation_mode, parent_tree + "simulation_mode");
+    sc_trace(tf, (int&)s.analysis_type, parent_tree + "analysis_type");
     sc_trace(tf, s.trace_all_optical_nets, parent_tree + "trace_all_optical_nets");
     sc_trace(tf, s.verbose_component_initialization, parent_tree + "verbose_component_initialization");
 }
\ No newline at end of file
diff --git a/src/specs.h b/src/specs.h
index fe56d6a..f2ae80a 100644
--- a/src/specs.h
+++ b/src/specs.h
@@ -73,10 +73,10 @@ public:
     };
 
     enum AnalysisType {
-        ANALYSIS_TYPE_MINVAL,
-        CW_OPERATING_POINT,
-        CW_SWEEP,
-        TIME_DOMAIN,
+        ANALYSIS_TYPE_MINVAL = -1,
+        CW_OPERATING_POINT = 0,
+        CW_SWEEP = 1,
+        TIME_DOMAIN = 2,
         ANALYSIS_TYPE_MAXVAL,
 
         // aliases
@@ -114,7 +114,7 @@ public:
 
     // other
     sc_signal<bool, SC_MANY_WRITERS> drop_all_events;
-    bool verbose_component_initialization = true;
+    bool verbose_component_initialization = false;
 
     SPECSConfig(sc_module_name name);
 
@@ -156,4 +156,4 @@ public:
     sc_trace(sc_trace_file *tf, const SPECSConfig &s, string parent_tree);
 };
 
-extern SPECSConfig specsGlobalConfig;
\ No newline at end of file
+extern SPECSConfig specsGlobalConfig;