Merge branch 'master' of gitext.gfz-potsdam.de:heimann/grond

src/core.py

@@ -730,6 +730,7 @@ def process_event(ievent, g_data_id):
     #     update_every=10,
     #     movie_filename='grond_opt_time_magnitude.mp4')
 
+    try:
         solver = config.solver_config.get_solver()
         solver.solve(
             problem,
@@ -741,6 +742,9 @@ def process_event(ievent, g_data_id):
 
         harvest(rundir, problem, force=True)
 
+    except BadProblem as e:
+        logger.error(str(e))
+
     tstop = time.time()
     logger.info(
         'stop %i / %i (%g min)' % (ievent, nevents, (tstop - tstart)/60.))

src/problems/base.py

@@ -205,10 +205,10 @@ class Problem(Object):
 
         return ws
 
-    def get_bootstrap_weights(self, ibootstrap=None):
+    def get_bootstrap_weights(self, nbootstrap, ibootstrap=None):
         if self._bootstrap_weights is None:
             self._bootstrap_weights = self.make_bootstrap_weights(
-                self.nbootstrap, type='bayesian')
+                nbootstrap, type='bayesian')
 
         if ibootstrap is None:
             return self._bootstrap_weights
@@ -261,7 +261,8 @@ class Problem(Object):
             for p in target.target_parameters:
                 r = target.target_ranges[p.name]
                 out.append((r.start, r.stop))
-        return out
+
+        return num.array(out, dtype=num.float)
 
     def get_dependant_bounds(self):
         return []

src/problems/cmt.py

@@ -18,7 +18,6 @@ class CMTProblemConfig(ProblemConfig):
 
     ranges = Dict.T(String.T(), gf.Range.T())
     distance_min = Float.T(default=0.0)
-    nbootstrap = Int.T(default=10)
     mt_type = StringChoice.T(choices=['full', 'deviatoric'])
 
     def get_problem(self, event, targets):
@@ -39,7 +38,6 @@ class CMTProblemConfig(ProblemConfig):
             targets=targets,
             ranges=self.ranges,
             distance_min=self.distance_min,
-            nbootstrap=self.nbootstrap,
             mt_type=self.mt_type,
             norm_exponent=self.norm_exponent)
 
@@ -67,7 +65,6 @@ class CMTProblem(Problem):
         Parameter('rel_moment_clvd', label='$M_{0}^{CLVD}/M_{0}$')]
 
     distance_min = Float.T(default=0.0)
-    nbootstrap = Int.T(default=10)
     mt_type = StringChoice.T(
         default='full', choices=['full', 'deviatoric', 'dc'])