Justine Devin / gammalib

Commit c610b5bacf5ea11c727e5c7a7f15db252fd338df

Authored by Jürgen Knödlseder
1 parent 0c09d5d6

Replace GAMMALIB_SOURCE environment variable by PACKAGE_SOURCE environment varia… 

…ble in unit tests and use PACKAGE_SOURCE determine in configure instead of abs_top_srcdir as the latter does not exist on older systems.
Inline Side-by-side
Showing 16 changed files with 61 additions and 51 deletions
.gitignore
  View file @c610b5b
@@ -37,6 +37,9 @@ m4/lt~obsolete.m4 @@ -37,6 +37,9 @@ m4/lt~obsolete.m4
37 *.cpp~ 37 *.cpp~
38 *.hpp~ 38 *.hpp~
39 *.i~ 39 *.i~
  40 +*.xml~
  41 +*.ac~
  42 +*.am~
40 .gitignore~ 43 .gitignore~
41 Makefile 44 Makefile
42 stamp-h1 45 stamp-h1
configure.ac
  View file @c610b5b
@@ -60,7 +60,14 @@ else @@ -60,7 +60,14 @@ else
60 gammalib_prefix=${prefix} 60 gammalib_prefix=${prefix}
61 fi 61 fi
62 AC_DEFINE_UNQUOTED([PACKAGE_PREFIX], "${gammalib_prefix}", [Location where library is installed]) 62 AC_DEFINE_UNQUOTED([PACKAGE_PREFIX], "${gammalib_prefix}", [Location where library is installed])
63 -AC_DEFINE_UNQUOTED([PACKAGE_SOURCE], "`pwd`", [Location where source is installed]) 63 +
  64 +
  65 +#############################################################################
  66 +# Determine source directory for unit testing #
  67 +#############################################################################
  68 +PACKAGE_SOURCE=`pwd`
  69 +AC_DEFINE_UNQUOTED([PACKAGE_SOURCE], "${PACKAGE_SOURCE}", [Location where source is installed])
  70 +AC_SUBST(PACKAGE_SOURCE)
64 71
65 72
66 ############################################################################# 73 #############################################################################
inst/com/test/data/obs.xml
  View file @c610b5b
1 <observation_list title="observation library"> 1 <observation_list title="observation library">
2 <observation name="Crab" id="00001" instrument="COM"> 2 <observation name="Crab" id="00001" instrument="COM">
3 - <parameter name="DRE" file="$(GAMMALIB_SOURCE)/inst/com/test/data/m50439_dre.fits"/>  
4 - <parameter name="DRB" file="$(GAMMALIB_SOURCE)/inst/com/test/data/m34997_drg.fits"/>  
5 - <parameter name="DRG" file="$(GAMMALIB_SOURCE)/inst/com/test/data/m34997_drg.fits"/>  
6 - <parameter name="DRX" file="$(GAMMALIB_SOURCE)/inst/com/test/data/m32171_drx.fits"/> 3 + <parameter name="DRE" file="$(PACKAGE_SOURCE)/inst/com/test/data/m50439_dre.fits"/>
  4 + <parameter name="DRB" file="$(PACKAGE_SOURCE)/inst/com/test/data/m34997_drg.fits"/>
  5 + <parameter name="DRG" file="$(PACKAGE_SOURCE)/inst/com/test/data/m34997_drg.fits"/>
  6 + <parameter name="DRX" file="$(PACKAGE_SOURCE)/inst/com/test/data/m32171_drx.fits"/>
7 <parameter name="IAQ" file="u47569_iaq.fits"/> 7 <parameter name="IAQ" file="u47569_iaq.fits"/>
8 </observation> 8 </observation>
9 </observation_list> 9 </observation_list>
10 \ No newline at end of file 10 \ No newline at end of file
inst/cta/test/data/irf_binned.xml
  View file @c610b5b
