1826dd46cb
minor
2022-04-04 10:57:27 +02:00
cf6423dbbe
delete old servers, wip
2022-04-04 10:45:44 +02:00
8b1851e652
wip, copy server delete old name
2022-04-01 17:52:27 +02:00
Dhanya Thattil
5913864cbb
Merge pull request #419 from slsdetectorgroup/jsonmaster
...
Jsonmaster
2022-03-31 15:10:44 +02:00
c2ef6d700e
merge fix
2022-03-31 15:09:58 +02:00
76296507ff
updated release
2022-03-31 15:09:34 +02:00
03d2158472
Merge branch 'developer' into jsonmaster
2022-03-30 16:49:41 +02:00
Dhanya Thattil
bb7b676ca2
Merge pull request #420 from slsdetectorgroup/framesinfilehdf5
...
frames in file hdf5
2022-03-30 16:49:17 +02:00
e1988bf088
fixes
2022-03-30 16:47:43 +02:00
8ef1a209c9
added release notes
2022-03-30 16:06:04 +02:00
28572af3ab
resetting frames in file when creating a new hdf5 file
2022-03-30 15:39:20 +02:00
c57e528447
wip, prettywriter
2022-03-30 10:43:43 +02:00
74e325edb4
removing \n in timestamp for json file
2022-03-30 09:06:09 +02:00
e68499bb09
Merge branch 'developer' into jsonmaster
2022-03-29 16:29:55 +02:00
8ce6868e46
fixed compilation
2022-03-29 16:13:33 +02:00
f5cca7a98f
removed binary master file as well
2022-03-29 13:30:06 +02:00
b9aa0f46e4
wip, hdf5 refactored
2022-03-29 13:02:57 +02:00
6cd780ae99
wip
2022-03-29 11:49:30 +02:00
f2be834d55
wip, binary file refactored for stringbuffer, hdf5 mid way, masterattributes to be de (inherited) :)
2022-03-28 17:43:58 +02:00
Erik Fröjdh
e55e18d5e9
Refactoring of SharedMemory.h ( #418 )
...
Function names match Detector.h
Removed double print due to LOG then throw
file descriptor not kept as a member variable
2022-03-28 16:13:56 +02:00
Erik Frojdh
66900da476
Minor fixes to dacnames
2022-03-28 14:39:31 +02:00
Erik Frojdh
13ec32c79a
With corrections
2022-03-28 14:30:45 +02:00
Erik Fröjdh
1ff35edb99
Setting dac names for CTB (C++ and Python) ( #413 )
...
# Setting DAC names for CTB
* Introduced new shared memory for CTB only
* Prepared for additional functionality
* Works from C++ and Python
Co-authored-by: Dhanya Thattil <dhanya.thattil@psi.ch>
2022-03-28 14:27:47 +02:00
9a969c1549
Merge branch 'developer' into jsonmaster
2022-03-28 12:32:21 +02:00
039e1fd829
merge fix with developer
2022-03-28 10:26:28 +02:00
Dhanya Thattil
fc41d4313f
Merge pull request #414 from slsdetectorgroup/specialfile
...
Specialfile
2022-03-28 10:22:46 +02:00
4bd4364a3a
minor. binaries in
2022-03-28 10:21:19 +02:00
4b697dd9db
binaries in
2022-03-28 09:47:43 +02:00
6470277e43
use s_ischr.. not s_isblk
2022-03-28 09:47:32 +02:00
2453390cc3
merge fix
2022-03-28 09:11:32 +02:00
fa694dbc4c
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
2022-03-25 18:21:12 +01:00
redford_s
ea1222ac5b
Solved problem in photon finder
2022-03-25 18:20:32 +01:00
cbed2e88c6
wip, binary json master for other dets
2022-03-25 15:34:39 +01:00
Erik Frojdh
4cce1dbd7f
added missing files
2022-03-25 15:13:08 +01:00
Erik Frojdh
1710177af4
Merge branch 'dacnames' of github.com:slsdetectorgroup/slsDetectorPackage into dacnames
2022-03-25 15:10:47 +01:00
Erik Frojdh
5c79a1a1e8
Moved to class implementation
2022-03-25 15:08:50 +01:00
0f02ffdc9a
binary master json done, hdf5 left wip
2022-03-25 13:29:03 +01:00
Dhanya Thattil
83d76267f9
Merge pull request #411 from slsdetectorgroup/numudp
...
num udp interfaces in shm
2022-03-25 12:13:47 +01:00
9ff43efdc5
Merge branch 'developer' into numudp
2022-03-25 10:50:51 +01:00
21c21a423d
update release
2022-03-25 08:18:29 +01:00
e479b7d4be
updated releasetxt
2022-03-25 08:17:12 +01:00
8f0398681e
updated releasetxt
2022-03-25 08:15:57 +01:00
Erik Frojdh
b112cf81c4
fixed daclist setter
2022-03-24 17:46:20 +01:00
Erik Frojdh
589124845a
working implementation
2022-03-24 17:40:44 +01:00
90d1d0f8b8
wip, json master
2022-03-24 17:15:23 +01:00
1e564a1b33
binaries in. fixed
2022-03-24 12:33:19 +01:00
5fe10c19a1
binarie sin
2022-03-24 09:26:29 +01:00
Dhanya Thattil
de5c298d99
Merge pull request #373 from slsdetectorgroup/ghdf5
...
Gotthard25um: virtual hdf5 image
2022-03-23 12:08:40 +01:00
Dhanya Thattil
2a1f6dc544
Merge pull request #371 from slsdetectorgroup/g225gui
...
Gotthard25um: gui image
2022-03-23 12:06:27 +01:00
fc21a6763d
fix and minor removing comments
2022-03-23 12:03:51 +01:00
