Skip to content

Commit 5ed57d4

Browse files
committed
Update documentation
1 parent 6fbe154 commit 5ed57d4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1238
-1335
lines changed

_images/dpp_centroid_binary.png

65.4 KB
Loading

_images/dpp_centroid_coro.png

335 KB
Loading

_images/dpp_centroid_planet.png

493 KB
Loading

_images/dpp_select.mov

38.5 MB
Binary file not shown.

_sources/configuration.md

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(configuration)=
22
# Configuration
33

4-
The configuration file uses the [TOML](https://toml.io) format. There are many options that have defaults, sometimes even sensible ones. In general, if an entire section is missing, the operation will be excluded. Note that sections for the configuration (e.g., `[calibration]`, `[collapsing]`) can be in any order, although keeping them in the same order as the pipeline execution may be clearer.
4+
The configuration file uses the [TOML](https://toml.io) format. There are many options that have defaults, sometimes even sensible ones. In general, if an entire section is missing, the operation will be excluded. Note that sections for the configuration (e.g., `[calibration]`, `[polarimetry]`) can be in any order, although keeping them in the same order as the pipeline execution may be clearer.
55

66
We use [semantic versioning](https://semver.org/), so there are certain guarantees about the backwards compatibility of the pipeline, which means you don't have to have the exact same version of `vampires_dpp` as in the configuration- merely a version that is compatible.
77

@@ -29,6 +29,14 @@ We notate where the pipeline ends up saving data files with the "💾" emoji.
2929
.. autoclass:: vampires_dpp.pipeline.config.TargetConfig
3030
```
3131

32+
### File combination
33+
```{margin} 💾 File Output
34+
35+
```
36+
```{eval-rst}
37+
.. autoclass:: vampires_dpp.pipeline.config.CombineConfig
38+
```
39+
3240
### Calibration
3341
```{margin} 💾 File Output
3442
@@ -45,13 +53,29 @@ We notate where the pipeline ends up saving data files with the "💾" emoji.
4553
.. autoclass:: vampires_dpp.pipeline.config.AnalysisConfig
4654
```
4755

56+
### Frame selection
57+
```{margin} 💾 File Output
58+
59+
```
60+
```{eval-rst}
61+
.. autoclass:: vampires_dpp.pipeline.config.FrameSelectConfig
62+
```
63+
64+
### Frame alignment
65+
```{margin} 💾 File Output
66+
67+
```
68+
```{eval-rst}
69+
.. autoclass:: vampires_dpp.pipeline.config.AlignmentConfig
70+
```
4871

49-
### Frame-collapsing
72+
73+
### Cube coadding
5074
```{margin} 💾 File Output
5175
5276
```
5377
```{eval-rst}
54-
.. autoclass:: vampires_dpp.pipeline.config.CollapseConfig
78+
.. autoclass:: vampires_dpp.pipeline.config.CoaddConfig
5579
```
5680

5781
### Spectrophotometric Calibration
@@ -68,13 +92,3 @@ We notate where the pipeline ends up saving data files with the "💾" emoji.
6892
.. autoclass:: vampires_dpp.pipeline.config.PolarimetryConfig
6993
```
7094

71-
72-
## Examples
73-
74-
### PDI
75-
76-
```{eval-python}
77-
78-
from vampires_dpp.pipeline.templates import VAMPIRES_PDI
79-
VAMPIRES_PDI.to_toml()
80-
```

_sources/faq.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,12 @@ The time it takes to open a file, write to disk, and close it will add a lot to
3131

3232
3. Use multi-processing
3333

34-
Using more processes should improve some parts of the pipeline, but don't expect multiplicative increases in speed since most operations are limited by the storage IO speed.
34+
Using more processes should improve some parts of the pipeline, but don't expect multiplicative increases in speed since most operations are limited by the storage IO speed.
35+
36+
```{admonition} Tip: multiprocessing with numpy
37+
:class: tip
38+
Make sure when you're multiprocessing to set the correct environment variables in numpy
39+
40+
OMP_NUM_THREADS=1 dpp run -j <num_proc> <config> <input_filenames>
41+
OMP_NUM_THREADS=1 dpp run -j 4 20230101_ABAur_vampires.toml norm/*.fits
42+
```

_sources/quickstart.md

Lines changed: 42 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,16 @@ We strive to make the VAMPIRES DPP as automated as possible- the following setup
1414
The pipeline uses Python multi-processing to help speed-up reductions. You will likely be limited by your computer's available memory (RAM)- if you spawn too many processes and load too much data in parallel you can run out of memory. Commands with multi-processing enabled have the `-j` command line flag, which will default to a single process `-j1` by default.
1515
1616
When possible, we indicate a command that has multi-processing enabled with the "🚀" emoji. We do not multi-process by default (to avoid awkward out-of-memory errors) so you must *opt in* to all commands using the `-j` flag.
17+
18+
In general, multiprocessing does seem to help when not limited by file I/O (e.g., slow hard disk drive), so give it a try!
19+
```
20+
21+
```{admonition} Tip: multiprocessing and numpy
22+
:class: tip
23+
24+
Internal numpy routines can cause multiprocessing to become _much_ slower. In this case, make sure to set the [appropriate environment variables](https://numpy.org/doc/stable/reference/global_state.html#number-of-threads-used-for-linear-algebra).
25+
26+
export OMP_NUM_THREADS=1
1727
```
1828

1929
```{admonition} Warning: Large data volume
@@ -68,6 +78,13 @@ There are a few recognized data formats the processing pipeline recognizes. Depe
6878
Any EMCCD VAMPIRES format data needs normalized- at minimum it will removed the corrupted detector readout frame and empty frames.
6979
```
7080

81+
### CMOS format
82+
83+
Any data taken after the June 2023 upgrades has the same format regardless if data is downloaded from the archive or from the SCExAO computers directly. It is assumed that any FLC deinterleaving has been done beforehand, which is expected to be done by the support astronomer.
84+
85+
No further action is required for the CMOS format- `dpp norm` can be skipped.
86+
87+
7188
### EMCCD formats
7289

7390
These formats are used for VAMPIRES data prior to the June 2023 upgrades. They come in two distinct formats
@@ -95,15 +112,21 @@ dpp norm [-j 1] [-d] -o normed 750-50_em300_00100ms_512x512/*.fits
95112
Not all data needs deinterleaved- calibration files (darks, flats, pinholes, skies, etc.) typically do not need deinterleaved. If you do not plan to do polarimetry (e.g., speckle imaging, ADI-only) you can skip deinterleaving entirely, effectively averaging together data between the two FLC states. If you prefer to model each state separately then deinterleave away.
96113
```
97114

98-
### CMOS format
115+
## Quick look and filter
99116

100-
Any data taken after the June 2023 upgrades has the same format regardless if data is downloaded from the archive or from the SCExAO computers directly. It is assumed that any FLC deinterleaving has been done before hand, which is expected to be done by the support astronomer.
117+
Before running files through the pipeline, it is recommended to inspect your raw data and discard errant cubes and cubes with poor seeing. Doing this ahead of time saves on processing time and avoids errors.
101118

102-
No further action is required for the CMOS format- `dpp norm` can be skipped.
119+
```
120+
dpp select <input_files>/*.fits
121+
```
103122

104-
## Quick look and filter
123+
```{image} dpp_select.mov
124+
```
105125

106-
Before running files through the pipeline, it is recommended to inspect your raw data and discard errant cubes and cubes with poor seeing. Doing this ahead of time saves on processing time and avoids errors.
126+
After this, you can use the filelist as your input, for example
127+
```
128+
dpp run my_config.toml $(< filelist_select.txt)
129+
```
107130

108131
## Create calibration files
109132

@@ -140,7 +163,6 @@ To allow efficient data analysis we only measure the PSF centroid and statistics
140163
We recommend running the centroid step as it greatly reduces the chances for errors in image registration. In addition, for coronagraphic data you *must* run the centroid step to specify which satellite spots to use for analysis. The centroid step is not *strictly* required for non-coronagraphic data, though- if you do not provide it the center of the frame will be used as the starting estimate, and your analysis window size can be made larger to accommadate misalignment. Nonetheless, we highly recommend this step.
141164
```
142165

143-
144166
### Automated mode
145167

146168
If the terminal you are connected to has working graphics (i.e., X-forwarding for SSH connections, not inside a tmux sesssion) and you have a copy of matplotlib installed you can run
@@ -151,6 +173,20 @@ If the terminal you are connected to has working graphics (i.e., X-forwarding fo
151173
dpp centroid [-j 1] 20230101_ABAur.toml 750-50_em300_00100ms_512x512/*.fits
152174
```
153175

176+
**Coronagraphic**
177+
```{image} dpp_centroid_coro.png
178+
:width: 80%
179+
```
180+
181+
**Non-coronagraphic/Binaries**
182+
```{image} dpp_centroid_binary.png
183+
:width: 80%
184+
```
185+
186+
**Planets**
187+
```{image} dpp_centroid_planet.png
188+
:width: 80%
189+
```
154190
### Manual mode
155191

156192
If you do not have a graphics-ready terminal, or you want to skip the interactive process and use your own methods, we provide a manual method for entering centroids. You will be prompted for the centroid of each PSF- enter the centroid as an `x, y` comma-separated tuple.

_static/basic.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ div.sphinxsidebarwrapper {
4848

4949
div.sphinxsidebar {
5050
float: left;
51-
width: 270px;
51+
width: 230px;
5252
margin-left: -100%;
5353
font-size: 90%;
5454
word-wrap: break-word;

_static/scripts/bootstrap.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

_static/scripts/fontawesome.js

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/*!
2+
* Font Awesome Free 6.5.2 by @fontawesome - https://fontawesome.com
3+
* License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
4+
* Copyright 2024 Fonticons, Inc.
5+
*/

_static/scripts/fontawesome.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

_static/scripts/pydata-sphinx-theme.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

_static/scripts/pydata-sphinx-theme.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

_static/styles/pydata-sphinx-theme.css

Lines changed: 31 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

_static/styles/pydata-sphinx-theme.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

_static/webpack-macros.html

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,23 @@
22
AUTO-GENERATED from webpack.config.js, do **NOT** edit by hand.
33
These are re-used in layout.html
44
-->
5-
{# Load FontAwesome icons #}
6-
{% macro head_pre_icons() %}
7-
<link href="{{ pathto('_static/vendor/fontawesome/6.5.2/css/all.min.css', 1) }}?digest=dfe6caa3a7d634c4db9b" rel="stylesheet" />
8-
<link rel="preload" as="font" type="font/woff2" crossorigin href="{{ pathto('_static/vendor/fontawesome/6.5.2/webfonts/fa-solid-900.woff2', 1) }}" />
9-
<link rel="preload" as="font" type="font/woff2" crossorigin href="{{ pathto('_static/vendor/fontawesome/6.5.2/webfonts/fa-brands-400.woff2', 1) }}" />
10-
<link rel="preload" as="font" type="font/woff2" crossorigin href="{{ pathto('_static/vendor/fontawesome/6.5.2/webfonts/fa-regular-400.woff2', 1) }}" />
11-
{% endmacro %}
125

136
{% macro head_pre_assets() %}
147
<!-- Loaded before other Sphinx assets -->
15-
<link href="{{ pathto('_static/styles/theme.css', 1) }}?digest=dfe6caa3a7d634c4db9b" rel="stylesheet" />
16-
<link href="{{ pathto('_static/styles/bootstrap.css', 1) }}?digest=dfe6caa3a7d634c4db9b" rel="stylesheet" />
17-
<link href="{{ pathto('_static/styles/pydata-sphinx-theme.css', 1) }}?digest=dfe6caa3a7d634c4db9b" rel="stylesheet" />
8+
<link href="{{ pathto('_static/styles/theme.css', 1) }}?digest=8878045cc6db502f8baf" rel="stylesheet" />
9+
<link href="{{ pathto('_static/styles/pydata-sphinx-theme.css', 1) }}?digest=8878045cc6db502f8baf" rel="stylesheet" />
1810
{% endmacro %}
1911

2012
{% macro head_js_preload() %}
13+
<!-- So that users can add custom icons -->
14+
<script src="{{ pathto('_static/scripts/fontawesome.js', 1) }}?digest=8878045cc6db502f8baf"></script>
2115
<!-- Pre-loaded scripts that we'll load fully later -->
22-
<link rel="preload" as="script" href="{{ pathto('_static/scripts/bootstrap.js', 1) }}?digest=dfe6caa3a7d634c4db9b" />
23-
<link rel="preload" as="script" href="{{ pathto('_static/scripts/pydata-sphinx-theme.js', 1) }}?digest=dfe6caa3a7d634c4db9b" />
24-
<script src="{{ pathto('_static/vendor/fontawesome/6.5.2/js/all.min.js', 1) }}?digest=dfe6caa3a7d634c4db9b"></script>
16+
<link rel="preload" as="script" href="{{ pathto('_static/scripts/bootstrap.js', 1) }}?digest=8878045cc6db502f8baf" />
17+
<link rel="preload" as="script" href="{{ pathto('_static/scripts/pydata-sphinx-theme.js', 1) }}?digest=8878045cc6db502f8baf" />
2518
{% endmacro %}
2619

2720
{% macro body_post() %}
2821
<!-- Scripts loaded after <body> so the DOM is not blocked -->
29-
<script src="{{ pathto('_static/scripts/bootstrap.js', 1) }}?digest=dfe6caa3a7d634c4db9b"></script>
30-
<script src="{{ pathto('_static/scripts/pydata-sphinx-theme.js', 1) }}?digest=dfe6caa3a7d634c4db9b"></script>
22+
<script defer src="{{ pathto('_static/scripts/bootstrap.js', 1) }}?digest=8878045cc6db502f8baf"></script>
23+
<script defer src="{{ pathto('_static/scripts/pydata-sphinx-theme.js', 1) }}?digest=8878045cc6db502f8baf"></script>
3124
{% endmacro %}

0 commit comments

Comments
 (0)