Merge pull request #201 from LSSTDESC/issue/189/renaming-in-creation

Issue/189/renaming in creation (adding Modeler class)
LSSTDESC · Sep 8, 2022 · 3bb255c · 3bb255c
2 parents 3921993 + bc0a54f
commit 3bb255c
Show file tree

Hide file tree

Showing 28 changed files with 1,263 additions and 532 deletions.
diff --git a/.pylintrc b/.pylintrc
@@ -60,7 +60,7 @@ confidence=
 # --enable=similarities". If you want to run only the classes checker, but have
 # no Warning level messages displayed, use"--disable=all --enable=classes
 # --disable=W"
-disable=import-star-module-level,old-octal-literal,oct-method,print-statement,unpacking-in-except,parameter-unpacking,backtick,old-raise-syntax,old-ne-operator,long-suffix,dict-view-method,dict-iter-method,metaclass-assignment,next-method-called,raising-string,indexing-exception,raw_input-builtin,long-builtin,file-builtin,execfile-builtin,coerce-builtin,cmp-builtin,buffer-builtin,basestring-builtin,apply-builtin,filter-builtin-not-iterating,using-cmp-argument,useless-suppression,range-builtin-not-iterating,suppressed-message,no-absolute-import,old-division,cmp-method,reload-builtin,zip-builtin-not-iterating,intern-builtin,unichr-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,input-builtin,round-builtin,hex-method,nonzero-method,map-builtin-not-iterating,abstract-method,broad-except,invalid-name,line-too-long,wrong-import-order,wrong-import-position,too-many-statements,super-with-arguments,import-outside-toplevel,too-many-arguments,too-many-instance-attributes,unspecified-encoding,no-else-return
+disable=import-star-module-level,old-octal-literal,oct-method,print-statement,unpacking-in-except,parameter-unpacking,backtick,old-raise-syntax,old-ne-operator,long-suffix,dict-view-method,dict-iter-method,metaclass-assignment,next-method-called,raising-string,indexing-exception,raw_input-builtin,long-builtin,file-builtin,execfile-builtin,coerce-builtin,cmp-builtin,buffer-builtin,basestring-builtin,apply-builtin,filter-builtin-not-iterating,using-cmp-argument,useless-suppression,range-builtin-not-iterating,suppressed-message,no-absolute-import,old-division,cmp-method,reload-builtin,zip-builtin-not-iterating,intern-builtin,unichr-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,input-builtin,round-builtin,hex-method,nonzero-method,map-builtin-not-iterating,abstract-method,broad-except,invalid-name,line-too-long,wrong-import-order,wrong-import-position,too-many-statements,super-with-arguments,import-outside-toplevel,too-many-arguments,too-many-instance-attributes,unspecified-encoding,no-else-return,too-few-public-methods,missing-module-docstring,missing-class-docstring
 
 
 [REPORTS]

