|
|
a64b34610a
|
merge from developer (without the additional json header implementations)
|
2019-02-12 09:35:24 +01:00 |
|
Erik Frojdh
|
89ee1d5bcf
|
new socket for slsDetector
|
2019-01-25 16:44:29 +01:00 |
|
Erik Frojdh
|
10539f8533
|
new getDetectorType functions
|
2019-01-18 10:53:49 +01:00 |
|
Erik Frojdh
|
b07492be6f
|
removing multiSlsDetectorCommand and using namespace std
|
2019-01-17 14:45:51 +01:00 |
|
Erik Frojdh
|
c05829031f
|
removed get from the users class and changed put
|
2019-01-17 14:20:03 +01:00 |
|
Erik Frojdh
|
49f71ffca7
|
project wide nullptr fix
|
2019-01-16 15:15:29 +01:00 |
|
|
|
c1c302f740
|
removing networkPArameter function complete
|
2019-01-14 20:42:15 +01:00 |
|
|
|
8f3f9caf2b
|
almost done with ctb update, need to do slow adcs, split to moench and ctb
|
2018-11-30 10:39:26 +01:00 |
|
|
|
178b832223
|
funcs name only in c++, bug fix:slsdetectorusers not deleting multislsdetectorcommand object, bug fix: programfpga does not delete fpgasrc malloc if returning in failure
|
2018-10-12 17:37:39 +02:00 |
|
|
|
5a356534e6
|
refactor receiver client interface, moved defs into one sls_detector_defs.h
|
2018-10-11 12:25:18 +02:00 |
|
|
|
1c78400369
|
client compiles, more changes required
|
2018-10-08 09:34:08 +02:00 |
|
|
|
b5c35ddeac
|
slsdetector and users updated to reflect new signatures, not yet compiled
|
2018-10-05 15:28:25 +02:00 |
|
|
|
c248b12455
|
refactored ONLY THE CLIENT first stage, compiles
|
2018-10-02 15:15:35 +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 |
|
|
|
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 |
|
Erik Frojdh
|
d71008bd10
|
removing using namespace std from headers in slsDetector
|
2018-05-24 12:18:25 +02:00 |
|
|
|
a154d0a088
|
slsDetectorUsers: added setthreshold without trimbits for eiger
|
2018-05-23 16:39:52 +02:00 |
|
|
|
cb635d800a
|
eiger server: added overflow, noverflow to the flags to show/not show saturation when there is overflow in any of the single subframes in 32 bit mode
|
2018-05-22 18:43:13 +02:00 |
|
|
|
b4d9a6a09d
|
slsReceiver, slsDetector(eiger server), client: added sub period to receiver, fixed eiger subperiod updates to client, added subperiod and subexptime to users, fixed hdf5 warnings
|
2018-05-17 12:34:18 +02:00 |
|
|
|
d09a1a0a95
|
esrf changes: users class added API functionality getNMods
|
2018-04-23 17:38:40 +02:00 |
|
|
|
7cd35f24b8
|
added to users class receiverfifodepth, flowcontrol10g, 10gbe
|
2018-04-09 18:21:43 +02:00 |
|
|
|
649cb0aed9
|
added reset frames caught in to users class
|
2018-04-09 09:18:56 +02:00 |
|
|
|
9e8d3e598f
|
added enablegappixels to users class
|
2018-03-28 10:41:52 +02:00 |
|
Dhanya Maliakal
|
41f24489bc
|
zmqip in users fixed
|
2017-11-28 10:33:40 +01:00 |
|
Dhanya Maliakal
|
16e4fbf8dd
|
receiver read freq should save value in shm even if no receiver present
|
2017-11-23 18:21:54 +01:00 |
|
Dhanya Maliakal
|
856ad76247
|
included setreceiver online in users class, so that one can start using users without config file
|
2017-11-23 10:21:54 +01:00 |
|
Dhanya Maliakal
|
f647bdaa48
|
updated users class to reflect zmq changes (separation), fixed warnings
|
2017-11-17 08:46:43 +01:00 |
|
Dhanya Maliakal
|
4097c37b31
|
in between
|
2017-11-16 16:01:31 +01:00 |
|
Dhanya Maliakal
|
4903164f95
|
added high voltage to users class
|
2017-11-14 10:58:54 +01:00 |
|
|
|
a59309b13f
|
minor bug fix if same client: client ip only 8 bytes instead of 16 bytes copied, added user class functionality for long term use:stopacquisition
|
2017-10-12 10:18:15 +02:00 |
|
Dhanya Maliakal
|
0a446c425b
|
added users functions for silent mode
|
2017-09-27 10:17:48 +02:00 |
|
Dhanya Maliakal
|
271664f577
|
changes to users class to call dac and adc by string name
|
2017-09-21 12:54:03 +02:00 |
|
Dhanya Maliakal
|
f2be03be05
|
example for adc index in users
|
2017-09-21 11:51:38 +02:00 |
|
Dhanya Maliakal
|
7e37a1da4b
|
change in user functions
|
2017-09-21 11:16:29 +02:00 |
|
Dhanya Maliakal
|
18f014fd9e
|
added in users class startreceiver, stop receiver, start status
|
2017-09-21 11:05:20 +02:00 |
|
Dhanya Maliakal
|
15b86a50d5
|
added advanced user stuff for esrf
|
2017-09-19 10:05:55 +02: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
|
a1df8bdc15
|
done for eiger, some checks for frameindex=-1,socket closing earlier than last socket etc
|
2016-09-20 15:11:39 +02:00 |
|
Dhanya Maliakal
|
7848b79cf2
|
2d noop for setdetectorsize
|
2015-12-15 16:24:43 +01:00 |
|
Dhanya Maliakal
|
cd80160e7d
|
getdetectorsize in users reflects 2d addon
|
2015-12-15 15:40:39 +01:00 |
|
Dhanya Maliakal
|
2dd2b577fd
|
getdetectorsize in users reflects 2d
|
2015-12-15 15:36:49 +01:00 |
|
Dhanya Maliakal
|
921154e43a
|
detsizechan or maximum detecto size for users incorrectly implemented for only 1d
|
2015-12-15 12:07:28 +01:00 |
|
Dhanya Maliakal
|
a770389c90
|
including subframe index from receiver to client and also sending this to gui
|
2015-09-23 11:50:02 +02:00 |
|
Maliakal Dhanya
|
1bd69fa18f
|
opened client command interface to the users class
|
2014-05-23 14:48:34 +02:00 |
|
Maliakal Dhanya
|
8788a060dd
|
creating a separate receiver
|
2014-05-21 09:44:35 +02:00 |
|
bergamaschi
|
1673da0854
|
fixed mismatch between slsDetectorCommand and slsDetectorUsers when setting the timing mode
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@684 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-11-13 11:59:35 +00:00 |
|
l_maliakal_d
|
9e08196677
|
huge change in receiver in previous version, sortingand padding frames before movign into fifo; users small change in previous revision typecasting
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@676 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-10-02 14:28:37 +00:00 |
|
l_maliakal_d
|
eba9bcf9ac
|
gotthard server fix: problem for new board due to component version change
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@675 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-10-02 14:20:44 +00:00 |
|
