From 1319dc961c0bf03fc0c28eabe04834ffc975ee7d Mon Sep 17 00:00:00 2001
From: Jürgen Knödlseder <jurgen.knodlseder@irap.omp.eu>
Date: Sat, 21 Oct 2017 23:38:37 +0200
Subject: [PATCH] Add csspec WSTAT unit test

---
 configure.ac         |  4 ++--
 test/test_cscript.py | 12 ++----------
 test/test_csspec.py  | 29 +++++++++++++++++++++++++----
 3 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8851bd1..ee4482d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,8 +32,8 @@ AC_INIT([ctools], [1.5.0.dev1], [jurgen.knodlseder@irap.omp.eu], [ctools])
 AC_CONFIG_SRCDIR([src/ctselect/ctselect.cpp])
 AC_CONFIG_MACRO_DIR([m4])
 #AM_INIT_AUTOMAKE([gnu no-dependencies foreign])
-#AM_INIT_AUTOMAKE([gnu -Wno-portability foreign])
-AM_INIT_AUTOMAKE([gnu -Wno-portability foreign serial-tests])
+AM_INIT_AUTOMAKE([gnu -Wno-portability foreign])
+#AM_INIT_AUTOMAKE([gnu -Wno-portability foreign serial-tests])
 AC_CONFIG_HEADER([config.h])
 
 
diff --git a/test/test_cscript.py b/test/test_cscript.py
index eee06d0..b6081ae 100755
--- a/test/test_cscript.py
+++ b/test/test_cscript.py
@@ -152,12 +152,8 @@ class ctobservation_test(ctools.csobservation):
         """
         Constructor
         """
-        # Set name
-        self._name    = 'ctobservation_test'
-        self._version = ctools.__version__
-
         # Initialise application by calling the appropriate class constructor
-        self._init_csobservation(argv)
+        self._init_csobservation('ctobservation_test', ctools.__version__, argv)
 
         # Return
         return
@@ -183,12 +179,8 @@ class ctlikelihood_test(ctools.cslikelihood):
         """
         Constructor
         """
-        # Set name
-        self._name    = 'ctlikelihood_test'
-        self._version = ctools.__version__
-
         # Initialise application by calling the appropriate class constructor
-        self._init_cslikelihood(argv)
+        self._init_cslikelihood('ctlikelihood_test', ctools.__version__, argv)
 
         # Return
         return
diff --git a/test/test_csspec.py b/test/test_csspec.py
index 546ee5b..a56b028 100755
--- a/test/test_csspec.py
+++ b/test/test_csspec.py
@@ -128,12 +128,12 @@ class Test(test):
         spec['srcname']  = 'Crab'
         spec['caldb']    = self._caldb
         spec['irf']      = self._irf
-        spec['outfile']  = 'csspec_py1.fits'
         spec['method']   = 'AUTO'
         spec['ebinalg']  = 'LOG'
         spec['enumbins'] = 5
         spec['emin']     = 0.1
         spec['emax']     = 100.0
+        spec['outfile']  = 'csspec_py1.fits'
         spec['logfile']  = 'csspec_py1.log'
         spec['chatter']  = 2
         spec['publish']  = True
@@ -155,12 +155,12 @@ class Test(test):
         spec['bkgcube']   = self._bkgcube
         spec['inmodel']   = self._model
         spec['srcname']   = 'Crab'
-        spec['outfile']   = 'csspec_py2.fits'
         spec['method']    = 'AUTO'
         spec['ebinalg']   = 'LOG'
         spec['enumbins']  = 2
         spec['emin']      = 0.1
         spec['emax']      = 100.0
+        spec['outfile']   = 'csspec_py2.fits'
         spec['logfile']   = 'csspec_py2.log'
         spec['chatter']   = 3
         spec['publish']   = False
@@ -176,12 +176,12 @@ class Test(test):
         spec['inobs']    = self._inonoff
         spec['inmodel']  = self._onoff_model
         spec['srcname']  = 'Crab'
-        spec['outfile']  = 'csspec_py3.fits'
         spec['method']   = 'AUTO'
         spec['ebinalg']  = 'LOG'
         spec['enumbins'] = 10
         spec['emin']     = 0.1
         spec['emax']     = 10.0
+        spec['outfile']  = 'csspec_py3.fits'
         spec['logfile']  = 'csspec_py3.log'
         spec['chatter']  = 4
         spec['publish']  = False
@@ -197,12 +197,12 @@ class Test(test):
         spec['inobs']    = self._inonoff
         spec['inmodel']  = self._onoff_model
         spec['srcname']  = 'Crab'
-        spec['outfile']  = 'csspec_py4.fits'
         spec['method']   = 'NODES'
         spec['ebinalg']  = 'LOG'
         spec['enumbins'] = 10
         spec['emin']     = 0.1
         spec['emax']     = 10.0
+        spec['outfile']  = 'csspec_py4.fits'
         spec['logfile']  = 'csspec_py4.log'
         spec['chatter']  = 4
         spec['publish']  = False
@@ -213,6 +213,27 @@ class Test(test):
         # Check result file
         self._check_result_file('csspec_py4.fits', 10)
 
+        # Set-up On/Off csspec using WSTAT
+        spec = cscripts.csspec()
+        spec['inobs']     = self._inonoff
+        spec['inmodel']   = self._onoff_model
+        spec['srcname']   = 'Crab'
+        spec['method']    = 'AUTO'
+        spec['statistic'] = 'WSTAT'
+        spec['ebinalg']   = 'LOG'
+        spec['enumbins']  = 10
+        spec['emin']      = 0.1
+        spec['emax']      = 10.0
+        spec['outfile']   = 'csspec_py5.fits'
+        spec['logfile']   = 'csspec_py5.log'
+        spec['chatter']   = 2
+
+        # Execute csspec script
+        spec.execute()
+
+        # Check result file
+        self._check_result_file('csspec_py5.fits', 10)
+
         # Return
         return
 
--
libgit2 0.21.4