Commit 39a0485282cca373b88c2da752cbae10a4470f72
1 parent
1e94255c
Switch on logger in test script.
Showing
1 changed file
with
19 additions
and
7 deletions
inst/cta/test/test_ml_fitting.py
| @@ -59,8 +59,12 @@ def unbinned_analysis(model, events, irf, caldb): | @@ -59,8 +59,12 @@ def unbinned_analysis(model, events, irf, caldb): | ||
| 59 | # Load model to describe the data from XML file | 59 | # Load model to describe the data from XML file |
| 60 | obs.models(model) | 60 | obs.models(model) |
| 61 | 61 | ||
| 62 | + # Allocate logger | ||
| 63 | + log = gammalib.GLog() | ||
| 64 | + log.cout(True) | ||
| 65 | + | ||
| 62 | # Allocate Levenberg-Marquardt optimizer | 66 | # Allocate Levenberg-Marquardt optimizer |
| 63 | - opt = gammalib.GOptimizerLM() | 67 | + opt = gammalib.GOptimizerLM(log) |
| 64 | 68 | ||
| 65 | # Optimize model parameters | 69 | # Optimize model parameters |
| 66 | obs.optimize(opt) | 70 | obs.optimize(opt) |
| @@ -125,8 +129,12 @@ def binned_analysis(model, cntmap, irf, caldb): | @@ -125,8 +129,12 @@ def binned_analysis(model, cntmap, irf, caldb): | ||
| 125 | # Load model to describe the data from XML file | 129 | # Load model to describe the data from XML file |
| 126 | obs.models(model) | 130 | obs.models(model) |
| 127 | 131 | ||
| 132 | + # Allocate logger | ||
| 133 | + log = gammalib.GLog() | ||
| 134 | + log.cout(True) | ||
| 135 | + | ||
| 128 | # Allocate Levenberg-Marquardt optimizer | 136 | # Allocate Levenberg-Marquardt optimizer |
| 129 | - opt = gammalib.GOptimizerLM() | 137 | + opt = gammalib.GOptimizerLM(log) |
| 130 | 138 | ||
| 131 | # Optimize model parameters | 139 | # Optimize model parameters |
| 132 | obs.optimize(opt) | 140 | obs.optimize(opt) |
| @@ -193,8 +201,12 @@ def stacked_analysis(model, cntmap, expcube, psfcube): | @@ -193,8 +201,12 @@ def stacked_analysis(model, cntmap, expcube, psfcube): | ||
| 193 | # Load model to describe the data from XML file | 201 | # Load model to describe the data from XML file |
| 194 | obs.models(model) | 202 | obs.models(model) |
| 195 | 203 | ||
| 204 | + # Allocate logger | ||
| 205 | + log = gammalib.GLog() | ||
| 206 | + log.cout(True) | ||
| 207 | + | ||
| 196 | # Allocate Levenberg-Marquardt optimizer | 208 | # Allocate Levenberg-Marquardt optimizer |
| 197 | - opt = gammalib.GOptimizerLM() | 209 | + opt = gammalib.GOptimizerLM(log) |
| 198 | 210 | ||
| 199 | # Optimize model parameters | 211 | # Optimize model parameters |
| 200 | obs.optimize(opt) | 212 | obs.optimize(opt) |
| @@ -241,8 +253,8 @@ if __name__ == '__main__': | @@ -241,8 +253,8 @@ if __name__ == '__main__': | ||
| 241 | #test = "gauss" | 253 | #test = "gauss" |
| 242 | #test = "disk" | 254 | #test = "disk" |
| 243 | #test = "shell" | 255 | #test = "shell" |
| 244 | - test = "ellipse" | ||
| 245 | - #test = "diffuse" | 256 | + #test = "ellipse" |
| 257 | + test = "diffuse" | ||
| 246 | 258 | ||
| 247 | # Set parameters | 259 | # Set parameters |
| 248 | irf = "cta_dummy_irf" | 260 | irf = "cta_dummy_irf" |
| @@ -283,10 +295,10 @@ if __name__ == '__main__': | @@ -283,10 +295,10 @@ if __name__ == '__main__': | ||
| 283 | cntref = 337.5 # +/- 1.8 (from ctobssim) | 295 | cntref = 337.5 # +/- 1.8 (from ctobssim) |
| 284 | 296 | ||
| 285 | # Perform unbinned analysis | 297 | # Perform unbinned analysis |
| 286 | - #results_unbinned = unbinned_analysis(model, events, irf, gammalib.GCaldb(caldb)) | 298 | + results_unbinned = unbinned_analysis(model, events, irf, gammalib.GCaldb(caldb)) |
| 287 | 299 | ||
| 288 | # Perform binned analysis | 300 | # Perform binned analysis |
| 289 | #results_binned = binned_analysis(model, cntmap, irf, gammalib.GCaldb(caldb)) | 301 | #results_binned = binned_analysis(model, cntmap, irf, gammalib.GCaldb(caldb)) |
| 290 | 302 | ||
| 291 | # Perform stacked analysis | 303 | # Perform stacked analysis |
| 292 | - results_stacked = stacked_analysis(model, cntmap, expcube, psfcube) | 304 | + #results_stacked = stacked_analysis(model, cntmap, expcube, psfcube) |