173 stream resource seperate classes #429

subinsaji · 2024-07-03T09:31:53Z

Fixes #173

… added back

.github/workflows/_test.yml

.github/workflows/ci.yml

src/ophyd_async/epics/areadetector/writers/general_hdffile.py

src/ophyd_async/panda/writers/_hdf_writer.py

src/ophyd_async/sim/pattern_generator.py

coretl

I imagine this will break the pattern generator, but it's more important to get this in as it's holding other things in. We can fix the pattern generator in another ticket

coretl · 2024-07-04T15:11:12Z

src/ophyd_async/sim/pattern_generator.py

+        self.maxshape: tuple[Any, ...] = (1,)
+        self.fillvalue: int = 1
+        self.shape: List[int] = [1, 1]


For the next ticket:

shape of a frame is [detector_height, detector_width]

shape of the DATA HDF dataset is [1, detector_height, detector_width]

fill value for SUM dataset is -1, not required for the dataset

maxshape for the DATA HDF dataset = [None, detector_height, detector_width]

As per https://github.com/dls-controls/bluefly/blob/0ee7ea837d5f74e3cdc69e2315e9beed28dd7766/bluefly/areadetector_sim.py#L55-L68

Seher Karakuzu and others added 28 commits June 11, 2024 10:02

initial attempt to refactoring _HDFFile class

2da8dbe

few more changes to merge _HDFFile classes

87f765c

function to distinguish event model version

9978024

event model version check: some more changes

02ef379

few more changes

872a14c

completed initial refactoring

5a59c21

try downloading event-model via https

2aaab09

addressed comments

81623e5

Add event-model-version to CI test matrix.

69d229e

Declare event-model-version.

c553804

Default to latest event-model

d5d21cc

Fix syntax

b8402d2

some fix for tests

0eb1eb0

some more test fixes

9c1cb91

some more test fixes

7516df5

some more test fixes

8c6750e

(#397) added dataclass to extend maxshape and fillvalue

eb733f9

testing to see what happens in CI when maxshape, fillvalue, dtype are…

e04d95a

… added back

lint error fixes

5ac26f2

Optional needed if setting type to None

284ab94

merging dev into this branch

18b3bb8

fixing tests

0db1b03

small fix

ca78e1d

remove Optional

6eef859

modify dataclasses and attempt at fixing tests

af525c3

Merge branch 'main' into 173-StreamResource-seperate-classes

83771ab

(#374) drop old event model

077d651

saving changes

061b141

coretl reviewed Jul 3, 2024

View reviewed changes

.github/workflows/_test.yml Outdated Show resolved Hide resolved

.github/workflows/ci.yml Outdated Show resolved Hide resolved

dropping changes reffering to event model in workflows

e91d1f3

reorder and add back swmr

b1cd6d5

subinsaji commented Jul 3, 2024

View reviewed changes

src/ophyd_async/epics/areadetector/writers/general_hdffile.py Show resolved Hide resolved

coretl mentioned this pull request Jul 3, 2024

PandA resource_path includes root #379

Closed

subinsaji and others added 8 commits July 3, 2024 13:36

saving work in progress

b6c2d4a

fix dtype test

3116ca2

revert back to old event model

77ee2d4

Add branching to panda writer test

bb05afd

Add branching for different event model verions to hdf_panda test

5c7e8cb

Update resource kwargs for older style stream resource

cad091f

Update tests for older style stream resource

4765382

Update incorrect resource path for detector tests

28e7378

abbiemery marked this pull request as ready for review July 4, 2024 10:41

coretl requested changes Jul 4, 2024

View reviewed changes

Put correct values in pattern generator init

f7652a5

coretl approved these changes Jul 4, 2024

View reviewed changes

abbiemery merged commit dbbcf28 into main Jul 4, 2024
18 checks passed

abbiemery deleted the 173-StreamResource-seperate-classes branch July 4, 2024 15:14

abbiemery mentioned this pull request Jul 4, 2024

Pattern Generator dataset creation is not correct, and has no tests to catch it. #432

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

173 stream resource seperate classes #429

173 stream resource seperate classes #429

subinsaji commented Jul 3, 2024 •

edited

Loading

coretl left a comment

coretl Jul 4, 2024

173 stream resource seperate classes #429

173 stream resource seperate classes #429

Conversation

subinsaji commented Jul 3, 2024 • edited Loading

coretl left a comment

Choose a reason for hiding this comment

coretl Jul 4, 2024

Choose a reason for hiding this comment

subinsaji commented Jul 3, 2024 •

edited

Loading