detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-05-01 10:20:04 +02:00
Code Issues Actions Packages Releases Activity
6,289 Commits 43 Branches 100 Tags
Commit Graph

113 Commits

Author SHA1 Message Date
Dhanya Thattil
55f8497eac WIP 2020-04-08 11:05:06 +02:00
Dhanya Thattil
07cd71f0c7 removed update shared memory from detector, check if eiger firmware >=26: have same top and bottom addresses 2020-04-07 17:19:47 +02:00
Dhanya Thattil
83283b672a WIP 2020-04-06 19:38:35 +02:00
Dhanya Thattil
80e55cd4da WIP 2020-04-06 17:28:05 +02:00
Dhanya Thattil
fdb6e3f3d4 Removeshm (#90) 
* eiger: moved rate correction outside, fixed threshold energy bug in client (binaries not  updated yet)

* removed dr and deadtiem from shm

* help for rx_status and status to point them to rx_Start, rx_stop, start and stop

* moved progress to receiver

* removed currentsettings from eiger shm

* updated server binaries, and client api

* moench and ctb virtual servers compile fix

* gui: moved acquire to a concurrent qt thread so it doesnt block updateplot
 2020-04-06 10:44:44 +02:00
Dhanya Thattil
f2dd146e56 updates on servers (mainly virtual): indices, dbit clock not allowed for moench anymore 2020-03-31 16:54:35 +02:00
Dhanya Thattil
d58eb1dc6e
Gappixels (#89) 
* WIP

* WIP virtual delays, imagetest for saturation

* WIP, vertical and horizontal

* WIP

* gap pixels work, fixed 32 bit data out (10gbe=0) for virtual servers

* quad works (also in virtual), handling gappixels and quad

* jungfrau gapppixels work

* jungfrau: done

* complete image or missing packets given in json header and gui

* eiger virtual 4 bit mode bug fix

* working version of zmq add json header, except printout

* printout bug

* fix for json para

* to map WIP

* map done

* map print , mapwith result left

* json result works, testing added

* updated server binaries

* compiling on rhels7, variable size char array iniitalization

* zmqsocket parsing didnt need Document

* const to map, json para is strings not map

* json add header: mapping cleaner without insert make_pair
 2020-03-30 14:54:35 +02:00
Dhanya Thattil
17227be4df gotthard2: burst mode fix 2020-03-13 17:39:16 +01:00
Erik Frojdh
0de0d82a1a replaced old logger 2020-03-11 12:40:12 +01:00
Dhanya Thattil
df2512fb1c all servers: eiger, jungfrau, gotthard, ctb, moench, mythen3, gotthard2 updated 2020-03-10 15:57:27 +01:00
Dhanya Thattil
ac1c40d6f9 virtual servers: redundant declarations fixed 2020-03-10 15:50:33 +01:00
Dhanya Thattil
5192dae9c5 removed virtual server warnings 2020-03-10 15:15:09 +01:00
Dhanya Thattil
758afad02c
ctb, moench, eiger, gotthard: get number of channels for moench and ctb, others removed unnecessary variables in shm, added moench virtual sever (#86) 2020-03-10 09:08:08 +01:00
Dhanya Thattil
c64b09ee79
Jungfraufix (#84) 
* jungfrau: added dbitphase, different pll clkindex 0 with different wr bit
 2020-03-04 17:06:18 +01:00
Dhanya Thattil
8abc32e7f1 moench: default pattern file in server, settings, tests 2020-03-03 16:00:01 +01:00
Dhanya Thattil
6bbcf6173d moench: first version 2020-03-02 18:34:10 +01:00
Dhanya Thattil
11e7737a2f
gotthard2: timingsource and currentsource features, (timing source external yet to be implemented in fpga to test (#80) 2020-02-28 12:45:02 +01:00
Dhanya Thattil
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
Dhanya Thattil
d3dc9a7690 gotthard2: disentangled burst mode #frames, exptime, period from start of acquisition, order dependent now for debugging 2020-02-04 12:23:58 +01:00
Dhanya Thattil
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
Dhanya Thattil
a9e375ed34 gotthard2: bursttype to burstmode 2020-01-23 11:03:14 +01:00
Dhanya Thattil
8cbf3c62a9 merge from developer 2020-01-22 17:30:13 +01:00
Dhanya Thattil
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
Dhanya Thattil
e746256653 gotthard2: gain updated 2020-01-21 16:01:38 +01:00
Dhanya Thattil
6cfd0f8962 gotthard2: first edit 2020-01-20 12:13:23 +01:00
Dhanya Thattil
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
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
Dhanya Thattil
3486137de3 bfin warnings fixed 2019-11-27 18:22:33 +01:00
Dhanya Thattil
9455a5fba1 ctb: adcenable10g included, 10g readout enables included 2019-11-27 17:28:57 +01:00
Dhanya Thattil
d07873ee39 mythen3 and gotthard2: wait request not needed, reset to be implemented 2019-11-22 11:29:24 +01:00
Dhanya Thattil
dfc886a65b mythen3 gui 2019-11-18 17:57:19 +01:00
Dhanya Thattil
6a27207875 gotthard2: vetoref, burstmode 2019-11-15 18:59:27 +01:00
Dhanya Thattil
5518531620 gotthard2: veto reference 2019-11-14 19:01:10 +01:00
Dhanya Thattil
28a5aa8342 injectchannel WIP 2019-11-13 15:11:11 +01:00
Dhanya Thattil
90c34e4942 gotthard2, dacs and onchip dacs from config file 2019-11-11 18:02:08 +01:00
Dhanya Thattil
bb26b993ea servers, firmware check message to init message, minor 2019-11-11 12:00:04 +01:00
Dhanya Thattil
03ec2c53ab WIP 2019-11-08 17:10:28 +01:00
Dhanya Thattil
d7e2ab8ec4 gotthard2: on chip dacs 2019-11-08 17:09:57 +01:00
Dhanya Thattil
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
Dhanya Thattil
73b5c3ac57 merge 2019-11-06 16:46:00 +01:00
Dhanya Thattil
18b8720c17 separated parameters and versions 2019-11-06 16:43:59 +01:00
Marie Andrae
7de9401bc7 powerchip for mythen3 2019-11-06 11:50:09 +01:00
Dhanya Thattil
1f64d2a4e2 speed separated 2019-11-05 18:50:35 +01:00
Dhanya Thattil
031241ae28 timer split up 2019-11-04 16:40:11 +01:00
Dhanya Thattil
6c5c4f00b3 mythen3 calc checksum 2019-10-31 12:31:51 +01:00
Dhanya Thattil
11ea071543 adcinvert for jungfrau, gui for jungfrau dacs 2019-10-30 12:28:51 +01:00
Dhanya Thattil
f4a0780b51 patloops done 2019-10-24 18:59:23 +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
Dhanya Thattil
be50344b45 set clock divider, phase and get clock freq for gotthard2, priliminary 2019-10-17 16:39:41 +02:00