Commit a209009348813b21478da8b7269420bcca72420d
1 parent
e6767424
Correct extraction of parameters in cslightcrv (#1920)
Showing
2 changed files
with
7 additions
and
7 deletions
cscripts/cslightcrv.par
| ... | ... | @@ -16,7 +16,7 @@ |
| 16 | 16 | # |
| 17 | 17 | # Input and output parameters |
| 18 | 18 | #============================ |
| 19 | -inobs, f, h, events.fits,,, "Input event list, counts cube, or observation definition XML file" | |
| 19 | +inobs, f, a, events.fits,,, "Input event list, counts cube, or observation definition XML file" | |
| 20 | 20 | inmodel, f, a, $CTOOLS/share/models/crab.xml,,, "Input model definition XML file" |
| 21 | 21 | srcname, s, a, Crab,,, "Source name" |
| 22 | 22 | expcube, f, a, NONE,,, "Input exposure cube file (only needed for stacked analysis)" | ... | ... |
cscripts/cslightcrv.py
| ... | ... | @@ -534,7 +534,7 @@ class cslightcrv(ctools.cscript): |
| 534 | 534 | select['rad'] = 'UNDEFINED' |
| 535 | 535 | select['ra'] = 'UNDEFINED' |
| 536 | 536 | select['dec'] = 'UNDEFINED' |
| 537 | - select.run() | |
| 537 | + select.run() | |
| 538 | 538 | |
| 539 | 539 | # Retrieve observation |
| 540 | 540 | obs = select.obs() |
| ... | ... | @@ -577,8 +577,8 @@ class cslightcrv(ctools.cscript): |
| 577 | 577 | |
| 578 | 578 | # Extract parameter values |
| 579 | 579 | for par in pars: |
| 580 | - result['values'][par] = source.spectral()[par].value() | |
| 581 | - result['values']['e_'+par] = source.spectral()[par].error() | |
| 580 | + result['values'][par] = source[par].value() | |
| 581 | + result['values']['e_'+par] = source[par].error() | |
| 582 | 582 | |
| 583 | 583 | # Calculate upper limit (-1 if not computed) |
| 584 | 584 | ulimit_value = self._compute_ulimit(like.obs()) |
| ... | ... | @@ -596,9 +596,9 @@ class cslightcrv(ctools.cscript): |
| 596 | 596 | self._log.header3('Results') |
| 597 | 597 | pars = self._get_free_par_names() |
| 598 | 598 | for par in pars: |
| 599 | - value = source.spectral()[par].value() | |
| 600 | - error = source.spectral()[par].error() | |
| 601 | - unit = source.spectral()[par].unit() | |
| 599 | + value = source[par].value() | |
| 600 | + error = source[par].error() | |
| 601 | + unit = source[par].unit() | |
| 602 | 602 | self._log_value(gammalib.NORMAL, par, |
| 603 | 603 | str(value)+' +/- '+str(error)+' '+unit) |
| 604 | 604 | if result['ulimit'] > 0.0: | ... | ... |