Simon Bonnefoy / ctools

Commit b0412b63c255cc640a3c5a50e2264e58a07efa66

Authored by Jürgen Knödlseder
1 parent d0835fc8

Set all statistic parameter values to DEFAULT

Inline Side-by-side
Showing 10 changed files with 40 additions and 25 deletions
doc/source/users/reference_manual/ctbutterfly.rst
  View file @b0412b6
... ... @@ -86,10 +86,13 @@ General parameters
86 86 ``(confidence = 0.68) [real]``
87 87 Confidence level for error computation.
88 88  
89   -``(statistic = CSTAT) <CSTAT|WSTAT|CHI2> [string]``
90   - Optimization statistic. ``CSTAT`` applies to all types of observations,
91   - ``WSTAT``applies only to On/Off observations, and ``CHI2`` applies only
92   - to binned or stacked observations.
  89 +``(statistic = DEFAULT) <DEFAULT|CSTAT|WSTAT|CHI2> [string]``
  90 + Optimization statistic. ``DEFAULT`` uses the default statistic for all
  91 + observations, which is ``CSTAT`` or the statistic specified in the
  92 + observation definition XML file. ``CSTAT`` uses the C statistic for
  93 + all observations, ``WSTAT`` uses the W statistic for all On/Off
  94 + observations, and ``CHI2`` uses the Chi squared statistic for all
  95 + binned or stacked observations.
93 96  
94 97 ``(matrix = "NONE") [file]``
95 98 Input covariance matrix file (not used)
... ...
doc/source/users/reference_manual/cterror.rst
  View file @b0412b6
... ... @@ -67,10 +67,13 @@ General parameters
67 67 ``(tol = 1e-3) [real]``
68 68 Computation tolerance.
69 69  
70   -``(statistic = CSTAT) <CSTAT|WSTAT|CHI2> [string]``
71   - Optimization statistic. ``CSTAT`` applies to all types of observations,
72   - ``WSTAT``applies only to On/Off observations, and ``CHI2`` applies only
73   - to binned or stacked observations.
  70 +``(statistic = DEFAULT) <DEFAULT|CSTAT|WSTAT|CHI2> [string]``
  71 + Optimization statistic. ``DEFAULT`` uses the default statistic for all
  72 + observations, which is ``CSTAT`` or the statistic specified in the
  73 + observation definition XML file. ``CSTAT`` uses the C statistic for
  74 + all observations, ``WSTAT`` uses the W statistic for all On/Off
  75 + observations, and ``CHI2`` uses the Chi squared statistic for all
  76 + binned or stacked observations.
74 77  
75 78 ``(max_iter = 50) [integer]``
76 79 Maximum number of iterations before stopping the likelihood
... ...
doc/source/users/reference_manual/ctlike.rst
  View file @b0412b6
... ... @@ -94,10 +94,13 @@ General parameters
94 94 ``(outcovmat = NONE) [string]``
95 95 Output FITS or CSV file to store covariance matrix.
96 96  
97   -``(statistic = CSTAT) <CSTAT|WSTAT|CHI2> [string]``
98   - Optimization statistic. ``CSTAT`` applies to all types of observations,
99   - ``WSTAT``applies only to On/Off observations, and ``CHI2`` applies only
100   - to binned or stacked observations.
  97 +``(statistic = DEFAULT) <DEFAULT|CSTAT|WSTAT|CHI2> [string]``
  98 + Optimization statistic. ``DEFAULT`` uses the default statistic for all
  99 + observations, which is ``CSTAT`` or the statistic specified in the
  100 + observation definition XML file. ``CSTAT`` uses the C statistic for
  101 + all observations, ``WSTAT`` uses the W statistic for all On/Off
  102 + observations, and ``CHI2`` uses the Chi squared statistic for all
  103 + binned or stacked observations.
101 104  
102 105 ``(refit = no) [boolean]``
103 106 Perform refitting of solution after initial fit.
... ...
doc/source/users/reference_manual/cttsmap.rst
  View file @b0412b6
... ... @@ -66,10 +66,13 @@ General parameters
66 66 ``(errors = no) [boolean]``
67 67 Compute and store parameter errors?
68 68  
69   -``(statistic = CSTAT) <CSTAT|WSTAT|CHI2> [string]``
70   - Optimization statistic. ``CSTAT`` applies to all types of observations,
71   - ``WSTAT``applies only to On/Off observations, and ``CHI2`` applies only
72   - to binned or stacked observations.
  69 +``(statistic = DEFAULT) <DEFAULT|CSTAT|WSTAT|CHI2> [string]``
  70 + Optimization statistic. ``DEFAULT`` uses the default statistic for all
  71 + observations, which is ``CSTAT`` or the statistic specified in the
  72 + observation definition XML file. ``CSTAT`` uses the C statistic for
  73 + all observations, ``WSTAT`` uses the W statistic for all On/Off
  74 + observations, and ``CHI2`` uses the Chi squared statistic for all
  75 + binned or stacked observations.
