Maria Haupt / gammalib

Commit e1b87df5b517db1373c25eeea36d922fc1e5c448

Authored by Jürgen Knödlseder
2 parents abf60445 d365e655

Merge branch 'bugfix-1.0.1' into integration 

# Conflicts:
#	ChangeLog
#	NEWS
#	README
Inline Side-by-side
Showing 2 changed files with 13 additions and 5 deletions
ChangeLog
  View file @e1b87df
... ... @@ -7,7 +7,7 @@
7 7 Load CTA GTI extension from the HDU name provided by the DSS keyword (#1598)
8 8  
9 9  
10   -2016-01-13 Juergen Knoedlseder <jurgen.knodlseder@irap.omp.eu>
  10 +2016-01-22 Juergen Knoedlseder <jurgen.knodlseder@irap.omp.eu>
11 11  
12 12 * Bug fix version 1.0.1 released
13 13 ================================
... ... @@ -15,6 +15,7 @@
15 15 Add units to CTA event list columns (#1616)
16 16 Allow usage of numbers in FITS extension names (#1611)
17 17 Solve compatibility issues with Anaconda on Mac OS X (#1607)
  18 + Correct diffuse map MC normalisation (#1584)
18 19  
19 20  
20 21 2015-12-18 Juergen Knoedlseder <jurgen.knodlseder@irap.omp.eu>
... ...
src/model/GModelSpatialDiffuseMap.cpp
  View file @e1b87df
... ... @@ -719,11 +719,18 @@ void GModelSpatialDiffuseMap::set_mc_cone(const GSkyDir&amp; centre,
719 719 // Make sure that last pixel in the cache is >1
720 720 m_mc_cache[npix] = 1.0001;
721 721  
722   - // Set the normalization factor for the MC simulations as the
723   - // fraction of the flux that is comprised within the simulation
724   - // cone
  722 + // Set the normalization factor for the MC simulations. In case
  723 + // that the map is normalized, this is the fraction of the flux
  724 + // that is comprised within the simulation cone. For non-normalized
  725 + // maps, this is simply the flux comprised within the simulation
  726 + // cone.
725 727 if (sum_map > 0.0) {
726   - m_mc_norm = sum / sum_map;
  728 + if (m_normalize) {
  729 + m_mc_norm = sum / sum_map;
  730 + }
  731 + else {
  732 + m_mc_norm = sum;
  733 + }
727 734 }
728 735  
729 736 // Do we have a HealPix map?
... ...