1 <observation_list title="observation library"> 1 <observation_list title="observation library">
2 <observation name="Crab" id="000001" instrument="CTA"> 2 <observation name="Crab" id="000001" instrument="CTA">
3 - <parameter name="CountsMap" file="$(GAMMALIB_SOURCE)/inst/cta/test/data/crab_cntmap.fits"/>  
4 - <parameter name="EffectiveArea" file="$(GAMMALIB_SOURCE)/inst/cta/caldb/dummy/bcf/hard/000001/ea_test.fits"/>  
5 - <parameter name="PointSpreadFunction" file="$(GAMMALIB_SOURCE)/inst/cta/caldb/dummy/bcf/hard/000001/psf_test.fits"/>  
6 - <parameter name="EnergyDispersion" file="$(GAMMALIB_SOURCE)/inst/cta/caldb/dummy/bcf/hard/000001/edisp_test.fits"/> 3 + <parameter name="CountsMap" file="$(PACKAGE_SOURCE)/inst/cta/test/data/crab_cntmap.fits"/>
  4 + <parameter name="EffectiveArea" file="$(PACKAGE_SOURCE)/inst/cta/caldb/dummy/bcf/hard/000001/ea_test.fits"/>
  5 + <parameter name="PointSpreadFunction" file="$(PACKAGE_SOURCE)/inst/cta/caldb/dummy/bcf/hard/000001/psf_test.fits"/>
  6 + <parameter name="EnergyDispersion" file="$(PACKAGE_SOURCE)/inst/cta/caldb/dummy/bcf/hard/000001/edisp_test.fits"/>
7 </observation> 7 </observation>
8 </observation_list> 8 </observation_list>
inst/cta/test/data/irf_unbinned.xml
  View file @c610b5b
1 <observation_list title="observation library"> 1 <observation_list title="observation library">
2 <observation name="Crab" id="000001" instrument="CTA"> 2 <observation name="Crab" id="000001" instrument="CTA">
3 - <parameter name="EventList" file="$(GAMMALIB_SOURCE)/inst/cta/test/data/crab_events.fits"/>  
4 - <parameter name="EffectiveArea" file="$(GAMMALIB_SOURCE)/inst/cta/caldb/dummy/bcf/hard/000001/ea_test.fits"/>  
5 - <parameter name="PointSpreadFunction" file="$(GAMMALIB_SOURCE)/inst/cta/caldb/dummy/bcf/hard/000001/psf_test.fits"/>  
6 - <parameter name="EnergyDispersion" file="$(GAMMALIB_SOURCE)/inst/cta/caldb/dummy/bcf/hard/000001/edisp_test.fits"/> 3 + <parameter name="EventList" file="$(PACKAGE_SOURCE)/inst/cta/test/data/crab_events.fits"/>
  4 + <parameter name="EffectiveArea" file="$(PACKAGE_SOURCE)/inst/cta/caldb/dummy/bcf/hard/000001/ea_test.fits"/>
  5 + <parameter name="PointSpreadFunction" file="$(PACKAGE_SOURCE)/inst/cta/caldb/dummy/bcf/hard/000001/psf_test.fits"/>
  6 + <parameter name="EnergyDispersion" file="$(PACKAGE_SOURCE)/inst/cta/caldb/dummy/bcf/hard/000001/edisp_test.fits"/>
7 </observation> 7 </observation>
8 </observation_list> 8 </observation_list>
inst/cta/test/data/obs_binned.xml
  View file @c610b5b
1 <observation_list title="observation library"> 1 <observation_list title="observation library">
2 <observation name="Crab" id="00001" instrument="CTA"> 2 <observation name="Crab" id="00001" instrument="CTA">
3 - <parameter name="CountsMap" file="$(GAMMALIB_SOURCE)/inst/cta/test/data/crab_cntmap.fits"/> 3 + <parameter name="CountsMap" file="$(PACKAGE_SOURCE)/inst/cta/test/data/crab_cntmap.fits"/>
4 <parameter name="EffectiveArea" file=""/> 4 <parameter name="EffectiveArea" file=""/>
5 <parameter name="PointSpreadFunction" file=""/> 5 <parameter name="PointSpreadFunction" file=""/>
6 <parameter name="EnergyDispersion" file=""/> 6 <parameter name="EnergyDispersion" file=""/>
inst/cta/test/data/obs_unbinned.xml
  View file @c610b5b
