Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 0 additions & 21 deletions src/fastcs_eiger/controllers/odin/eiger_odin_controller.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import asyncio
from pathlib import Path

from fastcs.attributes import AttrRW
from fastcs.connections import IPConnectionSettings
from fastcs.datatypes import Bool, Int
from fastcs.methods import command

from fastcs_eiger.controllers.eiger_controller import COMMAND_GROUP, EigerController
from fastcs_eiger.controllers.odin.generate_vds import create_interleave_vds
from fastcs_eiger.controllers.odin.odin_controller import OdinController
from fastcs_eiger.eiger_parameter import EigerAPIVersion

Expand Down Expand Up @@ -66,10 +64,6 @@ async def start_writing(self):
self.OD.FP.data_datatype.put(f"uint{self.detector.bit_depth_image.get()}"),
)

path = Path(self.OD.file_path.get())
prefix = self.OD.file_prefix.get()
frame_count = self.OD.FP.frames.get()

await self.OD.FP.start_writing()

try:
Expand All @@ -78,18 +72,3 @@ async def start_writing(self):
)
except TimeoutError as e:
raise TimeoutError("File writers failed to start") from e

if self.enable_vds_creation.get():
create_interleave_vds(
path=path,
prefix=prefix,
datasets=["data", "data2", "data3"],
frame_count=frame_count,
frames_per_block=self.OD.block_size.get(),
blocks_per_file=self.OD.FP.process_blocks_per_file.get(),
frame_shape=(
self.OD.FP.data_dims_1.get(),
self.OD.FP.data_dims_0.get(),
),
dtype=self.OD.FP.data_datatype.get(),
)
120 changes: 0 additions & 120 deletions src/fastcs_eiger/controllers/odin/generate_vds.py

This file was deleted.

19 changes: 0 additions & 19 deletions tests/test_eiger_odin_controller.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from pathlib import Path

import pytest
from fastcs.attributes import AttrR, AttrRW
from fastcs.connections import IPConnectionSettings
Expand Down Expand Up @@ -78,10 +76,6 @@ async def test_start_writing(eiger_odin_controller, mocker: MockerFixture):
detector_mock.compression.get.return_value = "lz4"
detector_mock.bit_depth_image.get.return_value = 16

create_mock = mocker.patch(
"fastcs_eiger.controllers.odin.eiger_odin_controller.create_interleave_vds"
)

writing_wait_mock = mocker.patch.object(controller.OD.writing, "wait_for_value")

writing_wait_mock.side_effect = TimeoutError
Expand All @@ -98,18 +92,5 @@ async def test_start_writing(eiger_odin_controller, mocker: MockerFixture):
True, timeout=controller.start_writing_timeout.get()
)

create_mock.assert_not_called()

controller.enable_vds_creation._value = True
await controller.start_writing()

create_mock.assert_called_once_with(
path=Path("/tmp/data"),
prefix="test_prefix",
datasets=["data", "data2", "data3"],
frame_count=100,
frames_per_block=4,
blocks_per_file=10,
frame_shape=(1024, 512),
dtype="uint16",
)
Loading
Loading