|
|
d67b4765ea
|
Removing redundant null byte from end of json header
|
2018-09-17 12:32:33 +02:00 |
|
|
|
14c899e7cf
|
removed some manual warnings
|
2018-08-24 12:34:06 +02:00 |
|
|
|
b3d4e90f7f
|
sls_detector_software is obsolete, conda packet sls_detector_lib or sls_detector_gui
|
2018-08-23 16:52:52 +02:00 |
|
|
|
cedd275892
|
conflict fix, minor
|
2018-08-23 16:24:17 +02:00 |
|
|
|
588037fd18
|
updated release version
|
2018-08-23 16:23:24 +02:00 |
|
Dhanya Thattil
|
1700d9884a
|
Updated release.txt, minor indentation
|
2018-08-23 16:08:24 +02:00 |
|
|
|
e0b8fb3609
|
updated manuals, jungfrau server (reqd firmware vversion)
|
2018-08-23 15:52:12 +02:00 |
|
|
|
b7f62fcd47
|
updated release.txt
|
2018-08-23 13:07:38 +02:00 |
|
|
|
5b6ec303d7
|
manual api mainclient fix for enum FAIL
|
2018-08-23 13:00:49 +02:00 |
|
|
|
cea6c30ded
|
updating release.txt, version API
|
2018-08-23 12:48:08 +02:00 |
|
|
|
0781344117
|
updating binaries
|
2018-08-22 19:00:21 +02:00 |
|
|
|
63c130a380
|
client:updated users class and release.txt
|
2018-08-22 18:08:35 +02:00 |
|
|
|
7945d15beb
|
client: updating release.txt, updating command line help, catching slsDetectorUsers exception from multislsdetector constructor
|
2018-08-21 18:49:29 +02:00 |
|
|
|
4e446f1f39
|
eiger server: changed subperiod to subdeadtime, changing subexptime or subdeadtime sets subperiod in eiger server
|
2018-08-17 13:45:09 +02:00 |
|
|
|
2a28333a96
|
jungfrau server: allow check version in update mode
|
2018-08-16 15:09:29 +02:00 |
|
|
|
830f92dedc
|
client and receiver: silent mode put into shared memory, works properly now
|
2018-08-15 19:51:04 +02:00 |
|
|
|
87e8333dfd
|
slsDetectorSoftware & eiger server: fixed coordinates in 2 d, but switch to row (x), col(y); numdetx and numdety sent to all receivers now, likely bug fix virtual file linked in master for 1 mod jungfrau; xccoord and y coord calculated at setdetector pos and given to listener
|
2018-08-15 19:02:16 +02:00 |
|
|
|
b3ccd5e1a1
|
slsReceiverSoftware: bugfix double acquire did not write parameter file cuz vector.push_back always never clearing when closing current file
|
2018-08-14 19:11:52 +02:00 |
|
|
|
f0ac49190a
|
slsReceiver:trying to get deactivate to work
|
2018-08-14 15:06:06 +02:00 |
|
|
|
fa175ac934
|
eiger server: updated binaries
|
2018-08-10 19:14:52 +02:00 |
|
|
|
0018fa46f8
|
slsDetectorSoftware: Eiger server, added 3 commands, measuredperiod,measuredsubperiod, status trigger. measured period is in 10ns in det server, status trigger reads reg,sets bit and unsets bit
|
2018-08-10 19:14:05 +02:00 |
|
|
|
c934e92a41
|
Merge branch 'mainexceptions' into developer
|
2018-08-10 17:10:15 +02:00 |
|
|
|
da4253fe13
|
Exception handling from constructors for slsDetector and multiSlsDetector, zmqsockets deleted first in multi freeshm/constructor, removed unnecessary exceptions from exceptions list, replaced in slsDetector socket assign from NULL to 0
|
2018-08-10 17:07:29 +02:00 |
|
Erik Frojdh
|
3cab1bc0fe
|
minor cleaning of ZmqSocket
|
2018-08-10 14:34:59 +02:00 |
|
Erik Frojdh
|
d74a8368b8
|
commented find pkg png
|
2018-08-10 14:11:16 +02:00 |
|
|
|
39ebd81230
|
Zmqsocket merge with Erik's (removing header message) and mine(socketdescriptor safe destruction in constructor exception)
|
2018-08-09 18:21:30 +02:00 |
|
|
|
823c855ef4
|
Zmqsocket merge with Erik's (removing header message) and mine(socketdescriptor safe destruction in constructor exception)
|
2018-08-09 18:19:47 +02:00 |
|
Erik Frojdh
|
7fadf4feb4
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2018-08-09 18:15:59 +02:00 |
|
Erik Frojdh
|
f86578cfc3
|
minor fix
|
2018-08-09 18:15:35 +02:00 |
|
|
|
a0512a01d5
|
Exceptions: zmq socket class descriptors made into its own class for auto destruction upon construction exception, similarly for other try blocks. slsDetector and multislsdetector left to do
|
2018-08-09 18:12:56 +02:00 |
|
Erik Frojdh
|
bdd37fa7c2
|
commenting zmq detail
|
2018-08-09 17:58:55 +02:00 |
|
Erik Frojdh
|
a96a019435
|
string lenght
|
2018-08-09 17:46:07 +02:00 |
|
Erik Frojdh
|
dd3f4aa81d
|
switched from zmq_msg_revc to zmq_recv
|
2018-08-09 17:40:04 +02:00 |
|
|
|
1102153d2b
|
Exceptions handling in constructor for genericSocket, created object to handle both socket descriptors upon throwing exception in constructor (as raw pointers wont get destructed automatically)
|
2018-08-09 15:43:56 +02:00 |
|
|
|
ab7e63c20f
|
Moved sls_detector_exceptions to sls_receiver_exceptions & its consequences
|
2018-08-08 15:43:29 +02:00 |
|
|
|
f1333c7a90
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2018-08-08 14:47:22 +02:00 |
|
|
|
e77cdb35dd
|
socket: refactored genericsocket a bit to make socketdescriptor readable
|
2018-08-08 14:47:07 +02:00 |
|
|
|
52b1e98726
|
merge
|
2018-08-08 12:06:14 +02:00 |
|
|
|
df75fef6f6
|
reordered moenchExecutables
|
2018-08-08 11:27:46 +02:00 |
|
|
|
44fdc46c11
|
some changes in the moench executables
|
2018-08-08 10:23:35 +02:00 |
|
|
|
147194e8af
|
slsDetector: connect stop socket in checkonline so that it does not stick to its initialized default file descriptor zero (which gets closed upon socket deletion)
|
2018-08-03 14:54:32 +02:00 |
|
|
|
05055eb283
|
slsReceiver: deleting slsReceiverUsers object before calling start() gives seg fault
|
2018-08-03 09:32:31 +02:00 |
|
|
|
0dc1e10bd3
|
slsDetectorSoftware: order of zmq deletion in multi destructor to first because api using zmq to get data will need to be deleted first
|
2018-07-30 18:51:18 +02:00 |
|
|
|
e38e500e16
|
manual example api: fixed the makefile include
|
2018-07-30 18:36:49 +02:00 |
|
|
|
134f13fc52
|
slsDetectorSoftware: back to original multi threading setTimer (removed parallelCallDetectorMember) due to change in function signature
|
2018-07-30 18:00:18 +02:00 |
|
|
|
41fb6c26a2
|
slsDetectorSoftware: from 3.1.4: being able to get timer values individually from the users class since gotthard 25um master and slave will have different delay values
|
2018-07-30 17:47:37 +02:00 |
|
|
|
73fcef5f6d
|
slsReceiverSoftware: bitset storage in case the libarary changes contiguous representation, also changed hdf5 representation from 512 byte (to_string) to just passing char* to keep at 64 bytes
|
2018-07-30 12:05:22 +02:00 |
|
|
|
e9cc91698e
|
Merge branch '3.3.0-rc' into developer
|
2018-07-26 13:46:58 +02:00 |
|
|
|
6213b5e07a
|
gotthard server and slsDetectorSoftware: more accuracy when converting from double to int64_t by adding 0.5, improved clock precision of gotthard from 32.1 to 32.007729
|
2018-07-26 13:46:41 +02:00 |
|
|
|
08aacf76ac
|
Merge branch '3.3.0-rc' into developer
|
2018-07-23 15:03:13 +02:00 |
|
