Skip to content

Commit de06abc

Browse files
authored
Flarelist anc (#431)
rewrite pipeline to cronjob based approach #422 * flare list, flare list with position, flare list with soop, flare list preview maps * change flarelist to L3 * new naming for LL3 QL products * fixes after python3.11 upgrade * fix missing isnan from merge conflicts fix tests fix tests fix tests * add future migration logic to ProcessingHistoryStorage * preperation for merge and release * fix for #437 * Update stixpy dependency to use GitHub source
1 parent f8d1429 commit de06abc

39 files changed

Lines changed: 2534 additions & 391 deletions

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,3 +165,4 @@ monitor_status.json
165165
stixcore/data/test/idb/v2.26.38/idb.sqlite
166166
.python-version
167167
sunpy/_version.py
168+
stixcore/_version.py

docs/code_ref/io.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ to certain directories.
66

77
.. automodapi:: stixcore.io
88

9-
.. automodapi:: stixcore.io.fits
10-
.. automodapi:: stixcore.io.fits.processors
9+
.. automodapi:: stixcore.io.product_processors.fits.processors
10+
.. automodapi:: stixcore.io.product_processors.plots.processors
1111

1212
.. automodapi:: stixcore.io.soc
1313
.. automodapi:: stixcore.io.soc.manager

docs/pipelineconfiguration.rst

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,25 @@ Sync FITS products with Platform (stix data center)
7575
# sync current fits to NAS (connection to Platform)
7676
0 */6 * * * sudo rsync -avLo --delete /var/www/data/fits/ /mnt/nas05/stix/stixcore_fits/
7777
78+
Sync STIX-CONF repo in all used instances
79+
*****************************************
80+
81+
```
82+
# sync the STIX-CONF to the latest release update version number
83+
# in the publix www folder
84+
10 */4 * * * cd /var/www/data/STIX-CONF && git fetch --tags && latestTag=$(git describe --tags `git rev-list --tags --max-count=1`) && git checkout $latestTag; echo $latestTag > VERSION.TXT
85+
# but also in the Pipeline setup once a day
86+
# had to be copied into the venv folder as well to get activated
87+
20 22 * * * cd /home/stixcore/STIXCore/stixcore/config/data/common/ && git fetch --tags && latestTag=$(git describe --tags `git rev-list --tags --max-count=1`) && git checkout $latestTag; echo $latestTag > VERSION.TXT && cp -r /home/stixcore/STIXCore/stixcore/config/data/common /home/stixcore/STIXCore/venv/lib/python3.9/site-packages/stixcore/config/data/
88+
```
89+
90+
Sync FITS products with Platform (stix data center)
91+
***************************************************
92+
93+
```
94+
# sync current fits to NAS (connection to Platform)
95+
0 */6 * * * sudo rsync -avLo --delete /var/www/data/fits/ /mnt/nas05/stix/stixcore_fits/
96+
```
7897
7998
Sync SPICE kernels and SOOP data
8099
********************************

pyproject.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ license = "BSD-3-Clause"
1515
license-files = ["LICENSE.rst"]
1616
authors = [
1717
{name="Shane Maloney", email = "shane.maloney@dias.ie"},
18-
{name="Nicky Maloney", email = "shane.maloney@dias.ie"}
18+
{name="Nicky Hochmuth", email = "nicky.hochmuth@ateleris.ch"}
1919
]
2020
dependencies = [
2121
"bitstring~=4.2",
@@ -27,9 +27,10 @@ dependencies = [
2727
"pyyaml",
2828
"scp",
2929
"spiceypy~=6.0",
30+
"sunpy~=6.0.0",
3031
"watchdog~=6.0",
3132
"stixdcpy==3.0",
32-
"stixpy>=0.1.3"
33+
"stixpy@git+https://github.com/TCDSolar/stixpy.git@main"
3334
]
3435
dynamic = ["version"]
3536
keywords = ["solar physics", "solar", "sun", "solarorbiter", "stix"]

stixcore/data/stixcore.ini

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ tm_archive =
33
fits_archive = /data/stix/out/test/pipeline_auto_test
44
spice_kernels =
55
soop_files =
6+
fido_search_url = file:///data/stix/out/fits_v1.2.0
67
[Logging]
78
stop_on_error = False
89
[IDLBridge]
@@ -13,6 +14,8 @@ status_server_port = 12345
1314
parallel_batchsize_L0 = 300
1415
parallel_batchsize_L1 = 300
1516
parallel_batchsize_L2 = 100
17+
flareid_sdc_lut_file = ./stixcore/data/publish/flarelist_sdc_lut.csv
18+
flareid_sc_lut_file = ./stixcore/data/publish/flarelist_sc_lut.csv
1619
[Publish]
1720
db_file = ./stixcore/data/publish/published.sqlite
1821
include_levels = L0
@@ -29,3 +32,5 @@ endpoint = https://solarorbiter.esac.esa.int/soopkitchen/api
2932
user = smaloney
3033
password = set_in_user_ini
3134
soop_files_download = ./stixcore/data/soop
35+
[Processing]
36+
flarelist_sdc_min_count = 1000

stixcore/data/test/stixcore.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ error_mail_sender = test@test.de
2020
parallel_batchsize_L0 = 3
2121
parallel_batchsize_L1 = 3
2222
parallel_batchsize_L2 = 3
23+
status_server_port = 12345
2324
[SOOP]
2425
endpoint = https://solarorbiter.esac.esa.int/soopkitchen/api
2526
user = smaloney

0 commit comments

Comments
 (0)