Skip to content

Commit

Permalink
road to windows s0
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastian-zieba committed Nov 8, 2023
1 parent 130b6d0 commit d2f5165
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion docs/source/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://devguide.python.org/versions/>`_. 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 <https://devguide.python.org/versions/>`_. 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 <https://pacmandocs.readthedocs.io/en/latest/installation.html#test-your-installation>`_ for an example.

Expand Down
2 changes: 1 addition & 1 deletion src/pacman/s00_table.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
4 changes: 2 additions & 2 deletions src/pacman/s01_horizons.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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')

Expand Down
4 changes: 2 additions & 2 deletions src/pacman/s02_barycorr.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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')

Expand Down
4 changes: 2 additions & 2 deletions src/pacman/s03_refspectra.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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')

Expand Down

0 comments on commit d2f5165

Please sign in to comment.