From d2f5165bd6a26abb9f3ca60e83302e4f87939180 Mon Sep 17 00:00:00 2001 From: "Sebastian Zieba (astronodes)" Date: Wed, 8 Nov 2023 17:19:35 +0100 Subject: [PATCH] road to windows s0 --- docs/source/installation.rst | 2 +- src/pacman/s00_table.py | 2 +- src/pacman/s01_horizons.py | 4 ++-- src/pacman/s02_barycorr.py | 4 ++-- src/pacman/s03_refspectra.py | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/source/installation.rst b/docs/source/installation.rst index 6ddf10b..a400828 100644 --- a/docs/source/installation.rst +++ b/docs/source/installation.rst @@ -26,7 +26,7 @@ Once you have Anaconda installed, navigate in a terminal to a directory where yo With these steps, we created a conda environment called ``pacman`` and installed ``PACMAN`` and its dependencies there. We also installed the code in the edit mode with ``-e``, giving you the option to edit the source code. -.. note:: In this example, the conda environment was initialized with python v3.9.0. PACMAN was tested with python v3.8 to v3.12, so it is up to the user which version to use. Python 3.7 reached end of life in `June 2023 `_. We therefore stopped supporting it. +.. note:: In this example, the conda environment was initialized with python v3.9.0. PACMAN was tested with python v3.8 to v3.11, so it is up to the user which version to use. Python 3.7 reached end of life in `June 2023 `_. We therefore stopped supporting it. .. note:: ``pip install -e .`` will only install the necessary dependencies. If you also want to install the dependencies to run the tests (using pytest) or work on the docs, you have to use the ``[test]`` or ``[docs]`` arguments respectively after ``pip install -e .``. See `Test Your Installation `_ for an example. diff --git a/src/pacman/s00_table.py b/src/pacman/s00_table.py index ccaf0a9..cb8e7d4 100644 --- a/src/pacman/s00_table.py +++ b/src/pacman/s00_table.py @@ -258,7 +258,7 @@ def run00(eventlabel, pcf_path='.'): # Save results print('Saving Metadata') - me.saveevent(meta, meta.workdir + '/WFC3_' + meta.eventlabel + "_Meta_Save", save=[]) + me.saveevent(meta, meta.workdir + os.path.sep + 'WFC3_' + meta.eventlabel + '_Meta_Save', save=[]) print('Finished s00 \n') diff --git a/src/pacman/s01_horizons.py b/src/pacman/s01_horizons.py index 00ee470..f3c6ad6 100644 --- a/src/pacman/s01_horizons.py +++ b/src/pacman/s01_horizons.py @@ -42,7 +42,7 @@ def run01(eventlabel, workdir, meta=None): print('Starting s01') if meta == None: - meta = me.loadevent(os.path.join(workdir, 'WFC3_', eventlabel, "_Meta_Save")) + meta = me.loadevent(workdir + os.path.sep + 'WFC3_' + eventlabel + '_Meta_Save')) # read in filelist filelist_path = meta.workdir + os.path.sep + 'filelist.txt' @@ -113,7 +113,7 @@ def run01(eventlabel, workdir, meta=None): # Save results print('Saving Metadata') - me.saveevent(meta, os.path.join(meta.workdir, 'WFC3_', meta.eventlabel, '_Meta_Save'), save=[]) + me.saveevent(meta, meta.workdir + os.path.sep + 'WFC3_' + meta.eventlabel + '_Meta_Save', save=[]) print('Finished s01 \n') diff --git a/src/pacman/s02_barycorr.py b/src/pacman/s02_barycorr.py index ad1ee05..efa1632 100644 --- a/src/pacman/s02_barycorr.py +++ b/src/pacman/s02_barycorr.py @@ -39,7 +39,7 @@ def run02(eventlabel, workdir, meta=None): print('Starting s02') if meta == None: - meta = me.loadevent(os.path.join(workdir, 'WFC3_', eventlabel, "_Meta_Save")) + meta = me.loadevent(workdir + os.path.sep + 'WFC3_' + eventlabel + '_Meta_Save')) # read in filelist filelist_path = meta.workdir + os.path.sep + 'filelist.txt' @@ -101,7 +101,7 @@ def run02(eventlabel, workdir, meta=None): # Save results print('Saving Metadata') - me.saveevent(meta, os.path.join(meta.workdir, 'WFC3_', meta.eventlabel, '_Meta_Save'), save=[]) + me.saveevent(meta, meta.workdir + os.path.sep + 'WFC3_' + meta.eventlabel + '_Meta_Save', save=[]) print('Finished s02 \n') diff --git a/src/pacman/s03_refspectra.py b/src/pacman/s03_refspectra.py index 3caa89a..c9ff68f 100644 --- a/src/pacman/s03_refspectra.py +++ b/src/pacman/s03_refspectra.py @@ -42,7 +42,7 @@ def run03(eventlabel, workdir, meta=None): print('Starting s03') if meta == None: - meta = me.loadevent(os.path.join(workdir, 'WFC3_', eventlabel, "_Meta_Save")) + meta = me.loadevent(workdir + os.path.sep + 'WFC3_' + eventlabel + '_Meta_Save')) ### Stellar Spectrum Teff, logg, MH = meta.Teff, meta.logg, meta.MH @@ -106,7 +106,7 @@ def run03(eventlabel, workdir, meta=None): # Save results print('Saving Metadata') - me.saveevent(meta, os.path.join(meta.workdir, 'WFC3_', meta.eventlabel, '_Meta_Save'), save=[]) + me.saveevent(meta, meta.workdir + os.path.sep + 'WFC3_' + meta.eventlabel + '_Meta_Save', save=[]) print('Finished s03 \n')