Commits · master · Instrument Control / NomadSpecialModules

05 May, 2020 1 commit
- Added scan data in VEXPController · 13c22fde
  yannick legoc authored May 05, 2020
  
  13c22fde
24 Apr, 2020 1 commit
- remove pylon · 480b56c2
  Abdelali Elaazzouzi authored Apr 24, 2020
  
  480b56c2
23 Apr, 2020 2 commits
- Recompile NomadGUISpecialModle jars · 1d8fbb77
  Locatelli authored Apr 23, 2020
  
  1d8fbb77
- Merge remote-tracking branch 'origin/ploty2' into V3.2_191 · eece015d
  Locatelli authored Apr 23, 2020
  
  eece015d
22 Apr, 2020 1 commit
- Merge remote-tracking branch 'origin/V3.2_191' into ploty2 · ac99776d
  Locatelli authored Apr 22, 2020
  
  ac99776d
20 Apr, 2020 1 commit
- Added controller VEXPDetectorSimulator · d932a482
  yannick legoc authored Apr 20, 2020
  
  d932a482
17 Apr, 2020 1 commit
- Merge remote-tracking branch 'origin/V3.2_191' into ploty2 · 0e2239cc
  Locatelli authored Apr 17, 2020
  
  0e2239cc
16 Apr, 2020 3 commits
- remove pylon lib · b0bc80b2
  Abdelali Elaazzouzi authored Apr 16, 2020
  
  b0bc80b2
- Merge branch 'V3.2_191' of... · 3b8079d4
  ics authored Apr 16, 2020
```
Merge branch 'V3.2_191' of https://code.ill.fr/instrument-control/nomad-special-modules.git into V3.2_191
```
  3b8079d4
- remove cout and pylon lib · 9a6a5711
  Abdelali Elaazzouzi authored Apr 09, 2020
  
  9a6a5711
14 Apr, 2020 1 commit
- Applied toDouble() function to spy data in VEXPController · 4ee2d1b2
  yannick legoc authored Apr 14, 2020
  
  4ee2d1b2
09 Apr, 2020 2 commits
- Redo nomadspecialmodules jars · 33b6d4f3
  Locatelli authored Apr 09, 2020
  
  33b6d4f3
- remove cout · f8e267e8
  Abdelali Elaazzouzi authored Apr 09, 2020
  
  f8e267e8
08 Apr, 2020 1 commit
- new generic gige cam for d19 · 80ed048d
  ics authored Apr 08, 2020
  
  80ed048d
03 Apr, 2020 1 commit

Merge remote-tracking branch 'origin/V3.2_191' into ploty2 · 9e463c4a

Locatelli authored Apr 03, 2020

Conflicts:
	src/controllers/lss/d22special/gui/nomadd22specialgui.jar
	src/controllers/remotedielectricswindeta/DielectricsRemoteWindeta.cpp
	src/controllers/remotenanokin/RemoteNanokin.cpp
	src/controllers/remotenanokin/RemoteNanokin.h
	src/controllers/vexp/VEXPController.cpp
	src/drivers/caen/caen_cfd2/RealCAENCfd2Driver.cpp
	src/drivers/gigecam/photonics/CameraHandler.cpp
	src/drivers/gigecam/photonics/CameraHandler.h
	src/drivers/gigecam/photonics/RealPhotonicsDriver.cpp
	src/drivers/gigecam/photonics/RealPhotonicsDriver.h

9e463c4a

02 Apr, 2020 1 commit
- Correct Load tif image · 24928fc8
  Locatelli authored Apr 02, 2020
  
  24928fc8
30 Mar, 2020 1 commit
- generic driver · 71b5c38b
  ics authored Mar 30, 2020
  
  71b5c38b
17 Mar, 2020 1 commit
- change to generic name · a396116c
  ics authored Mar 17, 2020
  
  a396116c
13 Mar, 2020 2 commits
- Merge branch 'V3.2_191' of... · 4a031c49
  yannick legoc authored Mar 13, 2020
```
Merge branch 'V3.2_191' of https://code.ill.fr/instrument-control/nomad-special-modules into V3.2_191
```
  4a031c49
- Starting with mantid reduction · 732afa8f
  yannick legoc authored Mar 13, 2020
  
  732afa8f
10 Mar, 2020 1 commit
- Change rapidjson include path · 360928e2
  d11 authored Mar 10, 2020
  
  360928e2
09 Mar, 2020 2 commits
- Add nanokin gui and update controller · d44de61e
  ics authored Mar 09, 2020
  
  d44de61e
- Merge branch 'windeta-update' into V3.2_191 · dda6a36c
  yannick legoc authored Mar 09, 2020
  
  dda6a36c
05 Mar, 2020 3 commits
- Changed order of sleep in VEXPController · 20160fd1
  yannick legoc authored Mar 05, 2020
  
  20160fd1
- Merge branch 'V3.2_191' of... · bf15aa20
  ics authored Mar 05, 2020
```
Merge branch 'V3.2_191' of https://code.ill.fr/instrument-control/nomad-special-modules into V3.2_191
```
  bf15aa20
- Cfd2 update · 6bb776df
  ics authored Mar 05, 2020
  
  6bb776df
25 Feb, 2020 1 commit
- Merge V3.2_191 · e844ad94
  Locatelli authored Feb 25, 2020
  
  e844ad94
21 Feb, 2020 3 commits
- extand driver for basler camera · 71c5f5e3
  Abdelali Elaazzouzi authored Feb 21, 2020
  
  71c5f5e3
- Merge branch 'V3.2_191' of... · 06ea7093
  Abdelali Elaazzouzi authored Feb 21, 2020
```
Merge branch 'V3.2_191' of https://code.ill.fr/instrument-control/nomad-special-modules.git into V3.2_191
```
  06ea7093
- extand drivers for basler cam · 2aa1a358
  Abdelali Elaazzouzi authored Feb 21, 2020
  
  2aa1a358
14 Feb, 2020 2 commits
- Update of the dielectrics · 864fe964
  yannick legoc authored Feb 14, 2020
  
  864fe964
- Added starting time in data passed to VEXP · 264a6c6c
  yannick legoc authored Feb 14, 2020
  
  264a6c6c
07 Feb, 2020 1 commit
- Intermediate remote lss simulation during counts · 84242f07
  yannick legoc authored Feb 07, 2020
  
  84242f07
05 Feb, 2020 1 commit
- Adapted Mantid reduction test to new requests and subscriber · 78bfc237
  yannick legoc authored Feb 05, 2020
  
  78bfc237
29 Jan, 2020 1 commit
- added spy view for lss_simulation and updated information for spy AutoConfig · 5822627d
  Guanghan Song authored Jan 29, 2020
  
  5822627d
28 Jan, 2020 2 commits
- Added attributes to spy in D22AutoConfig · 9f83c043
  yannick legoc authored Jan 28, 2020
  
  9f83c043
- Added dTypeScan in VEXPController · e2caac75
  yannick legoc authored Jan 28, 2020
  
  e2caac75
20 Jan, 2020 1 commit
- Filtering axis scans and replacing startedNumor by numor in VEXPController · be827b95
  yannick legoc authored Jan 20, 2020
  
  be827b95
16 Jan, 2020 1 commit
- Added nameScan in VEXP · 583dc543
  yannick legoc authored Jan 16, 2020
  
  583dc543
14 Jan, 2020 1 commit
- Corrected property size of calc_type in D22AutoConfig · 9af11f9c
  yannick legoc authored Jan 14, 2020
  
  9af11f9c