Merge branch 'master' into test_malte

sixdeskdb/davsturns.py

@@ -901,6 +901,7 @@ def RunDaVsTurns(db,force,outfile,outfileold,turnstep,davstfit,fitdat,fitdaterr,
 
 
 import itertools
+
 from . import tables
 # new DA method for unequal emittances - MT
 def RunDaVsTurns_ue(db, emittances, turnstep=100, method=1, close=True,

sixdeskdb/deskdb.py

@@ -2568,7 +2568,9 @@ def mk_da_vst_ang(self,seed,tune,turnstep):
     e.g. for angmax=29+1 for divisors [1, 2, 3, 5, 6, 10]"""
     RunDaVsTurnsAng(self,seed,tune,turnstep)
 
+
   def get_surv_tmp(self, seed, tune=None, verbose=True):
+
     '''get survival turns from DB calculated from emitI and emitII'''
 
     if verbose:
@@ -2608,6 +2610,7 @@ def get_surv_tmp(self, seed, tune=None, verbose=True):
             "shape (%s, newaxis). Skip this seed %s!"%(n_angles, seed)))
       return None
 
+
   def get_surv(self, seed, tune_pair):
         '''get survival turns from DB calculated from emitI and emitII'''
 
@@ -2631,7 +2634,6 @@ def get_surv(self, seed, tune_pair):
                   "shape (%s,newaxis). Skip this seed %s!"%(angles, seed))
             return None
 
-
   def plot_da_vst(self,seed,tune,ldat,ldaterr,ampmin,ampmax,tmax,slog,sfit,fitndrop):
     """plot dynamic aperture vs number of turns where ldat,ldaterr is the data and 
     the associated error to be plotted. The data is plotted in blue and the fit in red.