Skip to content

feat[jungfrau][correct]: use new correct data source and link to old data source

Karim Ahmed requested to merge feat/new_corrected_data_source_jungfrau into master

Description

Update Jungfrau to store data in new output correct data source and link to legacy sources.

Relevant to this issue: https://git.xfel.eu/calibration/planning/-/issues/170

How Has This Been Tested?

CORR-R9034-JNGFR02-S00000.h5
  + NEW: INDEX/FXE_XAD_JF1M/CORR/JNGFR02:daqOutput/data/count
  + NEW: INDEX/FXE_XAD_JF1M/CORR/JNGFR02:daqOutput/data/first
  + NEW: INSTRUMENT/FXE_XAD_JF1M/CORR/JNGFR02:daqOutput/data/adc
  + NEW: INSTRUMENT/FXE_XAD_JF1M/CORR/JNGFR02:daqOutput/data/frameNumber
  + NEW: INSTRUMENT/FXE_XAD_JF1M/CORR/JNGFR02:daqOutput/data/gain
  + NEW: INSTRUMENT/FXE_XAD_JF1M/CORR/JNGFR02:daqOutput/data/mask
  + NEW: INSTRUMENT/FXE_XAD_JF1M/CORR/JNGFR02:daqOutput/data/memoryCell
  + NEW: INSTRUMENT/FXE_XAD_JF1M/CORR/JNGFR02:daqOutput/data/trainId
  - MISSING: INDEX/FXE_XAD_JF1M/DET/JNGFR02:daqOutput/data/count
  - MISSING: INDEX/FXE_XAD_JF1M/DET/JNGFR02:daqOutput/data/first
  - MISSING: INSTRUMENT/FXE_XAD_JF1M/DET/JNGFR02:daqOutput/data/adc
  - MISSING: INSTRUMENT/FXE_XAD_JF1M/DET/JNGFR02:daqOutput/data/frameNumber
  - MISSING: INSTRUMENT/FXE_XAD_JF1M/DET/JNGFR02:daqOutput/data/gain
  - MISSING: INSTRUMENT/FXE_XAD_JF1M/DET/JNGFR02:daqOutput/data/mask
  - MISSING: INSTRUMENT/FXE_XAD_JF1M/DET/JNGFR02:daqOutput/data/memoryCell
  - MISSING: INSTRUMENT/FXE_XAD_JF1M/DET/JNGFR02:daqOutput/data/trainId
  ~ CHANGED: METADATA/dataSources/dataSourceId (Shape: (2,) -> (3,))
  ~ CHANGED: METADATA/dataSources/deviceId (Shape: (2,) -> (3,))
  ~ CHANGED: METADATA/dataSources/root (Shape: (2,) -> (3,))

Relevant Documents (optional)

  • INSTRUMENT

FROM

└FXE_XAD_JF1M
  ├DET
  │ └JNGFR01:daqOutput
  │   └data
  │     ├adc	[float32: 500 × 16 × 512 × 1024]
  │     ├frameNumber	[uint64: 500 × 16]
  │     ├gain	[uint8: 500 × 16 × 512 × 1024]
  │     ├mask	[uint32: 500 × 16 × 512 × 1024]
  │     ├memoryCell	[uint8: 500 × 16]
  │     └trainId	[uint64: 500]
  └ROIPROC
    └JNGFR01:output
      └data
        ├roi1
        │ └data	[float32: 500 × 16 × 512]
        └roi2
          └data	[float32: 500 × 16 × 512]

to

└FXE_XAD_JF1M
  ├CORR
  │ └JNGFR01:daqOutput
  │   └data
  │     ├adc	[float32: 500 × 16 × 512 × 1024]
  │     ├frameNumber	[uint64: 500 × 16]
  │     ├gain	[uint8: 500 × 16 × 512 × 1024]
  │     ├mask	[uint32: 500 × 16 × 512 × 1024]
  │     ├memoryCell	[uint8: 500 × 16]
  │     └trainId	[uint64: 500]
  ├DET
  │ └JNGFR01:daqOutput	-> /INSTRUMENT/FXE_XAD_JF1M/CORR/JNGFR01:daqOutput
  └ROIPROC
    └JNGFR01:output
      └data
        ├roi1
        │ └data	[float32: 500 × 16 × 512]
        └roi2
          └data	[float32: 500 × 16 × 512]
  • INDEX

FROM

├FXE_XAD_JF1M
│ ├DET
│ │ └JNGFR01:daqOutput
│ │   └data
│ │     ├count	[uint64: 500]
│ │     └first	[uint64: 500]
│ └ROIPROC
│   ├JNGFR01
│   │ ├count	[uint64: 500]
│   │ └first	[uint64: 500]
│   └JNGFR01:output
│     └data
│       ├count	[uint64: 500]
│       └first	[uint64: 500]
├flag	[int32: 500]
├origin	[int32: 500]
├timestamp	[uint64: 500]
└trainId	[uint64: 500]

TO

├FXE_XAD_JF1M
│ ├CORR
│ │ └JNGFR01:daqOutput
│ │   └data
│ │     ├count	[uint64: 500]
│ │     └first	[uint64: 500]
│ ├DET
│ │ └JNGFR01:daqOutput	-> /INDEX/FXE_XAD_JF1M/CORR/JNGFR01:daqOutput
│ └ROIPROC
│   ├JNGFR01
│   │ ├count	[uint64: 500]
│   │ └first	[uint64: 500]
│   └JNGFR01:output
│     └data
│       ├count	[uint64: 500]
│       └first	[uint64: 500]
├flag	[int32: 500]
├origin	[int32: 500]
├timestamp	[uint64: 500]
└trainId	[uint64: 500]

Types of changes

  • New feature (non-breaking change which adds functionality)

Checklist:

Reviewers

Edited by Karim Ahmed

Merge request reports