Veronika Vodeb / ctools

Commit 58732e19f9ad473e6070bee8890a001489ac301c

Authored by Jürgen Knödlseder
1 parent 99ab76de

Do no longer automatically import csroot2caldb (#2652)

Inline Side-by-side
Showing 6 changed files with 12 additions and 7 deletions
ChangeLog
  View file @58732e1
1   -2018-07-25
  1 +2018-07-27
2 2  
3 3 * Version 1.6.0 released
4 4 ========================
5 5  
  6 + Do no longer automatically import csroot2caldb (#2652)
6 7 Transparently update parameter files (#2513)
7 8 Change formula for number of true energy bins in csphagen (#2490)
8 9 Remove ctools::is_valid_filename() method
... ...
1 1 New Features and Important Changes in ctools 1.6.0
2 2  
3   -25 July 2018
  3 +27 July 2018
4 4  
5 5  
6 6 Introduction
... ... @@ -288,7 +288,10 @@ parameter due to a bug in the code. This bug was fixed (#2448).
288 288  
289 289 csroot2caldb - Generates calibration database from ROOT file
290 290 ------------------------------------------------------------
291   -None
  291 +The script is no longer automatically imported by a "import cscript" statement
  292 +since this led to some conflicts with the "--help" option due to the automatic
  293 +opening of a X windows link. To use the tool in Python, use
  294 +"from cscripts.csroot2caldb import csroot2caldb" (#2652).
292 295  
293 296  
294 297 cssens - Computes sensitivity curve
... ...
cscripts/__init__.py.in
  View file @58732e1
... ... @@ -80,7 +80,6 @@ from cscripts.csphasecrv import csphasecrv
80 80 from cscripts.cspull import cspull
81 81 from cscripts.csresmap import csresmap
82 82 from cscripts.csresspec import csresspec
83   -from cscripts.csroot2caldb import csroot2caldb
84 83 from cscripts.cssens import cssens
85 84 from cscripts.csspec import csspec
86 85 from cscripts.cssrcdetect import cssrcdetect
... ...
cscripts/ioutils.py
  View file @58732e1
... ... @@ -20,7 +20,6 @@
20 20 import csv
21 21 import sys
22 22 import gammalib
23   -#import ctools
24 23  
25 24  
26 25 # ========================= #
... ...
doc/source/admin/release_history/1.6.rst
  View file @58732e1
... ... @@ -19,6 +19,8 @@ In particular, this release provides:
19 19 Bug fixes
20 20 ---------
21 21  
  22 +* [`2652 <https://cta-redmine.irap.omp.eu/issues/2652>`_] -
  23 + Do no longer automatically import :ref:`csroot2caldb`
22 24 * [`2456 <https://cta-redmine.irap.omp.eu/issues/2456>`_] -
23 25 Handle zero model for ``SUBDIV method`` in ``show_response.py``
24 26 * [`2448 <https://cta-redmine.irap.omp.eu/issues/2448>`_] -
... ...
test/test_csroot2caldb.py
  View file @58732e1
... ... @@ -19,7 +19,7 @@
19 19 #
20 20 # ==========================================================================
21 21 import os
22   -import cscripts
  22 +from cscripts.csroot2caldb import csroot2caldb
23 23 from testing import test
24 24  
25 25  
... ... @@ -98,7 +98,8 @@ class Test(test):
98 98 """
99 99 # Set-up csroot2caldb with a maximum of parameters so that the
100 100 # corresponding code gets tests
101   - caldb = cscripts.csroot2caldb()
  101 + #caldb = cscripts.csroot2caldb()
  102 + caldb = csroot2caldb()
102 103 caldb['infile'] = self._infile
103 104 caldb['outdir'] = 'csroot2caldb_py1'
104 105 caldb['inst'] = 'prod3'
... ...