From 88e351a66bf55f556f27b907ebf98690d6b87d96 Mon Sep 17 00:00:00 2001 From: Jürgen Knödlseder Date: Thu, 30 Nov 2017 13:53:37 +0100 Subject: [PATCH] Speed up ctools unit tests --- cscripts/Makefile.am | 3 ++- test/data/crab.xml | 2 +- test/data/model_crab_radialacceptance.xml | 24 ++++++++++++++++++++++++ test/test_cspull.py | 1 + test/test_cssens.py | 3 +++ test/test_csworkflow.py | 4 ++-- test/test_cterror.py | 8 ++++---- test/test_ctlike.py | 8 ++++---- test/test_ctprob.py | 2 +- test/test_obsutils.py | 21 ++++++++++++--------- 10 files changed, 54 insertions(+), 22 deletions(-) create mode 100644 test/data/model_crab_radialacceptance.xml diff --git a/cscripts/Makefile.am b/cscripts/Makefile.am index 75e8860..f292d84 100644 --- a/cscripts/Makefile.am +++ b/cscripts/Makefile.am @@ -218,7 +218,8 @@ testdata = $(top_srcdir)/test/data/crab.xml \ $(top_srcdir)/test/data/onoff_pha_on2.fits.gz \ $(top_srcdir)/test/data/onoff_rmf.fits.gz \ $(top_srcdir)/test/data/onoff_rmf1.fits.gz \ - $(top_srcdir)/test/data/onoff_rmf2.fits.gz + $(top_srcdir)/test/data/onoff_rmf2.fits.gz \ + $(top_srcdir)/test/data/model_crab_radialacceptance.xml # Test data to be distributed in $(pyexecdir)/cscripts/tests/data/iactdata testiactdata = $(top_srcdir)/test/data/iactdata/hdu-index.fits.gz \ diff --git a/test/data/crab.xml b/test/data/crab.xml index 4a73e2b..9a599b0 100644 --- a/test/data/crab.xml +++ b/test/data/crab.xml @@ -11,7 +11,7 @@ - + diff --git a/test/data/model_crab_radialacceptance.xml b/test/data/model_crab_radialacceptance.xml new file mode 100644 index 0000000..e07b0f4 --- /dev/null +++ b/test/data/model_crab_radialacceptance.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/test_cspull.py b/test/test_cspull.py index 7cb64f0..c67ce45 100755 --- a/test/test_cspull.py +++ b/test/test_cspull.py @@ -43,6 +43,7 @@ class Test(test): test.__init__(self) # Set members + self._model = self._datadir + '/model_crab_radialacceptance.xml' self._inobs = self._datadir + '/obs_stacked.xml' self._inobs_two = self._datadir + '/obs_stacked_two.xml' self._stacked_model = self._datadir + '/crab_bkgcube.xml' diff --git a/test/test_cssens.py b/test/test_cssens.py index 23f1bc2..def29bf 100755 --- a/test/test_cssens.py +++ b/test/test_cssens.py @@ -42,6 +42,9 @@ class Test(test): # Call base class constructor test.__init__(self) + # Set test data + self._model = self._datadir + '/model_crab_radialacceptance.xml' + # Return return diff --git a/test/test_csworkflow.py b/test/test_csworkflow.py index 0cbad1b..a5aeb9a 100755 --- a/test/test_csworkflow.py +++ b/test/test_csworkflow.py @@ -149,10 +149,10 @@ class Test(test): self.test_value(models['Crab'][3].value(), -2.45753747320273, 1.0e-4 * 2.45753747320273, 'Check Crab index') - self.test_value(models['CTABackgroundModel'][0].value(), + self.test_value(models['Background'][0].value(), 1.0444753409474, 1.0e-4 * 1.0444753409474, 'Check background model prefactor') - self.test_value(models['CTABackgroundModel'][1].value(), + self.test_value(models['Background'][1].value(), 0.0126628793551562, 1.0e-4 * 0.0126628793551562, 'Check background model index') diff --git a/test/test_cterror.py b/test/test_cterror.py index 6ba9600..1aa3a3b 100755 --- a/test/test_cterror.py +++ b/test/test_cterror.py @@ -275,16 +275,16 @@ class Test(test): self.test_value(models['Crab']['Index'].error(), 0.0366617454398694, 1.0e-3 * 0.0366617454398694, 'Check Crab Index error') - self.test_value(models['CTABackgroundModel']['Prefactor'].value(), + self.test_value(models['Background']['Prefactor'].value(), 1.01525433446138, 1.0e-4 * 1.01525433446138, 'Check fitted background Prefactor') - self.test_value(models['CTABackgroundModel']['Prefactor'].error(), + self.test_value(models['Background']['Prefactor'].error(), 0.0334412516391298, 1.0e-4 * 0.0334412516391298, 'Check background Prefactor error') - self.test_value(models['CTABackgroundModel']['Index'].value(), + self.test_value(models['Background']['Index'].value(), -0.005132848897274, 1.0e-3 * 0.005132848897274, 'Check fitted background Index') - self.test_value(models['CTABackgroundModel']['Index'].error(), + self.test_value(models['Background']['Index'].error(), 0.0200624490548333, 1.0e-4 * 0.0200624490548333, 'Check background Index error') diff --git a/test/test_ctlike.py b/test/test_ctlike.py index 53ef4a4..682e192 100755 --- a/test/test_ctlike.py +++ b/test/test_ctlike.py @@ -265,16 +265,16 @@ class Test(test): self.test_value(models['Crab']['Index'].error(), 0.0386777873333435, 1.0e-4 * 0.0386777873333435, 'Check Crab Index error') - self.test_value(models['CTABackgroundModel']['Prefactor'].value(), + self.test_value(models['Background']['Prefactor'].value(), 1.01525433446138, 1.0e-4 * 1.01525433446138, 'Check fitted background Prefactor') - self.test_value(models['CTABackgroundModel']['Prefactor'].error(), + self.test_value(models['Background']['Prefactor'].error(), 0.0334412516391298, 1.0e-4 * 0.0334412516391298, 'Check background Prefactor error') - self.test_value(models['CTABackgroundModel']['Index'].value(), + self.test_value(models['Background']['Index'].value(), -0.005132848897274, 1.0e-3 * 0.005132848897274, 'Check fitted background Index') - self.test_value(models['CTABackgroundModel']['Index'].error(), + self.test_value(models['Background']['Index'].error(), 0.0200624490548333, 1.0e-4 * 0.0200624490548333, 'Check background Index error') diff --git a/test/test_ctprob.py b/test/test_ctprob.py index 24c21a3..5d7153d 100755 --- a/test/test_ctprob.py +++ b/test/test_ctprob.py @@ -220,7 +220,7 @@ class Test(test): self._check_events(events, nevents=nevents) # Check that probability columns exist - colname1 = 'PROB_CTABackgroundModel' + colname1 = 'PROB_Background' colname2 = 'PROB_Crab' self._check_column(filename, colname1) self._check_column(filename, colname2) diff --git a/test/test_obsutils.py b/test/test_obsutils.py index fcc5fff..c0111f0 100755 --- a/test/test_obsutils.py +++ b/test/test_obsutils.py @@ -39,6 +39,9 @@ class Test(test): # Call base class constructor test.__init__(self) + # Set test data + self._model = self._datadir + '/model_crab_radialacceptance.xml' + # Return return @@ -113,14 +116,14 @@ class Test(test): # Check simulation results self.test_value(res.size(), 1, 'Check number of observations') self.test_value(res.models().size(), 2, 'Check number of models') - self.test_value(res.nobserved(), 6, 'Check number of observed events') + self.test_value(res.nobserved(), 4, 'Check number of observed events') self.test_value(res.npred(), 0.0, 'Check number of predicted events') self.test_value(res[0].eventtype(), 'EventList', 'Check event type') self.test_value(res[0].events().ebounds().emin().TeV(), 1.0, 'Check minimum energy') self.test_value(res[0].events().ebounds().emax().TeV(), 10.0, 'Check minimum energy') - self.test_value(res[0].events().number(), 6, + self.test_value(res[0].events().number(), 4, 'Check number of events in list') # Check energy dispersion flag @@ -144,7 +147,7 @@ class Test(test): # Check simulation results self.test_value(res.size(), 1, 'Check number of observations') self.test_value(res.models().size(), 2, 'Check number of models') - self.test_value(res.nobserved(), 6, 'Check number of observed events') + self.test_value(res.nobserved(), 4, 'Check number of observed events') self.test_value(res.npred(), 0.0, 'Check number of predicted events') self.test_value(res[0].eventtype(), 'CountsCube', 'Check event type') self.test_value(res[0].events().ebounds().emin().TeV(), 1.0, @@ -153,7 +156,7 @@ class Test(test): 'Check minimum energy') self.test_value(res[0].events().ebounds().size(), 5, 'Check number of energy bins') - self.test_value(res[0].events().number(), 6, + self.test_value(res[0].events().number(), 4, 'Check number of events in cube') # Check energy dispersion flag @@ -177,7 +180,7 @@ class Test(test): # Check simulation results self.test_value(res.size(), 1, 'Check number of observations') self.test_value(res.models().size(), 2, 'Check number of models') - self.test_value(res.nobserved(), 19, 'Check number of observed events') + self.test_value(res.nobserved(), 15, 'Check number of observed events') self.test_value(res.npred(), 0.0, 'Check number of predicted events') self.test_value(res[0].eventtype(), 'CountsCube', 'Check event type') self.test_value(res[0].events().ebounds().emin().TeV(), 1.0, @@ -186,7 +189,7 @@ class Test(test): 'Check minimum energy') self.test_value(res[0].events().ebounds().size(), 5, 'Check number of energy bins') - self.test_value(res[0].events().number(), 19, + self.test_value(res[0].events().number(), 15, 'Check number of events in cube') # Check energy dispersion flag @@ -211,7 +214,7 @@ class Test(test): # Check simulation results self.test_value(res.size(), 1, 'Check number of observations') self.test_value(res.models().size(), 2, 'Check number of models') - self.test_value(res.nobserved(), 28, 'Check number of observed events') + self.test_value(res.nobserved(), 24, 'Check number of observed events') self.test_value(res.npred(), 0.0, 'Check number of predicted events') self.test_value(res[0].eventtype(), 'CountsCube', 'Check event type') self.test_value(res[0].events().ebounds().emin().TeV(), 1.0, @@ -220,7 +223,7 @@ class Test(test): 'Check minimum energy') self.test_value(res[0].events().ebounds().size(), 5, 'Check number of energy bins') - self.test_value(res[0].events().number(), 28, + self.test_value(res[0].events().number(), 24, 'Check number of events in cube') # Check energy dispersion flag @@ -306,7 +309,7 @@ class Test(test): # Check simulation results self.test_value(res.size(), 1, 'Check number of observations') self.test_value(res.models().size(), 2, 'Check number of models') - self.test_value(res.nobserved(), 6, 'Check number of observed events') + self.test_value(res.nobserved(), 4, 'Check number of observed events') self.test_value(res.npred(), 0.0, 'Check number of predicted events') self.test_value(res[0].eventtype(), 'EventList', 'Check event type') self.test_value(res[0].events().ebounds().emin().TeV(), 1.0, -- libgit2 0.21.4