Do no longer automatically import csroot2caldb (#2652)

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