- rel_error = abs(new_k-k)/k
- if rel_error > maximum_relative_error:
- _LOG.warn(("new analysis doesn't match for k: %g -> %g "
- "(difference: %g, relative error: %g)")
- % (k, new_k, new_k-k, rel_error))
- if not dry_run:
- calib_save(filename, calib_group, k=new_k)
- rel_error = abs(new_k_s-k_s)/k_s
- if rel_error > maximum_relative_error:
- _LOG.warn(("new analysis doesn't match for k_s: %g -> %g "
- "(difference: %g, relative error: %g)")
- % (k_s, new_k_s, new_k_s-k_s, rel_error))
- if not dry_run:
- calib_save(filename, calib_group, k_s=new_k_s)
+ new_calib_k = False
+ if k is None:
+ new_calib_k = True
+ _LOG.warn('new analysis for k: %g' % new_k)
+ else:
+ rel_error = abs(new_k-k)/k
+ if rel_error > maximum_relative_error:
+ new_calib_k = True
+ _LOG.warn(("new analysis doesn't match for k: %g -> %g "
+ "(difference: %g, relative error: %g)")
+ % (k, new_k, new_k-k, rel_error))
+ if new_calib_k and not dry_run:
+ calib_save(filename, calib_group, k=new_k)
+ new_calib_k_s = False
+ if k_s is None:
+ new_calib_k_s = True
+ _LOG.warn('new analysis for k_s: %g' % new_k_s)
+ else:
+ rel_error = abs(new_k_s-k_s)/k_s
+ if rel_error > maximum_relative_error:
+ new_calib_k_s = True
+ _LOG.warn(("new analysis doesn't match for k_s: %g -> %g "
+ "(difference: %g, relative error: %g)")
+ % (k_s, new_k_s, new_k_s-k_s, rel_error))
+ if new_calib_k_s and not dry_run:
+ calib_save(filename, calib_group, k_s=new_k_s)