ACID-code-v2 0.2.2a1__tar.gz → 0.2.2a3__tar.gz

{acid_code_v2-0.2.2a1 → acid_code_v2-0.2.2a3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ACID_code_v2
-Version: 0.2.2a1
+Version: 0.2.2a3
 Summary: Returns line profiles from input spectra by fitting the stellar continuum and performing LSD
 Author: Lucy Dolan
 Author-email: Benjamin Cadell <bcadell01@qub.ac.uk>

{acid_code_v2-0.2.2a1 → acid_code_v2-0.2.2a3}/example/tutorial_code.py

@@ -5,6 +5,7 @@ import multiprocessing as mp
 import numpy as np
 import matplotlib.pyplot as plt
 try:
+    raise Exception("Force except block")
     import ACID_code_v2 as acid
 except:
     os.chdir(os.path.dirname(__file__))

{acid_code_v2-0.2.2a1 → acid_code_v2-0.2.2a3}/src/ACID_code_v2/ACID.py

@@ -8,7 +8,6 @@ from functools import partial
 from multiprocessing import Pool
 from . import utils
 from . import LSD
-from . import mcmc_utils
 
 warnings.filterwarnings("ignore")
 importlib.reload(LSD)
@@ -233,11 +232,57 @@ def model_func(inputs, x):
    
     return mdl
 
+def log_likelihood(theta, x, y, yerr):
+    ## maximum likelihood estimation for the mcmc model.
+    model = model_func(theta, x)
+
+    lnlike = -0.5 * np.sum(((y) - (model)) ** 2 / yerr**2 + np.log(yerr**2)+ np.log(2*np.pi))
+
+    return lnlike
+
+def log_prior(theta):
+    ## imposes the prior restrictions on the inputs - rejects if profile point is less than -10 or greater than 0.5.
+    check = 0
+    z = theta[:k_max]
+
+    for i in range(len(theta)):
+        if i < k_max: ## must lie in z
+            if -10 <= theta[i] <= 0.5:
+                pass
+            else:
+                check = 1
+
+    if check == 0:
+
+        # excluding the continuum points in the profile (in flux)
+        z_cont = []
+        v_cont = []
+        for i in range(0, 5):
+                z_cont.append(np.exp(z[len(z)-i-1])-1)
+                v_cont.append(velocities[len(velocities)-i-1])
+                z_cont.append(np.exp(z[i])-1)
+                v_cont.append(velocities[i])
+
+        z_cont = np.array(z_cont)
+        v_cont = np.array(v_cont)
+
+        p_pent = np.sum((np.log((1/np.sqrt(2*np.pi*0.01**2)))-0.5*(z_cont/0.01)**2))
+
+        return p_pent
+
+    return -np.inf
+
+def log_probability(theta):
+    ## calculates log probability - used for mcmc
+    lp = log_prior(theta)
+    if not np.isfinite(lp):
+        return -np.inf
+    final = lp + log_likelihood(theta, x, y, yerr)
+    return final
+
 def residual_mask(wavelengths, data_spec_in, data_err, initial_inputs, poly_ord, linelist,
                   velocities=np.arange(-25, 25, 0.82), pix_chunk=20, dev_perc=25, 
-                  tell_lines=[3820.33, 3933.66, 3968.47, 4327.74, 4307.90, 4383.55,
-                              4861.34, 5183.62, 5270.39, 5889.95, 5895.92, 6562.81,
-                              7593.70, 8226.96], n_sig=1):
+                  tell_lines=None, n_sig=1, alpha=None):
     ## iterative residual masking - mask continuous areas first - then possibly progress to masking the narrow lines
 
     forward = model_func(initial_inputs, wavelengths)
@@ -568,7 +613,7 @@ def ACID(input_wavelengths, input_spectra, input_spectral_errors, line, frame_sn
     yerr, model_inputs_resi, mask_idx = residual_mask(x, y, yerr, model_inputs, poly_ord,
                                                       linelist, pix_chunk=pix_chunk,
                                                       dev_perc=dev_perc, tell_lines=telluric_lines,
-                                                      n_sig=n_sig)
+                                                      n_sig=n_sig, alpha=alpha)
 
     # if verbose:
     #     t4 = time.time()
