From 380acc1dc0352c71786afee4973381876fc135f4 Mon Sep 17 00:00:00 2001 From: Jürgen Knödlseder Date: Thu, 23 May 2019 10:09:19 +0200 Subject: [PATCH] Adapt Sphinx documentation to new sky model output format --- doc/source/users/tutorials/1dc/first_onoff.rst | 4 ++-- doc/source/users/tutorials/hess_dr1/bkgmodel.ipynb | 4 ---- doc/source/users/tutorials/hess_dr1/classical.ipynb | 14 +++++--------- doc/source/users/tutorials/hess_dr1/skymap.ipynb | 4 ++-- doc/source/users/tutorials/hess_dr1/unbinned.ipynb | 14 +++++--------- doc/source/users/tutorials/howto/comptel/howto_comptel_fitting.rst | 2 +- doc/source/users/tutorials/howto/fermi/howto_fermi_fitting.rst | 6 +++--- doc/source/users/tutorials/howto/howto_advanced_python_fitting.ipynb | 7 +++---- doc/source/users/tutorials/howto/howto_connect_irfs.rst | 3 +-- doc/source/users/tutorials/howto/howto_connect_models.ipynb | 4 +--- doc/source/users/tutorials/howto/howto_extent.rst | 2 +- doc/source/users/tutorials/howto/howto_stacked_analysis.ipynb | 3 +-- doc/source/users/tutorials/howto/iact/analysis.rst | 6 ------ doc/source/users/tutorials/quickstart/ctools-from-python.ipynb | 6 ++---- doc/source/users/tutorials/quickstart/energy_dispersion.rst | 6 ++---- doc/source/users/tutorials/quickstart/fitting.rst | 3 +-- doc/source/users/tutorials/quickstart/onoff.rst | 6 ++---- doc/source/users/tutorials/quickstart/unbinned.rst | 3 +-- 18 files changed, 33 insertions(+), 64 deletions(-) diff --git a/doc/source/users/tutorials/1dc/first_onoff.rst b/doc/source/users/tutorials/1dc/first_onoff.rst index e66ddcd..1886e95 100644 --- a/doc/source/users/tutorials/1dc/first_onoff.rst +++ b/doc/source/users/tutorials/1dc/first_onoff.rst @@ -334,7 +334,6 @@ The fit result can be inspected by peeking the log file: 2019-04-09T13:23:01: === GModelSky === 2019-04-09T13:23:01: Name ......................: Dummy 2019-04-09T13:23:01: Instruments ...............: all - 2019-04-09T13:23:01: Instrument scale factors ..: unity 2019-04-09T13:23:01: Observation identifiers ...: all 2019-04-09T13:23:01: Model type ................: PointSource 2019-04-09T13:23:01: Model components ..........: "PointSource" * "PowerLaw" * "Constant" @@ -348,6 +347,7 @@ The fit result can be inspected by peeking the log file: 2019-04-09T13:23:01: PivotEnergy ..............: 1000000 MeV (fixed,scale=1000000,gradient) 2019-04-09T13:23:01: Number of temporal par's ..: 1 2019-04-09T13:23:01: Normalization ............: 1 (relative value) (fixed,scale=1,gradient) + 2019-04-09T13:23:01: Number of scale par's .....: 0 .. tip:: By default the ``WSTAT`` statistic is used which does not require a @@ -422,7 +422,6 @@ The fit result can be inspected by peeking the log file: 2019-04-09T21:27:21: === GModelSky === 2019-04-09T21:27:21: Name ......................: Cassiopeia A 2019-04-09T21:27:21: Instruments ...............: all - 2019-04-09T21:27:21: Instrument scale factors ..: unity 2019-04-09T21:27:21: Observation identifiers ...: all 2019-04-09T21:27:21: Model type ................: PointSource 2019-04-09T21:27:21: Model components ..........: "PointSource" * "PowerLaw" * "Constant" @@ -436,6 +435,7 @@ The fit result can be inspected by peeking the log file: 2019-04-09T21:27:21: PivotEnergy ..............: 1000000 MeV (fixed,scale=1000000,gradient) 2019-04-09T21:27:21: Number of temporal par's ..: 1 2019-04-09T21:27:21: Normalization ............: 1 (relative value) (fixed,scale=1,gradient) + 2019-04-09T21:27:21: Number of scale par's .....: 0 Visualising the source spectrum diff --git a/doc/source/users/tutorials/hess_dr1/bkgmodel.ipynb b/doc/source/users/tutorials/hess_dr1/bkgmodel.ipynb index 2fd4a01..0a2a856 100644 --- a/doc/source/users/tutorials/hess_dr1/bkgmodel.ipynb +++ b/doc/source/users/tutorials/hess_dr1/bkgmodel.ipynb @@ -89,7 +89,6 @@ "=== GCTAModelBackground ===\n", " Name ......................: Background_023523\n", " Instruments ...............: HESS\n", - " Instrument scale factors ..: unity\n", " Observation identifiers ...: 023523\n", " Model type ................: CTABackground\n", " Model components ..........: \"Multiplicative\" * \"NodeFunction\" * \"Constant\"\n", @@ -120,7 +119,6 @@ "=== GCTAModelBackground ===\n", " Name ......................: Background_023526\n", " Instruments ...............: HESS\n", - " Instrument scale factors ..: unity\n", " Observation identifiers ...: 023526\n", " Model type ................: CTABackground\n", " Model components ..........: \"Multiplicative\" * \"NodeFunction\" * \"Constant\"\n", @@ -151,7 +149,6 @@ "=== GCTAModelBackground ===\n", " Name ......................: Background_023559\n", " Instruments ...............: HESS\n", - " Instrument scale factors ..: unity\n", " Observation identifiers ...: 023559\n", " Model type ................: CTABackground\n", " Model components ..........: \"Multiplicative\" * \"NodeFunction\" * \"Constant\"\n", @@ -182,7 +179,6 @@ "=== GCTAModelBackground ===\n", " Name ......................: Background_023592\n", " Instruments ...............: HESS\n", - " Instrument scale factors ..: unity\n", " Observation identifiers ...: 023592\n", " Model type ................: CTABackground\n", " Model components ..........: \"Multiplicative\" * \"NodeFunction\" * \"Constant\"\n", diff --git a/doc/source/users/tutorials/hess_dr1/classical.ipynb b/doc/source/users/tutorials/hess_dr1/classical.ipynb index 14c437e..26dd3be 100644 --- a/doc/source/users/tutorials/hess_dr1/classical.ipynb +++ b/doc/source/users/tutorials/hess_dr1/classical.ipynb @@ -190,7 +190,6 @@ "=== GModelSky ===\n", " Name ......................: Dummy\n", " Instruments ...............: all\n", - " Instrument scale factors ..: unity\n", " Observation identifiers ...: all\n", " Model type ................: PointSource\n", " Model components ..........: \"PointSource\" * \"PowerLaw\" * \"Constant\"\n", @@ -203,7 +202,8 @@ " Index ....................: -2 +/- 0 [10,-10] (free,scale=-2,gradient)\n", " PivotEnergy ..............: 1000000 MeV (fixed,scale=1000000,gradient)\n", " Number of temporal par's ..: 1\n", - " Normalization ............: 1 (relative value) (fixed,scale=1,gradient)\n" + " Normalization ............: 1 (relative value) (fixed,scale=1,gradient)\n", + " Number of scale par's .....: 0\n" ] } ], @@ -277,7 +277,6 @@ "=== GModelSky ===\n", " Name ......................: Crab\n", " Instruments ...............: all\n", - " Instrument scale factors ..: unity\n", " Observation identifiers ...: all\n", " Model type ................: PointSource\n", " Model components ..........: \"PointSource\" * \"PowerLaw\" * \"Constant\"\n", @@ -290,7 +289,8 @@ " Index ....................: -2.63298373450669 +/- 0.0795120102122515 [10,-10] (free,scale=-2,gradient)\n", " PivotEnergy ..............: 1000000 MeV (fixed,scale=1000000,gradient)\n", " Number of temporal par's ..: 1\n", - " Normalization ............: 1 (relative value) (fixed,scale=1,gradient)\n" + " Normalization ............: 1 (relative value) (fixed,scale=1,gradient)\n", + " Number of scale par's .....: 0\n" ] } ], @@ -428,7 +428,6 @@ "=== GModelSky ===\n", " Name ......................: Crab\n", " Instruments ...............: all\n", - " Instrument scale factors ..: unity\n", " Observation identifiers ...: all\n", " Model type ................: PointSource\n", " Model components ..........: \"PointSource\" * \"PowerLaw\" * \"Constant\"\n", @@ -442,10 +441,10 @@ " PivotEnergy ..............: 1000000 [10000,1000000000] MeV (fixed,scale=1000000,gradient)\n", " Number of temporal par's ..: 1\n", " Normalization ............: 1 (relative value) (fixed,scale=1,gradient)\n", + " Number of scale par's .....: 0\n", "=== GCTAModelBackground ===\n", " Name ......................: Background_023523\n", " Instruments ...............: HESSOnOff\n", - " Instrument scale factors ..: unity\n", " Observation identifiers ...: 023523\n", " Model type ................: CTABackground\n", " Model components ..........: \"Multiplicative\" * \"NodeFunction\" * \"Constant\"\n", @@ -476,7 +475,6 @@ "=== GCTAModelBackground ===\n", " Name ......................: Background_023526\n", " Instruments ...............: HESSOnOff\n", - " Instrument scale factors ..: unity\n", " Observation identifiers ...: 023526\n", " Model type ................: CTABackground\n", " Model components ..........: \"Multiplicative\" * \"NodeFunction\" * \"Constant\"\n", @@ -507,7 +505,6 @@ "=== GCTAModelBackground ===\n", " Name ......................: Background_023559\n", " Instruments ...............: HESSOnOff\n", - " Instrument scale factors ..: unity\n", " Observation identifiers ...: 023559\n", " Model type ................: CTABackground\n", " Model components ..........: \"Multiplicative\" * \"NodeFunction\" * \"Constant\"\n", @@ -538,7 +535,6 @@ "=== GCTAModelBackground ===\n", " Name ......................: Background_023592\n", " Instruments ...............: HESSOnOff\n", - " Instrument scale factors ..: unity\n", " Observation identifiers ...: 023592\n", " Model type ................: CTABackground\n", " Model components ..........: \"Multiplicative\" * \"NodeFunction\" * \"Constant\"\n", diff --git a/doc/source/users/tutorials/hess_dr1/skymap.ipynb b/doc/source/users/tutorials/hess_dr1/skymap.ipynb index 74859a9..0fbb56c 100644 --- a/doc/source/users/tutorials/hess_dr1/skymap.ipynb +++ b/doc/source/users/tutorials/hess_dr1/skymap.ipynb @@ -172,7 +172,6 @@ "=== GModelSky ===\n", " Name ......................: Src001\n", " Instruments ...............: all\n", - " Instrument scale factors ..: unity\n", " Observation identifiers ...: all\n", " Model type ................: PointSource\n", " Model components ..........: \"PointSource\" * \"PowerLaw\" * \"Constant\"\n", @@ -185,7 +184,8 @@ " Index ....................: -2.48 +/- 0 [10,-10] (free,scale=-2.48,gradient)\n", " PivotEnergy ..............: 300000 MeV (fixed,scale=300000,gradient)\n", " Number of temporal par's ..: 1\n", - " Normalization ............: 1 (relative value) (fixed,scale=1,gradient)\n" + " Normalization ............: 1 (relative value) (fixed,scale=1,gradient)\n", + " Number of scale par's .....: 0\n" ] } ], diff --git a/doc/source/users/tutorials/hess_dr1/unbinned.ipynb b/doc/source/users/tutorials/hess_dr1/unbinned.ipynb index de5cf12..8e14b31 100644 --- a/doc/source/users/tutorials/hess_dr1/unbinned.ipynb +++ b/doc/source/users/tutorials/hess_dr1/unbinned.ipynb @@ -95,7 +95,6 @@ "=== GModelSky ===\n", " Name ......................: Src001\n", " Instruments ...............: all\n", - " Instrument scale factors ..: unity\n", " Observation identifiers ...: all\n", " Model type ................: PointSource\n", " Model components ..........: \"PointSource\" * \"PowerLaw\" * \"Constant\"\n", @@ -109,10 +108,10 @@ " PivotEnergy ..............: 300000 MeV (fixed,scale=300000,gradient)\n", " Number of temporal par's ..: 1\n", " Normalization ............: 1 (relative value) (fixed,scale=1,gradient)\n", + " Number of scale par's .....: 0\n", "=== GCTAModelBackground ===\n", " Name ......................: Background_023523\n", " Instruments ...............: HESS\n", - " Instrument scale factors ..: unity\n", " Observation identifiers ...: 023523\n", " Model type ................: CTABackground\n", " Model components ..........: \"Multiplicative\" * \"NodeFunction\" * \"Constant\"\n", @@ -143,7 +142,6 @@ "=== GCTAModelBackground ===\n", " Name ......................: Background_023526\n", " Instruments ...............: HESS\n", - " Instrument scale factors ..: unity\n", " Observation identifiers ...: 023526\n", " Model type ................: CTABackground\n", " Model components ..........: \"Multiplicative\" * \"NodeFunction\" * \"Constant\"\n", @@ -174,7 +172,6 @@ "=== GCTAModelBackground ===\n", " Name ......................: Background_023559\n", " Instruments ...............: HESS\n", - " Instrument scale factors ..: unity\n", " Observation identifiers ...: 023559\n", " Model type ................: CTABackground\n", " Model components ..........: \"Multiplicative\" * \"NodeFunction\" * \"Constant\"\n", @@ -205,7 +202,6 @@ "=== GCTAModelBackground ===\n", " Name ......................: Background_023592\n", " Instruments ...............: HESS\n", - " Instrument scale factors ..: unity\n", " Observation identifiers ...: 023592\n", " Model type ................: CTABackground\n", " Model components ..........: \"Multiplicative\" * \"NodeFunction\" * \"Constant\"\n", @@ -330,7 +326,6 @@ "=== GModelSky ===\n", " Name ......................: Crab\n", " Instruments ...............: all\n", - " Instrument scale factors ..: unity\n", " Observation identifiers ...: all\n", " Model type ................: PointSource\n", " Model components ..........: \"PointSource\" * \"PowerLaw\" * \"Constant\"\n", @@ -343,7 +338,8 @@ " Index ....................: -2.68230589724908 +/- 0.0650730512302727 [10,-10] (free,scale=-2.48,gradient)\n", " PivotEnergy ..............: 999999.999999999 MeV (fixed,scale=300000,gradient)\n", " Number of temporal par's ..: 1\n", - " Normalization ............: 1 (relative value) (fixed,scale=1,gradient)\n" + " Normalization ............: 1 (relative value) (fixed,scale=1,gradient)\n", + " Number of scale par's .....: 0\n" ] } ], @@ -396,7 +392,6 @@ "=== GModelSky ===\n", " Name ......................: Crab\n", " Instruments ...............: all\n", - " Instrument scale factors ..: unity\n", " Observation identifiers ...: all\n", " Model type ................: PointSource\n", " Model components ..........: \"PointSource\" * \"PowerLaw\" * \"Constant\"\n", @@ -409,7 +404,8 @@ " Index ....................: -2.66140151299329 +/- 0.0671763204868478 [10,-10] (free,scale=-2.48,gradient)\n", " PivotEnergy ..............: 999999.999999999 MeV (fixed,scale=300000,gradient)\n", " Number of temporal par's ..: 1\n", - " Normalization ............: 1 (relative value) (fixed,scale=1,gradient)\n" + " Normalization ............: 1 (relative value) (fixed,scale=1,gradient)\n", + " Number of scale par's .....: 0\n" ] } ], diff --git a/doc/source/users/tutorials/howto/comptel/howto_comptel_fitting.rst b/doc/source/users/tutorials/howto/comptel/howto_comptel_fitting.rst index 6292102..f638e62 100755 --- a/doc/source/users/tutorials/howto/comptel/howto_comptel_fitting.rst +++ b/doc/source/users/tutorials/howto/comptel/howto_comptel_fitting.rst @@ -245,7 +245,6 @@ log file ``ctlike.log`` that was also created by :ref:`ctlike`: 2019-04-04T15:11:40: Name ......................: Crab 2019-04-04T15:11:40: Instruments ...............: all 2019-04-04T15:11:40: Test Statistic ............: 915.478960024426 - 2019-04-04T15:11:40: Instrument scale factors ..: unity 2019-04-04T15:11:40: Observation identifiers ...: all 2019-04-04T15:11:40: Model type ................: PointSource 2019-04-04T15:11:40: Model components ..........: "PointSource" * "PowerLaw" * "Constant" @@ -259,6 +258,7 @@ log file ``ctlike.log`` that was also created by :ref:`ctlike`: 2019-04-04T15:11:40: PivotEnergy ..............: 1 [0.01,1000] MeV (fixed,scale=1,gradient) 2019-04-04T15:11:40: Number of temporal par's ..: 1 2019-04-04T15:11:40: Normalization ............: 1 (relative value) (fixed,scale=1,gradient) + 2019-04-04T15:11:40: Number of scale par's .....: 0 The fit converged after 10 iterations and did a second fit without the source component to determine the Test Statistic value of the Crab. diff --git a/doc/source/users/tutorials/howto/fermi/howto_fermi_fitting.rst b/doc/source/users/tutorials/howto/fermi/howto_fermi_fitting.rst index 7668232..cd54a7f 100755 --- a/doc/source/users/tutorials/howto/fermi/howto_fermi_fitting.rst +++ b/doc/source/users/tutorials/howto/fermi/howto_fermi_fitting.rst @@ -137,7 +137,6 @@ log file ``ctlike.log`` that was also created by :ref:`ctlike`: 2019-04-04T14:34:30: === GModelSky === 2019-04-04T14:34:30: Name ......................: Vela 2019-04-04T14:34:30: Instruments ...............: all - 2019-04-04T14:34:30: Instrument scale factors ..: unity 2019-04-04T14:34:30: Observation identifiers ...: all 2019-04-04T14:34:30: Model type ................: PointSource 2019-04-04T14:34:30: Model components ..........: "PointSource" * "SuperExponentialCutoffPowerLaw" * "Constant" @@ -153,10 +152,10 @@ log file ``ctlike.log`` that was also created by :ref:`ctlike`: 2019-04-04T14:34:30: Index2 ...................: 0.58755011716699 +/- 0.027919253961318 [0.1,5] (free,scale=1,gradient) 2019-04-04T14:34:30: Number of temporal par's ..: 1 2019-04-04T14:34:30: Normalization ............: 1 (relative value) (fixed,scale=1,gradient) + 2019-04-04T14:34:30: Number of scale par's .....: 0 2019-04-04T14:34:30: === GModelSky === 2019-04-04T14:34:30: Name ......................: Galactic_diffuse 2019-04-04T14:34:30: Instruments ...............: all - 2019-04-04T14:34:30: Instrument scale factors ..: unity 2019-04-04T14:34:30: Observation identifiers ...: all 2019-04-04T14:34:30: Model type ................: DiffuseSource 2019-04-04T14:34:30: Model components ..........: "DiffuseMapCube" * "Constant" * "Constant" @@ -167,10 +166,10 @@ log file ``ctlike.log`` that was also created by :ref:`ctlike`: 2019-04-04T14:34:30: Normalization ............: 1.10941973066989 +/- 0.00503412002600817 [0.1,1000] (free,scale=1,gradient) 2019-04-04T14:34:30: Number of temporal par's ..: 1 2019-04-04T14:34:30: Normalization ............: 1 (relative value) (fixed,scale=1,gradient) + 2019-04-04T14:34:30: Number of scale par's .....: 0 2019-04-04T14:34:30: === GModelSky === 2019-04-04T14:34:30: Name ......................: Extragalactic_diffuse 2019-04-04T14:34:30: Instruments ...............: all - 2019-04-04T14:34:30: Instrument scale factors ..: unity 2019-04-04T14:34:30: Observation identifiers ...: all 2019-04-04T14:34:30: Model type ................: DiffuseSource 2019-04-04T14:34:30: Model components ..........: "DiffuseIsotropic" * "FileFunction" * "Constant" @@ -181,6 +180,7 @@ log file ``ctlike.log`` that was also created by :ref:`ctlike`: 2019-04-04T14:34:30: Normalization ............: 1 [0,1000] (fixed,scale=1,gradient) 2019-04-04T14:34:30: Number of temporal par's ..: 1 2019-04-04T14:34:30: Normalization ............: 1 (relative value) (fixed,scale=1,gradient) + 2019-04-04T14:34:30: Number of scale par's .....: 0 The fit converged after 19 iterations with spectral parameters that are reasonably close to those found in diff --git a/doc/source/users/tutorials/howto/howto_advanced_python_fitting.ipynb b/doc/source/users/tutorials/howto/howto_advanced_python_fitting.ipynb index 529c5e7..6a275e0 100644 --- a/doc/source/users/tutorials/howto/howto_advanced_python_fitting.ipynb +++ b/doc/source/users/tutorials/howto/howto_advanced_python_fitting.ipynb @@ -246,7 +246,6 @@ "=== GModelSky ===\n", " Name ......................: Crab\n", " Instruments ...............: all\n", - " Instrument scale factors ..: unity\n", " Observation identifiers ...: all\n", " Model type ................: PointSource\n", " Model components ..........: \"PointSource\" * \"PowerLaw\" * \"Constant\"\n", @@ -260,10 +259,10 @@ " PivotEnergy ..............: 300000 [10000,1000000000] MeV (fixed,scale=1000000,gradient)\n", " Number of temporal par's ..: 1\n", " Normalization ............: 1 (relative value) (fixed,scale=1,gradient)\n", + " Number of scale par's .....: 0\n", "=== GCTAModelIrfBackground ===\n", " Name ......................: CTABackgroundModel\n", " Instruments ...............: CTA\n", - " Instrument scale factors ..: unity\n", " Observation identifiers ...: all\n", " Model type ................: \"PowerLaw\" * \"Constant\"\n", " Number of parameters ......: 4\n", @@ -670,7 +669,6 @@ "=== GModelSky ===\n", " Name ......................: Crab\n", " Instruments ...............: all\n", - " Instrument scale factors ..: unity\n", " Observation identifiers ...: all\n", " Model type ................: PointSource\n", " Model components ..........: \"PointSource\" * \"ExponentialCutoffPowerLaw\" * \"Constant\"\n", @@ -684,7 +682,8 @@ " CutoffEnergy .............: 3206993.95272881 +/- 117129.972166476 [0.1,infty[ MeV (free,scale=1,gradient)\n", " PivotEnergy ..............: 300000 MeV (fixed,scale=1,gradient)\n", " Number of temporal par's ..: 1\n", - " Normalization ............: 1 (relative value) (fixed,scale=1,gradient)\n" + " Normalization ............: 1 (relative value) (fixed,scale=1,gradient)\n", + " Number of scale par's .....: 0\n" ] } ], diff --git a/doc/source/users/tutorials/howto/howto_connect_irfs.rst b/doc/source/users/tutorials/howto/howto_connect_irfs.rst index 74d1e85..7644835 100644 --- a/doc/source/users/tutorials/howto/howto_connect_irfs.rst +++ b/doc/source/users/tutorials/howto/howto_connect_irfs.rst @@ -179,7 +179,6 @@ both observations. 2019-04-03T12:03:41: === GModelSky === 2019-04-03T12:03:41: Name ......................: Crab 2019-04-03T12:03:41: Instruments ...............: all - 2019-04-03T12:03:41: Instrument scale factors ..: unity 2019-04-03T12:03:41: Observation identifiers ...: all 2019-04-03T12:03:41: Model type ................: PointSource 2019-04-03T12:03:41: Model components ..........: "PointSource" * "PowerLaw" * "Constant" @@ -193,10 +192,10 @@ both observations. 2019-04-03T12:03:41: PivotEnergy ..............: 300000 [10000,1000000000] MeV (fixed,scale=1000000,gradient) 2019-04-03T12:03:41: Number of temporal par's ..: 1 2019-04-03T12:03:41: Normalization ............: 1 (relative value) (fixed,scale=1,gradient) + 2019-04-03T12:03:41: Number of scale par's .....: 0 2019-04-03T12:03:41: === GCTAModelIrfBackground === 2019-04-03T12:03:41: Name ......................: CTABackgroundModel 2019-04-03T12:03:41: Instruments ...............: CTA - 2019-04-03T12:03:41: Instrument scale factors ..: unity 2019-04-03T12:03:41: Observation identifiers ...: all 2019-04-03T12:03:41: Model type ................: "PowerLaw" * "Constant" 2019-04-03T12:03:41: Number of parameters ......: 4 diff --git a/doc/source/users/tutorials/howto/howto_connect_models.ipynb b/doc/source/users/tutorials/howto/howto_connect_models.ipynb index 7d3041a..9d9042f 100644 --- a/doc/source/users/tutorials/howto/howto_connect_models.ipynb +++ b/doc/source/users/tutorials/howto/howto_connect_models.ipynb @@ -272,7 +272,6 @@ "=== GModelSky ===\n", " Name ......................: Crab\n", " Instruments ...............: all\n", - " Instrument scale factors ..: unity\n", " Observation identifiers ...: all\n", " Model type ................: PointSource\n", " Model components ..........: \"PointSource\" * \"PowerLaw\" * \"Constant\"\n", @@ -286,10 +285,10 @@ " PivotEnergy ..............: 300000 [10000,1000000000] MeV (fixed,scale=1000000,gradient)\n", " Number of temporal par's ..: 1\n", " Normalization ............: 1 (relative value) (fixed,scale=1,gradient)\n", + " Number of scale par's .....: 0\n", "=== GCTAModelIrfBackground ===\n", " Name ......................: Background_000001\n", " Instruments ...............: CTA\n", - " Instrument scale factors ..: unity\n", " Observation identifiers ...: 000001\n", " Model type ................: \"PowerLaw\" * \"Constant\"\n", " Number of parameters ......: 4\n", @@ -302,7 +301,6 @@ "=== GCTAModelIrfBackground ===\n", " Name ......................: Background_000002\n", " Instruments ...............: CTA\n", - " Instrument scale factors ..: unity\n", " Observation identifiers ...: 000002\n", " Model type ................: \"PowerLaw\" * \"Constant\"\n", " Number of parameters ......: 4\n", diff --git a/doc/source/users/tutorials/howto/howto_extent.rst b/doc/source/users/tutorials/howto/howto_extent.rst index 0cf05ec..9712704 100755 --- a/doc/source/users/tutorials/howto/howto_extent.rst +++ b/doc/source/users/tutorials/howto/howto_extent.rst @@ -75,7 +75,6 @@ The source is detected with a TS value of 960.3. 2019-04-04T10:02:58: Name ......................: Src003 2019-04-04T10:02:58: Instruments ...............: all 2019-04-04T10:02:58: Test Statistic ............: 960.322220887407 - 2019-04-04T10:02:58: Instrument scale factors ..: unity 2019-04-04T10:02:58: Observation identifiers ...: all 2019-04-04T10:02:58: Model type ................: ExtendedSource 2019-04-04T10:02:58: Model components ..........: "RadialDisk" * "PowerLaw" * "Constant" @@ -90,6 +89,7 @@ The source is detected with a TS value of 960.3. 2019-04-04T10:02:58: PivotEnergy ..............: 300000 MeV (fixed,scale=300000,gradient) 2019-04-04T10:02:58: Number of temporal par's ..: 1 2019-04-04T10:02:58: Normalization ............: 1 (relative value) (fixed,scale=1,gradient) + 2019-04-04T10:02:58: Number of scale par's .....: 0 .. warning:: The parameter errors returned by :ref:`ctlike` are purely statistical. In diff --git a/doc/source/users/tutorials/howto/howto_stacked_analysis.ipynb b/doc/source/users/tutorials/howto/howto_stacked_analysis.ipynb index 19338df..cf380b9 100644 --- a/doc/source/users/tutorials/howto/howto_stacked_analysis.ipynb +++ b/doc/source/users/tutorials/howto/howto_stacked_analysis.ipynb @@ -289,7 +289,6 @@ "=== GModelSky ===\n", " Name ......................: Crab\n", " Instruments ...............: all\n", - " Instrument scale factors ..: unity\n", " Observation identifiers ...: all\n", " Model type ................: PointSource\n", " Model components ..........: \"PointSource\" * \"PowerLaw\" * \"Constant\"\n", @@ -303,10 +302,10 @@ " PivotEnergy ..............: 300000 [10000,1000000000] MeV (fixed,scale=1000000,gradient)\n", " Number of temporal par's ..: 1\n", " Normalization ............: 1 (relative value) (fixed,scale=1,gradient)\n", + " Number of scale par's .....: 0\n", "=== GCTAModelCubeBackground ===\n", " Name ......................: BackgroundModel\n", " Instruments ...............: CTA, HESS, MAGIC, VERITAS\n", - " Instrument scale factors ..: unity\n", " Observation identifiers ...: all\n", " Model type ................: \"PowerLaw\" * \"Constant\"\n", " Number of parameters ......: 4\n", diff --git a/doc/source/users/tutorials/howto/iact/analysis.rst b/doc/source/users/tutorials/howto/iact/analysis.rst index dd50e1e..4535f67 100755 --- a/doc/source/users/tutorials/howto/iact/analysis.rst +++ b/doc/source/users/tutorials/howto/iact/analysis.rst @@ -64,7 +64,6 @@ which will produce the following output in the log file ``ctlike.log``: 2019-04-05T14:18:18: === GCTAModelAeffBackground === 2019-04-05T14:18:18: Name ......................: bkg_23523 2019-04-05T14:18:18: Instruments ...............: HESS - 2019-04-05T14:18:18: Instrument scale factors ..: unity 2019-04-05T14:18:18: Observation identifiers ...: 23523 2019-04-05T14:18:18: Model type ................: "PowerLaw" * "Constant" 2019-04-05T14:18:18: Number of parameters ......: 4 @@ -77,7 +76,6 @@ which will produce the following output in the log file ``ctlike.log``: 2019-04-05T14:18:18: === GCTAModelAeffBackground === 2019-04-05T14:18:18: Name ......................: bkg_23526 2019-04-05T14:18:18: Instruments ...............: HESS - 2019-04-05T14:18:18: Instrument scale factors ..: unity 2019-04-05T14:18:18: Observation identifiers ...: 23526 2019-04-05T14:18:18: Model type ................: "PowerLaw" * "Constant" 2019-04-05T14:18:18: Number of parameters ......: 4 @@ -90,7 +88,6 @@ which will produce the following output in the log file ``ctlike.log``: 2019-04-05T14:18:18: === GCTAModelAeffBackground === 2019-04-05T14:18:18: Name ......................: bkg_23559 2019-04-05T14:18:18: Instruments ...............: HESS - 2019-04-05T14:18:18: Instrument scale factors ..: unity 2019-04-05T14:18:18: Observation identifiers ...: 23559 2019-04-05T14:18:18: Model type ................: "PowerLaw" * "Constant" 2019-04-05T14:18:18: Number of parameters ......: 4 @@ -103,7 +100,6 @@ which will produce the following output in the log file ``ctlike.log``: 2019-04-05T14:18:18: === GCTAModelAeffBackground === 2019-04-05T14:18:18: Name ......................: bkg_23592 2019-04-05T14:18:18: Instruments ...............: HESS - 2019-04-05T14:18:18: Instrument scale factors ..: unity 2019-04-05T14:18:18: Observation identifiers ...: 23592 2019-04-05T14:18:18: Model type ................: "PowerLaw" * "Constant" 2019-04-05T14:18:18: Number of parameters ......: 4 @@ -116,7 +112,6 @@ which will produce the following output in the log file ``ctlike.log``: 2019-04-05T14:18:18: === GModelSky === 2019-04-05T14:18:18: Name ......................: Crab 2019-04-05T14:18:18: Instruments ...............: all - 2019-04-05T14:18:18: Instrument scale factors ..: unity 2019-04-05T14:18:18: Observation identifiers ...: all 2019-04-05T14:18:18: Model type ................: PointSource 2019-04-05T14:18:18: Model components ..........: "PointSource" * "PowerLaw" * "Constant" @@ -133,7 +128,6 @@ which will produce the following output in the log file ``ctlike.log``: 2019-04-05T14:18:18: === GCTAModelIrfBackground === 2019-04-05T14:18:18: Name ......................: CTABackgroundModel 2019-04-05T14:18:18: Instruments ...............: CTA - 2019-04-05T14:18:18: Instrument scale factors ..: unity 2019-04-05T14:18:18: Observation identifiers ...: all 2019-04-05T14:18:18: Model type ................: "PowerLaw" * "Constant" 2019-04-05T14:18:18: Number of parameters ......: 4 diff --git a/doc/source/users/tutorials/quickstart/ctools-from-python.ipynb b/doc/source/users/tutorials/quickstart/ctools-from-python.ipynb index 5225a4b..cf7114a 100644 --- a/doc/source/users/tutorials/quickstart/ctools-from-python.ipynb +++ b/doc/source/users/tutorials/quickstart/ctools-from-python.ipynb @@ -483,7 +483,6 @@ "=== GModelSky ===\n", " Name ......................: Crab\n", " Instruments ...............: all\n", - " Instrument scale factors ..: unity\n", " Observation identifiers ...: all\n", " Model type ................: PointSource\n", " Model components ..........: \"PointSource\" * \"PowerLaw\" * \"Constant\"\n", @@ -497,10 +496,10 @@ " PivotEnergy ..............: 300000 [10000,1000000000] MeV (fixed,scale=1000000,gradient)\n", " Number of temporal par's ..: 1\n", " Normalization ............: 1 (relative value) (fixed,scale=1,gradient)\n", + " Number of scale par's .....: 0\n", "=== GCTAModelIrfBackground ===\n", " Name ......................: CTABackgroundModel\n", " Instruments ...............: CTA\n", - " Instrument scale factors ..: unity\n", " Observation identifiers ...: all\n", " Model type ................: \"PowerLaw\" * \"Constant\"\n", " Number of parameters ......: 4\n", @@ -564,7 +563,6 @@ "=== GModelSky ===\n", " Name ......................: Crab\n", " Instruments ...............: all\n", - " Instrument scale factors ..: unity\n", " Observation identifiers ...: all\n", " Model type ................: PointSource\n", " Model components ..........: \"PointSource\" * \"PowerLaw\" * \"Constant\"\n", @@ -578,10 +576,10 @@ " PivotEnergy ..............: 300000 [10000,1000000000] MeV (fixed,scale=1000000,gradient)\n", " Number of temporal par's ..: 1\n", " Normalization ............: 1 (relative value) (fixed,scale=1,gradient)\n", + " Number of scale par's .....: 0\n", "=== GCTAModelIrfBackground ===\n", " Name ......................: CTABackgroundModel\n", " Instruments ...............: CTA\n", - " Instrument scale factors ..: unity\n", " Observation identifiers ...: all\n", " Model type ................: \"PowerLaw\" * \"Constant\"\n", " Number of parameters ......: 4\n", diff --git a/doc/source/users/tutorials/quickstart/energy_dispersion.rst b/doc/source/users/tutorials/quickstart/energy_dispersion.rst index edfcf00..a3c7e0f 100755 --- a/doc/source/users/tutorials/quickstart/energy_dispersion.rst +++ b/doc/source/users/tutorials/quickstart/energy_dispersion.rst @@ -147,7 +147,6 @@ And here is the output in the log file: 2019-04-02T14:24:57: === GModelSky === 2019-04-02T14:24:57: Name ......................: Crab 2019-04-02T14:24:57: Instruments ...............: all - 2019-04-02T14:24:57: Instrument scale factors ..: unity 2019-04-02T14:24:57: Observation identifiers ...: all 2019-04-02T14:24:57: Model type ................: PointSource 2019-04-02T14:24:57: Model components ..........: "PointSource" * "PowerLaw" * "Constant" @@ -161,10 +160,10 @@ And here is the output in the log file: 2019-04-02T14:24:57: PivotEnergy ..............: 300000 [10000,1000000000] MeV (fixed,scale=1000000,gradient) 2019-04-02T14:24:57: Number of temporal par's ..: 1 2019-04-02T14:24:57: Normalization ............: 1 (relative value) (fixed,scale=1,gradient) + 2019-04-02T14:24:57: Number of scale par's .....: 0 2019-04-02T14:24:57: === GCTAModelCubeBackground === 2019-04-02T14:24:57: Name ......................: BackgroundModel 2019-04-02T14:24:57: Instruments ...............: CTA, HESS, MAGIC, VERITAS - 2019-04-02T14:24:57: Instrument scale factors ..: unity 2019-04-02T14:24:57: Observation identifiers ...: all 2019-04-02T14:24:57: Model type ................: "PowerLaw" * "Constant" 2019-04-02T14:24:57: Number of parameters ......: 4 @@ -222,7 +221,6 @@ Here the output in the log file: 2019-04-02T14:27:05: === GModelSky === 2019-04-02T14:27:05: Name ......................: Crab 2019-04-02T14:27:05: Instruments ...............: all - 2019-04-02T14:27:05: Instrument scale factors ..: unity 2019-04-02T14:27:05: Observation identifiers ...: all 2019-04-02T14:27:05: Model type ................: PointSource 2019-04-02T14:27:05: Model components ..........: "PointSource" * "PowerLaw" * "Constant" @@ -236,10 +234,10 @@ Here the output in the log file: 2019-04-02T14:27:05: PivotEnergy ..............: 300000 [10000,1000000000] MeV (fixed,scale=1000000,gradient) 2019-04-02T14:27:05: Number of temporal par's ..: 1 2019-04-02T14:27:05: Normalization ............: 1 (relative value) (fixed,scale=1,gradient) + 2019-04-02T14:27:05: Number of scale par's .....: 0 2019-04-02T14:27:05: === GCTAModelIrfBackground === 2019-04-02T14:27:05: Name ......................: CTABackgroundModel 2019-04-02T14:27:05: Instruments ...............: CTA - 2019-04-02T14:27:05: Instrument scale factors ..: unity 2019-04-02T14:27:05: Observation identifiers ...: all 2019-04-02T14:27:05: Model type ................: "PowerLaw" * "Constant" 2019-04-02T14:27:05: Number of parameters ......: 4 diff --git a/doc/source/users/tutorials/quickstart/fitting.rst b/doc/source/users/tutorials/quickstart/fitting.rst index 557803b..ba0908d 100755 --- a/doc/source/users/tutorials/quickstart/fitting.rst +++ b/doc/source/users/tutorials/quickstart/fitting.rst @@ -128,7 +128,6 @@ Below the last lines of the log file that was produced by this run: 2019-04-02T13:55:48: === GModelSky === 2019-04-02T13:55:48: Name ......................: Crab 2019-04-02T13:55:48: Instruments ...............: all - 2019-04-02T13:55:48: Instrument scale factors ..: unity 2019-04-02T13:55:48: Observation identifiers ...: all 2019-04-02T13:55:48: Model type ................: PointSource 2019-04-02T13:55:48: Model components ..........: "PointSource" * "PowerLaw" * "Constant" @@ -142,10 +141,10 @@ Below the last lines of the log file that was produced by this run: 2019-04-02T13:55:48: PivotEnergy ..............: 300000 [10000,1000000000] MeV (fixed,scale=1000000,gradient) 2019-04-02T13:55:48: Number of temporal par's ..: 1 2019-04-02T13:55:48: Normalization ............: 1 (relative value) (fixed,scale=1,gradient) + 2019-04-02T13:55:48: Number of scale par's .....: 0 2019-04-02T13:55:48: === GCTAModelCubeBackground === 2019-04-02T13:55:48: Name ......................: BackgroundModel 2019-04-02T13:55:48: Instruments ...............: CTA, HESS, MAGIC, VERITAS - 2019-04-02T13:55:48: Instrument scale factors ..: unity 2019-04-02T13:55:48: Observation identifiers ...: all 2019-04-02T13:55:48: Model type ................: "PowerLaw" * "Constant" 2019-04-02T13:55:48: Number of parameters ......: 4 diff --git a/doc/source/users/tutorials/quickstart/onoff.rst b/doc/source/users/tutorials/quickstart/onoff.rst index fdfbaf2..b46b1a0 100644 --- a/doc/source/users/tutorials/quickstart/onoff.rst +++ b/doc/source/users/tutorials/quickstart/onoff.rst @@ -216,7 +216,6 @@ the background is not well known a priori. 2019-04-02T14:55:29: === GModelSky === 2019-04-02T14:55:29: Name ......................: Crab 2019-04-02T14:55:29: Instruments ...............: all - 2019-04-02T14:55:29: Instrument scale factors ..: unity 2019-04-02T14:55:29: Observation identifiers ...: all 2019-04-02T14:55:29: Model type ................: PointSource 2019-04-02T14:55:29: Model components ..........: "PointSource" * "PowerLaw" * "Constant" @@ -230,10 +229,10 @@ the background is not well known a priori. 2019-04-02T14:55:29: PivotEnergy ..............: 300000 [10000,1000000000] MeV (fixed,scale=1000000,gradient) 2019-04-02T14:55:29: Number of temporal par's ..: 1 2019-04-02T14:55:29: Normalization ............: 1 (relative value) (fixed,scale=1,gradient) + 2019-04-02T14:55:29: Number of scale par's .....: 0 2019-04-02T14:55:29: === GCTAModelIrfBackground === 2019-04-02T14:55:29: Name ......................: CTABackgroundModel 2019-04-02T14:55:29: Instruments ...............: CTAOnOff - 2019-04-02T14:55:29: Instrument scale factors ..: unity 2019-04-02T14:55:29: Observation identifiers ...: all 2019-04-02T14:55:29: Model type ................: "PowerLaw" * "Constant" 2019-04-02T14:55:29: Number of parameters ......: 4 @@ -291,7 +290,6 @@ the ``statistic=wstat`` option. 2019-04-02T15:56:29: === GModelSky === 2019-04-02T15:56:29: Name ......................: Crab 2019-04-02T15:56:29: Instruments ...............: all - 2019-04-02T15:56:29: Instrument scale factors ..: unity 2019-04-02T15:56:29: Observation identifiers ...: all 2019-04-02T15:56:29: Model type ................: PointSource 2019-04-02T15:56:29: Model components ..........: "PointSource" * "PowerLaw" * "Constant" @@ -305,10 +303,10 @@ the ``statistic=wstat`` option. 2019-04-02T15:56:29: PivotEnergy ..............: 300000 [10000,1000000000] MeV (fixed,scale=1000000,gradient) 2019-04-02T15:56:29: Number of temporal par's ..: 1 2019-04-02T15:56:29: Normalization ............: 1 (relative value) (fixed,scale=1,gradient) + 2019-04-02T15:56:29: Number of scale par's .....: 0 2019-04-02T15:56:29: === GCTAModelIrfBackground === 2019-04-02T15:56:29: Name ......................: CTABackgroundModel 2019-04-02T15:56:29: Instruments ...............: CTAOnOff - 2019-04-02T15:56:29: Instrument scale factors ..: unity 2019-04-02T15:56:29: Observation identifiers ...: all 2019-04-02T15:56:29: Model type ................: "PowerLaw" * "Constant" 2019-04-02T15:56:29: Number of parameters ......: 4 diff --git a/doc/source/users/tutorials/quickstart/unbinned.rst b/doc/source/users/tutorials/quickstart/unbinned.rst index 43af7a8..6eddd01 100755 --- a/doc/source/users/tutorials/quickstart/unbinned.rst +++ b/doc/source/users/tutorials/quickstart/unbinned.rst @@ -84,7 +84,6 @@ the same events for both analyses. 2019-04-02T14:15:10: === GModelSky === 2019-04-02T14:15:10: Name ......................: Crab 2019-04-02T14:15:10: Instruments ...............: all - 2019-04-02T14:15:10: Instrument scale factors ..: unity 2019-04-02T14:15:10: Observation identifiers ...: all 2019-04-02T14:15:10: Model type ................: PointSource 2019-04-02T14:15:10: Model components ..........: "PointSource" * "PowerLaw" * "Constant" @@ -98,10 +97,10 @@ the same events for both analyses. 2019-04-02T14:15:10: PivotEnergy ..............: 300000 [10000,1000000000] MeV (fixed,scale=1000000,gradient) 2019-04-02T14:15:10: Number of temporal par's ..: 1 2019-04-02T14:15:10: Normalization ............: 1 (relative value) (fixed,scale=1,gradient) + 2019-04-02T14:15:10: Number of scale par's .....: 0 2019-04-02T14:15:10: === GCTAModelIrfBackground === 2019-04-02T14:15:10: Name ......................: CTABackgroundModel 2019-04-02T14:15:10: Instruments ...............: CTA - 2019-04-02T14:15:10: Instrument scale factors ..: unity 2019-04-02T14:15:10: Observation identifiers ...: all 2019-04-02T14:15:10: Model type ................: "PowerLaw" * "Constant" 2019-04-02T14:15:10: Number of parameters ......: 4 -- libgit2 0.21.4