Commit 36a404e067dd5404cf4456e814a2d6f35004bea4
1 parent
ea342bf1
Do no longer set missing boundaries in ctool::get_observations and ctool::setup_observations (#2686)
Showing
4 changed files
with
15 additions
and
13 deletions
ChangeLog
| 1 | -2018-09-21 | 1 | +2018-09-22 |
| 2 | 2 | ||
| 3 | * Version 1.6.0 released | 3 | * Version 1.6.0 released |
| 4 | ======================== | 4 | ======================== |
| 5 | 5 | ||
| 6 | + Do no longer set missing boundaries in ctool::get_observations and | ||
| 7 | + ctool::setup_observations (#2686) | ||
| 6 | Unnormalize background cube values in ctbkgcube (#2685) | 8 | Unnormalize background cube values in ctbkgcube (#2685) |
| 7 | Account for varying energy thresholds in ctbin weight computation (#2685) | 9 | Account for varying energy thresholds in ctbin weight computation (#2685) |
| 8 | Add ctbkgcube::cntcube() method (#2685) | 10 | Add ctbkgcube::cntcube() method (#2685) |
NEWS
| 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 | -21 September 2018 | 3 | +22 September 2018 |
| 4 | 4 | ||
| 5 | 5 | ||
| 6 | Introduction | 6 | Introduction |
| @@ -140,6 +140,14 @@ None | @@ -140,6 +140,14 @@ None | ||
| 140 | 140 | ||
| 141 | ctselect - CTA event selection | 141 | ctselect - CTA event selection |
| 142 | ------------------------------ | 142 | ------------------------------ |
| 143 | +Do no longer set missing energy and RoI boundaries in ctool::get_observations | ||
| 144 | +and ctool::setup_observations since this led to a problem in ctselect. For | ||
| 145 | +H.E.S.S. data, where the boundaries are not set, the boundaries were preset | ||
| 146 | +with the User parameters, which made event selection with the usepnt=no option | ||
| 147 | +impossible. It is not clear why the setting of missing boundaries was introduced | ||
| 148 | +but it looks like a dangerous thing to do. The setting has therefore been | ||
| 149 | +removed (#2686). | ||
| 150 | + | ||
| 143 | Avoid an error in case that the RoI radius is identical to the existing RoI | 151 | Avoid an error in case that the RoI radius is identical to the existing RoI |
| 144 | radius (#2682). | 152 | radius (#2682). |
| 145 | 153 |
doc/source/admin/release_history/1.6.rst
| @@ -19,6 +19,9 @@ In particular, this release provides: | @@ -19,6 +19,9 @@ In particular, this release provides: | ||
| 19 | Bug fixes | 19 | Bug fixes |
| 20 | --------- | 20 | --------- |
| 21 | 21 | ||
| 22 | +* [`2686 <https://cta-redmine.irap.omp.eu/issues/2686>`_] - | ||
| 23 | + Do no longer set missing boundaries in ``ctool::get_observations`` and | ||
| 24 | + ``ctool::setup_observations`` | ||
| 22 | * [`2682 <https://cta-redmine.irap.omp.eu/issues/2682>`_] - | 25 | * [`2682 <https://cta-redmine.irap.omp.eu/issues/2682>`_] - |
| 23 | Avoid :ref:`ctselect` error in case that RoI radius is unchanged | 26 | Avoid :ref:`ctselect` error in case that RoI radius is unchanged |
| 24 | * [`2652 <https://cta-redmine.irap.omp.eu/issues/2652>`_] - | 27 | * [`2652 <https://cta-redmine.irap.omp.eu/issues/2652>`_] - |
src/support/ctool.cpp
| @@ -388,11 +388,6 @@ void ctool::sync_pfiles(void) | @@ -388,11 +388,6 @@ void ctool::sync_pfiles(void) | ||
| 388 | * observations in the container. In case that no response information is | 388 | * observations in the container. In case that no response information is |
| 389 | * required, the @p response argument should be set to @p false. See the | 389 | * required, the @p response argument should be set to @p false. See the |
| 390 | * set_response() method for details. | 390 | * set_response() method for details. |
| 391 | - * | ||
| 392 | - * | ||
| 393 | - * The method will also setup the observation boundaries for all CTA | ||
| 394 | - * observations in the container that contain event lists. For details, see | ||
| 395 | - * the set_obs_bounds() method. | ||
| 396 | ***************************************************************************/ | 391 | ***************************************************************************/ |
| 397 | void ctool::setup_observations(GObservations& obs, | 392 | void ctool::setup_observations(GObservations& obs, |
| 398 | const bool& response, | 393 | const bool& response, |
| @@ -480,9 +475,6 @@ void ctool::setup_observations(GObservations& obs, | @@ -480,9 +475,6 @@ void ctool::setup_observations(GObservations& obs, | ||
| 480 | set_response(obs); | 475 | set_response(obs); |
| 481 | } | 476 | } |
| 482 | 477 | ||
| 483 | - // Setup boundaries for all CTA observations containing event lists | ||
| 484 | - set_obs_bounds(obs); | ||
| 485 | - | ||
| 486 | // Return | 478 | // Return |
| 487 | return; | 479 | return; |
| 488 | } | 480 | } |
| @@ -1736,9 +1728,6 @@ GObservations ctool::get_observations(const bool& get_response) | @@ -1736,9 +1728,6 @@ GObservations ctool::get_observations(const bool& get_response) | ||
| 1736 | 1728 | ||
| 1737 | } // endif: response was required | 1729 | } // endif: response was required |
| 1738 | 1730 | ||
| 1739 | - // Set observation boundary parameters (emin, emax, rad) | ||
| 1740 | - set_obs_bounds(obs); | ||
| 1741 | - | ||
| 1742 | // Signal that XML file should be used for storage | 1731 | // Signal that XML file should be used for storage |
| 1743 | m_use_xml = true; | 1732 | m_use_xml = true; |
| 1744 | 1733 |