@@ -593,9 +638,6 @@ def ACID(input_wavelengths, input_spectra, input_spectral_errors, line, frame_sn
     pos = np.array(pos)
     pos = np.transpose(pos)
 
-    # Inistialise MCMC class:
-    mcmc_class = mcmc_utils.Model(model_func, x, y, yerr, velocities, k_max)
-
     if verbose:
         t5 = time.time()
         # print('MCMC set up takes: %s'%(t5-t4))
@@ -619,7 +661,7 @@ def ACID(input_wavelengths, input_spectra, input_spectral_errors, line, frame_sn
         if sys.platform != "win32":
             ctx = mp.get_context("fork")
             with ctx.Pool(processes = cores) as pool:
-                sampler = emcee.EnsembleSampler(nwalkers, ndim, mcmc_class.log_probability, pool=pool)
+                sampler = emcee.EnsembleSampler(nwalkers, ndim, log_probability, pool=pool)
                 sampler.run_mcmc(pos, nsteps, progress=True, store=True)
 
             # with Pool() as pool: # Original code
@@ -633,7 +675,7 @@ def ACID(input_wavelengths, input_spectra, input_spectral_errors, line, frame_sn
 
 
     else:
-        sampler = emcee.EnsembleSampler(nwalkers, ndim, mcmc_class.log_probability)
+        sampler = emcee.EnsembleSampler(nwalkers, ndim, log_probability)
         sampler.run_mcmc(pos, nsteps, progress=True)
 
     print('MCMC run takes: %s'%(time.time()-t5))

{acid_code_v2-0.2.2a1 → acid_code_v2-0.2.2a3}/src/ACID_code_v2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ACID_code_v2
-Version: 0.2.2a1
+Version: 0.2.2a3
 Summary: Returns line profiles from input spectra by fitting the stellar continuum and performing LSD
 Author: Lucy Dolan
 Author-email: Benjamin Cadell <bcadell01@qub.ac.uk>

{acid_code_v2-0.2.2a1 → acid_code_v2-0.2.2a3}/src/ACID_code_v2.egg-info/SOURCES.txt

@@ -25,7 +25,6 @@ example/tutorial_code.py
 src/ACID_code_v2/ACID.py
 src/ACID_code_v2/LSD.py
 src/ACID_code_v2/__init__.py
-src/ACID_code_v2/mcmc_utils.py
 src/ACID_code_v2/utils.py
 src/ACID_code_v2.egg-info/PKG-INFO
 src/ACID_code_v2.egg-info/SOURCES.txt

acid_code_v2-0.2.2a1/src/ACID_code_v2/mcmc_utils.py

@@ -1,60 +0,0 @@
-import numpy as np
-from .ACID import model_func
-
-
-class Model:
-    def __init__(self, model_func, x, y, yerr, velocities, k_max):
-        self.model_func = model_func
-        self.x = x
-        self.y = y
-        self.yerr = yerr
-        self.velocities = velocities
-        self.k_max = k_max
-
-    def log_likelihood(self, theta, x, y, yerr):
-        ## maximum likelihood estimation for the mcmc model.
-        model = model_func(theta, x)
-
-        lnlike = -0.5 * np.sum(((y) - (model)) ** 2 / yerr**2 + np.log(yerr**2)+ np.log(2*np.pi))
-
-        return lnlike
-
-    def log_prior(self, theta):
-        ## imposes the prior restrictions on the inputs - rejects if profile point is less than -10 or greater than 0.5.
-        check = 0
-        z = theta[:self.k_max]
-
-        for i in range(len(theta)):
-            if i < self.k_max: ## must lie in z
-                if -10 <= theta[i] <= 0.5:
-                    pass
-                else:
-                    check = 1
-
-        if check == 0:
-
-            # excluding the continuum points in the profile (in flux)
-            z_cont = []
-            v_cont = []
-            for i in range(0, 5):
-                    z_cont.append(np.exp(z[len(z)-i-1])-1)
-                    v_cont.append(self.velocities[len(self.velocities)-i-1])
-                    z_cont.append(np.exp(z[i])-1)
-                    v_cont.append(self.velocities[i])
-
-            z_cont = np.array(z_cont)
-            v_cont = np.array(v_cont)
-
-            p_pent = np.sum((np.log((1/np.sqrt(2*np.pi*0.01**2)))-0.5*(z_cont/0.01)**2))
-
-            return p_pent
-
-        return -np.inf
-
-    def log_probability(self, theta):
-        ## calculates log probability - used for mcmc
-        lp = self.log_prior(theta)
-        if not np.isfinite(lp):
-            return -np.inf
-        final = lp + self.log_likelihood(theta, self.x, self.y, self.yerr)
-        return final