Merge #245 (DougBurke) - Update copyright year to include 2016

helpers/__init__.py

@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2014, 2015  Smithsonian Astrophysical Observatory
+#  Copyright (C) 2014, 2015, 2016  Smithsonian Astrophysical Observatory
 #
 #
 #  This program is free software; you can redistribute it and/or modify

helpers/clean.py

@@ -1,5 +1,5 @@
-# 
-#  Copyright (C) 2014  Smithsonian Astrophysical Observatory
+#
+#  Copyright (C) 2014, 2016  Smithsonian Astrophysical Observatory
 #
 #
 #  This program is free software; you can redistribute it and/or modify

helpers/deps/__init__.py

@@ -1,5 +1,5 @@
-# 
-#  Copyright (C) 2014  Smithsonian Astrophysical Observatory
+#
+#  Copyright (C) 2014, 2016  Smithsonian Astrophysical Observatory
 #
 #
 #  This program is free software; you can redistribute it and/or modify

helpers/develop.py

@@ -1,6 +1,6 @@
 from __future__ import print_function
 #
-#  Copyright (C) 2015  Smithsonian Astrophysical Observatory
+#  Copyright (C) 2015, 2016  Smithsonian Astrophysical Observatory
 #
 #
 #  This program is free software; you can redistribute it and/or modify

helpers/extensions/__init__.py

@@ -1,5 +1,5 @@
-# 
-#  Copyright (C) 2014  Smithsonian Astrophysical Observatory
+#
+#  Copyright (C) 2014, 2016  Smithsonian Astrophysical Observatory
 #
 #
 #  This program is free software; you can redistribute it and/or modify

helpers/install.py

@@ -1,5 +1,5 @@
-# 
-#  Copyright (C) 2014, 2015  Smithsonian Astrophysical Observatory
+#
+#  Copyright (C) 2014, 2015, 2016  Smithsonian Astrophysical Observatory
 #
 #
 #  This program is free software; you can redistribute it and/or modify

helpers/sdist.py

@@ -1,5 +1,5 @@
-# 
-#  Copyright (C) 2014  Smithsonian Astrophysical Observatory
+#
+#  Copyright (C) 2014, 2016  Smithsonian Astrophysical Observatory
 #
 #
 #  This program is free software; you can redistribute it and/or modify

helpers/sherpa_config.py

@@ -1,6 +1,6 @@
 from __future__ import absolute_import
-# 
-#  Copyright (C) 2014, 2015  Smithsonian Astrophysical Observatory
+#
+#  Copyright (C) 2014, 2015, 2016  Smithsonian Astrophysical Observatory
 #
 #
 #  This program is free software; you can redistribute it and/or modify

helpers/xspec_config.py

@@ -1,5 +1,5 @@
-# 
-#  Copyright (C) 2014, 2015  Smithsonian Astrophysical Observatory
+#
+#  Copyright (C) 2014, 2015, 2016  Smithsonian Astrophysical Observatory
 #
 #
 #  This program is free software; you can redistribute it and/or modify

setup.py

@@ -1,6 +1,6 @@
 from __future__ import print_function
 #
-# Copyright (C) 2014  Smithsonian Astrophysical Observatory
+# Copyright (C) 2014, 2016  Smithsonian Astrophysical Observatory
 #
 #
 #  This program is free software; you can redistribute it and/or modify

sherpa/astro/datastack/ds.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 from __future__ import print_function
 #
-# Copyright (C) 2015  Smithsonian Astrophysical Observatory
+# Copyright (C) 2015, 2016  Smithsonian Astrophysical Observatory
 #
 #
 #  This program is free software; you can redistribute it and/or modify

sherpa/astro/datastack/plot_backend/__init__.py

@@ -1,6 +1,6 @@
 from __future__ import absolute_import
 #
-# Copyright (C) 2015  Smithsonian Astrophysical Observatory
+# Copyright (C) 2015, 2016  Smithsonian Astrophysical Observatory
 #
 #
 #  This program is free software; you can redistribute it and/or modify

sherpa/astro/datastack/utils.py

@@ -1,6 +1,6 @@
 from __future__ import absolute_import
 #
-# Copyright (C) 2015  Smithsonian Astrophysical Observatory
+# Copyright (C) 2015, 2016  Smithsonian Astrophysical Observatory
 #
 #
 #  This program is free software; you can redistribute it and/or modify

sherpa/astro/flux.py

@@ -1,6 +1,6 @@
 from __future__ import print_function
 #
-#  Copyright (C) 2009, 2015  Smithsonian Astrophysical Observatory
+#  Copyright (C) 2009, 2015, 2016  Smithsonian Astrophysical Observatory
 #
 #
 #  This program is free software; you can redistribute it and/or modify

