Code

WIP: Qudi spectrometer#598

Code

Draft

alrik-durand wants to merge 54 commits intoUlm-IQO:masterUlm-IQO/qudi:masterfrom alrik-durand:qudi_spectrometer_wipalrik-durand/qudi:qudi_spectrometer_wipCopy head branch name to clipboard

+4,405

Commits

Commits on Apr 7, 2020

• Spectro master branch Base

  AdrienR09

  committed
  7bb30d9

  Copy full SHA for 7bb30d9

• hardware spectro Newton 940

  pvalvin

  committed
  cd7e690

  Copy full SHA for cd7e690

Commits on Apr 8, 2020

• updating of the camera interface

  Show description for 76d7761
  AdrienR09

  committed
  76d7761

  Copy full SHA for 76d7761

• Spectrum logic update

  Show description for cfec3e0
  AdrienR09

  committed
  cfec3e0

  Copy full SHA for cfec3e0

Commits on Apr 9, 2020

• Camera complete interface update

  Show description for 9264da8
  AdrienR09

  committed
  9264da8

  Copy full SHA for 9264da8

• Camera complete interface update 2

  Show description for a3c77d7
  AdrienR09

  committed
  a3c77d7

  Copy full SHA for a3c77d7

Commits on Apr 10, 2020

• Camera complete interface update 3

  Show description for 325f4cc
  AdrienR09

  committed
  325f4cc

  Copy full SHA for 325f4cc

• Logic module in progress

  Show description for afca522
  AdrienR09

  committed
  afca522

  Copy full SHA for afca522

• camera complete interface update4 + Newton940 début de réécriture

  pvalvin

  committed
  e371764

  Copy full SHA for e371764

• Logic module

  Show description for d900f12
  AdrienR09

  committed
  d900f12

  Copy full SHA for d900f12

• Merge branch 'hirondelle_local' into hardware_spectro

  AdrienR09

  committed
  f39bec7

  Copy full SHA for f39bec7

• Complete camera interface update 4

  AdrienR09

  committed
  6e039fc

  Copy full SHA for 6e039fc

• Logic version 1 (ready for review)

  Show description for 1aaf62e
  AdrienR09

  committed
  1aaf62e

  Copy full SHA for 1aaf62e

Commits on Apr 11, 2020

• Complete interface update 5

  AdrienR09

  committed
  009627b

  Copy full SHA for 009627b

Commits on Apr 14, 2020

• Logic module update 1

  Show description for 725fb92
  AdrienR09

  committed
  725fb92

  Copy full SHA for 725fb92

Commits on Apr 17, 2020

• Logic version 2 (ready for review again)

  Show description for 282b276
  AdrienR09

  committed
  282b276

  Copy full SHA for 282b276

• Logic version 2 (with little corrections)

  AdrienR09

  committed
  754e148

  Copy full SHA for 754e148

• Updated Interfaces (Camera+Spectro)

  Show description for 05b53a6
  AdrienR09

  committed
  05b53a6

  Copy full SHA for 05b53a6

Commits on Apr 20, 2020

• HW / Newton940 update

  pvalvin

  committed
  e6e0684

  Copy full SHA for e6e0684

• Merge remote-tracking branch 'AdrienR09/hardware_spectro' into hardware_spectro

  pvalvin

  committed
  ccb316c

  Copy full SHA for ccb316c

• Hardware Camera and interface update

  Show description for da7c7b5
  pvalvin

  committed
  da7c7b5

  Copy full SHA for da7c7b5

Commits on Apr 22, 2020

• Added review for spectrum_logic

  alrik-durand

  committed
  2a3f5e0

  Copy full SHA for 2a3f5e0

• Update camera hardware

  Show description for 7e705fd
  pvalvin

  committed
  7e705fd

  Copy full SHA for 7e705fd

• GUI module + ui update (old version)

  Show description for e8ecf82
  AdrienR09

  committed
  e8ecf82

  Copy full SHA for e8ecf82

