Erik Frojdh
e9029ba8f2
removed unused functions
2020-02-03 16:44:14 +01:00
Erik Frojdh
121747352d
buffer
2020-02-03 16:35:30 +01:00
Erik Frojdh
a829e69313
minor
2020-02-03 16:00:24 +01:00
Erik Frojdh
972f21258a
renamed multiSlsDetector
2020-02-03 14:57:37 +01:00
93ab8d05d7
eiger: change speed to full speed for dr of 4, 8, 16
2020-02-03 11:37:43 +01:00
e432e6f90d
4.1.1 changes: software trigger via stop server, disentangling rxr streamin from register call back
2020-02-03 11:25:19 +01:00
f0cccf9de8
initialchecks can be bypassed (version compatibility and oher tests at server start up)
2020-01-31 16:46:33 +01:00
89c774dbf7
nios programming: check file size first
2020-01-31 11:24:48 +01:00
Dhanya Thattil
5ca3a1b685
gotthard2 and mythen3: programming fpga, reboot; jungfrau, ctb: modified programming ( #74 )
2020-01-30 19:52:35 -08:00
a9e375ed34
gotthard2: bursttype to burstmode
2020-01-23 11:03:14 +01:00
f881133795
get/set timing, generate data for gotthard2, vref_rstore instead of restore for gotthard2
2020-01-22 18:18:56 +01:00
8cbf3c62a9
merge from developer
2020-01-22 17:30:13 +01:00
3ea2520615
PR minor changes
2020-01-22 13:55:10 +01:00
981b13494c
mythen3: virtual server, connected timing mode, row and col in header, included pattern bit and mask
2020-01-21 18:16:27 +01:00
9c89f6a63d
Merge branch 'developer' into gotthard2
2020-01-21 16:05:04 +01:00
e746256653
gotthard2: gain updated
2020-01-21 16:01:38 +01:00
bdf3a010c3
updated client doc for gotthard2: the timers that are used in continuous mode only
2020-01-21 10:26:11 +01:00
65d95480bd
mythen3 bug fix: rxr needs to update dr
2020-01-20 13:50:50 +01:00
6cfd0f8962
gotthard2: first edit
2020-01-20 12:13:23 +01:00
95030bc55f
Merge branch 'developer' into gotthard2
2020-01-16 16:52:08 +01:00
Erik Frojdh
c1fac7cdb7
fixed conversion for IpAddr
2020-01-16 16:31:11 +01:00
e8bdf5a505
gotthard2: updated register map; powerchip checking detector type; internal and external period, frames, exptime; set/get delay, get actualtime, measurement, framesfromstart enabled; which detector comment updated in cmdproxy, detector and slsdetector
2020-01-16 15:33:35 +01:00
Erik Frojdh
f3598c1f39
nullptr
2020-01-16 14:17:57 +01:00
Erik Frojdh
9ac08ad5c9
clang-tidy header include order
2020-01-16 14:00:43 +01:00
Erik Frojdh
7a00732fa8
various minor things from clang-tidy
2020-01-16 11:39:35 +01:00
b6d9015ed0
rearranging
2020-01-15 15:08:01 +01:00
Dhanya Thattil
de53747ddd
Counters ( #71 )
...
* mythen3: adding counters mask, firmware still takes only number of counters for now
* mythen3: checking if module attached before powering on chip
* bug fix: loop inital declaration not allowed in c
* fix scope eiger test
* mythen3: renamed setCounters to setCounterMask and getCounterMask in API
* mythen3 replacing counting bits with popcount
Co-authored-by: Erik Fröjdh <erik.frojdh@gmail.com>
2020-01-14 17:40:46 +01:00
Erik Frojdh
8c8d213b56
python funcs
2020-01-13 16:13:47 +01:00
504fc2d095
ctb: validate asampes and dsamples > 0 for romode; client: exception caught in acquire to stop receiver and clear busy flag
2019-12-10 10:25:14 +01:00
8881542156
ctb bug fix: clkioctrl not taken in hex
2019-12-05 17:15:31 +01:00
1a8337540a
rxr: switched to threads for threadObject (from pthread), moved priorities to threadObject, mutex
2019-11-29 16:19:02 +01:00
Erik Frojdh
f4cdd759b0
clang-tidy
2019-11-27 18:42:16 +01:00
Erik Frojdh
d53082c615
clang-tidy empty()
2019-11-27 18:15:55 +01:00
Erik Frojdh
c94f6a2bf2
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
2019-11-27 17:56:02 +01:00
Erik Frojdh
2364364697
minor
2019-11-27 17:55:50 +01:00
ad0fb44573
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
2019-11-27 17:29:26 +01:00
9455a5fba1
ctb: adcenable10g included, 10g readout enables included
2019-11-27 17:28:57 +01:00
Erik Frojdh
a28fa66e54
renamed CmdLineParser to CmdParser
2019-11-27 13:56:14 +01:00
Erik Frojdh
e996068328
more tests
2019-11-27 13:39:06 +01:00
9e8a874e39
rxr bug fix: update shm when updating rxr
2019-11-27 11:12:31 +01:00
Erik Frojdh
58050f72da
moved headers
2019-11-25 11:58:45 +01:00
398f3734ec
rxr: missing packets, stopacquistion lets rxr know to calculate missing packets from last frame caught
2019-11-20 16:16:14 +01:00
7bde337d58
minor: changed interrupted acq help (clearbusy), gui look in mythen3 developer tab
2019-11-19 18:19:54 +01:00
dfc886a65b
mythen3 gui
2019-11-18 17:57:19 +01:00
32cf46a8a3
moved cmdlineparser.h to includes, Paralel calls edited to throw exception if no detector added
2019-11-18 11:00:25 +01:00
Erik Fröjdh
fa2c842745
New command line app and removing slsDetectorCommand ( #69 )
...
* WIP
* WIP
* WIP
* WIP
* config2 working
* removed slsDetectorCommand
* WIP
* added test file
* more tests
2019-11-18 09:29:17 +01:00
6a27207875
gotthard2: vetoref, burstmode
2019-11-15 18:59:27 +01:00
5518531620
gotthard2: veto reference
2019-11-14 19:01:10 +01:00
28a5aa8342
injectchannel WIP
2019-11-13 15:11:11 +01:00
5ee3f5cf4c
rxr bug fix: if no rxr, shm variables should remember so that there is no order to rxr commands in config file
2019-11-13 13:56:09 +01:00
