Swap to correct IC86_2012 binning

icecube · Jul 21, 2020 · 97181e5 · 97181e5
1 parent 10313f3
commit 97181e5
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 25 deletions.
diff --git a/flarestack/data/icecube/ps_tracks/__init__.py b/flarestack/data/icecube/ps_tracks/__init__.py
@@ -33,20 +33,30 @@
         np.linspace(-1., 1., 50),
         np.arange(2., 9. + 0.01, 0.125)
     ),
-    "IC86": (
+    "IC86_2011": (
         np.unique(np.concatenate([
                 np.linspace(-1., -0.2, 10 + 1),
                 np.linspace(-0.2, boundary, 4 + 1),
                 np.linspace(boundary, 0.2, 5 + 1),
                 np.linspace(0.2, 1., 10)
             ])),
         np.arange(1., 10. + 0.01, 0.125)
+    ),
+    "IC86_2012": (
+        np.unique(np.concatenate([
+            np.linspace(-1., -0.93, 4 + 1),
+            np.linspace(-0.93, -0.3, 10 + 1),
+            np.linspace(-0.3, 0.05, 9 + 1),
+            np.linspace(0.05, 1., 18 + 1),
+        ])),
+        np.arange(1., 9.5 + 0.01, 0.125)
     )
 }
 
-
 def get_ps_binning(season):
-    if "IC86" in season:
-        season = "IC86"
+    if season in ["IC86_1", "IC86-2011", "IC86_2011"]:
+        season = "IC86_2011"
+    elif "IC86" in season:
+        season = "IC86_2012"
     return ps_binning[season]
 
