Dmitry Malyshev / ctools

Commit 946b1e39aa50bc744c076c502adf720e3ff404af

Authored by Jürgen Knödlseder
1 parent c0ec604c

Adapt model XML files to new spatial model names (#1818)

Inline Side-by-side
Showing 31 changed files with 41 additions and 41 deletions
models/crab.xml
  View file @946b1e3
... ... @@ -6,7 +6,7 @@
6 6 <parameter name="Index" scale="-1" value="2.48" min="0.0" max="+5.0" free="1"/>
7 7 <parameter name="Scale" scale="1e6" value="0.3" min="0.01" max="1000.0" free="0"/>
8 8 </spectrum>
9   - <spatialModel type="SkyDirFunction">
  9 + <spatialModel type="PointSource">
10 10 <parameter name="RA" scale="1.0" value="83.6331" min="-360" max="360" free="0"/>
11 11 <parameter name="DEC" scale="1.0" value="22.0145" min="-90" max="90" free="0"/>
12 12 </spatialModel>
... ...
models/crab_poly.xml
  View file @946b1e3
... ... @@ -6,7 +6,7 @@
6 6 <parameter name="Index" scale="-1" value="2.48" min="0.0" max="+5.0" free="1"/>
7 7 <parameter name="Scale" scale="1e6" value="0.3" min="0.01" max="1000.0" free="0"/>
8 8 </spectrum>
9   - <spatialModel type="SkyDirFunction">
  9 + <spatialModel type="PointSource">
10 10 <parameter name="RA" scale="1.0" value="83.6331" min="-360" max="360" free="0"/>
11 11 <parameter name="DEC" scale="1.0" value="22.0145" min="-90" max="90" free="0"/>
12 12 </spatialModel>
... ...
models/crab_profile.xml
  View file @946b1e3
... ... @@ -6,7 +6,7 @@
6 6 <parameter name="Index" scale="-1" value="2.48" min="0.0" max="+5.0" free="1"/>
7 7 <parameter name="Scale" scale="1e6" value="0.3" min="0.01" max="1000.0" free="0"/>
8 8 </spectrum>
9   - <spatialModel type="SkyDirFunction">
  9 + <spatialModel type="PointSource">
10 10 <parameter name="RA" scale="1.0" value="83.6331" min="-360" max="360" free="0"/>
11 11 <parameter name="DEC" scale="1.0" value="22.0145" min="-90" max="90" free="0"/>
12 12 </spatialModel>
... ...
models/disk.xml
  View file @946b1e3
... ... @@ -6,7 +6,7 @@
6 6 <parameter name="Index" scale="-1" value="2.48" min="0.0" max="+5.0" free="1"/>
7 7 <parameter name="Scale" scale="1e6" value="0.3" min="0.01" max="1000.0" free="0"/>
8 8 </spectrum>
9   - <spatialModel type="DiskFunction">
  9 + <spatialModel type="RadialDisk">
10 10 <parameter name="RA" scale="1.0" value="83.6331" min="-360" max="360" free="1"/>
11 11 <parameter name="DEC" scale="1.0" value="22.0145" min="-90" max="90" free="1"/>
12 12 <parameter name="Radius" scale="1.0" value="0.45" min="0.01" max="10" free="1"/>
... ...
models/gauss.xml
  View file @946b1e3
... ... @@ -6,7 +6,7 @@
6 6 <parameter name="Index" scale="-1" value="2.48" min="0.0" max="+5.0" free="1"/>
7 7 <parameter name="Scale" scale="1e6" value="0.3" min="0.01" max="1000.0" free="0"/>
8 8 </spectrum>
9   - <spatialModel type="GaussFunction">
  9 + <spatialModel type="RadialGaussian">
10 10 <parameter name="RA" scale="1.0" value="83.6331" min="-360" max="360" free="1"/>
11 11 <parameter name="DEC" scale="1.0" value="22.0145" min="-90" max="90" free="1"/>
12 12 <parameter name="Sigma" scale="1.0" value="0.20" min="0.01" max="10" free="1"/>
... ...
models/shell.xml
  View file @946b1e3
... ... @@ -6,7 +6,7 @@
6 6 <parameter name="Index" scale="-1" value="2.48" min="0.0" max="+5.0" free="1"/>
7 7 <parameter name="Scale" scale="1e6" value="0.3" min="0.01" max="1000.0" free="0"/>
8 8 </spectrum>
9   - <spatialModel type="ShellFunction">
  9 + <spatialModel type="RadialShell">
10 10 <parameter name="RA" scale="1.0" value="83.6331" min="-360" max="360" free="1"/>
11 11 <parameter name="DEC" scale="1.0" value="22.0145" min="-90" max="90" free="1"/>
12 12 <parameter name="Radius" scale="1.0" value="0.30" min="0.01" max="10" free="1"/>
... ...
test/data/crab.xml
  View file @946b1e3
... ... @@ -6,7 +6,7 @@
6 6 <parameter name="Index" scale="-1" value="2.48" min="0.0" max="+5.0" free="1"/>
7 7 <parameter name="Scale" scale="1e6" value="0.3" min="0.01" max="1000.0" free="0"/>
8 8 </spectrum>
9   - <spatialModel type="SkyDirFunction">
  9 + <spatialModel type="PointSource">
10 10 <parameter name="RA" scale="1.0" value="83.6331" min="-360" max="360" free="0"/>
11 11 <parameter name="DEC" scale="1.0" value="22.0145" min="-90" max="90" free="0"/>
12 12 </spatialModel>
... ...
test/data/crab_bkgcube.xml
  View file @946b1e3
... ... @@ -6,7 +6,7 @@
6 6 <parameter name="Index" value="2.48" error="0" scale="-1" min="0" max="5" free="1" />
7 7 <parameter name="Scale" value="0.3" scale="1e+06" min="0.01" max="1000" free="0" />
8 8 </spectrum>
9   - <spatialModel type="SkyDirFunction">
  9 + <spatialModel type="PointSource">
10 10 <parameter name="RA" value="83.6331" scale="1" min="-360" max="360" free="0" />
11 11 <parameter name="DEC" value="22.0145" scale="1" min="-90" max="90" free="0" />
12 12 </spatialModel>
... ...
test/data/disk.xml
  View file @946b1e3
... ... @@ -6,7 +6,7 @@
6 6 <parameter name="Index" scale="-1" value="2.48" min="0.0" max="+5.0" free="1"/>
7 7 <parameter name="Scale" scale="1e6" value="0.3" min="0.01" max="1000.0" free="0"/>
8 8 </spectrum>
9   - <spatialModel type="DiskFunction">
  9 + <spatialModel type="RadialDisk">
10 10 <parameter name="RA" scale="1.0" value="83.6331" min="-360" max="360" free="1"/>
11 11 <parameter name="DEC" scale="1.0" value="22.0145" min="-90" max="90" free="1"/>
12 12 <parameter name="Radius" scale="1.0" value="0.45" min="0.01" max="10" free="1"/>
... ...
test/data/gauss.xml
  View file @946b1e3
... ... @@ -6,7 +6,7 @@
6 6 <parameter name="Index" scale="-1" value="2.48" min="0.0" max="+5.0" free="1"/>
7 7 <parameter name="Scale" scale="1e6" value="0.3" min="0.01" max="1000.0" free="0"/>
8 8 </spectrum>
9   - <spatialModel type="GaussFunction">
  9 + <spatialModel type="RadialGaussian">
10 10 <parameter name="RA" scale="1.0" value="83.6331" min="-360" max="360" free="1"/>
11 11 <parameter name="DEC" scale="1.0" value="22.0145" min="-90" max="90" free="1"/>
12 12 <parameter name="Sigma" scale="1.0" value="0.20" min="0.01" max="10" free="1"/>
... ...
test/data/sciver/crab_const.xml
  View file @946b1e3
... ... @@ -6,7 +6,7 @@
6 6 <parameter name="Index" scale="-1" value="2.48" min="0.0" max="+5.0" free="1"/>
7 7 <parameter name="Scale" scale="1e6" value="0.3" min="0.01" max="1000.0" free="0"/>
8 8 </spectrum>
9   - <spatialModel type="ConstantValue">
  9 + <spatialModel type="DiffuseIsotropic">
10 10 <parameter name="Value" scale="1" value="1" min="0.1" max="10" free="0"/>
11 11 </spatialModel>
12 12 </source>
... ...
test/data/sciver/crab_cube.xml
  View file @946b1e3
... ... @@ -6,7 +6,7 @@
6 6 <parameter name="Index" scale="1.0" value="0.0" min="-5.0" max="+5.0" free="1"/>
7 7 <parameter name="Scale" scale="1e6" value="1.0" min="0.01" max="1000.0" free="0"/>
8 8 </spectrum>
9   - <spatialModel type="MapCubeFunction" file="data/sciver/crab_cube.fits">
  9 + <spatialModel type="DiffuseMapCube" file="data/sciver/crab_cube.fits">
10 10 <parameter name="Normalization" scale="1" value="1" min="0.1" max="10" free="0"/>
11 11 </spatialModel>
12 12 </source>
... ...
test/data/sciver/crab_egauss.xml
  View file @946b1e3
... ... @@ -6,7 +6,7 @@
6 6 <parameter name="Index" scale="-1" value="2.48" min="0.0" max="+5.0" free="1"/>
7 7 <parameter name="Scale" scale="1e6" value="0.3" min="0.01" max="1000.0" free="0"/>
8 8 </spectrum>
9   - <spatialModel type="EllipticalGauss">
  9 + <spatialModel type="EllipticalGaussian">
10 10 <parameter name="RA" scale="1.0" value="83.6331" min="-360" max="360" free="1"/>
11 11 <parameter name="DEC" scale="1.0" value="22.0145" min="-90" max="90" free="1"/>
12 12 <parameter name="PA" scale="1.0" value="45.0" min="-360" max="360" free="1"/>
... ...
test/data/sciver/crab_eplaw.xml
  View file @946b1e3
... ... @@ -7,7 +7,7 @@
7 7 <parameter name="Cutoff" scale="1e6" value="1.0" min="0.01" max="1000.0" free="1"/>
8 8 <parameter name="Scale" scale="1e6" value="0.3" min="0.01" max="1000.0" free="0"/>
9 9 </spectrum>
10   - <spatialModel type="SkyDirFunction">
  10 + <spatialModel type="PointSource">
11 11 <parameter name="RA" scale="1.0" value="83.6331" min="-360" max="360" free="0"/>
12 12 <parameter name="DEC" scale="1.0" value="22.0145" min="-90" max="90" free="0"/>
13 13 </spatialModel>
... ...
test/data/sciver/crab_filefct.xml
  View file @946b1e3
... ... @@ -4,7 +4,7 @@
4 4 <spectrum type="FileFunction" file="data/sciver/filefunction.txt">
5 5 <parameter scale="1.0" name="Normalization" min="0.0" max="1000.0" value="1.0" free="1"/>
6 6 </spectrum>
7   - <spatialModel type="SkyDirFunction">
  7 + <spatialModel type="PointSource">
8 8 <parameter name="RA" scale="1.0" value="83.6331" min="-360" max="360" free="0"/>
9 9 <parameter name="DEC" scale="1.0" value="22.0145" min="-90" max="90" free="0"/>
10 10 </spatialModel>
... ...
test/data/sciver/crab_gauss.xml
  View file @946b1e3
... ... @@ -6,7 +6,7 @@
6 6 <parameter name="Mean" scale="1e6" value="5.0" min="0.01" max="100.0" free="1"/>
7 7 <parameter name="Sigma" scale="1e6" value="1.0" min="0.01" max="100.0" free="1"/>
8 8 </spectrum>
9   - <spatialModel type="SkyDirFunction">
  9 + <spatialModel type="PointSource">
10 10 <parameter name="RA" scale="1.0" value="83.6331" min="-360" max="360" free="0"/>
11 11 <parameter name="DEC" scale="1.0" value="22.0145" min="-90" max="90" free="0"/>
12 12 </spatialModel>
... ...
test/data/sciver/crab_logparabola.xml
  View file @946b1e3
... ... @@ -7,7 +7,7 @@
7 7 <parameter name="Curvature" scale="-1" value="0.074" min="0.01" max="1000.0" free="1"/>
8 8 <parameter name="Scale" scale="1e6" value="1.0" min="0.01" max="1000.0" free="0"/>
9 9 </spectrum>
10   - <spatialModel type="SkyDirFunction">
  10 + <spatialModel type="PointSource">
11 11 <parameter name="RA" scale="1.0" value="83.6331" min="-360" max="360" free="0"/>
12 12 <parameter name="DEC" scale="1.0" value="22.0145" min="-90" max="90" free="0"/>
13 13 </spatialModel>
... ...
test/data/sciver/crab_map.xml
  View file @946b1e3
... ... @@ -6,7 +6,7 @@
6 6 <parameter name="Index" scale="-1" value="2.48" min="0.0" max="+5.0" free="1"/>
7 7 <parameter name="Scale" scale="1e6" value="0.3" min="0.01" max="1000.0" free="0"/>
8 8 </spectrum>
9   - <spatialModel type="SpatialMap" file="data/sciver/cena_lobes_parkes.fits">
  9 + <spatialModel type="DiffuseMap" file="data/sciver/cena_lobes_parkes.fits">
10 10 <parameter scale="1" name="Prefactor" min="0.001" max="1000.0" value="1" free="0"/>
11 11 </spatialModel>
12 12 </source>
... ...
test/data/sciver/crab_map_nn.xml
  View file @946b1e3
... ... @@ -6,7 +6,7 @@
6 6 <parameter name="Index" scale="-1" value="2.48" min="0.0" max="+5.0" free="1"/>
7 7 <parameter name="Scale" scale="1e6" value="0.3" min="0.01" max="1000.0" free="0"/>
8 8 </spectrum>
9   - <spatialModel type="SpatialMap" file="data/sciver/cena_lobes_parkes.fits" normalize="0">
  9 + <spatialModel type="DiffuseMap" file="data/sciver/cena_lobes_parkes.fits" normalize="0">
10 10 <parameter scale="1" name="Prefactor" min="0.001" max="1000.0" value="0.3" free="0"/>
11 11 </spatialModel>
12 12 </source>
... ...
test/data/sciver/crab_map_roi.xml
  View file @946b1e3
... ... @@ -6,7 +6,7 @@
6 6 <parameter name="Index" scale="-1" value="2.48" min="0.0" max="+5.0" free="1"/>
7 7 <parameter name="Scale" scale="1e6" value="0.3" min="0.01" max="1000.0" free="0"/>
8 8 </spectrum>
9   - <spatialModel type="SpatialMap" file="data/sciver/cena_lobes_parkes.fits">
  9 + <spatialModel type="DiffuseMap" file="data/sciver/cena_lobes_parkes.fits">
10 10 <parameter scale="1" name="Prefactor" min="0.001" max="1000.0" value="1" free="0"/>
11 11 </spatialModel>
12 12 </source>
... ...
test/data/sciver/crab_nodes.xml
  View file @946b1e3
... ... @@ -19,7 +19,7 @@
19 19 <parameter scale="1e-22" name="Intensity" min="1e-07" max="1000.0" value="8.0" free="1"/>
20 20 </node>
21 21 </spectrum>
22   - <spatialModel type="SkyDirFunction">
  22 + <spatialModel type="PointSource">
23 23 <parameter name="RA" scale="1.0" value="83.6331" min="-360" max="360" free="0"/>
24 24 <parameter name="DEC" scale="1.0" value="22.0145" min="-90" max="90" free="0"/>
25 25 </spatialModel>
... ...
test/data/sciver/crab_plaw.xml
  View file @946b1e3
... ... @@ -6,7 +6,7 @@
6 6 <parameter name="Index" scale="-1" value="2.48" min="0.0" max="+5.0" free="1"/>
7 7 <parameter name="Scale" scale="1e6" value="0.3" min="0.01" max="1000.0" free="0"/>
8 8 </spectrum>
9   - <spatialModel type="SkyDirFunction">
  9 + <spatialModel type="PointSource">
10 10 <parameter name="RA" scale="1.0" value="83.6331" min="-360" max="360" free="0"/>
11 11 <parameter name="DEC" scale="1.0" value="22.0145" min="-90" max="90" free="0"/>
12 12 </spatialModel>
... ...
test/data/sciver/crab_plaw2.xml
  View file @946b1e3
... ... @@ -7,7 +7,7 @@
7 7 <parameter name="LowerLimit" scale="1.0" value="100.0" min="10.0" max="1000000.0" free="0"/>
8 8 <parameter name="UpperLimit" scale="1.0" value="500000.0" min="10.0" max="1000000.0" free="0"/>
9 9 </spectrum>
10   - <spatialModel type="SkyDirFunction">
  10 + <spatialModel type="PointSource">
11 11 <parameter name="RA" scale="1.0" value="83.6331" min="-360" max="360" free="0"/>
12 12 <parameter name="DEC" scale="1.0" value="22.0145" min="-90" max="90" free="0"/>
13 13 </spatialModel>
... ...
test/data/sciver/crab_plaw_edisp.xml
  View file @946b1e3
... ... @@ -6,7 +6,7 @@
6 6 <parameter name="Index" scale="-1" value="2.48" min="0.0" max="+5.0" free="1"/>
7 7 <parameter name="Scale" scale="1e6" value="0.3" min="0.01" max="1000.0" free="0"/>
8 8 </spectrum>
9   - <spatialModel type="SkyDirFunction">
  9 + <spatialModel type="PointSource">
10 10 <parameter name="RA" scale="1.0" value="83.6331" min="-360" max="360" free="0"/>
11 11 <parameter name="DEC" scale="1.0" value="22.0145" min="-90" max="90" free="0"/>
12 12 </spatialModel>
... ...
test/data/sciver/crab_ptsrc.xml
  View file @946b1e3
... ... @@ -6,7 +6,7 @@
6 6 <parameter name="Index" scale="-1" value="2.48" min="0.0" max="+5.0" free="1"/>
7 7 <parameter name="Scale" scale="1e6" value="0.3" min="0.01" max="1000.0" free="0"/>
8 8 </spectrum>
9   - <spatialModel type="SkyDirFunction">
  9 + <spatialModel type="PointSource">
10 10 <parameter name="RA" scale="1.0" value="83.6331" min="-360" max="360" free="1"/>
11 11 <parameter name="DEC" scale="1.0" value="22.0145" min="-90" max="90" free="1"/>
12 12 </spatialModel>
... ...
test/data/sciver/crab_rdisk.xml
  View file @946b1e3
... ... @@ -6,7 +6,7 @@
6 6 <parameter name="Index" scale="-1" value="2.48" min="0.0" max="+5.0" free="1"/>
7 7 <parameter name="Scale" scale="1e6" value="0.3" min="0.01" max="1000.0" free="0"/>
8 8 </spectrum>
9   - <spatialModel type="DiskFunction">
  9 + <spatialModel type="RadialDisk">
10 10 <parameter name="RA" scale="1.0" value="83.6331" min="-360" max="360" free="1"/>
11 11 <parameter name="DEC" scale="1.0" value="22.0145" min="-90" max="90" free="1"/>
12 12 <parameter name="Radius" scale="1.0" value="0.2" min="0.01" max="10" free="1"/>
... ...
test/data/sciver/crab_rgauss.xml
  View file @946b1e3
... ... @@ -6,7 +6,7 @@
6 6 <parameter name="Index" scale="-1" value="2.48" min="0.0" max="+5.0" free="1"/>
7 7 <parameter name="Scale" scale="1e6" value="0.3" min="0.01" max="1000.0" free="0"/>
8 8 </spectrum>
9   - <spatialModel type="GaussFunction">
  9 + <spatialModel type="RadialGaussian">
10 10 <parameter name="RA" scale="1.0" value="83.6331" min="-360" max="360" free="1"/>
11 11 <parameter name="DEC" scale="1.0" value="22.0145" min="-90" max="90" free="1"/>
12 12 <parameter name="Sigma" scale="1.0" value="0.20" min="0.01" max="10" free="1"/>
... ...
test/data/sciver/crab_rshell.xml
  View file @946b1e3
... ... @@ -6,7 +6,7 @@
6 6 <parameter name="Index" scale="-1" value="2.48" min="0.0" max="+5.0" free="1"/>
7 7 <parameter name="Scale" scale="1e6" value="0.3" min="0.01" max="1000.0" free="0"/>
8 8 </spectrum>
9   - <spatialModel type="ShellFunction">
  9 + <spatialModel type="RadialShell">
10 10 <parameter name="RA" scale="1.0" value="83.6331" min="-360" max="360" free="1"/>
11 11 <parameter name="DEC" scale="1.0" value="22.0145" min="-90" max="90" free="1"/>
12 12 <parameter name="Radius" scale="1.0" value="0.30" min="0.01" max="10" free="1"/>
... ...
test/data/sciver/crab_supeplaw.xml
  View file @946b1e3
... ... @@ -8,7 +8,7 @@
8 8 <parameter name="Scale" scale="1e6" value="1.0" min="0.01" max="1000.0" free="0"/>
9 9 <parameter name="Index2" scale="1.0" value="1.5" min="0.1" max="5.0" free="1"/>
10 10 </spectrum>
11   - <spatialModel type="SkyDirFunction">
  11 + <spatialModel type="PointSource">
12 12 <parameter name="RA" scale="1.0" value="83.6331" min="-360" max="360" free="0"/>
13 13 <parameter name="DEC" scale="1.0" value="22.0145" min="-90" max="90" free="0"/>
14 14 </spatialModel>
... ...
test/data/shell.xml
  View file @946b1e3
... ... @@ -6,7 +6,7 @@
6 6 <parameter name="Index" scale="-1" value="2.48" min="0.0" max="+5.0" free="1"/>
7 7 <parameter name="Scale" scale="1e6" value="0.3" min="0.01" max="1000.0" free="0"/>
8 8 </spectrum>
9   - <spatialModel type="ShellFunction">
  9 + <spatialModel type="RadialShell">
10 10 <parameter name="RA" scale="1.0" value="83.6331" min="-360" max="360" free="1"/>
11 11 <parameter name="DEC" scale="1.0" value="22.0145" min="-90" max="90" free="1"/>
12 12 <parameter name="Radius" scale="1.0" value="0.30" min="0.01" max="10" free="1"/>
... ...
test/data/source1.xml
  View file @946b1e3
1 1 <?xml version="1.0" standalone="no"?>
2 2 <source_library title="source library">
3   - <source name="Source1" type="PointSource">
4   - <spectrum type="PowerLaw">
5   - <parameter scale="1e-07" name="Prefactor" min="1e-07" max="1000.0" value="1.0" 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="117.0" />
11   - <parameter free="0" max="90" min="-90" name="DEC" scale="1" value="-33.0" />
12   - </spatialModel>
13   - </source>
  3 + <source name="Source1" type="PointSource">
  4 + <spectrum type="PowerLaw">
  5 + <parameter scale="1e-07" name="Prefactor" min="1e-07" max="1000.0" value="1.0" 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="PointSource">
  10 + <parameter free="0" max="360" min="-360" name="RA" scale="1" value="117.0" />
  11 + <parameter free="0" max="90" min="-90" name="DEC" scale="1" value="-33.0" />
  12 + </spatialModel>
  13 + </source>
14 14 </source_library>
15 15  
... ...