389 Commits

Author SHA1 Message Date
Dhanya Thattil
f55bdd6eae
M3: master starts twice (non blocking) (#444)
* start acq for master m3 was sent twice (non blocking), removed redundant code, check that there is only one master

* m3 can have more than 1 master (when many master modules used independently)

* fix for singe mod m3 or other dets
2022-05-10 14:27:40 +02:00
Dhanya Thattil
52882cba20
M3: polarity, interpolation, pump probe (#421)
* wip, adding m3 functions: polarity, inerpolation, pumpprobe

* added interpol, polarity, pump probe, analog pulsing, digital pulsing

* tests

* binaries in

* update release

* added python polarity enum

* fixed python and minor readability in mythen3.c

* binarie sin

* added all the m3 funcs also in list.c and enablingall counters for enabling interpolation

* binarie sin
2022-04-08 15:18:01 +02:00
835aa575b0 remaining for removing copydetectorserver 2022-04-05 14:55:45 +02:00
150d27cf95 removed copydetectorserver 2022-04-05 14:11:04 +02:00
Erik Fröjdh
e55e18d5e9
Refactoring of SharedMemory.h (#418)
Function names match Detector.h
Removed double print due to LOG then throw
file descriptor not kept as a member variable
2022-03-28 16:13:56 +02:00
Erik Fröjdh
1ff35edb99
Setting dac names for CTB (C++ and Python) (#413)
# Setting DAC names for CTB
* Introduced new shared memory for CTB only
* Prepared for additional functionality 
* Works from C++ and Python

Co-authored-by: Dhanya Thattil <dhanya.thattil@psi.ch>
2022-03-28 14:27:47 +02:00
2453390cc3 merge fix 2022-03-28 09:11:32 +02:00
9ff43efdc5 Merge branch 'developer' into numudp 2022-03-25 10:50:51 +01:00
0f4bcf3a9d test if special file when updating kernel(solution: reboot only), --force-delete-normal-file used to force delete bfin fpga drive if normal file and create proper device tree 2022-03-22 16:44:12 +01:00
2b35101b17 moved shm numUdpInterfaces initialization up front, moved updating this value in DetectorImpl::setHostname to DetectorImpl::addModule for more readability, renamed getNumberofUdpInterfaces to an updateNumberofUdpInterfaces as the shm was being updated and is used only in setHostname, everywhere else getNumberofUdpInterfaces is replaced by getNumberofUdpInterfacesFromShm 2022-03-22 10:23:22 +01:00
89395bd990 merge fix 2022-03-18 12:11:40 +01:00
c1895c4bc8 Merge branch 'developer' into rxacqIndices 2022-03-17 08:48:15 +01:00
ef1c52ddc1 merge conflict fix 2022-03-17 08:46:04 +01:00
39d3ee2b15 merge fix 2022-03-17 08:41:49 +01:00
7a39822813 fixes for set top, masterin api 2022-03-16 12:49:22 +01:00
ed5a1cdf1c eiger: get nextframenumber for 10g fixed (was connected to 1g registers for get), eiger/jungfrau/ctb/moench: if after a stop the next framenumbers are inconsistent, then it will get their max value andf set to +1 2022-03-15 17:17:28 +01:00
34588356e8 added top 2022-02-28 17:05:24 +01:00
a1ee681135 - framescaught and frameindex now returns a vector for each port
- progress looks at activated or enabled ports, so progress does not stagnate
- (eiger) disable datastreaming also for virtual servers only for 10g
- missing packets also takes care of disabled ports
2022-02-24 11:15:03 +01:00
89edf58f41 wip, setmaster 2022-02-23 12:26:37 +01:00
ef3df36e55 merge fix 2022-02-23 11:40:50 +01:00
939fc70284 bug fix in startDetector vector 2022-02-23 10:32:06 +01:00
92beb3aa2a bug fix from an earlier PR, slaves.begin() 2022-02-23 09:32:25 +01:00
543eb7bb60 merge fixed 2022-02-23 09:23:00 +01:00
2b2533f465 allowing setmaster for eiger 2022-02-22 15:23:04 +01:00
8f632db2a0 get number of missing packets now returns signed so negative numbers mean extra packets 2022-02-22 10:27:22 +01:00
daa536077d merge fix 2022-02-21 15:14:47 +01:00
5e97bcde7f startdetector (non blocking) is allowed at modular level 2022-02-21 09:42:24 +01:00
4107938921 adding 12 bit mode for eiger, WIP 2022-02-16 15:03:25 +01:00
Dhanya Thattil
771b1e7877
rx_arping for 10g mode (#359)
* test for rx_arping

* arping ip and interface from client interface

* apring thread added to thread ids

* clean code for thread for arping

* removing the assumption that udpip1 fill be updated along with udpip2

* review, replacing syscall(sys_gettid) with gettid()
2022-02-04 10:12:57 +01:00
79affe1ea4 updated client and rxr, not tested 2022-01-06 18:46:14 +01:00
7772eb153d using const for getupdatemode 2021-11-22 15:08:58 +01:00
464ebe70f1 bug fix: servername interchanged for firmware name 2021-11-19 08:53:07 +01:00
18b0e84fbf eiger cant reboot 2021-11-18 15:55:12 +01:00
eb69d7cb69 update mode added. need to fix why udpatemode get and set not in allowed functions 2021-11-12 17:18:26 +01:00
ec1ee635d5 works and allowed reboot 2021-11-11 09:38:01 +01:00
9d21062f5a remove reboot for checks 2021-11-11 09:24:48 +01:00
4b46091be2 python fix, server copy wrong filename 2021-11-10 16:40:14 +01:00
5190e2ab30 refactoring 2021-11-10 15:56:01 +01:00
0e9c88dfa2 programfpga already does reboot 2021-11-10 11:49:32 +01:00
233d374a4d server works 2021-11-10 11:47:26 +01:00
15aa42d328 wip 2021-11-10 10:58:29 +01:00
14ee2087dc rebootcontroller after updating kernel 2021-11-09 16:19:53 +01:00
5143295711 binaries in 2021-11-09 14:36:24 +01:00
7b4f8c118b client done 2021-11-08 14:26:53 +01:00
6e49b77b08 updating kernel like program fpga, execute command to print which module failed, unlinking temporary file while programming bug fix 2021-11-03 17:17:24 +01:00
eff64f99f2 addd kernel version 2021-11-03 11:46:46 +01:00
146b012eff minor changes 2021-10-27 11:14:29 +02:00
76dc6db5c0 jungfrau: api changed from set/getFilterCell to set/getNumberOfFilterCells, storagecells command line changed to extrastoragecells, fixed wrong numberof arguments parsing message 2021-10-21 11:59:10 +02:00
aab5418166 eiger copy detector server command should not reboot for eiger (feature does not exist) 2021-10-19 16:21:37 +02:00
b39c64032d clang format 2021-10-19 14:49:43 +02:00