sherpa/astro/io/crates_backend.py

@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2011, 2015  Smithsonian Astrophysical Observatory
+#  Copyright (C) 2011, 2015, 2016  Smithsonian Astrophysical Observatory
 #
 #
 #  This program is free software; you can redistribute it and/or modify

sherpa/astro/io/meta.py

@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2009, 2015  Smithsonian Astrophysical Observatory
+#  Copyright (C) 2009, 2015, 2016  Smithsonian Astrophysical Observatory
 #
 #
 #  This program is free software; you can redistribute it and/or modify

sherpa/astro/models/tests/test_models.py

@@ -1,5 +1,5 @@
-# 
-#  Copyright (C) 2007  Smithsonian Astrophysical Observatory
+#
+#  Copyright (C) 2007, 2016  Smithsonian Astrophysical Observatory
 #
 #
 #  This program is free software; you can redistribute it and/or modify

sherpa/astro/optical/__init__.py

@@ -1,5 +1,5 @@
-# 
-#  Copyright (C) 2011  Smithsonian Astrophysical Observatory
+#
+#  Copyright (C) 2011, 2016  Smithsonian Astrophysical Observatory
 #
 #
 #  This program is free software; you can redistribute it and/or modify
@@ -134,7 +134,7 @@ class AbsorptionGaussian(ArithmeticModel):
 
     def __init__(self, name='absorptiongaussian'):
 
