diff --git a/.github/workflows/notebooks.yml b/.github/workflows/notebooks.yml
index 7de633e5..cee4eea4 100644
--- a/.github/workflows/notebooks.yml
+++ b/.github/workflows/notebooks.yml
@@ -37,6 +37,12 @@ jobs:
run: |
poetry install
+ - name: Install Scarlet
+ run: |
+ pip install "pybind11[global]" peigen
+ git clone https://github.com/pmelchior/scarlet.git
+ cd scarlet; python setup.py install; cd ..
+
# just checks if they run
- name: Run notebooks
run: |
diff --git a/notebooks/00-quickstart.ipynb b/notebooks/00-quickstart.ipynb
index a76fa3d3..e59d1d4a 100644
--- a/notebooks/00-quickstart.ipynb
+++ b/notebooks/00-quickstart.ipynb
@@ -2,7 +2,7 @@
"cells": [
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 1,
"metadata": {},
"outputs": [],
"source": [
@@ -40,7 +40,7 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 2,
"metadata": {},
"outputs": [],
"source": [
@@ -51,7 +51,7 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 3,
"metadata": {},
"outputs": [],
"source": [
@@ -84,14 +84,14 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 4,
"metadata": {},
"outputs": [
{
"data": {
"text/html": [
"
Table length=5\n",
- "
\n",
+ "\n",
"galtileid | ra | dec | redshift | fluxnorm_bulge | fluxnorm_disk | fluxnorm_agn | a_b | a_d | b_b | b_d | pa_bulge | pa_disk | u_ab | g_ab | r_ab | i_ab | z_ab | y_ab |
\n",
"int64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 |
\n",
"2200871446 | 0.418319702147 | -0.000148399994941 | 0.496377289295 | 0.0 | 1.4144730572e-17 | 0.0 | 0.0 | 0.278649687767 | 0.0 | 0.221303001046 | 0.0 | 307.344329834 | 25.9418621063 | 25.129743576 | 23.9588813782 | 23.3607368469 | 23.0723800659 | 22.9095973969 |
\n",
@@ -113,7 +113,7 @@
"2212241881 0.423181056976 -0.00218109996058 ... 26.7419490814 26.1817016602"
]
},
- "execution_count": null,
+ "execution_count": 4,
"metadata": {},
"output_type": "execute_result"
}
@@ -140,7 +140,7 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 5,
"metadata": {},
"outputs": [],
"source": [
@@ -165,14 +165,14 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 6,
"metadata": {},
"outputs": [
{
"data": {
"text/html": [
"Table length=3\n",
- "
\n",
+ "\n",
"galtileid | ra | dec | redshift | fluxnorm_bulge | fluxnorm_disk | fluxnorm_agn | a_b | a_d | b_b | b_d | pa_bulge | pa_disk | u_ab | g_ab | r_ab | i_ab | z_ab | y_ab |
\n",
"int64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 |
\n",
"2202909702 | -0.9180529521276106 | 0.8255111545554434 | 0.761030912399 | 4.06549706794e-19 | 5.27902696464e-18 | 0.0 | 0.0750240981579 | 0.397735208273 | 0.0638189986348 | 0.216169804335 | 200.800704956 | 200.800704956 | 29.0995540619 | 27.4888687134 | 26.0163269043 | 24.9097938538 | 24.4229316711 | 24.1450653076 |
\n",
@@ -190,7 +190,7 @@
"2202673364 0.6265404784005448 ... 25.0117759705 25.0565166473"
]
},
- "execution_count": null,
+ "execution_count": 6,
"metadata": {},
"output_type": "execute_result"
}
@@ -216,7 +216,7 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 7,
"metadata": {},
"outputs": [],
"source": [
@@ -233,7 +233,7 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 8,
"metadata": {},
"outputs": [
{
@@ -269,7 +269,7 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 9,
"metadata": {},
"outputs": [],
"source": [
@@ -302,7 +302,7 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 10,
"metadata": {},
"outputs": [
{
@@ -311,7 +311,7 @@
"(100, 6, 120, 120)"
]
},
- "execution_count": null,
+ "execution_count": 10,
"metadata": {},
"output_type": "execute_result"
}
@@ -331,14 +331,14 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 11,
"metadata": {},
"outputs": [
{
"data": {
"text/html": [
"Table length=3\n",
- "
\n",
+ "\n",
"galtileid | ra | dec | redshift | fluxnorm_bulge | fluxnorm_disk | fluxnorm_agn | a_b | a_d | b_b | b_d | pa_bulge | pa_disk | u_ab | g_ab | r_ab | i_ab | z_ab | y_ab | x_peak | y_peak | btk_rotation | not_drawn_u | not_drawn_g | not_drawn_r | not_drawn_i | not_drawn_z | not_drawn_y |
\n",
"int64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 | float64 |
\n",
"2202008955 | 0.8701448475755365 | 0.7148085531751387 | 0.755906283855 | 0.0 | 7.038753629e-18 | 0.0 | 0.0 | 0.163465604186 | 0.0 | 0.0719522982836 | 0.0 | 48.2241973877 | 25.4941711426 | 25.2252883911 | 24.9438838959 | 24.4088439941 | 24.3243865967 | 24.2516822815 | 63.850724237965 | 63.07404276606157 | 0.0 | 0.0 | 0.0 | 0.0 | 0.0 | 0.0 | 0.0 |
\n",
@@ -356,7 +356,7 @@
"2202873263 -0.9945229996597038 0.45931089285988813 ... 0.0 0.0"
]
},
- "execution_count": null,
+ "execution_count": 11,
"metadata": {},
"output_type": "execute_result"
}
@@ -376,7 +376,7 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 12,
"metadata": {},
"outputs": [
{
@@ -390,7 +390,7 @@
"\t wcs: )"
]
},
- "execution_count": null,
+ "execution_count": 12,
"metadata": {},
"output_type": "execute_result"
}
@@ -409,16 +409,16 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 13,
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
- ""
+ ""
]
},
- "execution_count": null,
+ "execution_count": 13,
"metadata": {},
"output_type": "execute_result"
},
@@ -453,16 +453,16 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 14,
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
- ""
+ ""
]
},
- "execution_count": null,
+ "execution_count": 14,
"metadata": {},
"output_type": "execute_result"
},
@@ -498,16 +498,16 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 15,
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
- ""
+ ""
]
},
- "execution_count": null,
+ "execution_count": 15,
"metadata": {},
"output_type": "execute_result"
},
@@ -551,7 +551,7 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 16,
"metadata": {},
"outputs": [],
"source": [
@@ -560,7 +560,7 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 17,
"metadata": {},
"outputs": [],
"source": [
@@ -580,7 +580,7 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 18,
"metadata": {},
"outputs": [],
"source": [
@@ -597,7 +597,7 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 19,
"metadata": {},
"outputs": [
{
@@ -618,14 +618,14 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 20,
"metadata": {},
"outputs": [
{
"data": {
"text/html": [
"Table length=2\n",
- "
\n",
+ "\n",
"ra | dec |
\n",
"float64 | float64 |
\n",
"0.5341353877472973 | -1.0523902083800802 |
\n",
@@ -641,7 +641,7 @@
" 0.866781448569519 0.6445682006963833"
]
},
- "execution_count": null,
+ "execution_count": 20,
"metadata": {},
"output_type": "execute_result"
}
@@ -660,7 +660,7 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 21,
"metadata": {},
"outputs": [],
"source": [
@@ -677,14 +677,14 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 22,
"metadata": {},
"outputs": [
{
"data": {
"text/html": [
"Table length=2\n",
- "
\n",
+ "\n",
"ra | dec |
\n",
"float64 | float64 |
\n",
"0.5341353877472973 | -1.0523902083800802 |
\n",
@@ -700,7 +700,7 @@
" 0.866781448569519 0.6445682006963833"
]
},
- "execution_count": null,
+ "execution_count": 22,
"metadata": {},
"output_type": "execute_result"
}
@@ -718,16 +718,16 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 23,
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
- ""
+ ""
]
},
- "execution_count": null,
+ "execution_count": 23,
"metadata": {},
"output_type": "execute_result"
},
@@ -770,16 +770,16 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 25,
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
- ""
+ ""
]
},
- "execution_count": null,
+ "execution_count": 25,
"metadata": {},
"output_type": "execute_result"
},
@@ -815,7 +815,7 @@
"# plot isolated images from prediction\n",
"for ii in range(3, 6):\n",
" ax = axes.flatten()[ii]\n",
- " ax.imshow(deblend_batch.deblended_images[0, ii-3, 2, clip:-clip, clip:-clip], cmap=\"gray\", \n",
+ " ax.imshow(deblend_batch.deblended_images[0, ii-3, 0, clip:-clip, clip:-clip], cmap=\"gray\", \n",
" vmin=vmin, vmax=vmax)\n",
"\n",
"# add colorbar\n",