Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
3192ce4
simplified main L1 diagram
kosack Apr 23, 2025
b869c11
added pointing diagram
kosack Apr 23, 2025
b66c75d
added ontime diagram
kosack Apr 23, 2025
c2138c7
added event-list diagram
kosack Apr 23, 2025
c166586
cleaned up how time-series relate to measurements
kosack Apr 23, 2025
cb25e81
add IRF
kosack Apr 23, 2025
702fb21
move common plantuml style file up
kosack Apr 23, 2025
133d822
mention DataLink in ObsCore
kosack Apr 23, 2025
ff04cf6
improve IVOA linking
kosack Apr 23, 2025
18afa86
fix the diagram scaling
kosack Apr 24, 2025
0c29f3a
use aggregation for Observation to sub-HDUs
kosack Apr 24, 2025
c7a4fde
use ortho links for main diagram
kosack Apr 24, 2025
083580f
show relationship to Facility and Instrument
kosack Apr 24, 2025
02778b6
use "together" to improve layout
kosack Apr 24, 2025
05b8d82
move IVOA to left to make clearer
kosack Apr 29, 2025
08d95af
style update
kosack Apr 29, 2025
f7df310
use VODF color scheme
kosack Apr 29, 2025
f12977b
define <<extern>> style for classes out of VODF
kosack Apr 29, 2025
3663734
ensure stereotype color is correct
kosack Apr 29, 2025
376b75c
start to describe IRFs
kosack Apr 29, 2025
16984fd
added Coverage and some text for IRFs
kosack Apr 29, 2025
eacd810
more text defining the IRF
kosack Apr 30, 2025
839dd6b
cleanups to IRF
kosack Apr 30, 2025
da279a1
add a todo about even types / IRFs
kosack Apr 30, 2025
794e998
fix typo
kosack Apr 30, 2025
53fb258
PSF shouldn't be optional, even for spatial selection
kosack Apr 30, 2025
fda39dd
improve event diagram
kosack Apr 30, 2025
25794c7
started to add PDGID, etc
kosack Apr 30, 2025
b3c6dcb
fixed some typos
kosack Apr 30, 2025
3ac2688
fix logo
kosack Apr 30, 2025
1dadd50
better layout
kosack Apr 30, 2025
1af9779
remove comments
kosack Apr 30, 2025
63ffb96
show MOC types in coverage
kosack Apr 30, 2025
2f95bdb
fix typo: text -> alt_text
kosack Apr 30, 2025
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
7 changes: 7 additions & 0 deletions source/_static/custom.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,10 @@ html[data-theme="light"] {
html[data-theme="dark"] {
--pst-color-primary: #8800ff;
}


/* Ensure the SVG diagrams scale with font size, not diagram width */
img[src$=".svg"] {
max-width: 100%;
height: auto;
}
17 changes: 12 additions & 5 deletions source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
# ones.
extensions = [
"sphinxcontrib.plantuml",
"sphinx.ext.mathjax",
"sphinx.ext.todo",
]

# Add any paths that contain templates here, relative to this directory.
Expand Down Expand Up @@ -70,11 +72,8 @@
version_match = "v" + release

html_theme_options = {
# "logo_link": "",
"github_url": "https://github.com/vodf/vodf-docs",
"icon_links_label": "Quick Links",
# "show_nav_level": 4,
# "navigation_depth": 4,
"use_edit_page_button": True,
"navbar_align": "content",
"navbar_end": ["version-switcher", "navbar-icon-links"], # "theme-switcher"
Expand All @@ -84,9 +83,16 @@
},
"header_links_before_dropdown": 6,
"announcement": "<p>This is an unreleased version, informaton may not be correct</p>",
"footer_start": ["copyright",],
"footer_start": [
"copyright",
],
"footer_center": ["last-updated"],
"footer_end": ["sphinx-version", "theme-version"],
"logo": {
"alt_text":"VODF: Very-High-Energy Open Data Format",
"image_light": "source/_static/VODF-logo.png",
"image_dark": "source/_static/VODF-logo.png",
},
}

html_context = {
Expand All @@ -101,14 +107,15 @@
html_css_files = [
"custom.css",
]
html_logo = "_static/VODF-logo.svg"


# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ["_static"]

# Show TODO entries. Disable this before release
todo_include_todos = True

# ======================================================================
# Options for LaTeX docment output
Expand Down
43 changes: 43 additions & 0 deletions source/specification/common.inc
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
@startuml
hide circles
hide methods
skinparam DefaultFontSize 14
skinparam DefaultFontName "Arial"



<style>
package {
LineColor #gray
FontColor #gray
}

class {

backgroundColor white-aliceblue
header {
fontColor #ffffff
backgroundColor #8800ff
fontStyle bold
}

}


.extern {
class {
header {
backgroundColor #gray
}
}

}

</style>

skinparam classStereotypeFontColor white

hide <<extern>> stereotype


@enduml
44 changes: 44 additions & 0 deletions source/specification/core-concepts.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,47 @@ Core Concepts

This describes the overall data model of VODF and how its component parts are
inter-related.

Data Levels
-----------

.. todo::

Describe high-level relationship between L1 to L4

Common Types
------------

.. uml::

!include common.inc
class TimeStamp

Maps and N-Dimensional Arrays
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~




PDGID
~~~~~

.. uml::

!include common.inc
class PDGID <<integer>>


Particle ids used in VODF shall follow the integer `https://particle.wiki/wiki/PDG_particle_numbering_scheme <Particle Data Group Numbering Scheme>`_, e.g.:


.. csv-table:: Some example PDGIDs
:header: "Particle","ID"
:widths: 1,5

":math:`\gamma`", 22
":math:`e-`", 11
":math:`p`", 2212
":math:`\nu_e`", 12
":math:`\nu_\mu`", 14
":math:`\nu_\tau`",16
46 changes: 46 additions & 0 deletions source/specification/level-1/coverage.plantuml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
@startuml
!include ../common.inc
skinparam linetype ortho

package IVOA <<cloud>> {

class SMOC
class TMOC
class STMOC
}

package VODF {
package L1 {
class SpatialCoverage {
+ r_fov : float
..optional..
+ region : Region
}

class TemporalCoverage {
+ t_start
+ t_stop
}

class SpectralCoverage {
+ energy_min
+ energy_max
}

Coverage *-- SpatialCoverage
Coverage *-- TemporalCoverage
Coverage *-- SpectralCoverage
TemporalCoverage *-d--- "0..1" IVOA.TMOC
TemporalCoverage *-d--- "0..1" IVOA.STMOC
SpatialCoverage *-d--- "0..1" IVOA.SMOC
SpatialCoverage *-d--- "0..1" IVOA.STMOC


class OnTime <<extern>>
class Pointing <<extern>>
TemporalCoverage ..> OnTime
TemporalCoverage ..> Pointing
}
}

@enduml
38 changes: 38 additions & 0 deletions source/specification/level-1/eventlist.plantuml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
@startuml
!include ../common.inc


package VODF.L1 {

class EventList {
+ collection_id
+ obs_id
}
class Event {
+ event_id: int64
--
+ ra_reco: float32
+ dec_reco: float32
+ time_reco: TimeStamp
+ energy_reco: float32
..optional..
+ event_type: int
+ alt_reco: float32
+ az_reco: float32
}

class SimulatedEvent {
+ alt_true: float32
+ az_true: float32
+ energy_true: float32
+ time_true: TimeStamp
+ particle_id_true : PDGID
..optional..
+ ra_true: float32
+ dec_true: float32
}

EventList "1" o-- "0..*" Event
Event -r-|> SimulatedEvent
}
@enduml
Loading
Loading