|
|
fdcd633769
|
client: multi added indices for detpos in function signature for required
|
2018-10-03 11:41:50 +02:00 |
|
|
|
70ea4b48c3
|
client: removed slsDetectorutils and postprocessing. yet to compile, yet to add detpos index for every multi sls detector command and call from command interface, removed multiple threading, yet to interface with eriks single template for multiple threading
|
2018-10-03 11:15:39 +02:00 |
|
|
|
dafbc970e3
|
client stage2 ongoing, utils removed but not compile ready; left to do imod for every multi, connect client to multi
|
2018-10-02 18:13:00 +02:00 |
|
|
|
100c1b81f8
|
moved all the common header files from receiverSoftware to commonFiles
|
2018-10-02 16:32:37 +02:00 |
|
|
|
757bc89d05
|
moved common files outside slsDetectorSoftware
|
2018-10-02 16:07:53 +02:00 |
|
|
|
97934e323c
|
removed actions
|
2018-10-02 15:51:58 +02:00 |
|
|
|
c248b12455
|
refactored ONLY THE CLIENT first stage, compiles
|
2018-10-02 15:15:35 +02:00 |
|
|
|
def79807f6
|
merge conflict resolved from 4.0.0
|
2018-09-28 16:28:21 +02:00 |
|
|
|
e631414526
|
updated version
|
2018-09-27 18:23:08 +02:00 |
|
|
|
f9b95b63eb
|
gotthard server: made gotthard server readout only via udp, readframe just waits for acquisition to be done, does not allocate ram, receiver: removed positions hardcoded in 1d, should be 2d for all
|
2018-09-27 18:20:03 +02:00 |
|
|
|
c2db073d5e
|
receiver and client: changed xcoord to row and ycoord to column, zcoord to reserved
|
2018-09-26 15:03:04 +02:00 |
|
|
|
970d448e73
|
receiver: using namespace std removed from all the headers and the bug fixes for that for hdf5
|
2018-09-26 10:53:45 +02:00 |
|
|
|
5a139d70b5
|
gotthard and jungfrau server binary updated for API
|
2018-09-25 14:08:34 +02:00 |
|
|
|
33d1b11279
|
jungfrau server updated for API version change
|
2018-09-25 14:04:54 +02:00 |
|
|
|
b163180d6f
|
updating API versions
|
2018-09-25 14:02:22 +02:00 |
|
|
|
cab9dff225
|
Merge branch '4.0.0' of github.com:slsdetectorgroup/slsDetectorPackage into 4.0.0
|
2018-09-25 13:55:42 +02:00 |
|
|
|
7d8188fc11
|
gotthard server binary updated: config file not read a second time after detector start up
|
2018-09-25 13:55:26 +02:00 |
|
Erik Frojdh
|
64229ca32b
|
changed operator() to const
|
2018-09-25 11:20:44 +02:00 |
|
|
|
4aa0d26f26
|
gotthard server: trying to resolve roi problem that is only affected by latest firmware
|
2018-09-21 17:29:43 +02:00 |
|
|
|
c784f0f539
|
client: moved shortenable to roi in reciever, roi not yet written in master file
|
2018-09-19 17:35:26 +02:00 |
|
|
|
961489edb1
|
bugfix gotthard server and client to set roi and disable it, problem still exists with frame numbering between roi modes but can only be fixed in firmware
|
2018-09-18 18:02:01 +02:00 |
|
|
|
781152a772
|
slsDetectorSoftware bug fix: gappixels for x initialized wrong
|
2018-09-17 18:13:26 +02:00 |
|
|
|
59cb9c84c2
|
bug fix slsdetectorgui: xcoord and y coord are actually col and row indices
|
2018-09-17 14:35:31 +02:00 |
|
|
|
ed0b22b500
|
updated binaries
|
2018-08-24 13:18:51 +02:00 |
|
|
|
1b55fdad86
|
merged selected patches from 4.0.0 branch
|
2018-08-24 13:10:16 +02:00 |
|
|
|
14c899e7cf
|
removed some manual warnings
|
2018-08-24 12:34:06 +02:00 |
|
|
|
588037fd18
|
updated release version
|
2018-08-23 16:23:24 +02:00 |
|
|
|
e0b8fb3609
|
updated manuals, jungfrau server (reqd firmware vversion)
|
2018-08-23 15:52:12 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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
|
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 |
|
|
|
52b1e98726
|
merge
|
2018-08-08 12:06:14 +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 |
|
