Alexander Ziegler / ctools

Commit d1683b43bf07386d3d69eb25c89ff95190975c5e

Authored by Jürgen Knödlseder
1 parent ecce3168

Replace has_key() by in for Python 3.x compatibility (#1924)

Inline Side-by-side
Showing 3 changed files with 10 additions and 6 deletions
ChangeLog
  View file @d1683b4
1   -2017-01-03
  1 +2017-02-09
2 2  
3 3 * Version 1.2.0 released
4 4 ========================
5 5  
  6 + Replace has_key() by in for Python 3.x compatibility (#1924)
6 7 cslightcrv no longer accepts counts cubes on input (#1920)
7 8 Set ctbin reference time to CTA reference time (#1922)
8 9 Change ds9file parameter to outds9file
... ...
1 1 New Features and Important Changes in ctools 1.2.0
2 2  
3   -3 February 2017
  3 +9 February 2017
4 4  
5 5  
6 6 Introduction
... ... @@ -252,6 +252,9 @@ Examples
252 252 --------
253 253 Add show_lightcurve script to display a light curve.
254 254  
  255 +Replace has_key() by "in" in example scripts for Python 3.x compatibility
  256 +(#1924).
  257 +
255 258  
256 259 caldb
257 260 -----
... ...
examples/show_sensitivity.py
  View file @d1683b4
... ... @@ -2,7 +2,7 @@
2 2 # ==========================================================================
3 3 # Display differential sensitivity plot generated by cssens
4 4 #
5   -# Copyright (C) 2015-2016 Juergen Knoedlseder
  5 +# Copyright (C) 2015-2017 Juergen Knoedlseder
6 6 #
7 7 # This program is free software: you can redistribute it and/or modify
8 8 # it under the terms of the GNU General Public License as published by
... ... @@ -62,7 +62,7 @@ def read_sensitivity(filename):
62 62  
63 63 # Check where file contains differential or integral sensitivity
64 64 mode = 'Integral'
65   - if sensitivity.has_key('emax'):
  65 + if 'emax' in sensitivity:
66 66 emax_ref = -1.0
67 67 for value in sensitivity['emax']:
68 68 if emax_ref < 0.0:
... ... @@ -76,14 +76,14 @@ def read_sensitivity(filename):
76 76  
77 77 # Add linear energy values
78 78 if mode == 'Differential':
79   - if sensitivity.has_key('loge'):
  79 + if 'loge' in sensitivity:
80 80 name = 'energy'
81 81 values = []
82 82 for value in sensitivity['loge']:
83 83 values.append(math.pow(10.0, value))
84 84 sensitivity[name] = values
85 85 else:
86   - if sensitivity.has_key('emin'):
  86 + if 'emin' in sensitivity:
87 87 name = 'energy'
88 88 values = []
89 89 for value in sensitivity['emin']:
... ...