1 <observation_list title="observation library"> 1 <observation_list title="observation library">
2 <observation name="Crab" id="00001" instrument="CTA"> 2 <observation name="Crab" id="00001" instrument="CTA">
3 - <parameter name="EventList" file="$(GAMMALIB_SOURCE)/inst/cta/test/data/crab_events.fits"/> 3 + <parameter name="EventList" file="$(PACKAGE_SOURCE)/inst/cta/test/data/crab_events.fits"/>
4 <parameter name="EffectiveArea" file=""/> 4 <parameter name="EffectiveArea" file=""/>
5 <parameter name="PointSpreadFunction" file=""/> 5 <parameter name="PointSpreadFunction" file=""/>
6 <parameter name="EnergyDispersion" file=""/> 6 <parameter name="EnergyDispersion" file=""/>
inst/lat/test/data/p6v3/obs_binned.xml
  View file @c610b5b
1 <observation_list title="observation library"> 1 <observation_list title="observation library">
2 <observation name="Crab" id="00001" instrument="LAT"> 2 <observation name="Crab" id="00001" instrument="LAT">
3 - <parameter name="CountsMap" file="$(GAMMALIB_SOURCE)/inst/lat/test/data/p6v3/srcmap.fits"/>  
4 - <parameter name="ExposureMap" file="$(GAMMALIB_SOURCE)/inst/lat/test/data/p6v3/binned_expmap.fits"/>  
5 - <parameter name="LiveTimeCube" file="$(GAMMALIB_SOURCE)/inst/lat/test/data/p6v3/ltcube.fits"/>  
6 - <parameter name="IRF" value="P6_v3_diff"/> 3 + <parameter name="CountsMap" file="$(PACKAGE_SOURCE)/inst/lat/test/data/p6v3/srcmap.fits"/>
  4 + <parameter name="ExposureMap" file="$(PACKAGE_SOURCE)/inst/lat/test/data/p6v3/binned_expmap.fits"/>
  5 + <parameter name="LiveTimeCube" file="$(PACKAGE_SOURCE)/inst/lat/test/data/p6v3/ltcube.fits"/>
  6 + <parameter name="IRF" value="P6_v3_diff"/>
7 </observation> 7 </observation>
8 </observation_list> 8 </observation_list>
inst/lat/test/data/p6v3/obs_unbinned.xml
  View file @c610b5b
1 <observation_list title="observation library"> 1 <observation_list title="observation library">
2 <observation name="Crab" id="00001" instrument="LAT"> 2 <observation name="Crab" id="00001" instrument="LAT">
3 - <parameter name="FT1" file="$(GAMMALIB_SOURCE)/inst/lat/test/data/p6v3/ft1.fits"/>  
4 - <parameter name="FT2" file="$(GAMMALIB_SOURCE)/inst/lat/test/data/p6v3/ft2.fits"/>  
5 - <parameter name="LiveTimeCube" file="$(GAMMALIB_SOURCE)/inst/lat/test/data/p6v3/ltcube.fits"/>  
6 - <parameter name="IRF" value="P6_v3_diff"/> 3 + <parameter name="FT1" file="$(PACKAGE_SOURCE)/inst/lat/test/data/p6v3/ft1.fits"/>
  4 + <parameter name="FT2" file="$(PACKAGE_SOURCE)/inst/lat/test/data/p6v3/ft2.fits"/>
  5 + <parameter name="LiveTimeCube" file="$(PACKAGE_SOURCE)/inst/lat/test/data/p6v3/ltcube.fits"/>
  6 + <parameter name="IRF" value="P6_v3_diff"/>
7 </observation> 7 </observation>
8 </observation_list> 8 </observation_list>
inst/lat/test/data/p6v3/source_model.xml
  View file @c610b5b
