NuFit 5.2 and small bug fixes (#740)

add NuFit 5.2 osc values
ignore NANs in kde stage
ignore NANs in map plotter

Author: JanWeldert

pisa/core/map.py

@@ -717,10 +717,10 @@ def plot(self, symm=False, logz=False, vmin=None, vmax=None, backend=None,
 
             # we need to set the vmin and vmax now by hand:
             if vmin is None:
-                vmin = uncertainties.nominal_value(self.hist.min())
+                vmin = np.nanmin(unp.nominal_values(self.hist))
 
             if vmax is None:
-                vmax = uncertainties.nominal_value(self.hist.max())
+                vmax = np.nanmax(unp.nominal_values(self.hist))
 
             if symm:
                 v = np.max([-vmin, vmax])

pisa/utils/kde_hist.py

@@ -78,7 +78,7 @@ def get_hist(
     if len(weights) == 0:
         norm = sample.shape[0]
     else:
-        norm = np.sum(weights)
+        norm = np.sum(np.nan_to_num(weights))
 
     binning = binning.oversample(oversample)
 
@@ -107,9 +107,8 @@ def get_hist(
     reflect_upper = binning[coszen_name].bin_edges[-1] == 1
 
     # Get the kernel weights
-
     kde_kwargs = dict(
-        weights=weights,
+        weights=np.nan_to_num(weights),
         bw_method=bw_method,
         adaptive=adaptive,
         alpha=alpha,
@@ -127,7 +126,7 @@ def get_hist(
         c = b.weighted_centers.m
         if b.name == coszen_name:
             # how many bins to add for reflection
-            l = int(len(c) * coszen_reflection)
+            l = int(len(c) * float(coszen_reflection))
             if reflect_lower:
                 c0 = 2 * c[0] - c[1 : l + 1][::-1]
             else:

pisa_examples/resources/settings/osc/nufitv52.cfg

@@ -0,0 +1,42 @@
+# Best fit values from NuFitv5.2 (with SK atmospheric data)
+# Note that asymmetric Gaussian 1 sigma not currently implemented, so 1 sigma uncertainty not exact here
+
+theta12 = 33.41 units.deg
+theta12.3s_range = [31.31, 35.74] * units.deg
+
+theta13_nh = 8.58 +/- 0.11 units.deg
+theta13_nh.3s_range = [8.23, 8.91] * units.deg
+
+theta13_ih = 8.57 +/- 0.11 units.deg
+theta13_ih.3s_range = [8.23, 8.94] * units.deg
+
+theta23_nh = 42.2 units.deg
+theta23_nh.3s_range = [39.7, 51.0] * units.deg
+theta23_nh.range = [30.0, 60.0] * units.deg
+
+theta23_ih = 49.0 units.deg
+theta23_ih.3s_range = [39.9, 51.5] * units.deg
+theta23_ih.range = [30.0, 60.0] * units.deg
+
+deltacp_nh = 232 units.deg
+deltacp_nh.3s_range = [144,350] * units.deg
+deltacp_nh.range = [0,360] * units.deg
+
+deltacp_ih = 276 units.deg
+deltacp_ih.3s_range = [194,344] * units.deg
+deltacp_ih.range = [0,360] * units.deg
+
+deltam21 = 7.41e-5 units.eV**2
+deltam21.3s_range = [6.82e-5, 8.03e-5] * units.eV**2
+
+# NuFit dm3l = dm31 for the normal ordering, so can directly use the NuFit value
+deltam31_nh = 0.002507 units.eV**2
+deltam31_nh_gauss = 0.002507 +/- 0.000027 * units.eV**2
+deltam31_nh.range = [0.001, 0.007] * units.eV**2
+deltam31_nh.3s_range = [0.002427, 0.002590] * units.eV**2
+
+# NuFit dm3l = dm32 for the inverted ordering (and is thus negative), so must convert using: dm31 = dm32 + dm21
+deltam31_ih = -0.002412 units.eV**2
+deltam31_ih_gauss = -0.002412 +/- 0.000028 * units.eV**2
+deltam31_ih.3s_range = [-0.002496, -0.002332] * units.eV**2
+deltam31_ih.range = [-0.007, -0.001] * units.eV**2