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
d7e2ab8ec4
gotthard2: on chip dacs
2019-11-08 17:09:57 +01:00
615b3b2557
WIP
2019-11-06 19:07:00 +01:00
1797d39216
updated mythen3 to configure phase, freq, delay left, period left, actual time, measurement time, framesfrom start and othe register mappings
2019-11-06 18:58:22 +01:00
18b8720c17
separated parameters and versions
2019-11-06 16:43:59 +01:00
1f64d2a4e2
speed separated
2019-11-05 18:50:35 +01:00
Erik Frojdh
2f2e4da628
Moved CmdLineProxy
2019-11-05 11:07:07 +01:00
031241ae28
timer split up
2019-11-04 16:40:11 +01:00
ba9a0c7917
removed unused multi functions
2019-10-30 18:20:16 +01:00
ba3bc9c408
starting of users class
2019-10-30 15:13:16 +01:00
4aba8b6ac0
daclist and dacvalues for ctb as well
2019-10-30 11:38:29 +01:00
82570bc084
daclist and dacvalues
2019-10-30 11:09:34 +01:00
fe467cdf70
jungfrau dacs named
2019-10-29 18:11:16 +01:00
eb2040f0a7
fixed effects of scan
2019-10-29 14:43:51 +01:00
4b2cb7ecc1
WIP
2019-10-29 11:35:25 +01:00
badff47663
WIP
2019-10-29 11:05:20 +01:00
