Merge branch 'metrics_fix' into 'development'

Fixes json parsing in metrics and wrong mapping.

See merge request ems/astdm/dram.sys!250

DRAMSys/library/resources/simulations/ddr3-example.json

@@ -1,10 +1,10 @@
 {
     "simulation": {
-        "addressmapping": "congen_extended_solution.json",
+        "addressmapping": "am_ddr3_8x1Gbx8_dimm_p1KB_rbc.json",
         "mcconfig": "fifoStrict.json",
         "memspec": "MICRON_1Gb_DDR3-1600_8bit_G.json",
         "simconfig": "ddr3.json",
-        "simulationid": "ddr3-example-all-json",
+        "simulationid": "ddr3-example",
         "thermalconfig": "config.json",
         "tracesetup": [
             {

DRAMSys/traceAnalyzer/scripts/memUtil.py

@@ -71,8 +71,8 @@ def maximum_data_rate(connection):
     else:
         if (memoryType.find("WIDEIO") != -1):
             width = memspec.getValue("width")
-    clk = memspec.getValue("clkMhz")
-    rate = memspec.getValue("dataRate")
+    clk = memspec.getIntValue("memtimingspec", "clkMhz")
+    rate = memspec.getIntValue("memarchitecturespec", "dataRate")
     maxDataRate = float(clk)*float(width)*float(rate)
     return maxDataRate