From a2674643b2db4c42450a1c3e32826731c8316e7b Mon Sep 17 00:00:00 2001 From: Jürgen Knödlseder Date: Fri, 29 Jul 2016 16:17:56 +0200 Subject: [PATCH] Add complete set of models for test of csmodelinfo script (#1828) --- pyext/Makefile.am | 7 ++++++- test/data/model_filefunction.txt | 30 ++++++++++++++++++++++++++++++ test/data/model_map.fits.gz | Bin 0 -> 29195 bytes test/data/model_mapcube.fits.gz | Bin 0 -> 72703 bytes test/data/models_spatial.xml | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ test/data/models_spectral.xml | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ test/test_csmodelinfo.py | 10 +++++++--- 7 files changed, 289 insertions(+), 4 deletions(-) create mode 100644 test/data/model_filefunction.txt create mode 100644 test/data/model_map.fits.gz create mode 100644 test/data/model_mapcube.fits.gz create mode 100644 test/data/models_spatial.xml create mode 100644 test/data/models_spectral.xml diff --git a/pyext/Makefile.am b/pyext/Makefile.am index 5ac7a53..3c55a77 100755 --- a/pyext/Makefile.am +++ b/pyext/Makefile.am @@ -64,7 +64,12 @@ testscripts = ctools/tests/__init__.py \ testdata = $(top_srcdir)/test/data/crab.xml \ $(top_srcdir)/test/data/crab_events.fits.gz \ $(top_srcdir)/test/data/crab_cntmap.fits.gz \ - $(top_srcdir)/test/data/exclusion.reg + $(top_srcdir)/test/data/exclusion.reg \ + $(top_srcdir)/test/data/models_spatial.xml \ + $(top_srcdir)/test/data/models_spectral.xml \ + $(top_srcdir)/test/data/model_filefunction.txt \ + $(top_srcdir)/test/data/model_map.fits.gz \ + $(top_srcdir)/test/data/model_mapcube.fits.gz # Install test scripts and test data. Note that we don't need to prepend # $(DESTDIR) here (not fully clear why, but that's the way it is) diff --git a/test/data/model_filefunction.txt b/test/data/model_filefunction.txt new file mode 100644 index 0000000..8d05695 --- /dev/null +++ b/test/data/model_filefunction.txt @@ -0,0 +1,30 @@ +58.235 7.66262e-07 1.29224e-09 +79.6447 3.71493e-07 5.47092e-10 +108.925 1.72713e-07 2.53235e-10 +148.971 8.56959e-08 1.29723e-10 +203.739 4.45159e-08 7.0672e-11 +278.643 2.2986e-08 4.53314e-11 +381.084 1.06581e-08 1.99924e-11 +521.186 4.66463e-09 1.13792e-11 +712.797 1.99273e-09 6.51585e-12 +974.851 8.10078e-10 3.67421e-12 +1333.25 3.53139e-10 2.09111e-12 +1823.41 1.77486e-10 1.21071e-12 +2493.77 7.70024e-11 6.81635e-13 +3410.59 4.06553e-11 3.97477e-13 +4664.47 2.26725e-11 2.35739e-13 +6379.32 1.28343e-11 1.41644e-13 +8724.63 6.7448e-12 8.35471e-14 +11932.2 3.50028e-12 4.93965e-14 +16319.0 1.69362e-12 2.88296e-14 +22318.5 7.59714e-13 1.64385e-14 +30523.8 3.79995e-13 9.60986e-15 +41745.6 1.95559e-13 5.7418e-15 +57093.1 1.11084e-13 3.54123e-15 +78083.0 6.47859e-14 2.25748e-15 +106790.0 4.00477e-14 1.46605e-15 +146050.0 2.09208e-14 9.05386e-16 +199744.0 1.01209e-14 5.41346e-16 +273179.0 5.4305e-15 3.39977e-16 +373611.0 2.73304e-15 2.09263e-16 +510967.0 1.50496e-15 1.33751e-16 diff --git a/test/data/model_map.fits.gz b/test/data/model_map.fits.gz new file mode 100644 index 0000000..a8d5df5 Binary files /dev/null and b/test/data/model_map.fits.gz differ diff --git a/test/data/model_mapcube.fits.gz b/test/data/model_mapcube.fits.gz new file mode 100644 index 0000000..db2ff62 Binary files /dev/null and b/test/data/model_mapcube.fits.gz differ diff --git a/test/data/models_spatial.xml b/test/data/models_spatial.xml new file mode 100644 index 0000000..4046f40 --- /dev/null +++ b/test/data/models_spatial.xml @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/data/models_spectral.xml b/test/data/models_spectral.xml new file mode 100644 index 0000000..4ac1fe5 --- /dev/null +++ b/test/data/models_spectral.xml @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/test_csmodelinfo.py b/test/test_csmodelinfo.py index d26ec73..a8cff35 100755 --- a/test/test_csmodelinfo.py +++ b/test/test_csmodelinfo.py @@ -42,6 +42,10 @@ class Test(test): # Call base class constructor test.__init__(self) + # Set test data + self._models_spat = self._datadir + '/models_spatial.xml' + self._models_spec = self._datadir + '/models_spectral.xml' + # Return return @@ -69,7 +73,7 @@ class Test(test): csmodelinfo = self._script('csmodelinfo') # Setup csmodelinfo command - cmd = csmodelinfo+' inmodel="'+self._model+'"'+ \ + cmd = csmodelinfo+' inmodel="'+self._models_spec+'"'+ \ ' ds9file="model_cmd1.reg"'+ \ ' logfile="csmodelinfo_cmd1.log" chatter=1' @@ -103,7 +107,7 @@ class Test(test): """ # Set-up csmodelinfo modelinfo = cscripts.csmodelinfo() - modelinfo['inmodel'] = self._model + modelinfo['inmodel'] = self._models_spat modelinfo['ds9file'] = 'csmodelinfo_py1.reg' modelinfo['logfile'] = 'csmodelinfo_py1.log' modelinfo['chatter'] = 2 @@ -118,7 +122,7 @@ class Test(test): # Set-up csmodelinfo modelinfo = cscripts.csmodelinfo() - modelinfo['inmodel'] = self._model + modelinfo['inmodel'] = self._models_spec modelinfo['ds9file'] = 'csmodelinfo_py2.reg' modelinfo['logfile'] = 'csmodelinfo_py2.log' modelinfo['chatter'] = 3 -- libgit2 0.21.4