Move shift cascade vertex (#25)

* Move shift_cascade_vertex to model; clean up configs; remove float_precision compatibility * Rename estimate_charge_distribution -> charge_distribution_type * Update tests * Add compatibility note --------- Co-authored-by: mhuen <mhuen@users.noreply.github.com>
icecube · May 31, 2024 · de56a7b · de56a7b
1 parent 18f5acd
commit de56a7b
Show file tree

Hide file tree

Showing 34 changed files with 388 additions and 9,352 deletions.
diff --git a/...gs/cascade_13param_noise_tw_Spice321.yaml → configs/cascade_11param_noise_ftpv3m.yaml b/...gs/cascade_13param_noise_tw_Spice321.yaml → configs/cascade_11param_noise_ftpv3m.yaml
@@ -7,7 +7,7 @@
 ##############
 
 # Provide a unique name for the model
-unique_name: 'cascade_13param_noise_tw_Spice321'
+unique_name: 'cascade_11param_noise_ftpv3m'
 
 #------------------
 # Training settings
@@ -89,16 +89,14 @@ reconstruction_settings: {
     # from which column names in the data table the parameters will be loaded
     'seed_parameter_names': ['x', 'y', 'z', 'zenith', 'azimuth',
                              'energy', 'time',
-                             'Absorption', 'AnisotropyScale', 'DOMEfficiency',
+                             'Absorption',
                              'HoleIceForward_Unified_00',
                              'HoleIceForward_Unified_01',
                              'Scattering',
                          ],
     'seed_missing_value': 1.,
     'seed_missing_value_dict': {
         'Absorption': 1.,
-        'AnisotropyScale': 1.,
-        'DOMEfficiency': 1.,
         'HoleIceForward_Unified_00': 0.,
         'HoleIceForward_Unified_01': 0.,
         'Scattering': 1.,
@@ -410,7 +408,6 @@ data_handler_settings: {
 
     # settings for the label module
     'label_settings':{
-        'shift_cascade_vertex': True,
         # logarithm on labels:
         # (x, y, z, zenith, azimuth, energy, time)?
         'trafo_log': [False, False, False, False, False, True, False],
@@ -490,14 +487,16 @@ model_settings: {
 
             config: {
                 'keep_prob':,
+                'shift_cascade_vertex': True,
+                'add_anisotropy_angle': True,
                 'add_opening_angle': True,
                 'add_dom_coordinates': False,
                 'num_local_vars': 0,
                 'scale_charge': True,
                 'scale_charge_by_relative_dom_efficiency': True,
                 'scale_charge_by_global_dom_efficiency': True,
                 'prevent_mixture_component_swapping': False,
-                'estimate_charge_distribution': 'negative_binomial',
+                'charge_distribution_type': 'negative_binomial',
                 'num_latent_models': 10,
                 'float_precision': float64,
 

diff --git a/configs/cascade_14param_noise_tw_Spice321.yaml b/configs/cascade_14param_noise_tw_Spice321.yaml
diff --git a/configs/cascade_7param_charge_only_BFRv1Spice321.yaml b/configs/cascade_7param_charge_only_BFRv1Spice321.yaml
diff --git a/...param_noise_tw_BFRv1Spice321_low_mem.yaml → configs/cascade_7param_noise_ftpv3m.yaml b/...param_noise_tw_BFRv1Spice321_low_mem.yaml → configs/cascade_7param_noise_ftpv3m.yaml
@@ -7,8 +7,7 @@
 ##############
 
 # Provide a unique name for the model
-unique_name: 'cascade_7param_noise_tw_BFRv1Spice321_low_mem'
-
+unique_name: 'cascade_7param_noise_ftpv3m'
 
 #------------------
 # Training settings
@@ -389,7 +388,6 @@ data_handler_settings: {
 
     # settings for the label module
     'label_settings':{
-        'shift_cascade_vertex': True,
         # logarithm on labels:
         # (x, y, z, zenith, azimuth, energy, time)?
         'trafo_log': [False, False, False, False, False, True, False],
@@ -464,14 +462,16 @@ model_settings: {
 
             config: {
                 'keep_prob':,
+                'shift_cascade_vertex': True,
+                'add_anisotropy_angle': True,
                 'add_opening_angle': True,
                 'add_dom_coordinates': False,
                 'num_local_vars': 0,
                 'scale_charge': True,
                 'scale_charge_by_relative_dom_efficiency': True,
                 'scale_charge_by_global_dom_efficiency': False,
                 'prevent_mixture_component_swapping': False,
-                'estimate_charge_distribution': 'negative_binomial',
+                'charge_distribution_type': 'negative_binomial',
                 'num_latent_models': 10,
 
                 # This is a list of labels in addition to