Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable RHESSI images #370

Merged
merged 26 commits into from
Jun 10, 2024
Merged

Enable RHESSI images #370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
5353444
Rename test folders to __test__
dgarciabriseno Apr 3, 2024
1a64ec5
Add rhessi support to get_jp2_info
dgarciabriseno Apr 3, 2024
f0e5e2c
Add RHESSIDataServer
dgarciabriseno Apr 3, 2024
14e6fa0
Fix localbrowser for relative paths
dgarciabriseno Apr 3, 2024
7b3a5b7
Add rhessi support to jp2.py
dgarciabriseno Apr 3, 2024
05b0f5e
Enable rhessi for jp2parser
dgarciabriseno Apr 3, 2024
00fbeea
Initial database update
dgarciabriseno Apr 3, 2024
595e3cd
Fix localmove import
dgarciabriseno Apr 3, 2024
f6013f2
Add RHESSIImage.php
dgarciabriseno Apr 3, 2024
9419a67
Update RHESSI filesystem path
dgarciabriseno Apr 3, 2024
c999d6e
Add sql for all rhessi combinations
dgarciabriseno Apr 4, 2024
09bf8c0
Add transparency to rhessi images
dgarciabriseno Apr 4, 2024
e1039bb
Use colormaps instead of tables
dgarciabriseno Apr 4, 2024
9012d6b
Add tentative rhessi color table
dgarciabriseno Apr 4, 2024
a4c9840
centralize code which selects the image class
dgarciabriseno Apr 4, 2024
e051c25
Update energy band labels
dgarciabriseno Apr 4, 2024
d84d9c1
Update rhessi dataserver
dgarciabriseno Apr 4, 2024
8f2de25
Update RHESSI color map
dgarciabriseno Apr 11, 2024
bb7d318
Update jp2parser to support RHESSI
dgarciabriseno Apr 16, 2024
1185520
Update reading dsun for php
dgarciabriseno Apr 16, 2024
c1524c4
Fix type hint for py3.9
dgarciabriseno Apr 16, 2024
cc76c45
Add title note to event format docs
dgarciabriseno Apr 23, 2024
1f341b3
Updated db.py
dgarciabriseno Jun 10, 2024
41ae9ab
Update appendix
dgarciabriseno Jun 10, 2024
14d8659
rm unused code
dgarciabriseno Jun 10, 2024
f684837
Patches to support python 3.12
dgarciabriseno Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added docroot/resources/images/color-tables/RHESSI.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions docs/src/source/appendix/data_sources.rst
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
0 install/tests/README.md → install/__test__/README.md
View file
Open in desktop
File renamed without changes.
0 ...iewer/hvpull/downloader/tests/__init__.py → install/__test__/__init__.py
View file
Open in desktop
File renamed without changes.
0 install/tests/test_jp2.py → install/__test__/test_jp2.py
View file
Open in desktop
File renamed without changes.
189 changes: 189 additions & 0 deletions install/database/2024_04_03_rhessi.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,189 @@
INSERT INTO datasources (id, name, description, units, layeringOrder, enabled, sourceIdGroup, displayOrder)
VALUES
(95, 'RHESSI', 'RHESSI 3-6keV Back Projection', NULL, 1, 0, '', 0),
dgarciabriseno marked this conversation as resolved.
Show resolved Hide resolved
(96, 'RHESSI', 'RHESSI 6-12keV Back Projection', NULL, 1, 0, '', 0),
(97, 'RHESSI', 'RHESSI 12-25keV Back Projection', NULL, 1, 0, '', 0),
(98, 'RHESSI', 'RHESSI 25-50keV Back Projection', NULL, 1, 0, '', 0),
dgarciabriseno marked this conversation as resolved.
Show resolved Hide resolved
(99, 'RHESSI', 'RHESSI 50-100keV Back Projection', NULL, 1, 0, '', 0),
(100, 'RHESSI', 'RHESSI 100-300keV Back Projection', NULL, 1, 0, '', 0),

(101, 'RHESSI', 'RHESSI 3-6keV Clean', NULL, 1, 0, '', 0),
(102, 'RHESSI', 'RHESSI 6-12keV Clean', NULL, 1, 0, '', 0),
(103, 'RHESSI', 'RHESSI 12-25keV Clean', NULL, 1, 0, '', 0),
(104, 'RHESSI', 'RHESSI 25-50keV Clean', NULL, 1, 0, '', 0),
(105, 'RHESSI', 'RHESSI 50-100keV Clean', NULL, 1, 0, '', 0),
(106, 'RHESSI', 'RHESSI 100-300keV Clean', NULL, 1, 0, '', 0),