1 <source_library title="source library"> 1 <source_library title="source library">
2 <source type="DiffuseSource" name="Extragal_diffuse"> 2 <source type="DiffuseSource" name="Extragal_diffuse">
3 - <spectrum type="FileFunction" file="$(GAMMALIB_SOURCE)/inst/lat/test/data/p6v3/isotropic_iem_v02.txt"> 3 + <spectrum type="FileFunction" file="$(PACKAGE_SOURCE)/inst/lat/test/data/p6v3/isotropic_iem_v02.txt">
4 <parameter scale="1.0" name="Normalization" min="0.0" max="1000.0" value="1.0" free="1"/> 4 <parameter scale="1.0" name="Normalization" min="0.0" max="1000.0" value="1.0" free="1"/>
5 </spectrum> 5 </spectrum>
6 <spatialModel type="ConstantValue"> 6 <spatialModel type="ConstantValue">
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 <spectrum type="ConstantValue"> 11 <spectrum type="ConstantValue">
12 <parameter scale="1.0" name="Value" min="0.0" max="1000.0" value="1.0" free="1"/> 12 <parameter scale="1.0" name="Value" min="0.0" max="1000.0" value="1.0" free="1"/>
13 </spectrum> 13 </spectrum>
14 - <spatialModel type="MapCubeFunction" file="$(GAMMALIB_SOURCE)/test/data/test_cube.fits"> 14 + <spatialModel type="MapCubeFunction" file="$(PACKAGE_SOURCE)/test/data/test_cube.fits">
15 <parameter scale="1" name="Normalization" min="0.001" max="1000.0" value="1" free="0"/> 15 <parameter scale="1" name="Normalization" min="0.001" max="1000.0" value="1" free="0"/>
16 </spatialModel> 16 </spatialModel>
17 </source> 17 </source>
inst/lat/test/data/p7v6/obs_binned.xml
  View file @c610b5b
1 <observation_list title="observation library"> 1 <observation_list title="observation library">
2 <observation name="Crab" id="00001" instrument="LAT"> 2 <observation name="Crab" id="00001" instrument="LAT">
3 - <parameter name="CountsMap" file="$(GAMMALIB_SOURCE)/inst/lat/test/data/p7v6/srcmap.fits"/>  
4 - <parameter name="ExposureMap" file="$(GAMMALIB_SOURCE)/inst/lat/test/data/p7v6/binned_expmap.fits"/>  
5 - <parameter name="LiveTimeCube" file="$(GAMMALIB_SOURCE)/inst/lat/test/data/p7v6/ltcube.fits"/>  
6 - <parameter name="IRF" value="P7SOURCE_V6"/> 3 + <parameter name="CountsMap" file="$(PACKAGE_SOURCE)/inst/lat/test/data/p7v6/srcmap.fits"/>
  4 + <parameter name="ExposureMap" file="$(PACKAGE_SOURCE)/inst/lat/test/data/p7v6/binned_expmap.fits"/>
  5 + <parameter name="LiveTimeCube" file="$(PACKAGE_SOURCE)/inst/lat/test/data/p7v6/ltcube.fits"/>
  6 + <parameter name="IRF" value="P7SOURCE_V6"/>
7 </observation> 7 </observation>
8 </observation_list> 8 </observation_list>
inst/lat/test/data/p7v6/obs_unbinned.xml
  View file @c610b5b
1 <observation_list title="observation library"> 1 <observation_list title="observation library">
2 <observation name="Crab" id="00001" instrument="LAT"> 2 <observation name="Crab" id="00001" instrument="LAT">
3 - <parameter name="FT1" file="$(GAMMALIB_SOURCE)/inst/lat/test/data/p7v6/ft1.fits"/>  
4 - <parameter name="FT2" file="$(GAMMALIB_SOURCE)/inst/lat/test/data/p7v6/ft2.fits"/>  
5 - <parameter name="LiveTimeCube" file="$(GAMMALIB_SOURCE)/inst/lat/test/data/p7v6/ltcube.fits"/>  
6 - <parameter name="IRF" value="P7SOURCE_V6"/> 3 + <parameter name="FT1" file="$(PACKAGE_SOURCE)/inst/lat/test/data/p7v6/ft1.fits"/>
  4 + <parameter name="FT2" file="$(PACKAGE_SOURCE)/inst/lat/test/data/p7v6/ft2.fits"/>
  5 + <parameter name="LiveTimeCube" file="$(PACKAGE_SOURCE)/inst/lat/test/data/p7v6/ltcube.fits"/>
  6 + <parameter name="IRF" value="P7SOURCE_V6"/>