• Merge remote-tracking branch 'alrik-durand/logic_gui_spectro' into logic_gui_spectro

  AdrienR09

  committed
  9ad9e84

  Copy full SHA for 9ad9e84

Commits on Apr 28, 2020

• Logic version 3 (ready for comment and protestation)

  Show description for 617cbad
  AdrienR09

  committed
  617cbad

  Copy full SHA for 617cbad

• Update hardware + interface

  Show description for e905b09
  AdrienR09

  committed
  e905b09

  Copy full SHA for e905b09

• Merge branch 'hardware_spectro' into logic_gui_spectro

  AdrienR09

  committed
  f379878

  Copy full SHA for f379878

• Correction after test 1

  pvalvin

  committed
  e58d62d

  Copy full SHA for e58d62d

Commits on Apr 30, 2020

• Update after test

  pvalvin

  committed
  6d2c7b8

  Copy full SHA for 6d2c7b8

• first pass at andor camera hardware

  alrik-durand

  committed
  021d531

  Copy full SHA for 021d531

• changed camera interface to proposed solution

  alrik-durand

  committed
  5425968

  Copy full SHA for 5425968

• started working on newton hardware new version

  alrik-durand

  committed
  1e3a447

  Copy full SHA for 1e3a447

• small update interface

  alrik-durand

  committed
  62df971

  Copy full SHA for 62df971

Commits on May 4, 2020

• added get_ready_state to the camera interface

  alrik-durand

  committed
  69ceaac

  Copy full SHA for 69ceaac

• finished working on Andor camera hardware

  alrik-durand

  committed
  38467f9

  Copy full SHA for 38467f9

• renamed camera interface

  alrik-durand

  committed
  29eca4d

  Copy full SHA for 29eca4d

Commits on May 5, 2020

• added a dummy for spectroscopy camera interface

  alrik-durand

  committed
  94ebbc1

  Copy full SHA for 94ebbc1

• small check in newton

  alrik-durand

  committed
  7c2eb6c

  Copy full SHA for 7c2eb6c

• started working on v2 of spectro interface

  alrik-durand

  committed
  a0ebcf3

  Copy full SHA for a0ebcf3

• fixed bug in dummy and added it to default config

  alrik-durand

  committed
  13a3252

  Copy full SHA for 13a3252

• correct shutter architecture error in spectro camera_interface

  alrik-durand

  committed
  e291ad4

  Copy full SHA for e291ad4

• v2 of the spectrometer complete interface

  alrik-durand

  committed
  d33ee00

  Copy full SHA for d33ee00

• started the v2 of the shamrock, WIP

  alrik-durand

  committed
  65ef867

  Copy full SHA for 65ef867

Commits on May 6, 2020

• modified the grating spetro interface for simplicity

  alrik-durand

  committed
  7539ec2

  Copy full SHA for 7539ec2

• update grating spectro interface again

  alrik-durand

  committed
  dc031a0

  Copy full SHA for dc031a0

• update shamrock hardware

  alrik-durand

  committed
  9d1eeac

  Copy full SHA for 9d1eeac

• re-organized shamrock module

  alrik-durand

  committed
  7b619e2

  Copy full SHA for 7b619e2

Commits on May 7, 2020

• added temperature constraints in camera interface

  alrik-durand

  committed
  5a079f3

  Copy full SHA for 5a079f3

• Finished v2 of newton, time for testing !

  alrik-durand

  committed
  afdb167

  Copy full SHA for afdb167

Commits on May 11, 2020

• added the dummy spectro updated

  alrik-durand

  committed
  711a1da

  Copy full SHA for 711a1da

• removed setup config file from branch

  alrik-durand

  committed
  e531d1c

  Copy full SHA for e531d1c

• renamed interfaces

  alrik-durand

  committed
  d405a87

  Copy full SHA for d405a87

• renamed science camera interface

  alrik-durand

  committed
  b00b491

  Copy full SHA for b00b491