(107, 'RHESSI', 'RHESSI 3-6keV Clean 59', NULL, 1, 0, '', 0),
(108, 'RHESSI', 'RHESSI 6-12keV Clean 59', NULL, 1, 0, '', 0),
(109, 'RHESSI', 'RHESSI 12-25keV Clean 59', NULL, 1, 0, '', 0),
(110, 'RHESSI', 'RHESSI 25-50keV Clean 59', NULL, 1, 0, '', 0),
(111, 'RHESSI', 'RHESSI 50-100keV Clean 59', NULL, 1, 0, '', 0),
(112, 'RHESSI', 'RHESSI 100-300keV Clean 59', NULL, 1, 0, '', 0),

(113, 'RHESSI', 'RHESSI 3-6keV MEM_GE', NULL, 1, 0, '', 0),
(114, 'RHESSI', 'RHESSI 6-12keV MEM_GE', NULL, 1, 0, '', 0),
(115, 'RHESSI', 'RHESSI 12-25keV MEM_GE', NULL, 1, 0, '', 0),
(116, 'RHESSI', 'RHESSI 25-50keV MEM_GE', NULL, 1, 0, '', 0),
(117, 'RHESSI', 'RHESSI 50-100keV MEM_GE', NULL, 1, 0, '', 0),
(118, 'RHESSI', 'RHESSI 100-300keV MEM_GE', NULL, 1, 0, '', 0),

(119, 'RHESSI', 'RHESSI 3-6keV VIS CS', NULL, 1, 0, '', 0),
(120, 'RHESSI', 'RHESSI 6-12keV VIS CS', NULL, 1, 0, '', 0),
(121, 'RHESSI', 'RHESSI 12-25keV VIS CS', NULL, 1, 0, '', 0),
(122, 'RHESSI', 'RHESSI 25-50keV VIS CS', NULL, 1, 0, '', 0),
(123, 'RHESSI', 'RHESSI 50-100keV VIS CS', NULL, 1, 0, '', 0),
(124, 'RHESSI', 'RHESSI 100-300keV VIS CS', NULL, 1, 0, '', 0),

(125, 'RHESSI', 'RHESSI 3-6keV VIS FWDFIT', NULL, 1, 0, '', 0),
(126, 'RHESSI', 'RHESSI 6-12keV VIS FWDFIT', NULL, 1, 0, '', 0),
(127, 'RHESSI', 'RHESSI 12-25keV VIS FWDFIT', NULL, 1, 0, '', 0),
(128, 'RHESSI', 'RHESSI 25-50keV VIS FWDFIT', NULL, 1, 0, '', 0),
(129, 'RHESSI', 'RHESSI 50-100keV VIS FWDFIT', NULL, 1, 0, '', 0),
(130, 'RHESSI', 'RHESSI 100-300keV VIS FWDFIT', NULL, 1, 0, '', 0);

INSERT INTO datasource_property (sourceId, label, name, fitsName, description, uiOrder)
VALUES
(95, 'Observatory', 'RHESSI', 'RHESSI', 'RHESSI' , 1),
(95, 'Energy Band', '3-6keV', '3.0_6.0', '3keV to 6keV' , 2),
(95, 'Reconstruction', 'Back Projection', 'Back_Projection', 'Back Projection', 3),

(96, 'Observatory', 'RHESSI', 'RHESSI', 'RHESSI', 1),
(96, 'Energy Band', '6-12keV', '6.0_12.0', '6keV to 12keV', 2),
(96, 'Reconstruction', 'Back Projection', 'Back_Projection', 'Back Projection', 3),

(97, 'Observatory', 'RHESSI', 'RHESSI', 'RHESSI', 1),
(97, 'Energy Band', '12-25keV', '12.0_25.0', '12keV to 25keV', 2),
(97, 'Reconstruction', 'Back Projection', 'Back_Projection', 'Back Projection', 3),

(98, 'Observatory', 'RHESSI', 'RHESSI', 'RHESSI', 1),
(98, 'Energy Band', '25-50keV', '25.0_50.0', '25keV to 50keV', 2),
(98, 'Reconstruction', 'Back Projection', 'Back_Projection', 'Back Projection', 3),

(99, 'Observatory', 'RHESSI', 'RHESSI', 'RHESSI', 1),
(99, 'Energy Band', '50-100keV', '50.0_100.0', '50keV to 100keV', 2),
(99, 'Reconstruction', 'Back Projection', 'Back_Projection', 'Back Projection', 3),

(100, 'Observatory', 'RHESSI', 'RHESSI', 'RHESSI', 1),
(100, 'Energy Band', '100-300keV', '100.0_300.0', '50keV to 100keV', 2),
(100, 'Reconstruction', 'Back Projection', 'Back_Projection', 'Back Projection', 3),

