Commit 8a000436456670c370db4eee40d4a266509da740

Authored by Jürgen Knödlseder
1 parent d07eaeac

csspec now properly propagates instrument name for On/Off observations

ChangeLog
1 -2019-05-06 1 +2019-05-15
2 2
3 * Version 1.6.0 released 3 * Version 1.6.0 released
4 ======================== 4 ========================
5 5
  6 + csspec now properly propagates instrument name for On/Off observations
6 csresspec now also works for observation specific models (#2883) 7 csresspec now also works for observation specific models (#2883)
7 Add more spatial models to csbkgmodel (#2878) 8 Add more spatial models to csbkgmodel (#2878)
8 Add GAUSS(E) model to csbkgmodel (#2868) 9 Add GAUSS(E) model to csbkgmodel (#2868)
1 New Features and Important Changes in ctools 1.6.0 1 New Features and Important Changes in ctools 1.6.0
2 2
3 -6 May 2019 3 +15 May 2019
4 4
5 5
6 Introduction 6 Introduction
@@ -454,6 +454,8 @@ Add hidden "nthreads" parameter and implement parallelisation of computations @@ -454,6 +454,8 @@ Add hidden "nthreads" parameter and implement parallelisation of computations
454 454
455 csspec - Generates Spectral Energy Distribution 455 csspec - Generates Spectral Energy Distribution
456 ----------------------------------------------- 456 -----------------------------------------------
  457 +Correctly propagate the instrument name for On/Off observations.
  458 +
457 The script no longer skips energy bins with zero counts (#2671). 459 The script no longer skips energy bins with zero counts (#2671).
458 460
459 The full true energy range of the RMF is now used in an On/Off analysis to 461 The full true energy range of the RMF is now used in an On/Off analysis to
cscripts/csspec.py
@@ -516,11 +516,13 @@ class csspec(ctools.csobservation): @@ -516,11 +516,13 @@ class csspec(ctools.csobservation):
516 rmf[idst_true, idst_reco] = obs.rmf()[isrc_true, isrc_reco] 516 rmf[idst_true, idst_reco] = obs.rmf()[isrc_true, isrc_reco]
517 517
518 # Set On/Off observations 518 # Set On/Off observations
519 - obsid = obs.id()  
520 - statistic = obs.statistic() 519 + obsid = obs.id()
  520 + statistic = obs.statistic()
  521 + instrument = obs.instrument()
521 obs = gammalib.GCTAOnOffObservation(pha_on, pha_off, arf, rmf) 522 obs = gammalib.GCTAOnOffObservation(pha_on, pha_off, arf, rmf)
522 obs.id(obsid) 523 obs.id(obsid)
523 obs.statistic(statistic) 524 obs.statistic(statistic)
  525 + obs.instrument(instrument)
524 526
525 # Return observation 527 # Return observation
526 return obs 528 return obs
doc/source/admin/release_history/1.6.rst
@@ -22,6 +22,7 @@ In particular, this release provides: @@ -22,6 +22,7 @@ In particular, this release provides:
22 Bug fixes 22 Bug fixes
23 --------- 23 ---------
24 24
  25 +* :ref:`csspec` now properly propagates instrument name for On/Off observations
25 * [`2883 <https://cta-redmine.irap.omp.eu/issues/2883>`_] - 26 * [`2883 <https://cta-redmine.irap.omp.eu/issues/2883>`_] -
26 :ref:`csresspec` now also works for observation specific models 27 :ref:`csresspec` now also works for observation specific models
27 * [`2839 <https://cta-redmine.irap.omp.eu/issues/2839>`_] - 28 * [`2839 <https://cta-redmine.irap.omp.eu/issues/2839>`_] -