From 5228657a602368acce1e08001418e7fee60d7191 Mon Sep 17 00:00:00 2001
From: Marcel Paffrath <marcel.paffrath@rub.de>
Date: Mon, 15 Aug 2016 13:35:01 +0200
Subject: [PATCH] small changes for synthetic tests

---
 pylot/core/active/fmtomoUtils.py | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pylot/core/active/fmtomoUtils.py b/pylot/core/active/fmtomoUtils.py
index 7fc5cfb6..5c27aed0 100644
--- a/pylot/core/active/fmtomoUtils.py
+++ b/pylot/core/active/fmtomoUtils.py
@@ -6,17 +6,24 @@ import datetime
 import numpy as np
 
 class Tomo3d(object):
-    def __init__(self, fmtomodir, simuldir = 'fmtomo_simulation', citer = 0, overwrite = False):
+    def __init__(self, fmtomodir, simuldir = 'fmtomo_simulation', citer = 0, overwrite = False, buildObs = True):
         '''
         Class build from FMTOMO script tomo3d. Can be used to run several instances of FMM code in parallel.
 
         :param: citer, current iteration (default = 0: start new model)
         :type: integer
+
+        :param: fmtomodir, directory containing a clean FMTOMO installation (v. 1.0)
+        :type: string (path)
+
+        :param: simuldir, simulation directory (must contain FMTOMO input grid files)
+        :type: string (path)
         '''
         self.simuldir = simuldir
         self.setCWD()
         self.buildFmtomodir(fmtomodir)
-        self.buildObsdata()
+        if buildObs:
+            self.buildObsdata()
         self.defParas()
         self.copyRef()
         self.citer = citer       # current iteration
@@ -87,7 +94,7 @@ class Tomo3d(object):
         Initiates inversion parameters for FMTOMO.
         '''
         # Name of program for performing inversion
-        self.inv = '{0}/invert3d'.format(self.cwd)
+        self.inv = os.path.join(self.cwd, 'invert3d')
         # Name of file containing current model traveltimes
         self.mtrav = 'mtimes.dat'
         # Name of file containing reference model traveltimes
@@ -99,7 +106,7 @@ class Tomo3d(object):
         # Name of file containing initial source locations
         self.isl = 'sourcesref.in'
         # Name of program for calculating traveltime residuals
-        self.resid = '{0}/residuals'.format(self.cwd)
+        self.resid = os.path.join(self.cwd, 'residuals')
         # Name of output file for calculating traveltime residuals
         self.resout = 'residuals.dat'