diff --git a/flarestack/data/icecube/ps_tracks/ps_v002_p01.py b/flarestack/data/icecube/ps_tracks/ps_v002_p01.py
@@ -59,7 +59,7 @@
 """
 from flarestack.data.icecube.ic_season import IceCubeDataset, \
     IceCubeSeason, icecube_dataset_dir
-from flarestack.data.icecube.ps_tracks import ps_binning
+from flarestack.data.icecube.ps_tracks import get_ps_binning
 import numpy as np
 import copy
 
@@ -75,8 +75,8 @@
     exp_path=ps_data_dir + "IC40_exp.npy",
     mc_path=ps_data_dir + "IC40_corrected_MC.npy",
     grl_path=ps_data_dir + "IC40_GRL.npy",
-    sin_dec_bins=ps_binning["IC40"][0],
-    log_e_bins=ps_binning["IC40"][1]
+    sin_dec_bins=get_ps_binning("IC40")[0],
+    log_e_bins=get_ps_binning("IC40")[1]
 )
 
 ps_v002_p01.add_season(ic40)
@@ -88,8 +88,8 @@
     exp_path=ps_data_dir + "IC59_exp.npy",
     mc_path=ps_data_dir + "IC59_corrected_MC.npy",
     grl_path=ps_data_dir + "IC59_GRL.npy",
-    sin_dec_bins=ps_binning["IC59"][0],
-    log_e_bins=ps_binning["IC59"][1]
+    sin_dec_bins=get_ps_binning("IC59")[0],
+    log_e_bins=get_ps_binning("IC59")[1]
 )
 
 ps_v002_p01.add_season(ic59)
@@ -100,8 +100,8 @@
     exp_path=ps_data_dir + "IC79b_exp.npy",
     mc_path=ps_data_dir + "IC79b_corrected_MC.npy",
     grl_path=ps_data_dir + "IC79b_GRL.npy",
-    sin_dec_bins=ps_binning["IC79"][0],
-    log_e_bins=ps_binning["IC79"][1]
+    sin_dec_bins=get_ps_binning("IC79")[0],
+    log_e_bins=get_ps_binning("IC79")[1]
 )
 ps_v002_p01.add_season(ic79)
 
@@ -113,8 +113,8 @@
     exp_path=ps_data_dir + "IC86_exp.npy",
     mc_path=ps_data_dir + "IC86_corrected_MC.npy",
     grl_path=ps_data_dir + "IC86_GRL.npy",
-    sin_dec_bins=ps_binning["IC86"][0],
-    log_e_bins=ps_binning["IC86"][1]
+    sin_dec_bins=get_ps_binning("IC86_2011")[0],
+    log_e_bins=get_ps_binning("IC86_2011")[1]
 )
 
 ps_v002_p01.add_season(ic86_1)
@@ -129,8 +129,8 @@
         exp_path=ps_data_dir + "IC86-201{0}_exp_v2.npy".format(i),
         mc_path=ps_data_dir + "IC86-2012_corrected_MC_v2.npy",
         grl_path=ps_data_dir + "IC86-201{0}_GRL.npy".format(i),
-        sin_dec_bins=ps_binning["IC86"][0],
-        log_e_bins=ps_binning["IC86"][1]
+        sin_dec_bins=get_ps_binning("IC86_2012")[0],
+        log_e_bins=get_ps_binning("IC86_2012")[1]
     )
     ps_v002_p01.add_subseason(ic86_i)
 
@@ -148,8 +148,8 @@
         ps_data_dir + "IC86-2013_GRL.npy",
         ps_data_dir + "IC86-2014_GRL.npy"
     ],
-    sin_dec_bins=ps_binning["IC86"][0],
-    log_e_bins=ps_binning["IC86"][1]
+    sin_dec_bins=get_ps_binning("IC86_2012")[0],
+    log_e_bins=get_ps_binning("IC86_2012")[1]
 )
 
 ps_v002_p01.add_season(ic86_234)

diff --git a/flarestack/data/icecube/ps_tracks/ps_v003_p01.py b/flarestack/data/icecube/ps_tracks/ps_v003_p01.py
@@ -44,8 +44,8 @@ def old_ic_season(season):
     grl_path=[
         grl_data_dir + "IC86_{0}_exp.npy".format(x) for x in new_years
     ],
-    sin_dec_bins=get_ps_binning("IC86")[0],
-    log_e_bins=get_ps_binning("IC86")[1]
+    sin_dec_bins=get_ps_binning("IC86_2012")[0],
+    log_e_bins=get_ps_binning("IC86_2012")[1]
 )
 
 ps_v003_p01.add_season(ic86_234567)
@@ -60,8 +60,8 @@ def ic86_new_season(year):
         exp_path=ps_data_dir + "IC86_{0}_exp.npy".format(year),
         mc_path=ps_data_dir + "IC86_2012_MC.npy",
         grl_path=grl_data_dir + "IC86_{0}_exp.npy".format(year),
-        sin_dec_bins=get_ps_binning("IC86")[0],
-        log_e_bins=get_ps_binning("IC86")[1]
+        sin_dec_bins=get_ps_binning(year)[0],
+        log_e_bins=get_ps_binning(year)[1]
     )
 
 

diff --git a/flarestack/data/icecube/ps_tracks/ps_v003_p02.py b/flarestack/data/icecube/ps_tracks/ps_v003_p02.py
@@ -48,8 +48,8 @@ def old_ic_season(season):
     grl_path=[
         grl_data_dir + "IC86_{0}_exp.npy".format(x) for x in new_years
     ],
-    sin_dec_bins=get_ps_binning("IC86")[0],
-    log_e_bins=get_ps_binning("IC86")[1]
+    sin_dec_bins=get_ps_binning("IC86_2012")[0],
+    log_e_bins=get_ps_binning("IC86_2012")[1]
 )
 
 ps_v003_p02.add_season(ic86_234567)
@@ -64,8 +64,8 @@ def ic86_new_season(year):
         exp_path=ps_data_dir + "IC86_{0}_exp.npy".format(year),
         mc_path=ps_data_dir + "IC86_2012_MC.npy",
         grl_path=grl_data_dir + "IC86_{0}_exp.npy".format(year),
-        sin_dec_bins=get_ps_binning("IC86")[0],
-        log_e_bins=get_ps_binning("IC86")[1]
+        sin_dec_bins=get_ps_binning(year)[0],
+        log_e_bins=get_ps_binning(year)[1]
     )