Change continuum marginalization variable

Author: andreicuceu

lya_2pt/global_data.py

@@ -22,5 +22,5 @@
 
 get_old_distortion = None
 rejection_fraction = None
-continuum_order = None
+cont_marg_order = None
 seed = None

lya_2pt/interface.py

@@ -19,7 +19,7 @@
 accepted_options = [
     "input-nside", "output-nside", "num-cpu", "z_min", "z_max", "rp_min", "rp_max", "rt_max",
     "num_bins_rp", "num_bins_rt", "num_bins_rp_model", "num_bins_rt_model",
-    "rejection_fraction", "get-old-distortion", "continuum-order", "seed"
+    "rejection_fraction", "get-old-distortion", "continuum-marginalization-order", "seed"
 ]
 
 defaults = {
@@ -37,7 +37,7 @@
     "num_bins_rt_model": 50,
     "rejection_fraction": 0.99,
     "get-old-distortion": True,
-    "continuum-order": -1,
+    "continuum-marginalization-order": -1,
     "seed": 0,
 }
 
@@ -101,7 +101,7 @@ def __init__(self, config):
         globals.num_bins_rt_model = self.settings.getint('num_bins_rt_model')
         globals.rejection_fraction = self.settings.getfloat('rejection_fraction')
         globals.get_old_distortion = self.settings.getboolean('get-old-distortion')
-        globals.continuum_order = self.settings.getint('continuum-order')
+        globals.cont_marg_order = self.settings.getint('continuum-marginalization-order')
         globals.seed = self.settings.getint('seed')
 
         self.input_nside = self.settings.getint("input-nside")

lya_2pt/optimal_estimator.py

@@ -230,7 +230,7 @@ def compute_xi_and_fisher(healpix_id, eboss=True):
             globals.rp_max, globals.rt_max
         )
 
-        tracer1.set_inverse_covariance(xi1d_interp, globals.continuum_order)
+        tracer1.set_inverse_covariance(xi1d_interp, globals.cont_marg_order)
         tracer1.apply_invcov_to_deltas()
 
         if globals.rejection_fraction > 0:
@@ -240,7 +240,7 @@ def compute_xi_and_fisher(healpix_id, eboss=True):
             angles = angles[w]
 
         for tracer2, angle in zip(neighbours, angles):
-            tracer2.set_inverse_covariance(xi1d_interp, globals.continuum_order)
+            tracer2.set_inverse_covariance(xi1d_interp, globals.cont_marg_order)
             tracer2.apply_invcov_to_deltas()
             compute_xi_and_fisher_pair(tracer1, tracer2, angle, xi_est, fisher_est)
             tracer2.release_inverse_covariance()

lya_2pt/tracer.py

@@ -300,7 +300,7 @@ def apply_z_evol_to_weights(self, redshift_evol, reference_z):
                                                    / self.sum_weights)
             self.term3_norm = (self.weights * self.logwave_term**2).sum()
 
-    def set_inverse_covariance(self, xi1d_interp, cont_order=2):
+    def set_inverse_covariance(self, xi1d_interp, cont_order=1):
         if self.invcov is not None:
             return