d9cfc59df6
code refactor in slsdet: prevval for setnumtriggers
2020-02-26 11:27:24 +01:00
80304c2eaf
multi progress calculated in one function rather getting all of them from shm
2020-02-26 11:17:49 +01:00
6a0a931e3e
gotthard2: bursts and burst period, written to same register as triggers and delay (kept in server as variables) and set if conditions meet. bursts and burst period only in auto timing and burst mode. Also updating theses registers when switching between timing modes or burst modes
2020-02-25 15:45:40 +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
3ea2520615
PR minor changes
2020-01-22 13:55:10 +01:00
9c89f6a63d
Merge branch 'developer' into gotthard2
2020-01-21 16:05:04 +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
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
9455a5fba1
ctb: adcenable10g included, 10g readout enables included
2019-11-27 17:28:57 +01:00
9e8a874e39
rxr bug fix: update shm when updating rxr
2019-11-27 11:12:31 +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
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
18b8720c17
separated parameters and versions
2019-11-06 16:43:59 +01:00
1f64d2a4e2
speed separated
2019-11-05 18:50:35 +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
fe467cdf70
jungfrau dacs named
2019-10-29 18:11:16 +01:00
4b2cb7ecc1
WIP
2019-10-29 11:35:25 +01:00
badff47663
WIP
2019-10-29 11:05:20 +01:00
f4a0780b51
patloops done
2019-10-24 18:59:23 +02:00
8006043a97
bug fixes for tests
2019-10-22 15:46:28 +02:00
Dhanya Thattil
995f0924e5
Commandline ( #66 )
...
* WIP
* WIP
* removed status to string from defs
* WIP
* WIP
* WIP removed unused functions in multi
* WIP
* print hex in a terrible way
* WIP, loadconfig error
* WIP, type to string
* WIP
* fix to conversion
* WIP, hostname doesnt work
* WIP
* WIP
* WIP
* WIP, threshold
* WIP, threshold
* WIP
* WIP, triggers
* WIP, cycles to triggers
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* rx_udsocksize fx, WIP
* WIP
* WIP
* WIP
* file index (64 bit), WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* merge
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* New python mod
2019-10-21 10:29:06 +02:00
be50344b45
set clock divider, phase and get clock freq for gotthard2, priliminary
2019-10-17 16:39:41 +02:00
Dhanya Thattil
ca054626e6
Removeudpcache ( #65 )
...
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* solved eiger 1-10g issue
* some fixes for remove udp cache to work
* bug fix virtual
* removed special handling of rx_udpip
2019-09-30 14:46:25 +02:00
Dhanya Thattil
5bcde789ac
Readoutflags ( #61 )
...
* WIP
* eiger binary back wih versioning
* fixed readout flag in ctbgui, added speedLevel enum
* ctbgui: fixed a print out error
* ctb readout bug fix
* WIP
* WIP
* WIP
2019-09-02 19:27:27 +02:00
Dhanya Thattil
aafe049a9b
Guidetector ( #54 )
...
* WIP
* dacWidget
* main WIP
* advanced WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* WIP
* works
* updated gui to chrono
* review fixes
* unitque ptrs in gui
2019-08-26 19:14:22 +02:00
386b6601a8
initial version of gotthard2
2019-08-26 09:59:27 +02:00
8ec0ac4eb3
client bug fix: was configuring mac even for a get of tengiga enable
2019-08-23 10:21:20 +02:00
4b7ab98135
initial functions for mythen3
2019-08-22 15:55:27 +02:00
62c4bfab64
WIP
2019-08-21 09:23:32 +02:00
28963e313b
removed gotthard functions not used
2019-08-20 18:18:34 +02:00
ea5ac6ad03
WIP
2019-08-20 13:20:25 +02:00
c6dddaba97
allowed virtual servers
2019-08-16 18:49:08 +02:00
