Skip to content

Commit

Permalink
Added solution to install reflectivity - working with python 3.10
Browse files Browse the repository at this point in the history
  • Loading branch information
jpcurbelo committed Jul 3, 2024
1 parent 2df06f1 commit 43fdc09
Show file tree
Hide file tree
Showing 31 changed files with 244 additions and 193 deletions.
1 change: 1 addition & 0 deletions .github/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ __pycache__/
build/
venv-go-rxr/
venv-go-rxr-paper/
venv-gorxr310/
**/*.h5
.idea/
18 changes: 18 additions & 0 deletions GO_RXR.egg-info/PKG-INFO
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
Metadata-Version: 2.1
Name: GO-RXR
Version: 1.0
Summary: Global Optimization of Resonant X-ray Reflectometry Tool
Home-page: https://github.com/lucaskorol21/GO-RXR
Author: Lucas Korol
Author-email: [email protected]
Maintainer: Robert J. Green
Requires-Python: >=3.7
License-File: LICENSE
Requires-Dist: Cython==3.0.8
Requires-Dist: numpy==1.26.3
Requires-Dist: h5py==3.10.0
Requires-Dist: numba==0.59.0
Requires-Dist: pyqtgraph==0.13.3
Requires-Dist: scipy==1.12.0
Requires-Dist: matplotlib==3.8.1
Requires-Dist: PyQt5==5.15.2
9 changes: 9 additions & 0 deletions GO_RXR.egg-info/SOURCES.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
LICENSE
README.md
setup.cfg
setup.py
GO_RXR.egg-info/PKG-INFO
GO_RXR.egg-info/SOURCES.txt
GO_RXR.egg-info/dependency_links.txt
GO_RXR.egg-info/requires.txt
GO_RXR.egg-info/top_level.txt
1 change: 1 addition & 0 deletions GO_RXR.egg-info/dependency_links.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

8 changes: 8 additions & 0 deletions GO_RXR.egg-info/requires.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Cython==3.0.8
numpy==1.26.3
h5py==3.10.0
numba==0.59.0
pyqtgraph==0.13.3
scipy==1.12.0
matplotlib==3.8.1
PyQt5==5.15.2
1 change: 1 addition & 0 deletions GO_RXR.egg-info/top_level.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

3 changes: 2 additions & 1 deletion GUI_GO.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
to initialize because the all the libraries and files need to be unpacked before the software can be run.
"""

import os
import ast
from scipy import interpolate
from PyQt5.QtWidgets import *
Expand Down Expand Up @@ -8261,7 +8262,7 @@ def __init__(self):
cwd = os.getcwd()

self.version = '1.0'
self.fname = cwd + '\demo.h5' # initial sample
self.fname = os.path.join(cwd, 'demo.h5') # initial sample
self.data = [] # data info
self.data_dict = dict() # dictionary that contains data
self.sim_dict = dict() # dictionary that contains simulation
Expand Down
14 changes: 14 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ Install the python libraries by running the setup file:
$ python setup.py install
```

* First run ```$ pip install --upgrade pip setuptools``` if needed.

If the setup file does not work, then the libraries in the `requirements.txt` file can be installed.

##### For `matplotlib`, ensure that you have `Pilow` installed
Expand Down Expand Up @@ -124,6 +126,18 @@ $ sudo chown -R $USER .
$ python setup_reflectivity.py install
```

or

```bash
# Install Python Development Headers
$ sudo apt-get update
$ sudo apt-get install python3.10-dev

# Install your package using setup.py
$ python setup_reflectivity.py install
```


## Windows (Tested with Python 3.7 32-bit)

1. Download [Python 3.7 (332-bit)](https://www.python.org/downloads/release/python-370/)
Expand Down
4 changes: 4 additions & 0 deletions UNKNOWN.egg-info/PKG-INFO
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Metadata-Version: 2.1
Name: UNKNOWN
Version: 0.0.0
License-File: LICENSE
10 changes: 10 additions & 0 deletions UNKNOWN.egg-info/SOURCES.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
LICENSE
README.md
setup.cfg
setup.py
setup_reflectivity.py
UNKNOWN.egg-info/PKG-INFO
UNKNOWN.egg-info/SOURCES.txt
UNKNOWN.egg-info/dependency_links.txt
UNKNOWN.egg-info/top_level.txt
UTILS/Pythonreflectivity.cpp
1 change: 1 addition & 0 deletions UNKNOWN.egg-info/dependency_links.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

1 change: 1 addition & 0 deletions UNKNOWN.egg-info/top_level.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Pythonreflectivity
Loading

0 comments on commit 43fdc09

Please sign in to comment.