(101, 'Observatory', 'RHESSI', 'RHESSI', 'RHESSI', 1),
(101, 'Energy Band', '3-6keV', '3.0_6.0', '3keV to 6keV', 2),
(101, 'Reconstruction', 'Clean', 'Clean', 'Clean', 3),

(102, 'Observatory', 'RHESSI', 'RHESSI', 'RHESSI', 1),
(102, 'Energy Band', '6-12keV', '6.0_12.0', '6keV to 12keV', 2),
(102, 'Reconstruction', 'Clean', 'Clean', 'Clean', 3),

(103, 'Observatory', 'RHESSI', 'RHESSI', 'RHESSI', 1),
(103, 'Energy Band', '12-25keV', '12.0_25.0', '12keV to 25keV', 2),
(103, 'Reconstruction', 'Clean', 'Clean', 'Clean', 3),

(104, 'Observatory', 'RHESSI', 'RHESSI', 'RHESSI', 1),
(104, 'Energy Band', '25-50keV', '25.0_50.0', '25keV to 50keV', 2),
(104, 'Reconstruction', 'Clean', 'Clean', 'Clean', 3),

(105, 'Observatory', 'RHESSI', 'RHESSI', 'RHESSI', 1),
(105, 'Energy Band', '50-100keV', '50.0_100.0', '50keV to 100keV', 2),
(105, 'Reconstruction', 'Clean', 'Clean', 'Clean', 3),

(106, 'Observatory', 'RHESSI', 'RHESSI', 'RHESSI', 1),
(106, 'Energy Band', '100-300keV', '100.0_300.0', '50keV to 100keV', 2),
(106, 'Reconstruction', 'Clean', 'Clean', 'Clean', 3),

(107, 'Observatory', 'RHESSI', 'RHESSI', 'RHESSI', 1),
(107, 'Energy Band', '3-6keV', '3.0_6.0', '3keV to 6keV', 2),
(107, 'Reconstruction', 'Clean 59', 'Clean59', 'Clean 59', 3),

(108, 'Observatory', 'RHESSI', 'RHESSI', 'RHESSI', 1),
(108, 'Energy Band', '6-12keV', '6.0_12.0', '6keV to 12keV', 2),
(108, 'Reconstruction', 'Clean 59', 'Clean59', 'Clean 59', 3),

(109, 'Observatory', 'RHESSI', 'RHESSI', 'RHESSI', 1),
(109, 'Energy Band', '12-25keV', '12.0_25.0', '12keV to 25keV', 2),
(109, 'Reconstruction', 'Clean 59', 'Clean59', 'Clean 59', 3),

(110, 'Observatory', 'RHESSI', 'RHESSI', 'RHESSI', 1),
(110, 'Energy Band', '25-50keV', '25.0_50.0', '25keV to 50keV', 2),
(110, 'Reconstruction', 'Clean 59', 'Clean59', 'Clean 59', 3),

(111, 'Observatory', 'RHESSI', 'RHESSI', 'RHESSI', 1),
(111, 'Energy Band', '50-100keV', '50.0_100.0', '50keV to 100keV', 2),
(111, 'Reconstruction', 'Clean 59', 'Clean59', 'Clean 59', 3),

(112, 'Observatory', 'RHESSI', 'RHESSI', 'RHESSI', 1),
(112, 'Energy Band', '100-300keV', '100.0_300.0', '50keV to 100keV', 2),
(112, 'Reconstruction', 'Clean 59', 'Clean59', 'Clean 59', 3),

(113, 'Observatory', 'RHESSI', 'RHESSI', 'RHESSI', 1),
(113, 'Energy Band', '3-6keV', '3.0_6.0', '3keV to 6keV', 2),
(113, 'Reconstruction', 'MEM GE', 'MEM_GE', 'MEM GE', 3),

(114, 'Observatory', 'RHESSI', 'RHESSI', 'RHESSI', 1),
(114, 'Energy Band', '6-12keV', '6.0_12.0', '6keV to 12keV', 2),
(114, 'Reconstruction', 'MEM GE', 'MEM_GE', 'MEM GE', 3),

(115, 'Observatory', 'RHESSI', 'RHESSI', 'RHESSI', 1),
(115, 'Energy Band', '12-25keV', '12.0_25.0', '12keV to 25keV', 2),
(115, 'Reconstruction', 'MEM GE', 'MEM_GE', 'MEM GE', 3),