7 </observation> 7 </observation>
8 </observation_list> 8 </observation_list>
inst/lat/test/data/p7v6/source_model.xml
  View file @c610b5b
1 <source_library title="source library"> 1 <source_library title="source library">
2 <source type="DiffuseSource" name="Extragal_diffuse"> 2 <source type="DiffuseSource" name="Extragal_diffuse">
3 - <spectrum type="FileFunction" file="$(GAMMALIB_SOURCE)/inst/lat/test/data/p7v6/isotrop_2year_P76_source_v0.txt"> 3 + <spectrum type="FileFunction" file="$(PACKAGE_SOURCE)/inst/lat/test/data/p7v6/isotrop_2year_P76_source_v0.txt">
4 <parameter scale="1.0" name="Normalization" min="0.0" max="1000.0" value="1.0" free="1"/> 4 <parameter scale="1.0" name="Normalization" min="0.0" max="1000.0" value="1.0" free="1"/>
5 </spectrum> 5 </spectrum>
6 <spatialModel type="ConstantValue"> 6 <spatialModel type="ConstantValue">
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 <spectrum type="ConstantValue"> 11 <spectrum type="ConstantValue">
12 <parameter scale="1.0" name="Value" min="0.0" max="1000.0" value="1.0" free="1"/> 12 <parameter scale="1.0" name="Value" min="0.0" max="1000.0" value="1.0" free="1"/>
13 </spectrum> 13 </spectrum>
14 - <spatialModel type="MapCubeFunction" file="$(GAMMALIB_SOURCE)/test/data/test_cube.fits"> 14 + <spatialModel type="MapCubeFunction" file="$(PACKAGE_SOURCE)/test/data/test_cube.fits">
15 <parameter scale="1" name="Normalization" min="0.001" max="1000.0" value="1" free="0"/> 15 <parameter scale="1" name="Normalization" min="0.001" max="1000.0" value="1" free="0"/>
16 </spatialModel> 16 </spatialModel>
17 </source> 17 </source>
inst/mwl/test/data/crab.xml
  View file @c610b5b
1 <?xml version="1.0" standalone="no"?> 1 <?xml version="1.0" standalone="no"?>
2 <source_library title="source library"> 2 <source_library title="source library">
3 - <source name="1FGL J0005.7+3815" type="PointSource">  
4 - <spectrum type="PowerLaw">  
5 - <parameter scale="1e-07" name="Prefactor" min="1e-07" max="1000.0" value="1.73" free="1"/>  
6 - <parameter scale="1.0" name="Index" min="-5.0" max="+5.0" value="-2.1" free="1"/>  
7 - <parameter scale="1.0" name="Scale" min="10.0" max="1000000.0" value="100.0" free="0"/>  
8 - </spectrum>  
9 - <spatialModel type="SkyDirFunction">  
10 - <parameter free="0" max="360" min="-360" name="RA" scale="1" value="83.6331" />  
11 - <parameter free="0" max="90" min="-90" name="DEC" scale="1" value="22.0145" />  
12 - </spatialModel>  
13 - </source> 3 + <source name="1FGL J0005.7+3815" type="PointSource">
  4 + <spectrum type="PowerLaw">
  5 + <parameter scale="1e-07" name="Prefactor" min="1e-07" max="1000.0" value="1.73" free="1"/>
  6 + <parameter scale="1.0" name="Index" min="-5.0" max="+5.0" value="-2.1" free="1"/>
  7 + <parameter scale="1.0" name="Scale" min="10.0" max="1000000.0" value="100.0" free="0"/>
  8 + </spectrum>
  9 + <spatialModel type="SkyDirFunction">
  10 + <parameter free="0" max="360" min="-360" name="RA" scale="1" value="83.6331" />
  11 + <parameter free="0" max="90" min="-90" name="DEC" scale="1" value="22.0145" />
  12 + </spatialModel>
  13 + </source>
