Changeset 3273

Timestamp:

01/26/12 21:06:58 (4 months ago)

Author:

erkn

Message:

Refactor parameter handling

Location:

branches/mcxtrace-1.0/src/mcrun2

Files:

• main.py (modified) (1 diff)
• mcstas.py (modified) (4 diffs)

branches/mcxtrace-1.0/src/mcrun2/main.py

@@ -211 +211 @@
     # Run McStas
     mcstas = McStas(options.instr)
+
+    # Set parameters
+    for param in options.params:
+        if '=' in param:
+            key, value = param.split('=', 1)
+            mcstas.setParameter(key, value)
+        else:
+            LOG.warning('Ignoring invalid parameter: "%s"', param)
+
     mcstas.prepare(options)
     mcstas.run()

branches/mcxtrace-1.0/src/mcrun2/mcstas.py

@@ -71 +71 @@
         self.name = splitext(basename(self.path))[0]
         self.options = None
+        self.params = {}
 
         # Setup paths
@@ -81 +82 @@
 
 
+    def setParameter(self, key, value):
+        ''' Set the value of an experiment parameter '''
+        self.params[key] = value
+
+
     def prepare(self, options):
         ''' Prepare for simultation run '''
@@ -87 +93 @@
         # Use mpi?
         mpi = options.use_mpi
-
         self.binpath += (mpi and '-mpi' or '')
 
@@ -135 +140 @@
 
         # Add parameters last
-        args += options.params
+        args += [ '%s=%s' % (key, value) for key, value in self.params.items() ]
 
         # Run McStas