diff --git a/README.md b/README.md
@@ -1,8 +1,11 @@
-![example workflow](https://github.com/LSSTDESC/RAIL/actions/workflows/main.yml/badge.svg)
+<div align="center">
+
+[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/LSSTDESC/RAIL/rail?logo=Github)](https://github.com/LSSTDESC/RAIL/actions/workflows/main.yml)
 [![codecov](https://codecov.io/gh/LSSTDESC/RAIL/branch/master/graph/badge.svg)](https://codecov.io/gh/LSSTDESC/RAIL)
-[![PyPI version](https://badge.fury.io/py/pz-rail.svg)](https://badge.fury.io/py/pz-rail)
-[![Documentation Status](https://readthedocs.org/projects/lsstdescrail/badge/?version=stable)](https://lsstdescrail.readthedocs.io/en/stable/?badge=stable)
+[![PyPI](https://img.shields.io/pypi/v/pz-rail?color=blue&logo=pypi&logoColor=white)](https://pypi.org/project/pz-rail/)
+[![Read the Docs (version)](https://img.shields.io/readthedocs/lsstdescrail/stable?color=blue&logo=readthedocs&logoColor=white)](https://lsstdescrail.readthedocs.io/en/stable/#)
 
+</div>
 
 # RAIL: Redshift Assessment Infrastructure Layers
 
@@ -28,7 +31,7 @@ Potential extensions of the RAIL package are summarized in the [Future Plans sec
 
 This code, while public on GitHub, has not yet been released by DESC and is still under active development. Our release of v1.0 will be accompanied by a journal paper describing the development and validation of RAIL.
 
-If you make use of the ideas or software here, please cite this repository https://github.com/LSSTDESC/RAIL. You are welcome to re-use the code, which is open source and available under terms consistent with our [LICENSE](https://github.com/LSSTDESC/RAIL/blob/main/LICENSE) [(BSD 3-Clause)](https://opensource.org/licenses/BSD-3-Clause).
+If you make use of the ideas or software here, please cite this repository <https://github.com/LSSTDESC/RAIL>. You are welcome to re-use the code, which is open source and available under terms consistent with our [LICENSE](https://github.com/LSSTDESC/RAIL/blob/main/LICENSE) [(BSD 3-Clause)](https://opensource.org/licenses/BSD-3-Clause).
 
 External contributors and DESC members wishing to use RAIL for non-DESC projects should consult with the Photometric Redshifts (PZ) Working Group conveners, ideally before the work has started, but definitely before any publication or posting of the work to the arXiv.
 

diff --git a/examples/creation/configs/flowModeler.yaml b/examples/creation/configs/flowModeler.yaml
@@ -0,0 +1,17 @@
+run_params:
+  class_name: flowModeler
+  run_name: test_flowModeler
+  seed: 0
+  phys_cols:
+    "redshift": [0., 3.]
+  phot_cols:
+    "mag_u_lsst": [22.79, 27.79]
+    "mag_g_lsst": [24.04, 29.04]
+    "mag_r_lsst": [24.06, 29.06]
+    "mag_i_lsst": [23.62, 28.62]
+    "mag_z_lsst": [22.98, 27.98]
+    "mag_y_lsst": [22.05, 27.05]
+  calc_colors:
+    ref_column_name: mag_i_lsst
+  spline_knots: 16
+  num_training_epochs: 30
diff --git a/examples/goldenspike/README.md b/examples/goldenspike/README.md
@@ -1,3 +1,3 @@
 This directory contains an example notebook showing a simplified version the end-to-end functionality of RAIL.
 
-- [goldenspike.ipynb](https://htmlpreview.github.io/?https://github.com/LSSTDESC/RAIL/blob/master/examples/goldenspike/goldenspike.html) This notebooks chains together the funcitonality of the creation, estimation, and evaluation modules.
+- [goldenspike.ipynb](https://htmlpreview.github.io/?https://github.com/LSSTDESC/RAIL/blob/master/examples/goldenspike/goldenspike.html) This notebooks chains together the functionality of the creation, estimation, and evaluation modules.
diff --git a/examples/goldenspike/cleanup.sh b/examples/goldenspike/cleanup.sh
@@ -9,8 +9,12 @@ if [[ -z "${RAILDIR}" ]] then;
    \rm -rf examples/goldenspike/evaluation_results
    \rm -rf examples/goldenspike/*.out
    \rm -rf examples/goldenspike/data/pretrained_flow_copy.pkl
+   \rm -rf examples/goldenspike/data/trained_flow.pkl
+   \rm -rf examples/goldenspike/data/base_catalog.pq
    \rm -rf examples/goldenspike/tmp_goldenspike.yml
    \rm -rf examples/goldenspike/tmp_goldenspike_config.yml
+   \rm -rf examples/goldenspike/single_NZ_naive_stack_test.hdf5
+   \rm -rf examples/goldenspike/single_NZ_point_estimate_test.hdf5
 else
    \rm -rf ${RAILDIR}/examples/goldenspike/output_*.pq
    \rm -rf ${RAILDIR}/examples/goldenspike/output_*.fits
@@ -21,7 +25,11 @@ else
    \rm -rf ${RAILDIR}/examples/goldenspike/evaluation_results
    \rm -rf ${RAILDIR}/examples/goldenspike/*.out
    \rm -rf ${RAILDIR}/examples/goldenspike/data/pretrained_flow_copy.pkl
+   \rm -rf ${RAILDIR}/examples/goldenspike/data/trained_flow.pkl
+   \rm -rf ${RAILDIR}/examples/goldenspike/data/base_catalog.pq
    \rm -rf ${RAILDIR}/examples/goldenspike/tmp_goldenspike.yml
-   \rm -rf ${RAILDIR}/examples/goldenspike/tmp_goldenspike_config.yml     
+   \rm -rf ${RAILDIR}/examples/goldenspike/tmp_goldenspike_config.yml
+   \rm -rf ${RAILDIR}/examples/goldenspike/single_NZ_naive_stack_test.hdf5
+   \rm -rf ${RAILDIR}/examples/goldenspike/single_NZ_point_estimate_test.hdf5     
 fi