14 </source_library> 14 </source_library>
inst/mwl/test/data/obs_mwl.xml
  View file @c610b5b
1 <observation_list title="observation library"> 1 <observation_list title="observation library">
2 <observation name="Crab" id="00001" instrument="MWL"> 2 <observation name="Crab" id="00001" instrument="MWL">
3 <parameter name="Instrument" value="COMPTEL"/> 3 <parameter name="Instrument" value="COMPTEL"/>
4 - <parameter name="Data" file="$(GAMMALIB_SOURCE)/inst/mwl/test/data/crab_mwl.fits" extname="COMPTEL"/> 4 + <parameter name="Data" file="$(PACKAGE_SOURCE)/inst/mwl/test/data/crab_mwl.fits" extname="COMPTEL"/>
5 </observation> 5 </observation>
6 <observation name="Crab" id="00002" instrument="MWL"> 6 <observation name="Crab" id="00002" instrument="MWL">
7 <parameter name="Instrument" value="LAT"/> 7 <parameter name="Instrument" value="LAT"/>
8 - <parameter name="Data" file="$(GAMMALIB_SOURCE)/inst/mwl/test/data/crab_mwl.fits" extname="LAT"/> 8 + <parameter name="Data" file="$(PACKAGE_SOURCE)/inst/mwl/test/data/crab_mwl.fits" extname="LAT"/>
9 </observation> 9 </observation>
10 <observation name="Crab" id="00003" instrument="MWL"> 10 <observation name="Crab" id="00003" instrument="MWL">
11 <parameter name="Instrument" value="HESS"/> 11 <parameter name="Instrument" value="HESS"/>
12 - <parameter name="Data" file="$(GAMMALIB_SOURCE)/inst/mwl/test/data/crab_mwl.fits" extname="HESS"/> 12 + <parameter name="Data" file="$(PACKAGE_SOURCE)/inst/mwl/test/data/crab_mwl.fits" extname="HESS"/>
13 </observation> 13 </observation>
14 </observation_list> 14 </observation_list>
test/Makefile.am
  View file @c610b5b
@@ -82,7 +82,7 @@ check_PROGRAMS = test_GSupport \ @@ -82,7 +82,7 @@ check_PROGRAMS = test_GSupport \
82 # Set test environment (needed for linking with cfitsio and readline) 82 # Set test environment (needed for linking with cfitsio and readline)
83 TESTS_ENVIRONMENT = @RUNSHARED@=$(top_builddir)/src/.libs$(TEST_ENV_DIR):$(@RUNSHARED@) \ 83 TESTS_ENVIRONMENT = @RUNSHARED@=$(top_builddir)/src/.libs$(TEST_ENV_DIR):$(@RUNSHARED@) \
84 $(TEST_PYTHON_ENV) \ 84 $(TEST_PYTHON_ENV) \
85 - GAMMALIB_SOURCE=$(abs_top_srcdir) 85 + PACKAGE_SOURCE=$(PACKAGE_SOURCE)
86 86
87 # Tests (these are the tests to be executed) 87 # Tests (these are the tests to be executed)
88 TESTS = test_GSupport \ 88 TESTS = test_GSupport \
@@ -182,7 +182,7 @@ test_GObservation_LDADD = $(top_srcdir)/src/libgamma.la @@ -182,7 +182,7 @@ test_GObservation_LDADD = $(top_srcdir)/src/libgamma.la
182 # Add Valgrind rule 182 # Add Valgrind rule
183 # 183 #
184 valgrind: 184 valgrind:
185 - @export GAMMALIB_SOURCE=$(abs_top_srcdir) ; \ 185 + @export PACKAGE_SOURCE=$(PACKAGE_SOURCE) ; \
186 if type valgrind >/dev/null 2>&1; then \ 186 if type valgrind >/dev/null 2>&1; then \
187 cd .. ; \ 187 cd .. ; \
188 ln -s test/data data ; \ 188 ln -s test/data data ; \