Commit a2674643b2db4c42450a1c3e32826731c8316e7b
1 parent
29bbc390
Add complete set of models for test of csmodelinfo script (#1828)
Showing
7 changed files
with
289 additions
and
4 deletions
pyext/Makefile.am
| ... | ... | @@ -64,7 +64,12 @@ testscripts = ctools/tests/__init__.py \ |
| 64 | 64 | testdata = $(top_srcdir)/test/data/crab.xml \ |
| 65 | 65 | $(top_srcdir)/test/data/crab_events.fits.gz \ |
| 66 | 66 | $(top_srcdir)/test/data/crab_cntmap.fits.gz \ |
| 67 | - $(top_srcdir)/test/data/exclusion.reg | |
| 67 | + $(top_srcdir)/test/data/exclusion.reg \ | |
| 68 | + $(top_srcdir)/test/data/models_spatial.xml \ | |
| 69 | + $(top_srcdir)/test/data/models_spectral.xml \ | |
| 70 | + $(top_srcdir)/test/data/model_filefunction.txt \ | |
| 71 | + $(top_srcdir)/test/data/model_map.fits.gz \ | |
| 72 | + $(top_srcdir)/test/data/model_mapcube.fits.gz | |
| 68 | 73 | |
| 69 | 74 | # Install test scripts and test data. Note that we don't need to prepend |
| 70 | 75 | # $(DESTDIR) here (not fully clear why, but that's the way it is) | ... | ... |
test/data/model_filefunction.txt
0 → 100644
| 1 | +58.235 7.66262e-07 1.29224e-09 | |
| 2 | +79.6447 3.71493e-07 5.47092e-10 | |
| 3 | +108.925 1.72713e-07 2.53235e-10 | |
| 4 | +148.971 8.56959e-08 1.29723e-10 | |
| 5 | +203.739 4.45159e-08 7.0672e-11 | |
| 6 | +278.643 2.2986e-08 4.53314e-11 | |
| 7 | +381.084 1.06581e-08 1.99924e-11 | |
| 8 | +521.186 4.66463e-09 1.13792e-11 | |
| 9 | +712.797 1.99273e-09 6.51585e-12 | |
| 10 | +974.851 8.10078e-10 3.67421e-12 | |
| 11 | +1333.25 3.53139e-10 2.09111e-12 | |
| 12 | +1823.41 1.77486e-10 1.21071e-12 | |
| 13 | +2493.77 7.70024e-11 6.81635e-13 | |
| 14 | +3410.59 4.06553e-11 3.97477e-13 | |
| 15 | +4664.47 2.26725e-11 2.35739e-13 | |
| 16 | +6379.32 1.28343e-11 1.41644e-13 | |
| 17 | +8724.63 6.7448e-12 8.35471e-14 | |
| 18 | +11932.2 3.50028e-12 4.93965e-14 | |
| 19 | +16319.0 1.69362e-12 2.88296e-14 | |
| 20 | +22318.5 7.59714e-13 1.64385e-14 | |
| 21 | +30523.8 3.79995e-13 9.60986e-15 | |
| 22 | +41745.6 1.95559e-13 5.7418e-15 | |
| 23 | +57093.1 1.11084e-13 3.54123e-15 | |
| 24 | +78083.0 6.47859e-14 2.25748e-15 | |
| 25 | +106790.0 4.00477e-14 1.46605e-15 | |
| 26 | +146050.0 2.09208e-14 9.05386e-16 | |
| 27 | +199744.0 1.01209e-14 5.41346e-16 | |
| 28 | +273179.0 5.4305e-15 3.39977e-16 | |
| 29 | +373611.0 2.73304e-15 2.09263e-16 | |
| 30 | +510967.0 1.50496e-15 1.33751e-16 | ... | ... |
test/data/model_map.fits.gz
0 → 100644
No preview for this file type
test/data/model_mapcube.fits.gz
0 → 100644
No preview for this file type
test/data/models_spatial.xml
0 → 100644
| 1 | +<?xml version="1.0" standalone="no"?> | |
| 2 | +<!-- This model definition XML file contains all spatial models that are | |
| 3 | + available in GammaLib. The spatial models are combined with a power | |
| 4 | + law spectral model. --> | |
| 5 | +<source_library title="source library"> | |
| 6 | + <source name="PointSource*PowerLaw" type="PointSource"> | |
| 7 | + <spectrum type="PowerLaw"> | |
| 8 | + <parameter name="Prefactor" scale="1e-16" value="5.7" min="1e-07" max="1000.0" free="1"/> | |
| 9 | + <parameter name="Index" scale="-1" value="2.48" min="0.0" max="+5.0" free="1"/> | |
| 10 | + <parameter name="PivotEnergy" scale="1e6" value="0.3" min="0.01" max="1000.0" free="0"/> | |
| 11 | + </spectrum> | |
| 12 | + <spatialModel type="PointSource"> | |
| 13 | + <parameter name="RA" scale="1.0" value="83.6331" min="-360" max="360" free="1"/> | |
| 14 | + <parameter name="DEC" scale="1.0" value="22.0145" min="-90" max="90" free="1"/> | |
| 15 | + </spatialModel> | |
| 16 | + </source> | |
| 17 | + <source name="RadialDisk*PowerLaw" type="ExtendedSource"> | |
| 18 | + <spectrum type="PowerLaw"> | |
| 19 | + <parameter name="Prefactor" scale="1e-16" value="5.7" min="1e-07" max="1000.0" free="1"/> | |
| 20 | + <parameter name="Index" scale="-1" value="2.48" min="0.0" max="+5.0" free="1"/> | |
| 21 | + <parameter name="PivotEnergy" scale="1e6" value="0.3" min="0.01" max="1000.0" free="0"/> | |
| 22 | + </spectrum> | |
| 23 | + <spatialModel type="RadialDisk"> | |
| 24 | + <parameter name="RA" scale="1.0" value="83.6331" min="-360" max="360" free="1"/> | |
| 25 | + <parameter name="DEC" scale="1.0" value="22.0145" min="-90" max="90" free="1"/> | |
| 26 | + <parameter name="Radius" scale="1.0" value="0.2" min="0.01" max="10" free="1"/> | |
| 27 | + </spatialModel> | |
| 28 | + </source> | |
| 29 | + <source name="RadialGaussian*PowerLaw" type="ExtendedSource"> | |
| 30 | + <spectrum type="PowerLaw"> | |
| 31 | + <parameter name="Prefactor" scale="1e-16" value="5.7" min="1e-07" max="1000.0" free="1"/> | |
| 32 | + <parameter name="Index" scale="-1" value="2.48" min="0.0" max="+5.0" free="1"/> | |
| 33 | + <parameter name="PivotEnergy" scale="1e6" value="0.3" min="0.01" max="1000.0" free="0"/> | |
| 34 | + </spectrum> | |
| 35 | + <spatialModel type="RadialGaussian"> | |
| 36 | + <parameter name="RA" scale="1.0" value="83.6331" min="-360" max="360" free="1"/> | |
| 37 | + <parameter name="DEC" scale="1.0" value="22.0145" min="-90" max="90" free="1"/> | |
| 38 | + <parameter name="Sigma" scale="1.0" value="0.20" min="0.01" max="10" free="1"/> | |
| 39 | + </spatialModel> | |
| 40 | + </source> | |
| 41 | + <source name="RadialShell*PowerLaw" type="ExtendedSource"> | |
| 42 | + <spectrum type="PowerLaw"> | |
| 43 | + <parameter name="Prefactor" scale="1e-16" value="5.7" min="1e-07" max="1000.0" free="1"/> | |
| 44 | + <parameter name="Index" scale="-1" value="2.48" min="0.0" max="+5.0" free="1"/> | |
| 45 | + <parameter name="PivotEnergy" scale="1e6" value="0.3" min="0.01" max="1000.0" free="0"/> | |
| 46 | + </spectrum> | |
| 47 | + <spatialModel type="RadialShell"> | |
| 48 | + <parameter name="RA" scale="1.0" value="83.6331" min="-360" max="360" free="1"/> | |
| 49 | + <parameter name="DEC" scale="1.0" value="22.0145" min="-90" max="90" free="1"/> | |
| 50 | + <parameter name="Radius" scale="1.0" value="0.30" min="0.01" max="10" free="1"/> | |
| 51 | + <parameter name="Width" scale="1.0" value="0.10" min="0.01" max="10" free="1"/> | |
| 52 | + </spatialModel> | |
| 53 | + </source> | |
| 54 | + <source name="EllipticalDisk*PowerLaw" type="ExtendedSource"> | |
| 55 | + <spectrum type="PowerLaw"> | |
| 56 | + <parameter name="Prefactor" scale="1e-16" value="5.7" min="1e-07" max="1000.0" free="1"/> | |
| 57 | + <parameter name="Index" scale="-1" value="2.48" min="0.0" max="+5.0" free="1"/> | |
| 58 | + <parameter name="PivotEnergy" scale="1e6" value="0.3" min="0.01" max="1000.0" free="0"/> | |
| 59 | + </spectrum> | |
| 60 | + <spatialModel type="EllipticalDisk"> | |
| 61 | + <parameter name="RA" scale="1.0" value="83.6331" min="-360" max="360" free="1"/> | |
| 62 | + <parameter name="DEC" scale="1.0" value="22.0145" min="-90" max="90" free="1"/> | |
| 63 | + <parameter name="PA" scale="1.0" value="45.0" min="-360" max="360" free="1"/> | |
| 64 | + <parameter name="MinorRadius" scale="1.0" value="0.2" min="0.001" max="10" free="1"/> | |
| 65 | + <parameter name="MajorRadius" scale="1.0" value="0.4" min="0.001" max="10" free="1"/> | |
| 66 | + </spatialModel> | |
| 67 | + </source> | |
| 68 | + <source name="EllipticalGaussian*PowerLaw" type="ExtendedSource"> | |
| 69 | + <spectrum type="PowerLaw"> | |
| 70 | + <parameter name="Prefactor" scale="1e-16" value="5.7" min="1e-07" max="1000.0" free="1"/> | |
| 71 | + <parameter name="Index" scale="-1" value="2.48" min="0.0" max="+5.0" free="1"/> | |
| 72 | + <parameter name="PivotEnergy" scale="1e6" value="0.3" min="0.01" max="1000.0" free="0"/> | |
| 73 | + </spectrum> | |
| 74 | + <spatialModel type="EllipticalGaussian"> | |
| 75 | + <parameter name="RA" scale="1.0" value="83.6331" min="-360" max="360" free="1"/> | |
| 76 | + <parameter name="DEC" scale="1.0" value="22.0145" min="-90" max="90" free="1"/> | |
| 77 | + <parameter name="PA" scale="1.0" value="45.0" min="-360" max="360" free="1"/> | |
| 78 | + <parameter name="MinorRadius" scale="1.0" value="0.2" min="0.001" max="10" free="1"/> | |
| 79 | + <parameter name="MajorRadius" scale="1.0" value="0.4" min="0.001" max="10" free="1"/> | |
| 80 | + </spatialModel> | |
| 81 | + </source> | |
| 82 | + <source name="DiffuseIsotropic*PowerLaw" type="DiffuseSource"> | |
| 83 | + <spectrum type="PowerLaw"> | |
| 84 | + <parameter name="Prefactor" scale="1e-12" value="2.0" min="1e-07" max="1000.0" free="1"/> | |
| 85 | + <parameter name="Index" scale="-1" value="2.48" min="0.0" max="+5.0" free="1"/> | |
| 86 | + <parameter name="PivotEnergy" scale="1e6" value="0.3" min="0.01" max="1000.0" free="0"/> | |
| 87 | + </spectrum> | |
| 88 | + <spatialModel type="DiffuseIsotropic"> | |
| 89 | + <parameter name="Value" scale="1" value="1" min="0.1" max="10" free="0"/> | |
| 90 | + </spatialModel> | |
| 91 | + </source> | |
| 92 | + <source name="DiffuseMap*PowerLaw" type="DiffuseSource"> | |
| 93 | + <spectrum type="PowerLaw"> | |
| 94 | + <parameter name="Prefactor" scale="1e-16" value="5.7" min="1e-07" max="1000.0" free="1"/> | |
| 95 | + <parameter name="Index" scale="-1" value="2.48" min="0.0" max="+5.0" free="1"/> | |
| 96 | + <parameter name="PivotEnergy" scale="1e6" value="0.3" min="0.01" max="1000.0" free="0"/> | |
| 97 | + </spectrum> | |
| 98 | + <spatialModel type="DiffuseMap" file="model_map.fits"> | |
| 99 | + <parameter name="Normalization" scale="1" value="1" min="0.001" max="1000.0" free="0"/> | |
| 100 | + </spatialModel> | |
| 101 | + </source> | |
| 102 | + <source name="DiffuseMapCube*PowerLaw" type="DiffuseSource"> | |
| 103 | + <spectrum type="PowerLaw"> | |
| 104 | + <parameter name="Prefactor" scale="1.0" value="1.0" min="1e-07" max="1000.0" free="1"/> | |
| 105 | + <parameter name="Index" scale="1.0" value="0.0" min="-5.0" max="+5.0" free="1"/> | |
| 106 | + <parameter name="PivotEnergy" scale="1e6" value="1.0" min="0.01" max="1000.0" free="0"/> | |
| 107 | + </spectrum> | |
| 108 | + <spatialModel type="DiffuseMapCube" file="model_mapcube.fits"> | |
| 109 | + <parameter name="Normalization" scale="1" value="1" min="0.1" max="10" free="0"/> | |
| 110 | + </spatialModel> | |
| 111 | + </source> | |
| 112 | +</source_library> | ... | ... |
test/data/models_spectral.xml
0 → 100644
| 1 | +<?xml version="1.0" standalone="no"?> | |
| 2 | +<!-- This model definition XML file contains all spectral models that are | |
| 3 | + available in GammaLib. The spectral models are combined with a point | |
| 4 | + source spatial model. --> | |
| 5 | +<source_library title="source library"> | |
| 6 | + <source name="PointSource*Constant" type="PointSource"> | |
| 7 | + <spectrum type="Constant"> | |
| 8 | + <parameter name="Normalization" scale="1e-16" value="5.7" min="1e-07" max="1000.0" free="1"/> | |
| 9 | + </spectrum> | |
| 10 | + <spatialModel type="PointSource"> | |
| 11 | + <parameter name="RA" scale="1" value="83.6331" min="-360" max="360" free="0"/> | |
| 12 | + <parameter name="DEC" scale="1" value="22.0145" min="-90" max="90" free="0"/> | |
| 13 | + </spatialModel> | |
| 14 | + </source> | |
| 15 | + <source name="PointSource*PowerLaw" type="PointSource"> | |
| 16 | + <spectrum type="PowerLaw"> | |
| 17 | + <parameter name="Prefactor" scale="1e-16" value="5.7" min="1e-07" max="1000.0" free="1"/> | |
| 18 | + <parameter name="Index" scale="-1" value="2.48" min="0.0" max="+5.0" free="1"/> | |
| 19 | + <parameter name="PivotEnergy" scale="1e6" value="0.3" min="0.01" max="1000.0" free="0"/> | |
| 20 | + </spectrum> | |
| 21 | + <spatialModel type="PointSource"> | |
| 22 | + <parameter name="RA" scale="1.0" value="83.6331" min="-360" max="360" free="0"/> | |
| 23 | + <parameter name="DEC" scale="1.0" value="22.0145" min="-90" max="90" free="0"/> | |
| 24 | + </spatialModel> | |
| 25 | + </source> | |
| 26 | + <source name="PointSource*PowerLawPhotonFlux" type="PointSource"> | |
| 27 | + <spectrum type="PowerLaw"> | |
| 28 | + <parameter name="PhotonFlux" scale="1e-5" value="1.617" min="1e-07" max="1000.0" free="1"/> | |
| 29 | + <parameter name="Index" scale="-1.0" value="2.48" min="-5.0" max="+5.0" free="1"/> | |
| 30 | + <parameter name="LowerLimit" scale="1.0" value="100.0" min="10.0" max="1000000.0" free="0"/> | |
| 31 | + <parameter name="UpperLimit" scale="1.0" value="500000.0" min="10.0" max="1000000.0" free="0"/> | |
| 32 | + </spectrum> | |
| 33 | + <spatialModel type="PointSource"> | |
| 34 | + <parameter name="RA" scale="1.0" value="83.6331" min="-360" max="360" free="0"/> | |
| 35 | + <parameter name="DEC" scale="1.0" value="22.0145" min="-90" max="90" free="0"/> | |
| 36 | + </spatialModel> | |
| 37 | + </source> | |
| 38 | + <source name="PointSource*PowerLawEnergyFlux" type="PointSource"> | |
| 39 | + <spectrum type="PowerLaw"> | |
| 40 | + <parameter scale="1e-07" name="EnergyFlux" min="1e-07" max="1000.0" value="1.0" free="1"/> | |
| 41 | + <parameter scale="1.0" name="Index" min="-5.0" max="+5.0" value="-2.0" free="1"/> | |
| 42 | + <parameter scale="1.0" name="LowerLimit" min="10.0" max="1000000.0" value="100.0" free="0"/> | |
| 43 | + <parameter scale="1.0" name="UpperLimit" min="10.0" max="1000000.0" value="500000.0" free="0"/> | |
| 44 | + </spectrum> | |
| 45 | + <spatialModel type="PointSource"> | |
| 46 | + <parameter name="RA" scale="1" value="83.6331" min="-360" max="360" free="0"/> | |
| 47 | + <parameter name="DEC" scale="1" value="22.0145" min="-90" max="90" free="0"/> | |
| 48 | + </spatialModel> | |
| 49 | + </source> | |
| 50 | + <source name="PointSource*BrokenPowerLaw" type="PointSource"> | |
| 51 | + <spectrum type="BrokenPowerLaw"> | |
| 52 | + <parameter name="Prefactor" scale="1e-16" value="5.7" min="1e-07" max="1000.0" free="1"/> | |
| 53 | + <parameter name="Index1" scale="-1" value="2.48" min="0.0" max="+5.0" free="1"/> | |
| 54 | + <parameter name="BreakEnergy" scale="1e6" value="0.3" min="0.01" max="1000.0" free="1"/> | |
| 55 | + <parameter name="Index2" scale="-1" value="2.70" min="0.01" max="+5.0" free="1"/> | |
| 56 | + </spectrum> | |
| 57 | + <spatialModel type="PointSource"> | |
| 58 | + <parameter name="RA" scale="1" value="83.6331" min="-360" max="360" free="0"/> | |
| 59 | + <parameter name="DEC" scale="1" value="22.0145" min="-90" max="90" free="0"/> | |
| 60 | + </spatialModel> | |
| 61 | + </source> | |
| 62 | + <source name="PointSource*ExponentialCutoffPowerLaw" type="PointSource"> | |
| 63 | + <spectrum type="ExponentialCutoffPowerLaw"> | |
| 64 | + <parameter name="Prefactor" scale="1e-16" value="5.7" min="1e-07" max="1000.0" free="1"/> | |
| 65 | + <parameter name="Index" scale="-1" value="2.48" min="0.0" max="+5.0" free="1"/> | |
| 66 | + <parameter name="CutoffEnergy" scale="1e6" value="1.0" min="0.01" max="1000.0" free="1"/> | |
| 67 | + <parameter name="PivotEnergy" scale="1e6" value="0.3" min="0.01" max="1000.0" free="0"/> | |
| 68 | + </spectrum> | |
| 69 | + <spatialModel type="PointSource"> | |
| 70 | + <parameter name="RA" scale="1" value="83.6331" min="-360" max="360" free="0"/> | |
| 71 | + <parameter name="DEC" scale="1" value="22.0145" min="-90" max="90" free="0"/> | |
| 72 | + </spatialModel> | |
| 73 | + </source> | |
| 74 | + <source name="PointSource*ExponentialInverseCutoffPowerLaw" type="PointSource"> | |
| 75 | + <spectrum type="ExponentialCutoffPowerLaw"> | |
| 76 | + <parameter name="Prefactor" scale="1e-16" value="5.7" min="1e-07" max="1000.0" free="1"/> | |
| 77 | + <parameter name="Index" scale="-1" value="2.48" min="0.0" max="+5.0" free="1"/> | |
| 78 | + <parameter name="InverseCutoffEnergy" scale="1e-6" value="1.0" min="0.0" max="100.0" free="1"/> | |
| 79 | + <parameter name="PivotEnergy" scale="1e6" value="0.3" min="0.01" max="1000.0" free="0"/> | |
| 80 | + </spectrum> | |
| 81 | + <spatialModel type="SkyDirFunction"> | |
| 82 | + <parameter name="RA" scale="1" value="83.6331" min="-360" max="360" free="0"/> | |
| 83 | + <parameter name="DEC" scale="1" value="22.0145" min="-90" max="90" free="0"/> | |
| 84 | + </spatialModel> | |
| 85 | + </source> | |
| 86 | + <source name="PointSource*LogParabola" type="PointSource"> | |
| 87 | + <spectrum type="LogParabola"> | |
| 88 | + <parameter name="Prefactor" scale="1e-17" value="5.878" min="1e-07" max="1000.0" free="1"/> | |
| 89 | + <parameter name="Index" scale="-1" value="2.32473" min="0.0" max="+5.0" free="1"/> | |
| 90 | + <parameter name="Curvature" scale="-1" value="0.074" min="-5.0" max="+5.0" free="1"/> | |
| 91 | + <parameter name="PivotEnergy" scale="1e6" value="1.0" min="0.01" max="1000.0" free="0"/> | |
| 92 | + </spectrum> | |
| 93 | + <spatialModel type="PointSource"> | |
| 94 | + <parameter name="RA" scale="1" value="83.6331" min="-360" max="360" free="0"/> | |
| 95 | + <parameter name="DEC" scale="1" value="22.0145" min="-90" max="90" free="0"/> | |
| 96 | + </spatialModel> | |
| 97 | + </source> | |
| 98 | + <source name="PointSource*Gaussian" type="PointSource"> | |
| 99 | + <spectrum type="Gaussian"> | |
| 100 | + <parameter name="Normalization" scale="1e-10" value="1.0" min="1e-07" max="1000.0" free="1"/> | |
| 101 | + <parameter name="Mean" scale="1e6" value="5.0" min="0.01" max="100.0" free="1"/> | |
| 102 | + <parameter name="Sigma" scale="1e6" value="1.0" min="0.01" max="100.0" free="1"/> | |
| 103 | + </spectrum> | |
| 104 | + <spatialModel type="PointSource"> | |
| 105 | + <parameter name="RA" scale="1" value="83.6331" min="-360" max="360" free="0"/> | |
| 106 | + <parameter name="DEC" scale="1" value="22.0145" min="-90" max="90" free="0"/> | |
| 107 | + </spatialModel> | |
| 108 | + </source> | |
| 109 | + <source name="PointSource*NodeFunction" type="PointSource"> | |
| 110 | + <spectrum type="NodeFunction"> | |
| 111 | + <node> | |
| 112 | + <parameter scale="1.0" name="Energy" min="0.1" max="1.0e20" value="1.0" free="0"/> | |
| 113 | + <parameter scale="1e-07" name="Intensity" min="1e-07" max="1000.0" value="1.0" free="1"/> | |
| 114 | + </node> | |
| 115 | + <node> | |
| 116 | + <parameter scale="1.0" name="Energy" min="0.1" max="1.0e20" value="10.0" free="0"/> | |
| 117 | + <parameter scale="1e-07" name="Intensity" min="1e-07" max="1000.0" value="0.1" free="1"/> | |
| 118 | + </node> | |
| 119 | + </spectrum> | |
| 120 | + <spatialModel type="PointSource"> | |
| 121 | + <parameter name="RA" scale="1" value="83.6331" min="-360" max="360" free="0"/> | |
| 122 | + <parameter name="DEC" scale="1" value="22.0145" min="-90" max="90" free="0"/> | |
| 123 | + </spatialModel> | |
| 124 | + </source> | |
| 125 | + <source name="PointSource*FileFunction" type="PointSource"> | |
| 126 | + <spectrum type="FileFunction" file="model_filefunction.txt"> | |
| 127 | + <parameter scale="1.0" name="Normalization" min="0.0" max="1000.0" value="1.0" free="1"/> | |
| 128 | + </spectrum> | |
| 129 | + <spatialModel type="PointSource"> | |
| 130 | + <parameter name="RA" scale="1" value="83.6331" min="-360" max="360" free="0"/> | |
| 131 | + <parameter name="DEC" scale="1" value="22.0145" min="-90" max="90" free="0"/> | |
| 132 | + </spatialModel> | |
| 133 | + </source> | |
| 134 | +</source_library> | ... | ... |
test/test_csmodelinfo.py
| ... | ... | @@ -42,6 +42,10 @@ class Test(test): |
| 42 | 42 | # Call base class constructor |
| 43 | 43 | test.__init__(self) |
| 44 | 44 | |
| 45 | + # Set test data | |
| 46 | + self._models_spat = self._datadir + '/models_spatial.xml' | |
| 47 | + self._models_spec = self._datadir + '/models_spectral.xml' | |
| 48 | + | |
| 45 | 49 | # Return |
| 46 | 50 | return |
| 47 | 51 | |
| ... | ... | @@ -69,7 +73,7 @@ class Test(test): |
| 69 | 73 | csmodelinfo = self._script('csmodelinfo') |
| 70 | 74 | |
| 71 | 75 | # Setup csmodelinfo command |
| 72 | - cmd = csmodelinfo+' inmodel="'+self._model+'"'+ \ | |
| 76 | + cmd = csmodelinfo+' inmodel="'+self._models_spec+'"'+ \ | |
| 73 | 77 | ' ds9file="model_cmd1.reg"'+ \ |
| 74 | 78 | ' logfile="csmodelinfo_cmd1.log" chatter=1' |
| 75 | 79 | |
| ... | ... | @@ -103,7 +107,7 @@ class Test(test): |
| 103 | 107 | """ |
| 104 | 108 | # Set-up csmodelinfo |
| 105 | 109 | modelinfo = cscripts.csmodelinfo() |
| 106 | - modelinfo['inmodel'] = self._model | |
| 110 | + modelinfo['inmodel'] = self._models_spat | |
| 107 | 111 | modelinfo['ds9file'] = 'csmodelinfo_py1.reg' |
| 108 | 112 | modelinfo['logfile'] = 'csmodelinfo_py1.log' |
| 109 | 113 | modelinfo['chatter'] = 2 |
| ... | ... | @@ -118,7 +122,7 @@ class Test(test): |
| 118 | 122 | |
| 119 | 123 | # Set-up csmodelinfo |
| 120 | 124 | modelinfo = cscripts.csmodelinfo() |
| 121 | - modelinfo['inmodel'] = self._model | |
| 125 | + modelinfo['inmodel'] = self._models_spec | |
| 122 | 126 | modelinfo['ds9file'] = 'csmodelinfo_py2.reg' |
| 123 | 127 | modelinfo['logfile'] = 'csmodelinfo_py2.log' |
| 124 | 128 | modelinfo['chatter'] = 3 | ... | ... |