(116, 'Observatory', 'RHESSI', 'RHESSI', 'RHESSI', 1),
(116, 'Energy Band', '25-50keV', '25.0_50.0', '25keV to 50keV', 2),
(116, 'Reconstruction', 'MEM GE', 'MEM_GE', 'MEM GE', 3),

(117, 'Observatory', 'RHESSI', 'RHESSI', 'RHESSI', 1),
(117, 'Energy Band', '50-100keV', '50.0_100.0', '50keV to 100keV', 2),
(117, 'Reconstruction', 'MEM GE', 'MEM_GE', 'MEM GE', 3),

(118, 'Observatory', 'RHESSI', 'RHESSI', 'RHESSI', 1),
(118, 'Energy Band', '100-300keV', '100.0_300.0', '50keV to 100keV', 2),
(118, 'Reconstruction', 'MEM GE', 'MEM_GE', 'MEM GE', 3),

(119, 'Observatory', 'RHESSI', 'RHESSI', 'RHESSI', 1),
(119, 'Energy Band', '3-6keV', '3.0_6.0', '3keV to 6keV', 2),
(119, 'Reconstruction', 'VIS CS', 'VIS_CS', 'VIS CS', 3),

(120, 'Observatory', 'RHESSI', 'RHESSI', 'RHESSI', 1),
(120, 'Energy Band', '6-12keV', '6.0_12.0', '6keV to 12keV', 2),
(120, 'Reconstruction', 'VIS CS', 'VIS_CS', 'VIS CS', 3),

(121, 'Observatory', 'RHESSI', 'RHESSI', 'RHESSI', 1),
(121, 'Energy Band', '12-25keV', '12.0_25.0', '12keV to 25keV', 2),
(121, 'Reconstruction', 'VIS CS', 'VIS_CS', 'VIS CS', 3),

(122, 'Observatory', 'RHESSI', 'RHESSI', 'RHESSI', 1),
(122, 'Energy Band', '25-50keV', '25.0_50.0', '25keV to 50keV', 2),
(122, 'Reconstruction', 'VIS CS', 'VIS_CS', 'VIS CS', 3),

(123, 'Observatory', 'RHESSI', 'RHESSI', 'RHESSI', 1),
(123, 'Energy Band', '50-100keV', '50.0_100.0', '50keV to 100keV', 2),
(123, 'Reconstruction', 'VIS CS', 'VIS_CS', 'VIS CS', 3),

(124, 'Observatory', 'RHESSI', 'RHESSI', 'RHESSI', 1),
(124, 'Energy Band', '100-300keV', '100.0_300.0', '50keV to 100keV', 2),
(124, 'Reconstruction', 'VIS CS', 'VIS_CS', 'VIS CS', 3),

(125, 'Observatory', 'RHESSI', 'RHESSI', 'RHESSI', 1),
(125, 'Energy Band', '3-6keV', '3.0_6.0', '3keV to 6keV', 2),
(125, 'Reconstruction', 'VIS FWDFIT', 'VIS_FWDFIT', 'VIS FWDFIT', 3),

(126, 'Observatory', 'RHESSI', 'RHESSI', 'RHESSI', 1),
(126, 'Energy Band', '6-12keV', '6.0_12.0', '6keV to 12keV', 2),
(126, 'Reconstruction', 'VIS FWDFIT', 'VIS_FWDFIT', 'VIS FWDFIT', 3),

(127, 'Observatory', 'RHESSI', 'RHESSI', 'RHESSI', 1),
(127, 'Energy Band', '12-25keV', '12.0_25.0', '12keV to 25keV', 2),
(127, 'Reconstruction', 'VIS FWDFIT', 'VIS_FWDFIT', 'VIS FWDFIT', 3),

(128, 'Observatory', 'RHESSI', 'RHESSI', 'RHESSI', 1),
(128, 'Energy Band', '25-50keV', '25.0_50.0', '25keV to 50keV', 2),
(128, 'Reconstruction', 'VIS FWDFIT', 'VIS_FWDFIT', 'VIS FWDFIT', 3),

(129, 'Observatory', 'RHESSI', 'RHESSI', 'RHESSI', 1),
(129, 'Energy Band', '50-100keV', '50.0_100.0', '50keV to 100keV', 2),
(129, 'Reconstruction', 'VIS FWDFIT', 'VIS_FWDFIT', 'VIS FWDFIT', 3),

(130, 'Observatory', 'RHESSI', 'RHESSI', 'RHESSI', 1),
(130, 'Energy Band', '100-300keV', '100.0_300.0', '50keV to 100keV', 2),
(130, 'Reconstruction', 'VIS FWDFIT', 'VIS_FWDFIT', 'VIS FWDFIT', 3);
Loading
Loading