Veronika Vodeb / ctools

Commit 77aa3b085473062916d6f65037da25d90ca6f888

Authored by Jürgen Knödlseder
1 parent ca026351

Correct csspec code so that it also works for Python 2.3 & 2.4

Inline Side-by-side
Showing 1 changed file with 6 additions and 4 deletions
cscripts/csspec.py
  View file @77aa3b0
... ... @@ -1024,14 +1024,16 @@ class csspec(ctools.csobservation):
1024 1024 # Compute the flux values to evaluate loglike at
1025 1025 log_norm = math.log10(norm)
1026 1026 if (norm_err > 0.0) and (norm > norm_err):
1027   - log_step = log_norm - math.log10(norm-norm_err)
  1027 + log_step = log_norm - math.log10(norm-norm_err)
1028 1028 log_start = log_norm - (sigsteps/2) * log_step
1029 1029 else:
1030 1030 # For an upper limit bin use a broad range of steps in flux
1031 1031 # from [10^-24, 10^-14] or [norm, 10^-14] whichever is broader
1032   - log_start = -24 if (log_norm > -24) else log_norm
1033   - log_step = (-14 - log_start) / (sigsteps-1)
1034   - norm_vals = [10 ** (log_start + i*log_step) for i in range(sigsteps)]
  1032 + log_start = log_norm
  1033 + if log_start > -24.0:
  1034 + log_start = -24.0
  1035 + log_step = (-14.0 - log_start) / (sigsteps-1)
  1036 + norm_vals = [10.0 ** (log_start + i*log_step) for i in range(sigsteps)]
1035 1037  
1036 1038 # Loop through normalizations
1037 1039 flux_par.factor_min(0.0)
... ...