Providing defaults

n3fit/src/n3fit/scripts/n3fit_exec.py

@@ -145,23 +145,25 @@ class N3FitConfig(Config):
             validation_action = namespace + "validation_pseudodata"
 
             N3FIT_FIXED_CONFIG['actions_'].extend((training_action, validation_action))
-        #Theorycovmat_flags
+        #Theorycovmat flags and defaults
         N3FIT_FIXED_CONFIG['theory_covmat_flag'] = False
         N3FIT_FIXED_CONFIG['use_user_uncertainties'] = None
         N3FIT_FIXED_CONFIG['use_scalevar_uncertainties'] = None
         N3FIT_FIXED_CONFIG['use_thcovmat_in_fitting'] = None
         N3FIT_FIXED_CONFIG['use_thcovmat_in_sampling'] = None
+        import ipdb; ipdb.set_trace()
         if (thconfig:=file_content.get('theorycovmatconfig')) is not None:
             N3FIT_FIXED_CONFIG['theory_covmat_flag'] = True
-            N3FIT_FIXED_CONFIG['use_thcovmat_in_fitting'] = thconfig.get('use_thcovmat_in_fitting')
-            N3FIT_FIXED_CONFIG['use_thcovmat_in_sampling'] = thconfig.get('use_thcovmat_in_sampling')
-            N3FIT_FIXED_CONFIG['use_user_uncertainties'] = thconfig.get('use_user_uncertainties')
-            N3FIT_FIXED_CONFIG['use_scalevar_uncertainties'] = thconfig.get('use_scalevar_uncertainties')
+            N3FIT_FIXED_CONFIG['use_thcovmat_in_fitting'] = thconfig.get('use_thcovmat_in_fitting') if thconfig.get('use_thcovmat_in_fitting') is not None else True 
+            N3FIT_FIXED_CONFIG['use_thcovmat_in_sampling'] = thconfig.get('use_thcovmat_in_sampling') if thconfig.get('use_thcovmat_in_sampling') is not None else True 
+            N3FIT_FIXED_CONFIG['use_user_uncertainties'] = thconfig.get('use_user_uncertainties') if thconfig.get('use_user_uncertainties') is not None else False
+            N3FIT_FIXED_CONFIG['use_scalevar_uncertainties'] = thconfig.get('use_scalevar_uncertainties') if thconfig.get('use_scalevar_uncertainties') is not None else True
+        #Sampling flags and defaults
         N3FIT_FIXED_CONFIG['use_t0_sampling'] = False
         N3FIT_FIXED_CONFIG['separate_multiplicative'] = False
         if (sam_t0:=file_content.get('sampling_t0')) is not None:
-            N3FIT_FIXED_CONFIG['use_t0_sampling'] = sam_t0.get('use_t0')
-            N3FIT_FIXED_CONFIG['separate_multiplicative'] = sam_t0.get('separate_multiplicative')
+            N3FIT_FIXED_CONFIG['use_t0_sampling'] = sam_t0.get('use_t0') if sam_t0.get('use_t0') is not None else False
+            N3FIT_FIXED_CONFIG['separate_multiplicative'] = sam_t0.get('separate_multiplicative') if sam_t0.get('separate_multiplicative') is not None else False
         N3FIT_FIXED_CONFIG['use_t0_fitting'] = True
         if(fit_t0:=file_content.get('fitting_t0')) is not None:
             N3FIT_FIXED_CONFIG['use_t0_fitting'] = fit_t0.get('use_t0')