PyPI - ACID-code-v2 - Versions diffs - 0.2.0a1__tar.gz → 0.2.2a1__tar.gz - Mend

@@ -5,7 +5,7 @@ on:
       - 'v*'
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ACID_code_v2
-Version: 0.2.0a1
+Version: 0.2.2a1
 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>

@@ -800,7 +800,14 @@ def ACID(input_wavelengths, input_spectra, input_spectral_errors, line, frame_sn
     return all_frames
 def ACID_HARPS(filelist, line, vgrid, order_range=None, save_path = './', file_type = 'e2ds', **kwargs):
-    """_summary_
+    """Accurate Continuum fItting and Deconvolution for HARPS e2ds and s1d spectra (DRS pipeline 3.5)
+    Fits the continuum of the given spectra and performs LSD on the continuum corrected spectra,
+    returning an LSD profile for each file given. Files must all be kept in the same folder as well
+    as their corresponding blaze files. If 's1d' are being used their e2ds equivalents must also be
+    in this folder. Result files containing profiles and associated errors for each order (or
+    corresponding wavelength range in the case of 's1d' files) will be created and saved to a
+    specified folder. It is recommended that this folder is seperate to the input files.
     Parameters
     ----------
@@ -886,5 +893,3 @@ def ACID_HARPS(filelist, line, vgrid, order_range=None, save_path = './', file_t
         errors.append(result2)
     return BJDs, profiles, errors

@@ -1,13 +1,12 @@
 import numpy as np
 from scipy import linalg
 from astropy.io import  fits
-import glob, time, warnings, sys, psutil
+import glob, time, warnings, sys, psutil, os
 import scipy.constants as const
 import matplotlib.pyplot as plt
 from scipy.signal import find_peaks
 from scipy.interpolate import interp1d, LSQUnivariateSpline
 from tqdm import tqdm
-import os
 ckms = float(const.c/1e3)  # speed of light in km/s
 def LSD(wavelengths, flux_obs, rms, linelist, adjust_continuum, poly_ord, sn,
@@ -199,9 +198,9 @@ def continuumfit(wavelengths1, fluxes1, poly_ord):
         return flux_obs
-# from MM-LSD code - give credit if needed
 def upper_envelope(x, y):
-    #used to compute the tapas continuum. find peaks then fit spline to it.
+    # from MM-LSD code - give credit if needed
+    # used to compute the tapas continuum. find peaks then fit spline to it.
     peaks = find_peaks(y, height=0.2, distance=len(x) // 500)[0]
     # t= knot positions
     spl = LSQUnivariateSpline(x=x[peaks], y=y[peaks], t=x[peaks][5::10])

@@ -1,5 +1,5 @@
 import numpy as np
-from ACID_code_v2.ACID import model_func
+from .ACID import model_func
 class Model:

@@ -21,7 +21,6 @@ def ensure_list(x, allow_none=False):
     else:
         raise TypeError("Input must be a list or numpy array")
 def round_sig(x1, sig):
     return round(x1, sig-int(floor(log10(abs(x1))))-1)

@@ -6,7 +6,6 @@ README.md
 acid.yml
 pyproject.toml
 .github/workflows/publish.yml
-.github/workflows/python-app.yml
 .other_scripts/5_residual_profiles.py
 .other_scripts/8_master_out_profiles.py
 .vscode/launch.json

@@ -1,35 +0,0 @@
-# This workflow will install Python dependencies, run tests and lint with a single version of Python
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
-name: Python application
-on:
-  push:
-    branches: [ "main" ]
-  pull_request:
-    branches: [ "main" ]
-permissions:
-  contents: read
-jobs:
-  build:
-    runs-on: macos-latest
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3.7
-      uses: actions/setup-python@v3
-      with:
-        python-version: "3.7"
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install pytest
-        git clone https://github.com/ldolan05/ACID.git
-        cd ACID
-        python -m pip install -e .
-        if [ -f docs/requirements.txt ]; then pip install -r docs/requirements.txt; fi
-    - name: Test with pytest
-      run: |
-        pytest tests/*

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