Commits

Branch selector

 master

User selector

All users

Datepicker

All time

Commit History

Commits on Jan 25, 2020

• New autoconvert file

  MarkRivers

  committed
  ab6ec75

  Copy full SHA for ab6ec75

• Add bob

  MarkRivers

  committed
  206872a

  Copy full SHA for 206872a

Commits on Dec 2, 2019

• Fix Doxygen errors

  MarkRivers

  committed
  1e54359

  Copy full SHA for 1e54359

Commits on Feb 28, 2019

• Fixed ARCH

  MarkRivers

  committed
  a0c19c9

  Copy full SHA for a0c19c9

Commits on Feb 6, 2019

• Notes for R4-1

  MarkRivers

  committed
  6736f9f

  Copy full SHA for 6736f9f

• New conversion

  MarkRivers

  committed
  e62c0c0

  Copy full SHA for e62c0c0

• New file

  MarkRivers

  committed
  2dc5835

  Copy full SHA for 2dc5835

• New file for autoconvert

  MarkRivers

  committed
  6c46e80

  Copy full SHA for 6c46e80

• Add op directory

  MarkRivers

  committed
  54802c0

  Copy full SHA for 54802c0

Commits on Feb 3, 2018

• Changed to use RELEASE_LIBS_INCLUDE and RELEASE_PRODS_INCLUDE

  MarkRivers

  committed
  260d9cf

  Copy full SHA for 260d9cf

Commits on Nov 4, 2017

• Remove unlock() and lock() around call to doCallbacksGenericPointer; not needed and can cause problems

  MarkRivers

  committed
  bc08946

  Copy full SHA for bc08946

Commits on Jul 10, 2017

• Merge pull request #10 from areaDetector/protocol2.0

  Show description for ccb716d
  MarkRivers

  authored
  ccb716d

  Copy full SHA for ccb716d

• add RELEASE.md

  gilesknap

  committed
  07d77c7

  Copy full SHA for 07d77c7

• Merge branch 'protocol2.0' of github.com:areaDetector/ADMerlin into protocol2.0

  gilesknap

  committed
  d1cfce4

  Copy full SHA for d1cfce4

• Remove debug flags from library build - to fix windows IOC link errors

  gilesknap

  committed
  14d6668

  Copy full SHA for 14d6668

Commits on Jul 3, 2017

• Fixed layout

  MarkRivers

  committed
  7117eca

  Copy full SHA for 7117eca

Commits on Mar 3, 2017

• fixes for Windows compilation

  gilesknap

  committed
  b7eebf3

  Copy full SHA for b7eebf3

Commits on Feb 6, 2017

• comply with v2.0 of protocol for Uom devices - still backward compatible with Merlin Quad protocol

  gilesknap

  committed
  8ddace9

  Copy full SHA for 8ddace9

• remove redundant protocol versions

  gilesknap

  committed
  d9a3b3b

  Copy full SHA for d9a3b3b

Commits on Feb 3, 2017

• Change medipix to merlin. Merlin is the detector that uses medipix chips.

  Show description for c3d0fa2
  gilesknap

  committed
  c3d0fa2

  Copy full SHA for c3d0fa2

Commits on Feb 1, 2017

• update docs to latest

  gilesknap

  committed
  dc984a4

  Copy full SHA for dc984a4

Commits on Nov 10, 2016

• Merge pull request #8 from hdante/fixes-v4

  Show description for 4e4bed2
  MarkRivers

  authored
  4e4bed2

  Copy full SHA for 4e4bed2

Commits on Nov 9, 2016

• Disable building the medipix simulator in non Unix systems

  

  Henrique Dante de Almeida

  committed
  1107e1b

  Copy full SHA for 1107e1b

Commits on Oct 8, 2016

• Fix ordering of object file and library when linking

  

  Henrique Dante de Almeida

  committed
  178ee6d

  Copy full SHA for 178ee6d

Commits on Oct 5, 2016

• added license

  gilesknap

  committed
  578b927

  Copy full SHA for 578b927

Commits on Mar 11, 2016

• Fix some problems

  MarkRivers

  committed
  c68990f

  Copy full SHA for c68990f

• Removed unneeded line setting NDFileName; seemed to be an attempt to fix a problem that no longer occurs

  MarkRivers

  committed
  1a0e1e0

  Copy full SHA for 1a0e1e0

• Removed records with unsupported SUMCOUNT and BACKGROUNDCOUNT parameters; removed VAL field for waveform record, not allowed

  MarkRivers

  committed
  61fbe78

  Copy full SHA for 61fbe78

• Removed widgets that don't apply to Merlin (binning, file PVs, ROI, etc.

  MarkRivers

  committed
  a85428c

  Copy full SHA for a85428c

• Fixed wrong PV name; set text widget sizes

  MarkRivers

  committed
  160a574

  Copy full SHA for 160a574

Commits on Mar 9, 2016

• New file

  MarkRivers

  committed
  46d10b6

  Copy full SHA for 46d10b6

• Version for AD R2.x

  MarkRivers

  committed
  b2d457f

  Copy full SHA for b2d457f

• New file

  MarkRivers

  committed
  5a12c6c

  Copy full SHA for 5a12c6c

• Renamed merlinApp back to medipixApp

  MarkRivers

  committed
  5539fdb

  Copy full SHA for 5539fdb

• Fixed doxygen comments

  MarkRivers

  committed
  9b6c783

  Copy full SHA for 9b6c783

Pagination

Previous

Next