ACID-code-v2 0.1.4__tar.gz → 0.1.6__tar.gz

{acid_code_v2-0.1.4/ACID_code_v2.egg-info → acid_code_v2-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ACID_code_v2
-Version: 0.1.4
+Version: 0.1.6
 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.1.4 → acid_code_v2-0.1.6}/example/tutorial_code.py

@@ -5,10 +5,10 @@ import multiprocessing as mp
 import numpy as np
 import matplotlib.pyplot as plt
 os.chdir(os.path.dirname(__file__))
-os.chdir("../") # ensures we are in the main directory
+os.chdir("../src") # ensures we are in the main directory
 import ACID_code_v2 as acid
 importlib.reload(acid)
-os.chdir("example") # change to example directory
+os.chdir("../example") # change back to example directory
 
 spec_file = fits.open('sample_spec_1.fits')
 

{acid_code_v2-0.1.4 → acid_code_v2-0.1.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ACID_code_v2"
-version = "0.1.4"
+version = "0.1.6"
 authors = [
     {name = "Benjamin Cadell", email="bcadell01@qub.ac.uk"},
     {name = "Lucy Dolan"}
@@ -37,7 +37,7 @@ docs = [
 Homepage = "https://github.com/Benjamin-Cadell/ACID"
 
 [tool.setuptools.packages.find]
-where = ["."]
+where = ["src"]
 
 # ... other project metadata fields as listed in:
 #     https://packaging.python.org/en/latest/guides/writing-pyproject-toml/

{acid_code_v2-0.1.4 → acid_code_v2-0.1.6/src}/ACID_code_v2/ACID.py

@@ -9,7 +9,8 @@ import multiprocessing as mp
 from functools import partial
 from multiprocessing import Pool
 from math import log10, floor
-import LSD, utils
+from . import utils
+from . import LSD
 
 warnings.filterwarnings("ignore")
 importlib.reload(LSD)

{acid_code_v2-0.1.4 → acid_code_v2-0.1.6/src/ACID_code_v2.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ACID_code_v2
-Version: 0.1.4
+Version: 0.1.6
 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.1.4 → acid_code_v2-0.1.6/src}/ACID_code_v2.egg-info/SOURCES.txt

@@ -9,15 +9,6 @@ pyproject.toml
 .other_scripts/5_residual_profiles.py
 .other_scripts/8_master_out_profiles.py
 .vscode/launch.json
-ACID_code_v2/ACID.py
-ACID_code_v2/LSD.py
-ACID_code_v2/__init__.py
-ACID_code_v2/utils.py
-ACID_code_v2.egg-info/PKG-INFO
-ACID_code_v2.egg-info/SOURCES.txt
-ACID_code_v2.egg-info/dependency_links.txt
-ACID_code_v2.egg-info/requires.txt
-ACID_code_v2.egg-info/top_level.txt
 docs/ACID.rst
 docs/Makefile
 docs/conf.py
@@ -97,6 +88,15 @@ example/sample_spec_1.fits
 example/sample_spec_2.fits
 example/sample_spec_3.fits
 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/utils.py
+src/ACID_code_v2.egg-info/PKG-INFO
+src/ACID_code_v2.egg-info/SOURCES.txt
+src/ACID_code_v2.egg-info/dependency_links.txt
+src/ACID_code_v2.egg-info/requires.txt
+src/ACID_code_v2.egg-info/top_level.txt
 tests/test.py
 tests/tests.py
 tests/tutorial_test.py
@@ -166,6 +166,4 @@ tests/data/HARPS.2007-08-29T00:30:28.617_ccf_K5_A.fits
 tests/data/HARPS.2007-08-29T00:30:28.617_e2ds_A.fits
 tests/data/HARPS.2007-08-29T00:30:28.617_e2ds_B.fits
 tests/data/HARPS.2007-08-29T00:30:28.617_s1d_A.fits
-tests/data/HARPS.2007-08-29T00:30:28.617_s1d_B.fits
-tests/spawn multithreading tests/__main__.py
-tests/spawn multithreading tests/cli.py
+tests/data/HARPS.2007-08-29T00:30:28.617_s1d_B.fits

acid_code_v2-0.1.6/src/ACID_code_v2.egg-info/top_level.txt

@@ -0,0 +1 @@
+ACID_code_v2

acid_code_v2-0.1.4/ACID_code_v2.egg-info/top_level.txt

@@ -1,7 +0,0 @@
-ACID_code_v2
-dist
-docs
-downloads
-example
-packager
-tests

acid_code_v2-0.1.4/tests/spawn multithreading tests/__main__.py

@@ -1,3 +0,0 @@
-# ACID/__main__.py
-from .cli import cli
-cli()

acid_code_v2-0.1.4/tests/spawn multithreading tests/cli.py

@@ -1,63 +0,0 @@
-# ACID/cli.py
-import argparse
-import numpy as np
-from astropy.io import fits
-import multiprocessing as mp
-
-from . import ACID as acid_mod  # imports ACID/ACID.py module
-
-def cli():
-    p = argparse.ArgumentParser(
-        description="Run ACID (LSD + continuum fit) from the command line."
-    )
-    group = p.add_mutually_exclusive_group(required=True)
-    group.add_argument("--fits", help="Path to FITS with HDUs: 0=wavelength, 1=flux, 2=error, 3=S/N")
-    group.add_argument("--harps-list", nargs="+", help="List of HARPS files (same night)")
-
-    p.add_argument("--linelist", required=True, help="Path to VALD linelist")
-    p.add_argument("--vmin", type=float, default=-25.0)
-    p.add_argument("--vmax", type=float, default=25.0)
-    p.add_argument("--deltav", type=float, default=0.82)
-    p.add_argument("--nsteps", type=int, default=4000)
-    p.add_argument("--parallel", action="store_true", help="Use multiprocessing in MCMC")
-    p.add_argument("--cores", type=int, default=None, help="Number of cores if --parallel")
-    p.add_argument("--poly-order", type=int, default=3)
-    p.add_argument("--pix-chunk", type=int, default=20)
-    p.add_argument("--dev-perc", type=int, default=25)
-    p.add_argument("--n-sig", type=int, default=1)
-    p.add_argument("--out", default="acid_profile.npz", help="Output .npz path")
-
-    args = p.parse_args()
-
-    # Safe on macOS/Windows for spawn; harmless if already set
-    try:
-        mp.set_start_method("spawn", force=True)
-    except RuntimeError:
-        pass
-
-    velocities = np.arange(args.vmin, args.vmax, args.deltav)
-
-    if args.fits:
-        spec = fits.open(args.fits)
-        wavelength = spec[0].data
-        spectrum   = spec[1].data
-        error      = spec[2].data
-        sn         = spec[3].data
-
-        result = acid_mod.ACID(
-            [wavelength], [spectrum], [error], args.linelist, [sn], velocities,
-            poly_or=args.poly_order, pix_chunk=args.pix_chunk, dev_perc=args.dev_perc,
-            n_sig=args.n_sig, parallel=args.parallel, cores=args.cores, nsteps=args.nsteps,
-            verbose=True
-        )
-        profile = result[0, 0, 0]
-        perr    = result[0, 0, 1]
-        np.savez(args.out, velocities=velocities, profile=profile, profile_error=perr)
-        print(f"Saved single-profile output to {args.out}")
-
-    else:
-        BJDs, profiles, errors = acid_mod.ACID_HARPS(
-            args.harps_list, args.linelist, velocities, poly_or=args.poly_order,
-        )
-        np.savez(args.out, BJDs=BJDs, velocities=velocities, profiles=profiles, errors=errors)
-        print(f"Saved HARPS multi-order output to {args.out}")