73 76  
74 77 ``(usepnt = no) [boolean]``
75 78 Use CTA pointing direction for map centre instead of xref/yref parameters?
... ...
doc/source/users/reference_manual/ctulimit.rst
  View file @b0412b6
... ... @@ -78,10 +78,13 @@ General parameters
78 78 ``(tol = 1e-5) [real]``
79 79 Computation tolerance.
80 80  
81   -``(statistic = CSTAT) <CSTAT|WSTAT|CHI2> [string]``
82   - Optimization statistic. ``CSTAT`` applies to all types of observations,
83   - ``WSTAT``applies only to On/Off observations, and ``CHI2`` applies only
84   - to binned or stacked observations.
  81 +``(statistic = DEFAULT) <DEFAULT|CSTAT|WSTAT|CHI2> [string]``
  82 + Optimization statistic. ``DEFAULT`` uses the default statistic for all
  83 + observations, which is ``CSTAT`` or the statistic specified in the
  84 + observation definition XML file. ``CSTAT`` uses the C statistic for
  85 + all observations, ``WSTAT`` uses the W statistic for all On/Off
  86 + observations, and ``CHI2`` uses the Chi squared statistic for all
  87 + binned or stacked observations.
85 88  
86 89 ``(max_iter = 50) [integer]``
87 90 Maximum number of iterations before stopping the upper
... ...
src/ctbutterfly/ctbutterfly.par
  View file @b0412b6
... ... @@ -34,7 +34,7 @@ method, s, h, GAUSSIAN, GAUSSIAN|ENVELOPE,,&quot;Butterfly computation method&quot;
34 34 #=====================
35 35 fit, b, h, no,,, "Perform maximum likelihood fitting?"
36 36 confidence, r, h, 0.68,0.0,1.0, "Confidence level"
37   -statistic, s, h, CSTAT,CSTAT|WSTAT|CHI2,, "Optimization statistic"
  37 +statistic, s, h, DEFAULT,DEFAULT|CSTAT|WSTAT|CHI2,, "Optimization statistic"
38 38 matrix, f, h, "NONE",,, "Input covariance Matrix FITS file"
39 39  
40 40 #
... ...
src/cterror/cterror.par
  View file @b0412b6
... ... @@ -34,7 +34,7 @@ outmodel, f, a, &quot;results.xml&quot;,,, &quot;Output model definiton XML file&quot;
34 34 #=============================
35 35 confidence, r, h, 0.68,0.0,1.0, "Confidence level"
36 36 tol, r, h, 1e-3,,, "Computation tolerance"
37   -statistic, s, h, CSTAT,CSTAT|WSTAT|CHI2,, "Optimization statistic"
  37 +statistic, s, h, DEFAULT,DEFAULT|CSTAT|WSTAT|CHI2,, "Optimization statistic"
38 38 max_iter, i, h, 50,1,1000, "Maximum number of iterations"
39 39  
40 40 #
... ...
src/ctlike/ctlike.par
  View file @b0412b6
... ... @@ -31,7 +31,7 @@ outcovmat, f, h, &quot;NONE&quot;,,, &quot;Output covariance matrix FITS file&quot;
31 31 #
32 32 # Maximisation parameters
33 33 #========================
34   -statistic, s, h, CSTAT,CSTAT|WSTAT|CHI2,, "Optimization statistic"
  34 +statistic, s, h, DEFAULT,DEFAULT|CSTAT|WSTAT|CHI2,, "Optimization statistic"
35 35 refit, b, h, no,,, "Do refitting?"
36 36 fix_spat_for_ts, b, h, no,,, "Fix spatial parameters for TS computation?"
37 37  
... ...
src/cttsmap/cttsmap.par
  View file @b0412b6
... ... @@ -32,7 +32,7 @@ outmap, f, a, &quot;tsmap.fits&quot;,,, &quot;Output Test Statistic map file&quot;
32 32 # TS map computation parameters
33 33 #==============================
34 34 errors, b, h, no,,, "Compute and store parameter errors?"
35   -statistic, s, h, CSTAT,CSTAT|WSTAT|CHI2,, "Optimization statistic"
  35 +statistic, s, h, DEFAULT,DEFAULT|CSTAT|WSTAT|CHI2,, "Optimization statistic"
36 36  
37 37 #
38 38 # Spatial binning parameters
... ...
src/ctulimit/ctulimit.par
  View file @b0412b6
... ... @@ -37,7 +37,7 @@ eref, r, h, 1.0,,, &quot;Reference energy for differential limit (TeV)&quot;
37 37 emin, r, h, 1.0,,, "Minimum energy for integral flux limit (TeV)"
38 38 emax, r, h, 100.0,,, "Maximum energy for integral flux limit (TeV)"
39 39 tol, r, h, 1e-5,,, "Computation tolerance"
40   -statistic, s, h, CSTAT,CSTAT|WSTAT|CHI2,, "Optimization statistic"
  40 +statistic, s, h, DEFAULT,DEFAULT|CSTAT|WSTAT|CHI2,, "Optimization statistic"
41 41 max_iter, i, h, 50,1,1000, "Maximum number of iterations"
42 42  
43 43 #
... ...