diff --git a/test/data/workflow.xml b/test/data/workflow.xml
index 875cdc4..6952a7f 100755
--- a/test/data/workflow.xml
+++ b/test/data/workflow.xml
@@ -10,7 +10,7 @@
-
+
diff --git a/test/test_cstsdist.py b/test/test_cstsdist.py
index d52e5a1..174edc9 100755
--- a/test/test_cstsdist.py
+++ b/test/test_cstsdist.py
@@ -33,7 +33,7 @@ class Test(test):
This test class makes unit tests for the cstsdist script by using it
from the command line and from Python.
"""
-
+
# Constructor
def __init__(self):
"""
@@ -97,7 +97,7 @@ class Test(test):
cmd = cstsdist+' inobs="event_file_that_does_not_exist.xml"'+ \
' inmodel="'+self._model+'" srcname="Crab"'+ \
' caldb="'+self._caldb+'" irf="'+self._irf+'"'+ \
- ' ntrials=1 '+ \
+ ' ntrials=2 '+ \
' outfile="cstsdist_cmd2.dat"'+ \
' logfile="cstsdist_cmd2.log" chatter=2'
@@ -136,27 +136,6 @@ class Test(test):
# Check TS distribution file
self._check_result_file('cstsdist_py1.dat')
- # Set-up cstsdist without multiprocessing
- tsdist = cscripts.cstsdist()
- tsdist['inobs'] = self._events
- tsdist['inmodel'] = self._model
- tsdist['srcname'] = 'Crab'
- tsdist['caldb'] = self._caldb
- tsdist['irf'] = self._irf
- tsdist['ntrials'] = 2
- tsdist['outfile'] = 'cstsdist_py2.dat'
- tsdist['logfile'] = 'cstsdist_py2.log'
- tsdist['chatter'] = 3
- tsdist['nthreads'] = 1
-
- # Run cstsdist script
- tsdist.logFileOpen() # Make sure we get a log file
- tsdist.run()
- tsdist.save()
-
- # Check TS distribution file
- self._check_result_file('cstsdist_py2.dat')
-
# Return
return
@@ -223,15 +202,16 @@ class Test(test):
# Set-up cstsdist for event list
tsdist = cscripts.cstsdist()
- tsdist['inobs'] = self._events
- tsdist['inmodel'] = self._model
- tsdist['srcname'] = 'Crab'
- tsdist['caldb'] = self._caldb
- tsdist['irf'] = self._irf
- tsdist['ntrials'] = 2
- tsdist['outfile'] = 'cstsdist_py1_pickle.dat'
- tsdist['logfile'] = 'cstsdist_py1_pickle.log'
- tsdist['chatter'] = 3
+ tsdist['inobs'] = self._events
+ tsdist['inmodel'] = self._model
+ tsdist['srcname'] = 'Crab'
+ tsdist['caldb'] = self._caldb
+ tsdist['irf'] = self._irf
+ tsdist['ntrials'] = 2
+ tsdist['nthreads'] = 1 # This tests at the same time no multiprocessing
+ tsdist['outfile'] = 'cstsdist_py1_pickle.dat'
+ tsdist['logfile'] = 'cstsdist_py1_pickle.log'
+ tsdist['chatter'] = 3
# Perform pickeling tests of filled class
obj = self._pickeling(tsdist)
diff --git a/test/test_csworkflow.py b/test/test_csworkflow.py
index cb6f07b..2d89ca2 100755
--- a/test/test_csworkflow.py
+++ b/test/test_csworkflow.py
@@ -138,18 +138,24 @@ class Test(test):
# Load fit results
models = gammalib.GModels(filename)
+ # Set reference values
+ prefactor = 3.65452317299086e-16
+ index = 2.39356360627502
+ pre_background = 1.01409721455405
+ index_background = 0.0436264224942131
+
# Check fit result values
self.test_value(models['Crab'][2].value(),
- 5.65974581468379e-16, 1.0e-4 * 5.65974581468379e-16,
+ prefactor, 1.0e-4 * prefactor,
'Check Crab prefactor')
self.test_value(models['Crab'][3].value(),
- -2.45911900829089, 1.0e-4 * 2.45911900829089,
+ -index, 1.0e-4 * index,
'Check Crab index')
self.test_value(models['Background'][0].value(),
- 1.04744971751241, 1.0e-4 * 1.04744971751241,
+ pre_background, 1.0e-4 * pre_background,
'Check background model prefactor')
self.test_value(models['Background'][1].value(),
- 0.0117967073949693, 1.0e-4 * 0.0117967073949693,
+ index_background, 1.0e-4 * index_background,
'Check background model index')
# Return
diff --git a/test/test_cterror.py b/test/test_cterror.py
index ac3e9ac..155f3c9 100755
--- a/test/test_cterror.py
+++ b/test/test_cterror.py
@@ -68,7 +68,7 @@ class Test(test):
cmd = cterror+' inobs="'+self._events+'"'+ \
' inmodel="'+self._model+'" srcname="Crab"'+ \
' caldb="'+self._caldb+'" irf="'+self._irf+'"'+ \
- ' outmodel="cterror_cmd1.xml"'+ \
+ ' tol=0.1 outmodel="cterror_cmd1.xml"'+ \
' logfile="cterror_cmd1.log" chatter=1'
# Check if execution was successful
@@ -82,7 +82,7 @@ class Test(test):
cmd = cterror+' inobs="event_file_that_does_not_exist.fits"'+ \
' inmodel="'+self._model+'" srcname="Crab"'+ \
' caldb="'+self._caldb+'" irf="'+self._irf+'"'+ \
- ' outmodel="cterror_cmd2.xml"'+ \
+ ' tol=0.1 outmodel="cterror_cmd2.xml"'+ \
' logfile="cterror_cmd2.log" debug=yes chatter=1'
# Check if execution failed
@@ -124,6 +124,7 @@ class Test(test):
error['srcname'] = 'Crab'
error['caldb'] = self._caldb
error['irf'] = self._irf
+ error['tol'] = 0.1
error['outmodel'] = 'cterror_py1.xml'
error['logfile'] = 'cterror_py1.log'
error['chatter'] = 2
@@ -170,6 +171,7 @@ class Test(test):
error['srcname'] = 'Crab'
error['caldb'] = self._caldb
error['irf'] = self._irf
+ error['tol'] = 0.1
error['outmodel'] = 'cterror_py3.xml'
error['logfile'] = 'cterror_py3.log'
error['chatter'] = 4
@@ -259,9 +261,9 @@ class Test(test):
# Set reference values
prefactor = 3.65452317573063e-16
- prefactor_error = 1.12697923756417e-16
+ prefactor_error = 1.12920470341148e-16
index = 2.39356360626209
- index_error = 0.131093571504494
+ index_error = 0.128468611886618
pre_background = 1.01409721534593
pre_background_error = 0.122650321517162
index_background = 0.0436264224948547
diff --git a/test/test_ctulimit.py b/test/test_ctulimit.py
index 0329795..73fa9a9 100755
--- a/test/test_ctulimit.py
+++ b/test/test_ctulimit.py
@@ -67,7 +67,7 @@ class Test(test):
cmd = ctulimit+' inobs="'+self._events+'"'+ \
' inmodel="'+self._model+'" srcname="Crab"'+ \
' caldb="'+self._caldb+'" irf="'+self._irf+'"'+ \
- ' logfile="ctulimit_cmd1.log" chatter=1'
+ ' tol=0.1 logfile="ctulimit_cmd1.log" chatter=1'
# Check if execution was successful
self.test_assert(self._execute(cmd) == 0,
@@ -77,7 +77,7 @@ class Test(test):
cmd = ctulimit+' inobs="event_file_that_does_not_exist.fits"'+ \
' inmodel="'+self._model+'" srcname="Crab"'+ \
' caldb="'+self._caldb+'" irf="'+self._irf+'"'+ \
- ' logfile="ctulimit_cmd2.log" debug=yes chatter=2'
+ ' tol=0.1 logfile="ctulimit_cmd2.log" debug=yes chatter=2'
# Check if execution failed
self.test_assert(self._execute(cmd, success=False) != 0,
@@ -87,7 +87,7 @@ class Test(test):
cmd = ctulimit+' inobs="'+self._events+'"'+ \
' inmodel="'+self._model+'" srcname="Vela"'+ \
' caldb="'+self._caldb+'" irf="'+self._irf+'"'+ \
- ' logfile="ctulimit_cmd2.log" debug=yes chatter=2'
+ ' tol=0.1 logfile="ctulimit_cmd2.log" debug=yes chatter=2'
# Check if execution failed
self.test_assert(self._execute(cmd, success=False) != 0,
@@ -129,6 +129,7 @@ class Test(test):
ulimit['srcname'] = 'Crab'
ulimit['caldb'] = self._caldb
ulimit['irf'] = self._irf
+ ulimit['tol'] = 0.1
ulimit['logfile'] = 'ctulimit_py1.log'
ulimit['chatter'] = 2
@@ -138,9 +139,9 @@ class Test(test):
ulimit.save()
# Set reference value
- ref_diff = 2.7504120441004e-17
- ref_flux = 1.66909538876204e-11
- ref_eflux = 6.46471558856293e-11
+ ref_diff = 2.75359655874408e-17
+ ref_flux = 1.66942609234064e-11
+ ref_eflux = 6.4588860064421e-11
# Check results
self.test_value(ulimit.diff_ulimit(), ref_diff, 1.0e-21,
@@ -200,6 +201,7 @@ class Test(test):
# maximum likelihood
ulimit = ctools.ctulimit(like.obs())
ulimit['srcname'] = 'Crab'
+ ulimit['tol'] = 0.1
ulimit['logfile'] = 'ctulimit_py2.log'
ulimit['chatter'] = 3