Skip to content

I have problems... #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
brunofisico wants to merge 163 commits into
base: master
Choose a base branch
from
Open

I have problems... #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
163 commits
Select commit Hold shift + click to select a range
8878563
mac .yml
nclementel Dec 1, 2017
d10965b
start sphinx documentation
nclementel Dec 2, 2017
9db9645
removed unused import from sed/ and sigproc/
nclementel Dec 2, 2017
c2836d6
Removed unused import in /units/uncertainties/unumpy
Dec 7, 2017
ac67cce
Removed unused import in /units and /units/uncertainties/
Dec 7, 2017
bd6ad05
removed unused import from:
nclementel Dec 7, 2017
22457d1
start to adapt sed/builder.py
nclementel Dec 13, 2017
3a1dc90
Merge pull request #16 from mike-ivs/sphinx-doc
mike-ivs Dec 19, 2017
67ebc53
Merge pull request #15 from mike-ivs/remove-unused
mike-ivs Dec 19, 2017
8fa9028
Replaced "Scientific.Functions.Interpolation import InterpolatingFunc…
Feb 20, 2018
c82661e
This is a test commit
mike-ivs Mar 29, 2018
ce2a0c9
this is another test
mike-ivs Mar 29, 2018
c12cbd0
End of tests
mike-ivs Mar 29, 2018
5bc64de
New conda environment for Python 3.6
mike-ivs Mar 29, 2018
90b56e0
Added mac .yml conda environment file to main release
mike-ivs Mar 29, 2018
130115f
repository converted from python 2 to python 3 using python tool: 2to3
mike-ivs Apr 10, 2018
504188c
Merge pull request #21 from mike-ivs/2to3
JelsB Apr 15, 2018
46ce937
CONFIG: fix f2py compilation
JelsB Apr 15, 2018
23a6f01
CONFIG: make input comparison case insensitive
JelsB Apr 15, 2018
1d5cdd0
2to3: manual fixes of 'xxx_changeme'
JelsB Apr 15, 2018
45d2355
UNITS: remove unnecessary manual py3 fix
JelsB Apr 15, 2018
961ec10
UNITS: remove '__div__' ( '__truediv__' 2to3)
JelsB Apr 15, 2018
6b9db07
UNITS: change mismatching imports
JelsB Apr 15, 2018
786d001
SED: fix wrong indentation
JelsB Apr 15, 2018
b83f633
Merge pull request #22 from mike-ivs/fix_config
mike-ivs May 4, 2018
9c39468
COMMENT OUT: import issue not needed for binary.py
JelsB May 4, 2018
faf373f
TIMESERIES: fix wrong indentation
JelsB May 4, 2018
f8d869f
COMMENT OUT: comment out unused import issue
JelsB May 4, 2018
518f5e6
BINARY: fix doctest, split doctest over multiline to improve readability
JelsB May 4, 2018
84e6564
BINARY: fix wrong function names
JelsB May 4, 2018
54b9a44
SED: fix wrong function name
JelsB May 4, 2018
1370839
SED: replace deprecated numpy unique1d()
JelsB May 4, 2018
f9914e5
Py3 checked + Created doctest examples for linelist.py and moments.py
mike-ivs May 4, 2018
a500487
BINARY: wrong name notations in doctest
JelsB May 4, 2018
f6d9db4
ROTATION: fix docstring notations
JelsB May 4, 2018
1e4af24
Checked functionality of asteroseismology module and added IvS_repo_3…
May 5, 2018
3c9f600
Merge branch 'master' of https://github.com/mike-ivs/IvSPythonReposit…
May 5, 2018
06a2005
Merge pull request #23 from mike-ivs/master
JelsB May 18, 2018
59ef132
Included tests in aux/ and some bug fixes in units/
May 22, 2018
df0df57
Reduced .yml file to only contain platform-independent modules
mike-ivs Jun 4, 2018
d6cdcd1
Removal of redundant OS specific files
mike-ivs Jun 4, 2018
07f8c9e
Merge pull request #24 from mike-ivs/fix_envfile
mike-ivs Jun 4, 2018
a6ba862
yml environment file now platform independent
mike-ivs Jun 4, 2018
188ce1c
Added newer catalogs to Vizier query list
mike-ivs Jun 4, 2018
bfff9e1
Added more recent catalogs to Vizier query list
mike-ivs Jun 4, 2018
c0b21e2
Removed integrated uncertainties, added module via anaconda
mike-ivs Jun 4, 2018
a1751b1
Fixed 2to3 floor division
mike-ivs Jun 4, 2018
55e61c3
Fixed 'TabError'
mike-ivs Jun 4, 2018
3ae33c6
yml file now includes uncertainties and conda-forge channel
mike-ivs Jun 4, 2018
ea1dcb6
Merge pull request #25 from mike-ivs/fix_uncertainties
mike-ivs Jun 4, 2018
e5f3636
Remove duplicated catalogs and filters from vizier_cats
mike-ivs Jun 5, 2018
166d751
Correctly import AffineScalarFunc from uncertainties.core
mike-ivs Jun 5, 2018
9f5cb2e
Merge pull request #26 from mike-ivs/fix_uncertainties
mike-ivs Jun 5, 2018
86baa8f
Merge pull request #27 from mike-ivs/master
mike-ivs Jun 5, 2018
f11847b
SED: tried replacing Scientific interpolater but fails
JelsB Jun 15, 2018
a5a32c5
SED/LD: converted entire file to PEP8 style
JelsB Jun 15, 2018
907dcd9
Merge branch 'master' into fix_roche
JelsB Jun 15, 2018
94fcc0e
SED: change import to from ivs.x import to allow import from other dirs
JelsB Jun 15, 2018
68318d1
ROCHE: Add test module
JelsB Jun 15, 2018
66f691e
ROCHE/BINARY: more lines to PEP8 styles
JelsB Jun 15, 2018
a20aad5
ROCHE/BINARY: remove unused function parameter
JelsB Jun 15, 2018
747e7db
ROCHE/BINARY: remove default=None param values
JelsB Jun 15, 2018
6eea175
ROCHE/BINARY: add extra tests
JelsB Jun 15, 2018
5df99da
ROCHE:BINARY: convert to int when np.ones is used + PEP8
JelsB Jun 15, 2018
908c484
ROCHE/BINARY: add more test (but difficult to test and thus fail)
JelsB Jun 15, 2018
a83da1f
Merge pull request #29 from mike-ivs/fix_roche
JelsB Jun 18, 2018
d1453aa
SED/BUILDER: convert tabs to spaces
JelsB Jun 18, 2018
d4cee33
SED/BUILDER: add importError with discontinued PIL package.
JelsB Jun 18, 2018
b4b45a6
SED/EXTICT: replace unphysical float character
JelsB Jun 18, 2018
d6bb998
Merge pull request #30 from mike-ivs/fix_catalogs
JelsB Jun 18, 2018
e8752fc
SED/BUILDER: fix wrong indentation due to tab to space replacement
JelsB Jun 18, 2018
d6b5e87
SED/TESTSED: Add if_main for unittesting. Can now be used as test file.
JelsB Jun 18, 2018
2c81972
SED:TEST_SED: make new pytest-compatible module for SED testing.
JelsB Jun 18, 2018
6e63bf1
SED/BUILDER: convert parts to PEP8 style
JelsB Jun 18, 2018
79618b5
CATALOGS/SESAME: file to PEP8 style
JelsB Jun 19, 2018
9bb6770
UNITS + SIGPROC: re-removing uncertainties files
mike-ivs Jun 19, 2018
f10a348
Merge branch 'master' into fix_catalogs
mike-ivs Jun 19, 2018
98ead0f
CATALOGS/SESAME: convert url-fetched byte-string to string
JelsB Jun 19, 2018
660cf04
CATALOGS/SESAME: use file open context manager intead of open-close
JelsB Jun 19, 2018
6d91b82
CATALOGS/SESAME: convert url type from byte -> str, plus doctest fixes
mike-ivs Jun 19, 2018
6b5f54d
YML: add dependecies for hdf5 files and conversions.py
JelsB Jun 19, 2018
8107193
Merge branch 'master' of https://github.com/mike-ivs/IvSPythonReposit…
JelsB Jun 19, 2018
5c4e089
SED/MODEL: Update deprecate isnot boolean '-' to '~'
JelsB Jun 19, 2018
57fec5b
INOUT/ASCII: read2recarray now outputs unicode format, instead of byte
mike-ivs Jun 19, 2018
8795bcd
SED/BUILDER: some lines to PEP8
JelsB Jun 19, 2018
1f04ec5
Merge branch 'master' into fix_catalogs
mike-ivs Jun 19, 2018
4ee4f74
Merge branch 'fix_catalogs' into fix_sed
JelsB Jun 19, 2018
f99f56b
SED/BUILDER: change bytes to string with S to U dtype
JelsB Jun 19, 2018
a515cfd
SED/FIT: fixt calling of wrong dict
JelsB Jun 19, 2018
d7b4dc9
CATALOGS/HERMES: activated and fixed doctest
mike-ivs Jun 19, 2018
5f4d139
SED/FIT: remove unnecessary fitkw dictionary
JelsB Jun 19, 2018
4b8c0a1
SIGPROC/FIT: replace '== None' with 'is None', similar for '!= None'
JelsB Jun 19, 2018
2c17a37
Merge pull request #32 from mike-ivs/fix_catalogs
mike-ivs Jun 19, 2018
4dd1d72
INOUT/ASCII: fix to general replacement of byte->string
JelsB Jun 20, 2018
7f63ca2
ALL_DIR: uncertainties.1to2 code update
JelsB Jun 20, 2018
9eca0c9
ALL_FILES: bytes->string format
JelsB Jun 20, 2018
f16ccd6
UNIS/CONVERSIONS: replace badly-coded boolean checks
JelsB Jun 20, 2018
a096690
CATALOGS/GCPD: bytes->string from url
JelsB Jun 20, 2018
1f0d03f
CATALOGS/VIZIER: bytes->string when reading phot file headers
JelsB Jun 20, 2018
5c0f77b
ALL_FILES: bytes to string '|S\d'->'|U\d'
JelsB Jun 20, 2018
e024ce1
INOUT/ASCII: bytes->string
JelsB Jun 20, 2018
0f11cfa
SED|INOUTS|CONF: make SED work with new MARCS models + remove z as var
JelsB Jun 21, 2018
fadce4a
SED: Add consistent colour plotting function of Michel Hillen
JelsB Jun 21, 2018
02f4293
SED/BUILDER RegEx for byte->string conversion.
JelsB Jun 21, 2018
0411c3a
UNITS/CONVERSIONS: solved issues with photometric unit conversion
JelsB Jun 21, 2018
029ecf2
SED|CATALOGS: some PEP8 style
JelsB Jun 21, 2018
41d8393
Merge pull request #33 from mike-ivs/fix_sed
JelsB Jun 22, 2018
16e52e4
YML: remove build specification
JelsB Jun 22, 2018
4e98d3f
Update readme.rst
JelsB Jun 22, 2018
8903871
README: corrected to pull from mike-ivs instead of IvS-KULeuven
mike-ivs Jul 9, 2018
c825086
Update readme.rst
mike-ivs Jul 10, 2018
6a1c64a
MAKEDOC.PY: fixed for Py3, still uses epydoc
mike-ivs Jul 12, 2018
962278c
Merge branch 'master' into master
mike-ivs Sep 25, 2018
42da634
Merge pull request #8 from mike-ivs/master
mike-ivs Sep 25, 2018
ac3d6a2
Update readme.rst
mike-ivs Sep 25, 2018
790b58d
Update readme.rst
mike-ivs Sep 25, 2018
79c09a2
Merge branch 'master' into master
mike-ivs Oct 2, 2018
a329453
CATALOGS/HERMES fixes: lxml module added to env, INOUT/ASCII byte fix
mike-ivs Nov 9, 2018
b4537b8
Delete IvS_repo.yml
mike-ivs Nov 19, 2018
9a144e6
Update readme.rst
mike-ivs Nov 19, 2018
478f1e5
regex changed in line #150 to only replace 'a's followed by a number
Feb 26, 2019
d9e8022
The base_url of the gator catalog was changed, and this reflects it.
Feb 26, 2019
bd32324
INOUT/ASCII corrected bad regex behaviour: 's200' -> 'U00' now 'U200'
mike-ivs May 10, 2019
93942f7
Initial commit - PyQt5 gui
mike-ivs May 28, 2019
6e980ce
Update readme.rst
mike-ivs Jun 9, 2019
79bd758
Basic HERMES HRF spectrum overview and spectral viewer
mike-ivs Jun 9, 2019
529455f
PEP8 compliance and small tweaks
mike-ivs Jun 11, 2019
1ee787b
Added Pandas to IvS_repo_3.6 env requirements
mike-ivs Jun 11, 2019
c4a577b
CATALOGS/HERMES: fix to HermesOverview creation
mike-ivs Jun 17, 2019
6ae6bcb
CATALOGS/HERMES: fix to HermesOverview creation
mike-ivs Jun 17, 2019
ecd6c5d
Merge branch 'master' of https://github.com/IvS-KULeuven/IvSPythonRep…
mike-ivs Jun 17, 2019
d47360c
CATALOGS/HERMES: make_data_overview updates files correctly + dir dep…
mike-ivs Jun 17, 2019
e242ddb
CATALOGS/HERMES: File loops every 24h. Now ignores symlinks
mike-ivs Jun 17, 2019
6fdfa5b
small bugfixes
Aug 14, 2019
045da71
GUI/MAIN: Improved GUI and plotting behaviour
mike-ivs Aug 23, 2019
e0fd1eb
Merge branch 'master' of https://github.com/IvS-KULeuven/IvSPythonRep…
Sep 5, 2019
0d18da3
keyword 'extension' added for hermes.search function ('cf' by default)
Sep 24, 2019
eb372d8
Merge remote-tracking branch 'origin/master' into gui
mike-ivs Oct 4, 2019
463df49
Fixed merge issue with previous commit
mike-ivs Oct 4, 2019
91b6fa1
GUI/filter: removed filter.py and filter.ui for dialog->tab change
mike-ivs Oct 4, 2019
919b65b
GUI: Layout now in tab form, selection sidebar, + basic filter function
mike-ivs Oct 4, 2019
1850b90
GUI/MAIN: adjustments to comments
mike-ivs Oct 8, 2019
1a84801
GUI: Added observer+program filters, moved tablemodels to separate file
mike-ivs Oct 12, 2019
08d8d4f
GUI/GUI: adjusted search button style for visibility
mike-ivs Oct 12, 2019
2f7d5ff
GUI/MAIN: updated TODO list comments. Corrected TSV directory to STER
mike-ivs Oct 12, 2019
736a794
Merge pull request #16 from IvS-KULeuven/gui
mike-ivs Oct 14, 2019
82050a0
YMLfile: added pyqt and channel dependencies to .yml environment file
mike-ivs Oct 15, 2019
e54552a
TIMESERIES/PERGRAMS: fixed import paths, updated doctest to Py3
mike-ivs Oct 22, 2019
48e6ad5
TIMESERIES/PYKEP: fixed 'Nmax' and 'rmbadname1' f2py warnings
mike-ivs Oct 22, 2019
94ec91c
TIMESERIES/PYGLS: fixed 'Nmax' and 'rmbadname1' f2py warnings
mike-ivs Oct 22, 2019
69ed49a
IVS/CONFIG: added 'recompile' option for convenience
mike-ivs Oct 22, 2019
f848074
Changed depreciated functions to their working counterparts
Oct 30, 2019
0e7c963
Updated for the new conda
karandis Oct 31, 2019
91fbc21
Fixed the broken url for gcpd! The new webpage takes different IDs
Nov 21, 2019
70936be
Bugfixes and redundancies removed
Feb 21, 2020
1ba020d
Merge branch 'master' of https://github.com/IvS-KULeuven/IvSPythonRep…
Feb 21, 2020
8be26dd
typo in custom elevation
Jun 15, 2020
86f61d5
Fix for the function "iterative_prewhitening" (bug #21), Luc's fix!
Jun 15, 2020
054b2f7
numpy version
Jun 15, 2020
91ddd8e
changing it back to 1.13 until the dependencies are sorted, stay tuned
Jun 17, 2020
93ac0b5
added the 'encoding' keyword to the open functions so they recognize it
Aug 24, 2020
faa3d12
fixes to accommodate marcs models
Aug 24, 2020
f54e71d
Update fit.py
karandis Nov 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Compiled source
# Compiled source

*.pyc
*.class
Expand All @@ -11,6 +11,7 @@
# HTML files of the documentation

doc/html/*
docs/build

# Packages

Expand All @@ -37,3 +38,10 @@ doc/html/*
.DS_Store*
Icon?
Thumbs.db

# Sublime project files

*.sublime-project
*.sublime-workspace

*.dSYM
61 changes: 0 additions & 61 deletions IvS_repo.yml
View file
Open in desktop

This file was deleted.

19 changes: 19 additions & 0 deletions IvS_repo_3.6.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: ivs_repo_3.6
channels:
- defaults
- https://repo.continuum.io/pkgs/pro/
- https://repo.continuum.io/pkgs/free/
- conda-forge
- anaconda
dependencies:
- astropy=2.0.1
- matplotlib=2.0.2
- numpy=1.13.1
- python=3.6.2
- scipy=0.19.1
- uncertainties=3.0.2
- h5py=2.8.0
- ephem=3.7.6.0
- lxml=3.8.0
- pandas=0.20
- pyqt=5.6.0
Loading