|
|
d90db50a60
|
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer
|
2017-02-23 12:05:55 +01:00 |
|
|
|
f12df80c5b
|
some changes for chiptest board and mythen server now compiles
|
2017-02-23 12:05:34 +01:00 |
|
Erik Frojdh
|
9e9c109898
|
adding cmath and std:round interp
|
2017-02-22 11:31:01 +01:00 |
|
Dhanya Maliakal
|
19460a03f5
|
sending position id and num detectors in x and y dir
|
2017-02-21 15:13:27 +01:00 |
|
Dhanya Maliakal
|
549e346ad4
|
Merge branch '2.3-rc' into hdf5
|
2017-02-10 11:56:37 +01:00 |
|
Dhanya Maliakal
|
111f8beab3
|
updaterev
|
2017-02-10 11:51:29 +01:00 |
|
Dhanya Maliakal
|
4c351ba686
|
updated server with version variables
|
2017-02-10 11:51:05 +01:00 |
|
Dhanya Maliakal
|
3d2264fa56
|
updaterev
|
2017-02-10 11:50:13 +01:00 |
|
Dhanya Maliakal
|
5287441a65
|
removed warning
|
2017-02-07 08:52:05 +01:00 |
|
Dhanya Maliakal
|
9b3f4a3a66
|
commonFiles/error_defs.h
|
2017-02-03 14:34:05 +01:00 |
|
Dhanya Maliakal
|
490e756622
|
added the servers
|
2017-02-03 12:31:33 +01:00 |
|
Dhanya Maliakal
|
87ce1ed736
|
moved tau to settings file, removed gain and offset, setting threshold loads settings file, setting threshold only sets client variable
|
2017-02-03 12:29:44 +01:00 |
|
Dhanya Maliakal
|
bd31ac1d52
|
changes to variable name
|
2017-01-17 10:55:43 +01:00 |
|
Dhanya Maliakal
|
b16d087fd1
|
Merge branch '2.2-rc' into hdf5
|
2017-01-06 15:17:40 +01:00 |
|
Dhanya Maliakal
|
3563f0deec
|
Merge branch '2.2-rc' into developer
|
2017-01-06 15:17:14 +01:00 |
|
Dhanya Maliakal
|
111856ed7b
|
hv should work now
|
2017-01-06 15:16:05 +01:00 |
|
Dhanya Maliakal
|
0fdbac981e
|
should work for serial comm hv for 9m
|
2017-01-05 12:58:49 +01:00 |
|
|
|
987aeda6fb
|
sorted out problem with CPU read out
|
2016-12-22 17:24:53 +01:00 |
|
|
|
3eea80a121
|
compiles after merging
|
2016-12-19 13:50:25 +01:00 |
|
|
|
68b13a0ecd
|
merged to developer
|
2016-12-19 12:26:53 +01:00 |
|
|
|
12cd3d07a2
|
some changes for jctb
|
2016-12-19 12:05:59 +01:00 |
|
Dhanya Maliakal
|
ebf44704b2
|
merged error defs
|
2016-12-19 11:39:14 +01:00 |
|
Dhanya Maliakal
|
bd1601c2eb
|
fixwed the printing of errors but not error message
|
2016-12-19 11:37:14 +01:00 |
|
Dhanya Maliakal
|
d555bc6e75
|
fixwed the printing of errors but not error message
|
2016-12-19 11:33:16 +01:00 |
|
Dhanya Maliakal
|
b5f7dc29af
|
Merge branch '2.2-rc' into hdf5
|
2016-12-16 15:00:22 +01:00 |
|
Dhanya Maliakal
|
2d1c91c0e0
|
bug in sem for new scans
|
2016-12-16 14:59:55 +01:00 |
|
Dhanya Maliakal
|
b403aa20a6
|
Merge branch '2.2-rc' into hdf5
|
2016-12-16 14:51:08 +01:00 |
|
Dhanya Maliakal
|
64843c1c76
|
made the scans work, where the the dummy message from rxr doesnt stop it from listening for the scans/measurement, only at set join thread
|
2016-12-16 14:46:54 +01:00 |
|
Dhanya Maliakal
|
a971d87008
|
Merge branch '2.2-rc' into hdf5
|
2016-12-13 13:23:06 +01:00 |
|
Dhanya Maliakal
|
2a508435c7
|
change the filenaming according to det position and not det id
|
2016-12-13 11:41:27 +01:00 |
|
Dhanya Maliakal
|
e7621a6cd0
|
moving towards c++ api
|
2016-12-12 14:24:11 +01:00 |
|
Dhanya Maliakal
|
a67f9d50de
|
removed the allocating of memory for eiger and jungfrau to receive data via tcp from detector as this will not happen
|
2016-12-02 12:47:01 +01:00 |
|
Dhanya Maliakal
|
dd9387ef29
|
using detid to calculte zmq port in case of shmget error and det id does not start with 0 and 1 as in receiver zmq server ports
|
2016-12-02 08:53:08 +01:00 |
|
Dhanya Maliakal
|
790cef37ff
|
updaterev
|
2016-11-30 11:20:16 +01:00 |
|
Dhanya Maliakal
|
466f1506a5
|
bottom is defined as flippeddatax in config file, not anymore as argument for receiver
|
2016-11-30 10:36:34 +01:00 |
|
Dhanya Maliakal
|
52dbb7f9fc
|
smaller changes to make arguments const
|
2016-11-25 12:22:00 +01:00 |
|
Dhanya Maliakal
|
c70f453de4
|
changed everything to depend on receiver online shared memory flag, and if it is online is only checked rarely
|
2016-11-22 14:01:07 +01:00 |
|
Dhanya Maliakal
|
09d146ee55
|
changed a printout
|
2016-11-22 11:39:47 +01:00 |
|
Dhanya Maliakal
|
394526a9c3
|
removed zmq threads from client and made it receive packets via for loop
|
2016-11-22 11:05:42 +01:00 |
|
Dhanya Maliakal
|
0ed9ee0e5d
|
fixing the 32 bit crash and empty plot using zmq
|
2016-11-21 12:02:45 +01:00 |
|
Dhanya Maliakal
|
9d106f6c93
|
changed clock for jungfrau, maybe other debugging stuff outside this folder
|
2016-11-21 09:21:30 +01:00 |
|
Dhanya Maliakal
|
ebf102b8d9
|
updaterev
|
2016-11-14 11:57:53 +01:00 |
|
Dhanya Maliakal
|
c639477f28
|
adding exptime to receiver for file header
|
2016-11-14 11:57:29 +01:00 |
|
Dhanya Maliakal
|
b980640a4c
|
updaterev
|
2016-11-11 14:44:56 +01:00 |
|
Dhanya Maliakal
|
7ffba557f6
|
updatereveiger
|
2016-11-11 14:44:42 +01:00 |
|
Dhanya Maliakal
|
f13a42feeb
|
eigerupdaterev
|
2016-11-11 14:43:55 +01:00 |
|
Dhanya Maliakal
|
b1a3a224ff
|
implemented high voltage for normal modules
|
2016-11-11 14:43:18 +01:00 |
|
Dhanya Maliakal
|
44d6b0ffc0
|
fixed time interval in receiveR
|
2016-11-10 14:37:18 +01:00 |
|
Dhanya Maliakal
|
753ed306d9
|
changes to include eiger in gui
|
2016-11-10 08:41:46 +01:00 |
|
|
|
cb879c61ca
|
changes for new chipterboard -now works with reduced dynamic range and analog/digital readout
|
2016-11-09 11:36:59 +01:00 |
|
