Commit 420ad0e2cad9a1e698c250119a0da5ff6b501378
1 parent
e1462d52
Fixed bug when filling spectrum
Showing
1 changed file
with
8 additions
and
5 deletions
pyext/ctools/obsutils.py
| @@ -580,8 +580,9 @@ def specpoints(obs,source,ebins): | @@ -580,8 +580,9 @@ def specpoints(obs,source,ebins): | ||
| 580 | opt_spectral[normpar].free() | 580 | opt_spectral[normpar].free() |
| 581 | 581 | ||
| 582 | #Define spectrum dictionary, units are in format readable by astropy | 582 | #Define spectrum dictionary, units are in format readable by astropy |
| 583 | - pars = {"value":[],"eu_value":[],"ed_value":[],"unit":[]} | ||
| 584 | - spec = {"energy":pars.copy(),"flux":pars.copy(),"TS":[]} | 583 | + spec = {"energy":{"value":[],"eu_value":[],"ed_value":[],"unit":"none"}, |
| 584 | + "flux" :{"value":[],"eu_value":[],"ed_value":[],"unit":"none"}, | ||
| 585 | + "TS" :{"value":[],"eu_value":[],"ed_value":[],"unit":"none"}} | ||
| 585 | 586 | ||
| 586 | #Loop over energy bins, fit and write result to spectrum | 587 | #Loop over energy bins, fit and write result to spectrum |
| 587 | for ebin in ebins: | 588 | for ebin in ebins: |
| @@ -614,14 +615,16 @@ def specpoints(obs,source,ebins): | @@ -614,14 +615,16 @@ def specpoints(obs,source,ebins): | ||
| 614 | spec["energy"]["value"].append(ecenter) | 615 | spec["energy"]["value"].append(ecenter) |
| 615 | spec["energy"]["ed_value"].append(ecenter-ebin[0]) | 616 | spec["energy"]["ed_value"].append(ecenter-ebin[0]) |
| 616 | spec["energy"]["eu_value"].append(ebin[1]-ecenter) | 617 | spec["energy"]["eu_value"].append(ebin[1]-ecenter) |
| 617 | - spec["energy"]["unit"].append("1e12 eV") | 618 | + spec["energy"]["unit"]="1e12 eV" |
| 618 | 619 | ||
| 619 | spec["flux"]["value"].append(binflux*1e6) | 620 | spec["flux"]["value"].append(binflux*1e6) |
| 620 | spec["flux"]["ed_value"].append(relerr*binflux*1e6) | 621 | spec["flux"]["ed_value"].append(relerr*binflux*1e6) |
| 621 | spec["flux"]["eu_value"].append(relerr*binflux*1e6) | 622 | spec["flux"]["eu_value"].append(relerr*binflux*1e6) |
| 622 | - spec["flux"]["unit"].append("cm-2 1e-12 eV-1") | 623 | + spec["flux"]["unit"]="cm-2 1e-12 eV-1" |
| 623 | 624 | ||
| 624 | - spec["TS"].append(binlike.obs().models()[source].ts()) | 625 | + spec["TS"]["value"].append(binlike.obs().models()[source].ts()) |
| 625 | 626 | ||
| 627 | + print spec["energy"]["value"] | ||
| 628 | + print spec["flux"]["value"] | ||
| 626 | #Return spectrum | 629 | #Return spectrum |
| 627 | return spec | 630 | return spec |