From 172780f51941caaea880b8994d5ecbf29dfef2ea Mon Sep 17 00:00:00 2001 From: Josh Cardenzana Date: Mon, 16 Dec 2019 15:23:37 +0100 Subject: [PATCH] Rename 'ref_flux' column to 'ref_dnde' to be more accurate. --- cscripts/csspec.py | 12 ++++++------ test/data/spectrum.fits | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cscripts/csspec.py b/cscripts/csspec.py index 8807dba..42014b5 100755 --- a/cscripts/csspec.py +++ b/cscripts/csspec.py @@ -1071,7 +1071,7 @@ class csspec(ctools.csobservation): norm_err = gammalib.GFitsTableDoubleCol('norm_err', nrows) ulim_values = gammalib.GFitsTableDoubleCol('norm_ul', nrows) e2dnde = gammalib.GFitsTableDoubleCol('ref_e2dnde', nrows) - flux = gammalib.GFitsTableDoubleCol('ref_flux', nrows) + dnde = gammalib.GFitsTableDoubleCol('ref_dnde', nrows) Npred_values = gammalib.GFitsTableDoubleCol('ref_npred', nrows) TSvalues = gammalib.GFitsTableDoubleCol('ts', nrows) loglike = gammalib.GFitsTableDoubleCol('loglike', nrows) @@ -1084,7 +1084,7 @@ class csspec(ctools.csobservation): norm_err.unit('') ulim_values.unit('') e2dnde.unit('erg/cm2/s') - flux.unit('counts/MeV/cm2/s') + dnde.unit('counts/MeV/cm2/s') Npred_values.unit('counts') loglike.unit('') norm_scan.unit('') @@ -1099,7 +1099,7 @@ class csspec(ctools.csobservation): norm_err[i] = result['flux_err'] / result['flux'] ulim_values[i] = result['ulimit'] / result['flux'] e2dnde[i] = result['e2dnde'] - flux[i] = result['flux'] + dnde[i] = result['flux'] Npred_values[i] = result['Npred'] TSvalues[i] = result['TS'] loglike[i] = result['logL'] @@ -1125,12 +1125,12 @@ class csspec(ctools.csobservation): table.append(norm_err) table.append(ulim_values) table.append(e2dnde) - table.append(flux) + table.append(dnde) table.append(TSvalues) table.append(Npred_values) # Define the SED type - table.card('SED_TYPE', 'norm,e2dnde,flux,npred', 'SED type') + table.card('SED_TYPE', 'norm,e2dnde,dnde,npred', 'SED type') # Define the upper limit confidence level ulimit = ctools.ctulimit() @@ -1139,7 +1139,7 @@ class csspec(ctools.csobservation): # Add the likelihood data if ncols > 0: - table.card('SED_TYPE', 'likelihood,e2dnde,flux,npred', 'Likelihood scan data') + table.card('SED_TYPE').value('likelihood,e2dnde,dnde,npred') table.append(loglike) table.append(norm_scan) table.append(dloglike_scan) diff --git a/test/data/spectrum.fits b/test/data/spectrum.fits index 6836ba2..5410ef2 100644 --- a/test/data/spectrum.fits +++ b/test/data/spectrum.fits @@ -1,4 +1,4 @@ -SIMPLE = T / file does conform to FITS standard BITPIX = 8 / number of bits per data pixel NAXIS = 0 / number of data axes EXTEND = T / FITS dataset may contain extensions COMMENT FITS (Flexible Image Transport System) format is defined in 'AstronomyCOMMENT and Astrophysics', volume 376, page 359; bibcode: 2001A&A...376..359H COMMENT FITS (Flexible Image Transport System) format is defined in 'AstronomyCOMMENT and Astrophysics', volume 376, page 359; bibcode: 2001A&A...376..359H COMMENT FITS (Flexible Image Transport System) format is defined in 'AstronomyCOMMENT and Astrophysics', volume 376, page 359; bibcode: 2001A&A...376..359H COMMENT FITS (Flexible Image Transport System) format is defined in 'AstronomyCOMMENT and Astrophysics', volume 376, page 359; bibcode: 2001A&A...376..359H END XTENSION= 'BINTABLE' / binary table extension BITPIX = 8 / 8-bit bytes NAXIS = 2 / 2-dimensional binary table NAXIS1 = 80 / width of table in bytes NAXIS2 = 10 / number of rows in table PCOUNT = 0 / size of special data area GCOUNT = 1 / one data group (required keyword) TFIELDS = 10 / number of table fields TTYPE1 = 'e_ref ' / label for field 1 TFORM1 = '1D ' / data format of field 1 TUNIT1 = 'TeV ' / physical unit of field1 TTYPE2 = 'e_min ' / label for field 2 TFORM2 = '1D ' / data format of field 2 TUNIT2 = 'TeV ' / physical unit of field2 TTYPE3 = 'e_max ' / label for field 3 TFORM3 = '1D ' / data format of field 3 TUNIT3 = 'TeV ' / physical unit of field3 TTYPE4 = 'ref_e2dnde' / label for field 4 TFORM4 = '1D ' / data format of field 4 TUNIT4 = 'erg/cm2/s' / physical unit of field4 TTYPE5 = 'norm_err' / label for field 5 TFORM5 = '1D ' / data format of field 5 TUNIT5 = 'erg/cm2/s' / physical unit of field5 TTYPE6 = 'ts ' / label for field 6 TFORM6 = '1D ' / data format of field 6 TTYPE7 = 'norm_ul ' / label for field 7 TFORM7 = '1D ' / data format of field 7 TUNIT7 = 'erg/cm2/s' / physical unit of field7 TTYPE8 = 'ref_npred' / label for field 8 TFORM8 = '1D ' / data format of field 8 TTYPE9 = 'ref_flux' / label for field 9 TFORM9 = '1D ' / data format of field 9 TTYPE10 = 'norm ' / label for field 10 TFORM10 = '1D ' / data format of field 10 EXTNAME = 'SPECTRUM' / name of this extension INSTRUME= 'CTA ' / Name of Instrument TELESCOP= 'CTA ' / Name of Telescope UL_CONF = 9.4999998808E-01 / Confidence level of upper limits SED_TYPE= 'norm,e2dnde,flux' / SED type TUNIT6 = ' ' / physical unit of field6 TUNIT8 = ' ' / physical unit of field8 TUNIT9 = ' ' / physical unit of field9 TUNIT10 = ' ' / physical unit of field10 END ?_$?6L`,?V۴J=T5i?=<s@3?[YLy@o<5[?? zDM?ɊW|?zu$=r^f?Ρmk@@w`? @YײC<ɧ@be +SIMPLE = T / file does conform to FITS standard BITPIX = 8 / number of bits per data pixel NAXIS = 0 / number of data axes EXTEND = T / FITS dataset may contain extensions COMMENT FITS (Flexible Image Transport System) format is defined in 'AstronomyCOMMENT and Astrophysics', volume 376, page 359; bibcode: 2001A&A...376..359H COMMENT FITS (Flexible Image Transport System) format is defined in 'AstronomyCOMMENT and Astrophysics', volume 376, page 359; bibcode: 2001A&A...376..359H COMMENT FITS (Flexible Image Transport System) format is defined in 'AstronomyCOMMENT and Astrophysics', volume 376, page 359; bibcode: 2001A&A...376..359H COMMENT FITS (Flexible Image Transport System) format is defined in 'AstronomyCOMMENT and Astrophysics', volume 376, page 359; bibcode: 2001A&A...376..359H COMMENT FITS (Flexible Image Transport System) format is defined in 'AstronomyCOMMENT and Astrophysics', volume 376, page 359; bibcode: 2001A&A...376..359H END XTENSION= 'BINTABLE' / binary table extension BITPIX = 8 / 8-bit bytes NAXIS = 2 / 2-dimensional binary table NAXIS1 = 80 / width of table in bytes NAXIS2 = 10 / number of rows in table PCOUNT = 0 / size of special data area GCOUNT = 1 / one data group (required keyword) TFIELDS = 10 / number of table fields TTYPE1 = 'e_ref ' / label for field 1 TFORM1 = '1D ' / data format of field 1 TUNIT1 = 'TeV ' / physical unit of field1 TTYPE2 = 'e_min ' / label for field 2 TFORM2 = '1D ' / data format of field 2 TUNIT2 = 'TeV ' / physical unit of field2 TTYPE3 = 'e_max ' / label for field 3 TFORM3 = '1D ' / data format of field 3 TUNIT3 = 'TeV ' / physical unit of field3 TTYPE4 = 'ref_e2dnde' / label for field 4 TFORM4 = '1D ' / data format of field 4 TUNIT4 = 'erg/cm2/s' / physical unit of field4 TTYPE5 = 'norm_err' / label for field 5 TFORM5 = '1D ' / data format of field 5 TUNIT5 = 'erg/cm2/s' / physical unit of field5 TTYPE6 = 'ts ' / label for field 6 TFORM6 = '1D ' / data format of field 6 TTYPE7 = 'norm_ul ' / label for field 7 TFORM7 = '1D ' / data format of field 7 TUNIT7 = 'erg/cm2/s' / physical unit of field7 TTYPE8 = 'ref_npred' / label for field 8 TFORM8 = '1D ' / data format of field 8 TTYPE9 = 'ref_dnde' / label for field 9 TFORM9 = '1D ' / data format of field 9 TUNIT9 = 'counts/MeV/cm2/s' / physical unit of field9 TTYPE10 = 'norm ' / label for field 10 TFORM10 = '1D ' / data format of field 10 EXTNAME = 'SPECTRUM' / name of this extension INSTRUME= 'CTA ' / Name of Instrument TELESCOP= 'CTA ' / Name of Telescope UL_CONF = 9.4999998808E-01 / Confidence level of upper limits SED_TYPE= 'norm,dnde,e2dnde,npred' / SED type TUNIT6 = ' ' / physical unit of field6 TUNIT8 = ' ' / physical unit of field8 TUNIT10 = ' ' / physical unit of field10 END ?_$?6L`,?V۴J=T5i?=<s@3?[YLy@o<5[?? zDM?ɊW|?zu$=r^f?Ρmk@@w`? @YײC<ɧ@be ??<8?zu$?k# :=јĒ?{@?iw?K9[g@qJ<5hL=f??ɟk9?k# :?[`U=Du8(?v$t'@x?MȨ@{濠L<{#F?@?[`V@ LX:[S=T??Cuq@-4?F k@o6Y