-        self.fwhm = Parameter(name, 'fwhm', 100., tinyval, hard_min=tinyval, 
+        self.fwhm = Parameter(name, 'fwhm', 100., tinyval, hard_min=tinyval,
                               units="km/s")
         self.pos = Parameter(name, 'pos', 5000., tinyval, frozen=True, units='angstroms')
         self.ewidth = Parameter(name, 'ewidth', 1.)
@@ -173,7 +173,7 @@ class AbsorptionLorentz(ArithmeticModel):
 
     def __init__(self, name='absorptionlorentz'):
 
-        self.fwhm = Parameter(name, 'fwhm', 100., tinyval, hard_min=tinyval, 
+        self.fwhm = Parameter(name, 'fwhm', 100., tinyval, hard_min=tinyval,
                               units="km/s")
         self.pos = Parameter(name, 'pos', 5000., tinyval, frozen=True, units='angstroms')
         self.ewidth = Parameter(name, 'ewidth', 1.)
@@ -239,7 +239,7 @@ class OpticalGaussian(ArithmeticModel):
 
     def __init__(self, name='opticalgaussian'):
 
-        self.fwhm = Parameter(name, 'fwhm', 100., tinyval, hard_min=tinyval, 
+        self.fwhm = Parameter(name, 'fwhm', 100., tinyval, hard_min=tinyval,
                               units="km/s")
         self.pos = Parameter(name, 'pos', 5000., tinyval, frozen=True, units='angstroms')
         self.tau = Parameter(name, 'tau', 0.5)
@@ -363,7 +363,7 @@ def __init__(self, name='blackbody'):
 
         ArithmeticModel.__init__(self, name, (self.refer, self.ampl, self.temperature))
 
-    #@modelCacher1d 
+    #@modelCacher1d
     def calc(self, p, x, xhi=None, **kwargs):
         x = numpy.asarray(x, dtype=SherpaFloat)
         c1 = 1.438786e8
@@ -382,7 +382,7 @@ def calc(self, p, x, xhi=None, **kwargs):
             denon = numpy.zeros_like(x)
             denon[x0] = numpy.power(x[x0], 5)
             argmin_slice = numpy.where(arg < self._argmin)[0]
-            if (len(argmin_slice) > 0): 
+            if (len(argmin_slice) > 0):
                 denon[argmin_slice] *= arg[argmin_slice] * (1.0 + 0.5 * arg[argmin_slice])
             arg = numpy.where(arg > self._argmax, self._argmax, arg)
 
@@ -405,7 +405,7 @@ def __init__(self, name='bremsstrahlung'):
 
         ArithmeticModel.__init__(self, name, (self.refer, self.ampl, self.temperature))
 
-    #@modelCacher1d 
+    #@modelCacher1d
     def calc(self, p, x, xhi=None, **kwargs):
         x = numpy.asarray(x, dtype=SherpaFloat)
         if 0.0 == p[0]:
@@ -428,7 +428,7 @@ def __init__(self, name='brokenpowerlaw'):
 
         ArithmeticModel.__init__(self, name, (self.refer, self.ampl, self.index1, self.index2))
 
-    #@modelCacher1d 
+    #@modelCacher1d
     def calc(self, p, x, xhi=None, **kwargs):
         if 0.0 == p[0]:
             raise ValueError('model evaluation failed, ' +
@@ -451,7 +451,7 @@ def __init__(self, name='ccm'):
 
         ArithmeticModel.__init__(self, name, (self.ebv, self.r))
 
-    #@modelCacher1d 
+    #@modelCacher1d
     def calc(self, p, x, xhi=None, **kwargs):
         x = numpy.asarray(x, dtype=SherpaFloat)
         y = numpy.zeros_like(x)
@@ -520,7 +520,7 @@ class LogAbsorption(ArithmeticModel):
 
     def __init__(self, name='logabsorption'):
 
-        self.fwhm = Parameter(name, 'fwhm', 100., tinyval, hard_min=tinyval, 
+        self.fwhm = Parameter(name, 'fwhm', 100., tinyval, hard_min=tinyval,
                               units="km/s")
         self.pos = Parameter(name, 'pos', 5000., tinyval, frozen=True, units='angstroms')
         self.tau = Parameter(name, 'tau', 0.5)
@@ -592,7 +592,7 @@ def calc(self, p, x, xhi=None, **kwargs):
         fmax = (arg - 1.0) * p[2] / p[1] / 2.0
 
         if (p[3] == 1.0):
-            return numpy.where(x >= p[1], fmax * numpy.power((x / p[1]), -arg), fmax * numpy.power((x / p[1]), arg)) 
+            return numpy.where(x >= p[1], fmax * numpy.power((x / p[1]), -arg), fmax * numpy.power((x / p[1]), arg))
 
         arg1 = 0.69314718 / numpy.log (1.0 + p[3] * p[0] / 2.9979e5 / 2.0)
         fmax = (arg - 1.0) * p[2] / p[1] / (1.0 + (arg - 1.0) / (arg1 - 1.0))
@@ -618,7 +618,7 @@ def __init__(self, name='polynomial'):
         pars.append(self.offset)
         ArithmeticModel.__init__(self, name, pars)
 
-    #@modelCacher1d 
+    #@modelCacher1d
     def calc(self, p, x, xhi=None, **kwargs):
         x = numpy.asarray(x, dtype=SherpaFloat)
         y = numpy.zeros_like(x)
@@ -640,7 +640,7 @@ def __init__(self, name='powerlaw'):
 
         ArithmeticModel.__init__(self, name, (self.refer, self.ampl, self.index))
 
-    #@modelCacher1d 
+    #@modelCacher1d
     def calc(self, p, x, xhi=None, **kwargs):
         if 0.0 == p[0]:
             raise ValueError('model evaluation failed, ' +
@@ -665,7 +665,7 @@ def __init__(self, name='recombination'):
 
         ArithmeticModel.__init__(self, name, (self.refer, self.ampl, self.temperature, self.fwhm))
 
-    #@modelCacher1d 
+    #@modelCacher1d
     def calc(self, p, x, xhi=None, **kwargs):
         if 0.0 == p[0]:
             raise ValueError('model evaluation failed, ' +
@@ -743,7 +743,7 @@ class FM(ArithmeticModel):
     def __init__(self, name='fm'):
         self.ebv = Parameter(name, 'ebv', 0.5)  # E(B-V)
         self.x0 = Parameter(name, 'x0', 4.6)    # Position of Drude bump
-        self.width = Parameter(name, 'width', 0.06) # Width of Drude bump 
+        self.width = Parameter(name, 'width', 0.06) # Width of Drude bump
         self.c1 = Parameter(name, 'c1', 0.2)
         self.c2 = Parameter(name, 'c2', 0.1)
         self.c3 = Parameter(name, 'c3', 0.02)

sherpa/astro/optical/tests/test_optical.py

@@ -1,5 +1,5 @@
-# 
-#  Copyright (C) 2007  Smithsonian Astrophysical Observatory
+#
+#  Copyright (C) 2007, 2016  Smithsonian Astrophysical Observatory
 #
 #
 #  This program is free software; you can redistribute it and/or modify

sherpa/astro/plot.py

@@ -1,6 +1,6 @@
 from __future__ import division
 #
-#  Copyright (C) 2010, 2015  Smithsonian Astrophysical Observatory
+#  Copyright (C) 2010, 2015, 2016  Smithsonian Astrophysical Observatory
 #
 #
 #  This program is free software; you can redistribute it and/or modify

sherpa/astro/sim/fullbayes.py

@@ -1,5 +1,5 @@
-# 
-#  Copyright (C) 2011  Smithsonian Astrophysical Observatory
+#
+#  Copyright (C) 2011, 2016  Smithsonian Astrophysical Observatory
 #
 #
 #  This program is free software; you can redistribute it and/or modify
@@ -37,7 +37,7 @@ def __init__(self, fcn, sigma, mu, dof, fit, *args):
     def init(self, log=False, inv=False, defaultprior=True, priorshape=False,
              priors=(), originalscale=True, scale=1, sigma_m=False, p_M=.5,
              simarf=None, p_M_arf=.5, sigma_arf=0.1):
-        # nsubiters is missing from init() to indicate that nubiters=1 for 
+        # nsubiters is missing from init() to indicate that nubiters=1 for
         # full bayes
 
         if isinstance(simarf, PCA1DAdd):
@@ -46,7 +46,7 @@ def init(self, log=False, inv=False, defaultprior=True, priorshape=False,
             self.simarf = ARFSIMFactory()(simarf)
 
         if not isinstance(self.simarf, PCA1DAdd):
-            raise TypeError("Simulation ARF must be PCA for FullBayes" + 
+            raise TypeError("Simulation ARF must be PCA for FullBayes" +
                             " not %s" % type(self.simarf).__name__)
 
         self.accept_arfs = [0]
@@ -130,7 +130,7 @@ def reject_arf(self):
 
 
     def perturb_arf(self, current_params, current_stat):
-        if self.simarf is not None:         
+        if self.simarf is not None:
 
             # add deviations starting with original ARF for each iter
             for specresp, arf, arf_dict in zip(self.backup_arfs, self.arfs, self.arf_dicts):

sherpa/astro/sim/pragbayes.py

@@ -1,5 +1,5 @@
-# 
-#  Copyright (C) 2011  Smithsonian Astrophysical Observatory
+#
+#  Copyright (C) 2011, 2016  Smithsonian Astrophysical Observatory
 #
 #
 #  This program is free software; you can redistribute it and/or modify
@@ -62,7 +62,7 @@ def read(self, filename):
         elif emethod is not None and emethod.startswith('SIM1DADD'):
             bias      = cols[2]['BIAS']
             component = cols[3]['COMPONENT']
-            simcomp   = cols[3]['SIMCOMP'] 
+            simcomp   = cols[3]['SIMCOMP']
             return SIM1DAdd(bias, component, simcomp)
 
         raise TypeError("Unknown simulation ARF '%s'" % filename)
@@ -223,7 +223,7 @@ def __call__(self, **kwargs):
 
                 # Assume proposal is rejected by default
                 proposals[jump] = current_params
-                stats[jump]  = current_stat            
+                stats[jump]  = current_stat
 
                 for jj in xrange(nsubiter):
 
@@ -262,7 +262,7 @@ def __call__(self, **kwargs):
                         self._sampler.reject()
                         acceptflag[jump] = False
 
-                        # If acceptance fails do we start back at the last accepted 
+                        # If acceptance fails do we start back at the last accepted
                         # iteration or the last accepted subiteration?
                         current_params = proposals[ii]
                         current_stat   = stats[ii]
@@ -303,7 +303,7 @@ def init(self, log=False, inv=False, defaultprior=True, priorshape=False,
              simarf=None, nsubiters=10):
 
         # Note that nsubiters is used as a dummy parameter to indicate the default
-        # value.  See the function WalkWithSubIters.__call__() 
+        # value.  See the function WalkWithSubIters.__call__()
 
         if isinstance(simarf, (PCA1DAdd, SIM1DAdd)):
             self.simarf = simarf
@@ -346,7 +346,7 @@ def mh(self, current):
         """ MH jumping rule """
 
         # The current proposal is ignored here.
-        # MH jumps from the current best-fit parameter values using the 
+        # MH jumps from the current best-fit parameter values using the
         # covariance scale from the sub-iteration fit
 
         # If the ARF is updated then sigma will be None, then

sherpa/astro/tests/test_astro.py

@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2007, 2015  Smithsonian Astrophysical Observatory
+#  Copyright (C) 2007, 2015, 2016  Smithsonian Astrophysical Observatory
 #
 #
 #  This program is free software; you can redistribute it and/or modify

sherpa/astro/ui/tests/test_astro_ui.py

@@ -1,6 +1,6 @@
 from __future__ import print_function
 #
-#  Copyright (C) 2012, 2015  Smithsonian Astrophysical Observatory
+#  Copyright (C) 2012, 2015, 2016  Smithsonian Astrophysical Observatory
 #
 #
 #  This program is free software; you can redistribute it and/or modify

sherpa/astro/utils/src/_region.cc

@@ -1,5 +1,5 @@
 // 
-//  Copyright (C) 2009  Smithsonian Astrophysical Observatory
+//  Copyright (C) 2009, 2016  Smithsonian Astrophysical Observatory
 //
 //
 //  This program is free software; you can redistribute it and/or modify