Merge pull request #216 from rbiswas4/master

Fixing issues with `fluxcov` and in place modifications
sncosmo · Apr 26, 2018 · bd98387 · bd98387
2 parents b13b684 + 813b707
commit bd98387
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/sncosmo/fitting.py b/sncosmo/fitting.py
@@ -34,7 +34,7 @@ def generate_chisq(data, model, signature='iminuit', modelcov=False):
     if modelcov:
         _, mcov = model.bandfluxcov(data.band, data.time,
                                     zp=data.zp, zpsys=data.zpsys)
-        cov += mcov
+        cov = cov + mcov
     invcov = np.linalg.pinv(cov)
 
     # iminuit expects each parameter to be a separate argument (including fixed
@@ -87,7 +87,7 @@ def chisq(data, model, modelcov=False):
         if modelcov:
             mflux, mcov = model.bandfluxcov(data.band, data.time,
                                             zp=data.zp, zpsys=data.zpsys)
-            cov += mcov
+            cov = cov + mcov
         else:
             mflux = model.bandflux(data.band, data.time,
                                    zp=data.zp, zpsys=data.zpsys)

diff --git a/sncosmo/photdata.py b/sncosmo/photdata.py
@@ -25,7 +25,7 @@
     ('fluxerr', {'fluxerr', 'fe', 'fluxerror', 'flux_error', 'flux_err'}),
     ('zp', {'zp', 'zpt', 'zeropoint', 'zero_point'}),
     ('zpsys', {'zpsys', 'zpmagsys', 'magsys'}),
-    ('fluxcov', {'cov', 'covar', 'covariance', 'covmat'})
+    ('fluxcov', {'cov', 'covar', 'covariance', 'covmat', 'fluxcov'})
     ])
 
 PHOTDATA_REQUIRED_ALIASES = ('time', 'band', 'flux', 'fluxerr', 'zp', 'zpsys')