diff --git a/cscripts/Makefile.am b/cscripts/Makefile.am index f030612..ab76f3d 100755 --- a/cscripts/Makefile.am +++ b/cscripts/Makefile.am @@ -271,7 +271,7 @@ testiactevents = $(top_srcdir)/test/data/iactdata/events/irf_file.fits.gz \ $(top_srcdir)/test/data/iactdata/events/events_8.fits.gz # Test data to be distributed in $(pyexecdir)/cscripts/tests/data/prod5-v0.1 -testprod501data = $(top_srcdir)/test/data/prod5-v0.1/CTA-Performance-prod5-v0.1-South-20deg.FITS.tar.gz +testprod501data = $(top_srcdir)/test/data/prod5-v0.1/CTA-Performance-prod5-v0.1-South-20deg.FITS.tar # Install scripts, parfiles, test scripts and test data. Note that we don't # need to prepend $(DESTDIR) here (not fully clear why, but that's the way diff --git a/cscripts/csadd2caldb.py b/cscripts/csadd2caldb.py index e70b101..50d0117 100755 --- a/cscripts/csadd2caldb.py +++ b/cscripts/csadd2caldb.py @@ -79,11 +79,11 @@ class csadd2caldb(ctools.cscript): tarfiles = [] # Search for tarfiles in current directory - files = glob.glob('%s/*.FITS.tar.gz' % indir.url()) + files = glob.glob('%s/*.FITS.tar*' % indir.url()) tarfiles.extend(files) # Search for tarfiles in 'fits' subdirectory - files = glob.glob('%s/fits/*.FITS.tar.gz' % indir.url()) + files = glob.glob('%s/fits/*.FITS.tar*' % indir.url()) tarfiles.extend(files) # Return tarfiles diff --git a/test/data/prod5-v0.1/CTA-Performance-prod5-v0.1-South-20deg.FITS.tar b/test/data/prod5-v0.1/CTA-Performance-prod5-v0.1-South-20deg.FITS.tar new file mode 100644 index 0000000..1129376 --- /dev/null +++ b/test/data/prod5-v0.1/CTA-Performance-prod5-v0.1-South-20deg.FITS.tar diff --git a/test/data/prod5-v0.1/CTA-Performance-prod5-v0.1-South-20deg.FITS.tar.gz b/test/data/prod5-v0.1/CTA-Performance-prod5-v0.1-South-20deg.FITS.tar.gz deleted file mode 100644 index 052f7f3..0000000 --- a/test/data/prod5-v0.1/CTA-Performance-prod5-v0.1-South-20deg.FITS.tar.gz +++ /dev/null