fix coriolis2 settings to use new CfgCache

diff --git a/experiments9/coriolis2/settings.py b/experiments9/coriolis2/settings.py
index 35ff2bf8784f0792185b98353f6319c74ede18cc..57089be8165b1bb027a92f4ff13bd8e297070dfb 100644 (file)
--- a/experiments9/coriolis2/settings.py
+++ b/experiments9/coriolis2/settings.py
@@ -6,56 +6,56 @@ import Viewer
 from   helpers.overlay import CfgCache
 import symbolic.cmos  # do not remove
 
-with CfgCache(priority=Cfg.Parameter.Priority.UserFile) as cfg:
-    cfg.misc.catchCore               = False
-    cfg.misc.info                    = False
-    cfg.misc.paranoid                = False
-    cfg.misc.bug                     = False
-    cfg.misc.logMode                 = True
-    cfg.misc.verboseLevel1           = True
-    cfg.misc.verboseLevel2           = True
-    cfg.anabatic.edgeLenght          = 24
-    cfg.anabatic.edgeWidth           = 8
-    cfg.anabatic.topRoutingLayer     = 'METAL5'
-    cfg.etesian.graphics             = 3
-
-    #cfg.katana.searchHalo           = 30
-    #cfg.katana.eventsLimit          = 1000000
-    #cfg.katana.hTracksReservedLocal = 7
-    
-    # Run 2 (make-cgt-2.log)
-    #cfg.etesian.effort              = 2
-    #cfg.etesian.uniformDensity      = True
-    #cfg.etesian.spaceMargin         = 0.05
-    #cfg.etesian.aspectRatio         = 1.0
-    #cfg.katana.vTracksReservedLocal = 4
-    #cfg.katana.hTracksReservedLocal = 4
-
-    # Run 3 (make-cgt-3.log)
-    #cfg.etesian.effort              = 2
-    #cfg.etesian.uniformDensity      = False
-    #cfg.etesian.spaceMargin         = 0.05
-    #cfg.etesian.aspectRatio         = 1.0
-    #cfg.katana.vTracksReservedLocal = 5
-    #cfg.katana.hTracksReservedLocal = 5
-
-    # Run 4 (make-cgt-4.log)
-    #cfg.etesian.effort              = 2
-    #cfg.etesian.uniformDensity      = True
-    #cfg.etesian.spaceMargin         = 0.05
-    #cfg.etesian.aspectRatio         = 1.0
-
-    # Run 5 (make-cgt-5.log)
-    cfg.etesian.effort              = 2
-    cfg.etesian.uniformDensity      = True
-    cfg.etesian.spaceMargin         = 0.05
-    cfg.etesian.aspectRatio         = 1.0
-    cfg.katana.vTracksReservedLocal = 5
-    cfg.katana.hTracksReservedLocal = 5
-
-    env = CRL.AllianceFramework.get().getEnvironment()
-    env.setCLOCK ('^clk$|m_clock')
-    env.setPOWER ('vdd')
-    env.setGROUND('vss')
-
-    Viewer.Graphics.setStyle('Alliance.Classic [black]')
+cfg = CfgCache('')
+cfg.misc.catchCore               = False
+cfg.misc.info                    = False
+cfg.misc.paranoid                = False
+cfg.misc.bug                     = False
+cfg.misc.logMode                 = True
+cfg.misc.verboseLevel1           = True
+cfg.misc.verboseLevel2           = True
+cfg.anabatic.edgeLenght          = 24
+cfg.anabatic.edgeWidth           = 8
+cfg.anabatic.topRoutingLayer     = 'METAL5'
+cfg.etesian.graphics             = 3
+
+#cfg.katana.searchHalo           = 30
+#cfg.katana.eventsLimit          = 1000000
+#cfg.katana.hTracksReservedLocal = 7
+
+# Run 2 (make-cgt-2.log)
+#cfg.etesian.effort              = 2
+#cfg.etesian.uniformDensity      = True
+#cfg.etesian.spaceMargin         = 0.05
+#cfg.etesian.aspectRatio         = 1.0
+#cfg.katana.vTracksReservedLocal = 4
+#cfg.katana.hTracksReservedLocal = 4
+
+# Run 3 (make-cgt-3.log)
+#cfg.etesian.effort              = 2
+#cfg.etesian.uniformDensity      = False
+#cfg.etesian.spaceMargin         = 0.05
+#cfg.etesian.aspectRatio         = 1.0
+#cfg.katana.vTracksReservedLocal = 5
+#cfg.katana.hTracksReservedLocal = 5
+
+# Run 4 (make-cgt-4.log)
+#cfg.etesian.effort              = 2
+#cfg.etesian.uniformDensity      = True
+#cfg.etesian.spaceMargin         = 0.05
+#cfg.etesian.aspectRatio         = 1.0
+
+# Run 5 (make-cgt-5.log)
+cfg.etesian.effort              = 2
+cfg.etesian.uniformDensity      = True
+cfg.etesian.spaceMargin         = 0.05
+cfg.etesian.aspectRatio         = 1.0
+cfg.katana.vTracksReservedLocal = 5
+cfg.katana.hTracksReservedLocal = 5
+
+env = CRL.AllianceFramework.get().getEnvironment()
+env.setCLOCK ('^clk$|m_clock')
+env.setPOWER ('vdd')
+env.setGROUND('vss')
+
+Viewer.Graphics.setStyle('Alliance.Classic [black]')