Skip to content

Commit

Permalink
Merge branch 'main' into feature/next-prev-image
Browse files Browse the repository at this point in the history
  • Loading branch information
mudhoney committed Jun 17, 2024
2 parents e37c96d + a73f755 commit 910c2e6
Show file tree
Hide file tree
Showing 40 changed files with 756 additions and 177 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
}
},
"require": {
"helioviewer/event-interface": "v0.1.0",
"helioviewer/event-interface": "v0.2.1",
"matomo/device-detector": "dev-master"
},
"require-dev": {
Expand Down
14 changes: 7 additions & 7 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added docroot/resources/images/color-tables/RHESSI.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 6 additions & 4 deletions docroot/status/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"suvi" => genRobLink("SUVI", "https://www.ncei.noaa.gov/products/goes-r-solar-ultraviolet-imagers-suvi"),
"ncar" => genProviderLink("NCAR", "https://www2.hao.ucar.edu/mlso/instruments/cosmo-k-coronagraph-k-cor"),
"harvard" => genProviderLink("Harvard", "https://xrt.cfa.harvard.edu/"),
"MSU" => genProviderLink("MSU", "http://ylstone.physics.montana.edu/ylegacy/")
"MSU" => genProviderLink("MSU", "http://ylstone.physics.montana.edu/ylegacy/"),
"RHESSI" => genProviderLink("RHESSI", "https://hesperia.gsfc.nasa.gov/rhessi3/")
);

// Attribution
Expand All @@ -28,7 +29,8 @@
"SUVI" => $PROVIDERS['suvi'],
"COSMO" => $PROVIDERS['ncar'],
"XRT" => $PROVIDERS['harvard'],
"SXT" => $PROVIDERS['MSU']
"SXT" => $PROVIDERS['MSU'],
"RHESSI" => $PROVIDERS['RHESSI']
);

const COVERAGE = array (
Expand All @@ -47,7 +49,8 @@
"IRIS" => "IRIS_coverage.html",
"SWAP" => "PROBA2_coverage.html",
"SXT" => "Yohkoh_coverage.html",
"XRT" => "Hinode_coverage.html"
"XRT" => "Hinode_coverage.html",
"RHESSI" => "RHESSI_coverage.html"
);

const TABLE_ROW_TEMPLATE = "<tr class='%s'><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td align='center'>%s</td></tr>";
Expand Down Expand Up @@ -292,7 +295,6 @@ function array_push_if_not_null(&$arr, $value) {

// Get a list of the datasources grouped by instrument
$instruments = $imgIndex->getDataSourcesByInstrument();

// Create table of datasource statuses
foreach($instruments as $name => $datasources) {
$oldest = array(
Expand Down
1 change: 1 addition & 0 deletions docs/src/source/appendix/data_sources.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ parameter shown in the following tables.
.. include:: data_sources/mlso.rst
.. include:: data_sources/proba2.rst
.. include:: data_sources/suvi.rst
.. include:: data_sources/rhessi.rst
81 changes: 81 additions & 0 deletions docs/src/source/appendix/data_sources/rhessi.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
RHESSI
------

.. table:: RHESSI Data Sources

+-----------+-----------------------+-------------+
| Source ID | Reconstruction Method | Energy Band |
+===========+=======================+=============+
| 95 | Back Projection | 3-6 keV |
+-----------+-----------------------+-------------+
| 96 | Back Projection | 6-12 keV |
+-----------+-----------------------+-------------+
| 97 | Back Projection | 12-25 keV |
+-----------+-----------------------+-------------+
| 98 | Back Projection | 25-50 keV |
+-----------+-----------------------+-------------+
| 99 | Back Projection | 50-100 keV |
+-----------+-----------------------+-------------+
| 100 | Back Projection | 100-300 keV |
+-----------+-----------------------+-------------+
| 101 | Clean | 3-6 keV |
+-----------+-----------------------+-------------+
| 102 | Clean | 6-12 keV |
+-----------+-----------------------+-------------+
| 103 | Clean | 12-25 keV |
+-----------+-----------------------+-------------+
| 104 | Clean | 25-50 keV |
+-----------+-----------------------+-------------+
| 105 | Clean | 50-100 keV |
+-----------+-----------------------+-------------+
| 106 | Clean | 100-300 keV |
+-----------+-----------------------+-------------+
| 107 | Clean 59 | 3-6 keV |
+-----------+-----------------------+-------------+
| 108 | Clean 59 | 6-12 keV |
+-----------+-----------------------+-------------+
| 109 | Clean 59 | 12-25 keV |
+-----------+-----------------------+-------------+
| 110 | Clean 59 | 25-50 keV |
+-----------+-----------------------+-------------+
| 111 | Clean 59 | 50-100 keV |
+-----------+-----------------------+-------------+
| 112 | Clean 59 | 100-300 keV |
+-----------+-----------------------+-------------+
| 113 | MEM_GE | 3-6 keV |
+-----------+-----------------------+-------------+
| 114 | MEM_GE | 6-12 keV |
+-----------+-----------------------+-------------+
| 115 | MEM_GE | 12-25 keV |
+-----------+-----------------------+-------------+
| 116 | MEM_GE | 25-50 keV |
+-----------+-----------------------+-------------+
| 117 | MEM_GE | 50-100 keV |
+-----------+-----------------------+-------------+
| 118 | MEM_GE | 100-300 keV |
+-----------+-----------------------+-------------+
| 119 | VIS CS | 3-6 keV |
+-----------+-----------------------+-------------+
| 120 | VIS CS | 6-12 keV |
+-----------+-----------------------+-------------+
| 121 | VIS CS | 12-25 keV |
+-----------+-----------------------+-------------+
| 122 | VIS CS | 25-50 keV |
+-----------+-----------------------+-------------+
| 123 | VIS CS | 50-100 keV |
+-----------+-----------------------+-------------+
| 124 | VIS CS | 100-300 keV |
+-----------+-----------------------+-------------+
| 125 | FWDFIT | 3-6 keV |
+-----------+-----------------------+-------------+
| 126 | FWDFIT | 6-12 keV |
+-----------+-----------------------+-------------+
| 127 | FWDFIT | 12-25 keV |
+-----------+-----------------------+-------------+
| 128 | FWDFIT | 25-50 keV |
+-----------+-----------------------+-------------+
| 129 | FWDFIT | 50-100 keV |
+-----------+-----------------------+-------------+
| 130 | FWDFIT | 100-300 keV |
+-----------+-----------------------+-------------+

2 changes: 2 additions & 0 deletions docs/src/source/appendix/helioviewer_event_format.rst
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ The data field is where the actual event specific data goes.
| views | | List of views into the data. |
| | | This is parsed into the tabs that appear on Helioviewer |
+----------+---------------------------------------------------------------------------+
| title | Event information dialog popup title |
+----------+---------------------------------------------------------------------------+

The event object allows normalized positioning and labeling for any type of event while still containing the event-specific data.
Helioviewer is using this format for all features and events.
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 910c2e6

Please sign in to comment.