Commit 11df2d07f45f2c24b0ec2abf7948db8671f3aefe
Committed by
Jürgen Knödlseder
1 parent
e18c2a06
add log msg to _set_src_prefactor in cssens
Showing
1 changed file
with
16 additions
and
6 deletions
cscripts/cssens.py
| ... | ... | @@ -611,7 +611,6 @@ class cssens(ctools.csobservation): |
| 611 | 611 | # Return result |
| 612 | 612 | return result |
| 613 | 613 | |
| 614 | - # | |
| 615 | 614 | def _set_src_prefactor(self, test_model, crab_unit, test_crab_flux): |
| 616 | 615 | """ |
| 617 | 616 | Create a copy of the test models, set the normalisation parameter |
| ... | ... | @@ -637,13 +636,24 @@ class cssens(ctools.csobservation): |
| 637 | 636 | crab_prefactor = prefactor.value() * crab_unit |
| 638 | 637 | |
| 639 | 638 | val_margin = 0.01 |
| 640 | - min_pref = prefactor.min() | |
| 641 | - max_pref = prefactor.max() | |
| 639 | + min_pref = prefactor.min() * (1 + val_margin) | |
| 640 | + max_pref = prefactor.max() * (1 - val_margin) | |
| 642 | 641 | |
| 643 | 642 | val_now = crab_prefactor * test_crab_flux |
| 644 | - val_now = max(val_now, min_pref * (1 + val_margin)) | |
| 645 | - val_now = min(val_now, max_pref * (1 - val_margin)) | |
| 646 | - crab_prefactor = val_now / test_crab_flux | |
| 643 | + | |
| 644 | + if val_now < min_pref or val_now > max_pref: | |
| 645 | + log_name = 'test prefactor beyond limits' | |
| 646 | + log_value = ( | |
| 647 | + 'test prefactor is too low/high, having value ' | |
| 648 | + + str(val_now) + ' compared to limits: [' | |
| 649 | + + str(prefactor.min()) + ' , ' + str(prefactor.max()) + ']' | |
| 650 | + ) | |
| 651 | + self._log_value(gammalib.TERSE, log_name, log_value) | |
| 652 | + | |
| 653 | + val_now = max(val_now, min_pref) | |
| 654 | + val_now = min(val_now, max_pref) | |
| 655 | + | |
| 656 | + crab_prefactor = val_now / test_crab_flux | |
| 647 | 657 | |
| 648 | 658 | prefactor.value(val_now) |
| 649 | 659 | ... | ... |