finish merging develop2 to master

Author: sjkdenny

bin/binTimes.py

@@ -85,6 +85,7 @@
         min_time_delta = time_deltas.min()
         plotFun.plotTimeDeltaDist(time_deltas, min_time_delta)
         plt.savefig(os.path.join(figDirectory, 'time_delta_hist.pdf'))
+
     else:
         min_time_delta = args.tau 
 
@@ -142,4 +143,4 @@
 
     # plot timeDelta original
     plotFun.plotTimesOriginal(timeDelta)
-    plt.savefig(os.path.join(figDirectory, 'times_per_tile_original.pdf'))
+    plt.savefig(os.path.join(figDirectory, 'times_per_tile_original.pdf'))

bin/fitFun.py

@@ -524,6 +524,7 @@ def returnParamsFromResultsBounds(final_params, param_names, ub_vec):
         params_ub.add(name, value=final_params.loc[param])
     return params_ub
 
+
 def errorPropagationKdFromKoffKobs(koff, kobs, c, sigma_koff, sigma_kobs):
     koff = koff.astype(float)
     kobs = kobs.astype(float)