Skip to content

Commit

Permalink
Merge pull request #86 from acquire-project/dgm_chunking
Browse files Browse the repository at this point in the history 
Updating Tutorials for 0.3.0
  • Loading branch information
@dgmccart
dgmccart authored Sep 5, 2024
2 parents bf81d14 + 9744b73 commit a73d0ee
Show file tree
Hide file tree
Showing 17 changed files with 296 additions and 506 deletions.
11 changes: 6 additions & 5 deletions docs/examples/livestream_napari.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,12 @@ def is_not_done() -> bool:
def next_frame(): #-> Optional[npt.NDArray[Any]]:
"""Get the next frame from the current stream."""
if nframes[stream_id] < config.video[stream_id].max_frame_count:
if packet := runtime.get_available_data(stream_id):
n = packet.get_frame_count()
nframes[stream_id] += n
f = next(packet.frames())
return f.data().squeeze().copy()
with runtime.get_available_data(stream_id) as data:
if packet := data:
n = packet.get_frame_count()
nframes[stream_id] += n
f = next(packet.frames())
return f.data().squeeze().copy()
return None

stream = 1
Expand Down
370 changes: 178 additions & 192 deletions docs/examples/sample_props.json
View file
Original file line number Diff line number Diff line change
@@ -1,200 +1,186 @@
{
"video": [
{
"camera": {
"identifier": {
"id": [
0,
1
],
"kind": "Camera",
"name": "simulated: radial sin"
},
"settings": {
"binning": 1,
"exposure_time_us": 0.0,
"input_triggers": {
"acquisition_start": {
"edge": "Rising",
"enable": false,
"kind": "Input",
"line": 0
},
"exposure": {
"edge": "Rising",
"enable": false,
"kind": "Input",
"line": 0
},
"frame_start": {
"edge": "Rising",
"enable": false,
"kind": "Input",
"line": 0
}
},
"line_interval_us": 0.0,
"offset": [
0,
0
],
"output_triggers": {
"exposure": {
"edge": "Rising",
"enable": false,
"kind": "Input",
"line": 0
"video": [
{
"camera": {
"identifier": {
"id": [
0,
1
],
"kind": "Camera",
"name": "simulated: radial sin"
},
"settings": {
"binning": 1,
"exposure_time_us": 0.0,
"input_triggers": {
"acquisition_start": {
"edge": "Rising",
"enable": false,
"kind": "Input",
"line": 0
},
"exposure": {
"edge": "Rising",
"enable": false,
"kind": "Input",
"line": 0
},
"frame_start": {
"edge": "Rising",
"enable": false,
"kind": "Input",
"line": 0
}
},
"line_interval_us": 0.0,
"offset": [
0,
0
],
"output_triggers": {
"exposure": {
"edge": "Rising",
"enable": false,
"kind": "Input",
"line": 0
},
"frame_start": {
"edge": "Rising",
"enable": false,
"kind": "Input",
"line": 0
},
"trigger_wait": {
"edge": "Rising",
"enable": false,
"kind": "Input",
"line": 0
}
},
"pixel_type": "U16",
"readout_direction": "Forward",
"shape": [
1,
1
]
}
},
"frame_start": {
"edge": "Rising",
"enable": false,
"kind": "Input",
"line": 0
},
"trigger_wait": {
"edge": "Rising",
"enable": false,
"kind": "Input",
"line": 0
}
},
"pixel_type": "U16",
"readout_direction": "Forward",
"shape": [
1,
1
]
}
},
"frame_average_count": 0,
"max_frame_count": 18446744073709551615,
"storage": {
"identifier": {
"id": [
0,
0
],
"kind": "NONE",
"name": ""
},
"settings": {
"chunking": {
"max_bytes_per_chunk": 16777216,
"tile": {
"height": 0,
"planes": 0,
"width": 0
"frame_average_count": 0,
"max_frame_count": 18446744073709551615,
"storage": {
"identifier": {
"id": [
0,
5
],
"kind": "Storage",
"name": "trash"
},
"settings": {
"acquisition_dimensions": [],
"enable_multiscale": false,
"external_metadata_json": "",
"filename": "",
"first_frame_id": 0,
"pixel_scale_um": [
0.0,
0.0
]
},
"write_delay_ms": 0.0
}
},
"enable_multiscale": false,
"external_metadata_json": "",
"filename": "",
"first_frame_id": 0,
"pixel_scale_um": [
0.0,
0.0
]
},
"write_delay_ms": 0.0
}
},
{
"camera": {
"identifier": {
"id": [
0,
0
],
"kind": "NONE",
"name": ""
},
"settings": {
"binning": 1,
"exposure_time_us": 0.0,
"input_triggers": {
"acquisition_start": {
"edge": "Rising",
"enable": false,
"kind": "Input",
"line": 0
},
"exposure": {
"edge": "Rising",
"enable": false,
"kind": "Input",
"line": 0
},
"frame_start": {
"edge": "Rising",
"enable": false,
"kind": "Input",
"line": 0
}
},
"line_interval_us": 0.0,
"offset": [
0,
0
],
"output_triggers": {
"exposure": {
"edge": "Rising",
"enable": false,
"kind": "Input",
"line": 0
{
"camera": {
"identifier": {
"id": [
0,
0
],
"kind": "NONE",
"name": ""
},
"settings": {
"binning": 1,
"exposure_time_us": 0.0,
"input_triggers": {
"acquisition_start": {
"edge": "Rising",
"enable": false,
"kind": "Input",
"line": 0
},
"exposure": {
"edge": "Rising",
"enable": false,
"kind": "Input",
"line": 0
},
"frame_start": {
"edge": "Rising",
"enable": false,
"kind": "Input",
"line": 0
}
},
"line_interval_us": 0.0,
"offset": [
0,
0
],
"output_triggers": {
"exposure": {
"edge": "Rising",
"enable": false,
"kind": "Input",
"line": 0
},
"frame_start": {
"edge": "Rising",
"enable": false,
"kind": "Input",
"line": 0
},
"trigger_wait": {
"edge": "Rising",
"enable": false,
"kind": "Input",
"line": 0
}
},
"pixel_type": "U16",
"readout_direction": "Forward",
"shape": [
0,
0
]
}
},
"frame_start": {
"edge": "Rising",
"enable": false,
"kind": "Input",
"line": 0
},
"trigger_wait": {
"edge": "Rising",
"enable": false,
"kind": "Input",
"line": 0
"frame_average_count": 0,
"max_frame_count": 18446744073709551615,
"storage": {
"identifier": {
"id": [
0,
0
],
"kind": "NONE",
"name": ""
},
"settings": {
"acquisition_dimensions": [],
"enable_multiscale": false,
"external_metadata_json": "",
"filename": "",
"first_frame_id": 0,
"pixel_scale_um": [
0.0,
0.0
]
},
"write_delay_ms": 0.0
}
},
"pixel_type": "U16",
"readout_direction": "Forward",
"shape": [
0,
0
]
}
},
"frame_average_count": 0,
"max_frame_count": 18446744073709551615,
"storage": {
"identifier": {
"id": [
0,
0
],
"kind": "NONE",
"name": ""
},
"settings": {
"chunking": {
"max_bytes_per_chunk": 16777216,
"tile": {
"height": 0,
"planes": 0,
"width": 0
}
},
"enable_multiscale": false,
"external_metadata_json": "",
"filename": "",
"first_frame_id": 0,
"pixel_scale_um": [
0.0,
0.0
]
},
"write_delay_ms": 0.0
}
}
]
]
}
Loading

0 comments on commit a73d0ee

Please sign in to comment.