Skip to content

Commit

Permalink
modifications:
Browse files Browse the repository at this point in the history
* change the code structure
* intruduce setup.py
* intruduce example notebook
* change README.md
  • Loading branch information
kiyoyabe committed Sep 26, 2017
1 parent 25902d3 commit 6346f44
Show file tree
Hide file tree
Showing 22 changed files with 1,035 additions and 469 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
out
tmp
build
dist
pfs*.fits
python/pfsspecsim.egg-info
example/notebooks/tmp
example/notebooks/out
example/notebooks/.ipynb_checkpoints
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "datamodel"]
path = datamodel
path = python/pfsspecsim/datamodel
url = https://github.com/Subaru-PFS/datamodel
4 changes: 4 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
recursive-include python/pfsspecsim/config *
recursive-include python/pfsspecsim/datamodel *
recursive-include python/pfsspecsim/bin *

4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
all :
cd src; make
./set_path.py
# ./set_path.py
clean :
cd src; make clean
cd bin; make clean
cd python/pfsspecsim/bin; make clean
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Requirements
* matplotlib (if you use the plotting options)
* Sufficient computing power
(Note1) pyfits is required only for using gen_sim_spec.py and the PFS datamodel package. If you don't have these modules, please install them from the above website. The version of the module is the minimum one that we confirmed so far. If you have any updates, let me know please.
(Note2) Standard unix system including Linux and Mac OSX is recommended. There has been reported that this code does not work properly on a Linux system mounted on a Windows drive. This codes are tested under Mac OSX 10.9.5 on 2.8GHz Quad-Core Intel Xeon machine and Fedora Core 20 on Intel Core i5-4690 3.50GHz machine. Depending on the machine power, it takes <<several minutes>> if you run all the standard process. We recommend sufficient computing power at least similar to that we have tested. With our testing machine above, it takes about ~450 sec. (~200 sec. for noise calculation, ~155 sec. for emission line S/N calculation, and ~95 sec. for continuum S/N calculation).
(Note2) Standard unix system including Linux and Mac OSX is recommended. There has been reported that this code does not work properly on a Linux system mounted on a Windows drive. This codes are tested under Mac OSX 10.9.5 on 2.8GHz Quad-Core Intel Xeon machine and Fedora Core 20 on Intel Core i5-4690 3.50GHz machine. Depending on the machine power, it takes <<several minutes>> if you run all the standard process. We recommend sufficient computing power at least similar to that we have tested. With our testing machine above, it takes about ~90 sec. (~40 sec. for noise calculation, ~25 sec. for emission line S/N calculation, and ~20 sec. for continuum S/N calculation).

Installation
------------
Expand All @@ -31,12 +31,14 @@ To install the package, get the git repository by typing the following command o
$ git clone --recursive https://github.com/Subaru-PFS/spt_ExposureTimeCalculator.git
$ cd spt_ExposureTimeCalculator
$ make

$ python setup.py install

Once you clone the repository, you can pull updates from the next time on the directory like this:

$ git pull
$ git submodule update --init
$ make
$ python setup.py install

You also can get the zip or tar ball from the following page:

Expand Down
1 change: 0 additions & 1 deletion datamodel
Submodule datamodel deleted from cf3836
227 changes: 227 additions & 0 deletions example/notebooks/ETC Example.ipynb

Large diffs are not rendered by default.

Loading

0 comments on commit 6346f44

Please sign in to comment.