Code

i13-1 merlin test initial commit#965

Code

Merged

huw-dls merged 16 commits intomainDiamondLightSource/dodal:mainfrom i13_1_merlin_testDiamondLightSource/dodal:i13_1_merlin_testCopy head branch name to clipboardJan 13, 2025

+228-2

Commits

Commits on Jan 9, 2025

• i13-1 merlin test initial commit

  huw-dls

  committed
  b1f8158

  Copy full SHA for b1f8158

• Removed commented out stuff thats not needed with ADCore 3-12 version

  huw-dls

  committed
  6d858e4

  Copy full SHA for 6d858e4

• merlin_controller frame_timeout now init to 0 and print replaced with logging

  huw-dls

  committed
  32a6d05

  Copy full SHA for 32a6d05

• merlindetector replaced with merlin

  huw-dls

  committed
  2516822

  Copy full SHA for 2516822

• merlindetector now replaced with merlin

  huw-dls

  committed
  535140d

  Copy full SHA for 535140d

• i13-1 merlin test initial commit

  huw-dls

  committed
  0ad2761

  Copy full SHA for 0ad2761

• Removed commented out stuff thats not needed with ADCore 3-12 version

  huw-dls

  committed
  a92f4bc

  Copy full SHA for a92f4bc

• merlindetector replaced with merlin

  huw-dls

  committed
  7a429c3

  Copy full SHA for 7a429c3

• Using LocalDirectoryServiceClient for visit directory (as the hdf path was being set to 2022)

  huw-dls

  committed
  1ff3085

  Copy full SHA for 1ff3085

• Unit tests added.

  huw-dls

  committed
  506f9ba

  Copy full SHA for 506f9ba

• Use absolute imports

  

  DiamondJoseph

  authored and

  huw-dls

  committed
  dd5bf57

  Copy full SHA for dd5bf57

• Use correct imports

  

  DiamondJoseph

  authored and

  huw-dls

  committed
  7a0e7d0

  Copy full SHA for 7a0e7d0

• Apply suggestions from code review

  

  DiamondJoseph

  authored and

  huw-dls

  committed
  f9c28e6

  Copy full SHA for f9c28e6

• Formatting and type checking for merlin tests

  huw-dls

  committed
  f6931d8

  Copy full SHA for f6931d8

Commits on Jan 10, 2025

• Drop validation of merlin trigger mode for now

  callumforrester

  committed
  32f3c80

  Copy full SHA for 32f3c80

• Fix mock file path in merlin tests

  callumforrester

  committed
  daed185

  Copy full SHA for daed185