From 5f12dd5e2850b535025905794c9ac891440ef781 Mon Sep 17 00:00:00 2001
From: Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
Date: Mon, 4 Mar 2013 15:36:18 +0000
Subject: [PATCH] Uses the new configuration system for the cell mapping.

---
 stratus1/src/stratus/st_getrealmodel.py | 30 +++++++++----------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/stratus1/src/stratus/st_getrealmodel.py b/stratus1/src/stratus/st_getrealmodel.py
index ba8ad3cc..6f3e8e42 100644
--- a/stratus1/src/stratus/st_getrealmodel.py
+++ b/stratus1/src/stratus/st_getrealmodel.py
@@ -46,6 +46,7 @@
 # |                                                                 |
 # x-----------------------------------------------------------------x
 
+import Cfg
 from st_parser import Parser, InitParser, WeightParser
 
 import os
@@ -53,31 +54,23 @@ import os
 def InitBV () :
   myP = InitParser()
 
-  if 'STRATUS_MAPPING_NAME' in os.environ :
-    myP.Parse ( os.environ['STRATUS_MAPPING_NAME'] )
-  else :
-    err = "\n[Stratus ERROR] Virtual library : No file found in order to parse.\nCheck STRATUS_MAPPING_NAME.\n"
-    raise Exception ( err )    
+  mapping = Cfg.getParamString('stratus1.mappingName').asString()
+  myP.Parse ( mapping )
+  return
 
 def GetRealModel ( model ) :
   myP = Parser()
 
-  if 'STRATUS_MAPPING_NAME' in os.environ :
-    myP.Parse ( os.environ['STRATUS_MAPPING_NAME'] )
-  else :
-    err = "\n[Stratus ERROR] Virtual library : No file found in order to parse.\nCheck STRATUS_MAPPING_NAME.\n"
-    raise Exception ( err )
+  mapping = Cfg.getParamString('stratus1.mappingName').asString()
+  myP.Parse ( mapping )
 
   return myP._realCell[model], myP._inOut[model]    
 
 def GetWeightTime ( model, value=None ) :
   myP = WeightParser()
     
-  if 'STRATUS_MAPPING_NAME' in os.environ :
-    myP.Parse ( os.environ['STRATUS_MAPPING_NAME'] )
-  else :
-    err = "\n[Stratus ERROR] Virtual library : No file found in order to parse.\nCheck STRATUS_MAPPING_NAME.\n"
-    raise Exception ( err )        
+  mapping = Cfg.getParamString('stratus1.mappingName').asString()
+  myP.Parse ( mapping )
 
   if value == None :  
     if type(myP._weightTime[model]) == dict:
@@ -90,11 +83,8 @@ def GetWeightTime ( model, value=None ) :
 def GetWeightArea ( model ) :
   myP = WeightParser()
     
-  if 'STRATUS_MAPPING_NAME' in os.environ :
-    myP.Parse ( os.environ['STRATUS_MAPPING_NAME'] )
-  else :
-    err = "\n[Stratus ERROR] Virtual library : No file found in order to parse.\nCheck STRATUS_MAPPING_NAME.\n"
-    raise Exception ( err )        
+  mapping = Cfg.getParamString('stratus1.mappingName').asString()
+  myP.Parse ( mapping )
     
   return myP._weightArea[model]