Commit Graph

421 Commits

Author SHA1 Message Date
maliakal_d c4c16ad9c0 wip 2021-08-17 14:05:59 +02:00
maliakal_d f72f678d45 Merge branch 'developer' into roundrobin 2021-08-17 11:06:13 +02:00
maliakal_d 5f8dc7a7f0 fixes 2021-08-16 14:30:47 +02:00
maliakal_d 5790e4961b wip 2021-08-13 17:10:46 +02:00
maliakal_d 62d697e91f readnlines->partialread, better debugging for TCP socket interface bug 2021-08-13 12:34:50 +02:00
maliakal_d ec01f98c26 wip 2021-08-12 17:37:55 +02:00
maliakal_d 200df88dcf module id instead of serial number 2021-08-12 11:16:10 +02:00
maliakal_d 6f54402aba g2: setting serialnumber allowed 2021-08-11 18:50:49 +02:00
maliakal_d 9a777b13bb g2: dbitpipeline 2021-08-11 18:01:28 +02:00
maliakal_d 7a76064223 vetoalg added hits and raw 2021-08-11 16:08:32 +02:00
maliakal_d fce35e35a1 wip 2021-08-10 17:26:26 +02:00
maliakal_d aaa9f9f4ad merge bug fix 2021-08-09 12:13:55 +02:00
maliakal_d c7c6d2d654 merge bugs 2021-08-09 11:56:51 +02:00
maliakal_d fd6e82e161 Merge branch 'j13flippeddatax' into j7filter 2021-08-06 16:41:51 +02:00
maliakal_d dc921733d0 merge fix 2021-08-06 16:41:39 +02:00
maliakal_d e92270565b changed gain mode. dynamic_gain_mode to dynamic only. binaries in 2021-08-06 16:38:05 +02:00
maliakal_d 4986a5e61a Merge branch 'j13flippeddatax' into j7filter 2021-08-06 16:16:46 +02:00
maliakal_d e62fc1907f binaries in, merge fix 2021-08-06 16:16:25 +02:00
maliakal_d 67916cc188 binaries in, merge fix 2021-08-06 16:14:53 +02:00
maliakal_d cc3aede979 merge fix 2021-08-06 16:11:58 +02:00
maliakal_d 2c53a134cd updated i3gbe to lll 2021-08-06 16:08:07 +02:00
maliakal_d cf257cbc65 merge fix 2021-08-06 15:08:21 +02:00
maliakal_d 7bf6cc3995 wip 2021-08-06 13:25:55 +02:00
maliakal_d 86126c7e27 filter resistor in 2021-08-05 16:56:53 +02:00
maliakal_d 619f3b71c1 flippeddataoverxaxis changed to flipRows 2021-08-05 14:44:25 +02:00
maliakal_d c5d6dd0dd4 flippeddatax for jungfrau server 2021-08-05 12:39:04 +02:00
maliakal_d 1049e5fc71 wip 2021-08-04 14:35:07 +02:00
maliakal_d 3802f22ebe wip 2021-08-04 14:03:27 +02:00
maliakal_d 0e5e0f346b rewrote settings enums, gainmode enums 2021-08-04 13:07:48 +02:00
maliakal_d 550810a3ca wip 2021-08-03 20:47:26 +02:00
maliakal_d 9370fd3ab0 refactor 2021-08-03 20:13:25 +02:00
maliakal_d 9c4ecf0506 jungfrau: comp disable time 2021-08-03 13:12:58 +02:00
maliakal_d 9ed3a294ce jungfrau: gainmode 2021-08-02 12:44:57 +02:00
maliakal_d 6c15f5216d Merge branch 'jungfrau1.1' into j5resetdacs 2021-07-29 18:10:40 +02:00
maliakal_d fc7efb2410 refactor 2021-07-29 18:08:41 +02:00
maliakal_d 9f11dae703 fix 2021-07-29 17:26:45 +02:00
maliakal_d 9c03e83ef1 reset default dacs 2021-07-29 16:34:38 +02:00
maliakal_d de7f4489af defaultdac upto detector side, settings is undefined when none given 2021-07-28 20:11:58 +02:00
maliakal_d cce2511f7a removed forceswitch enum, removed fixgain1 and 2 from jungfrau settings (kept enum for g2 2021-07-23 17:12:48 +02:00
maliakal_d cb293f9945 j: 1. chipversion 2021-07-22 16:48:35 +02:00
maliakal_d 5b05a30287 merge conflict fix 2021-07-22 13:52:55 +02:00
maliakal_d 3d47db7e60 bug fix for virtual datastream and client 2021-07-22 13:47:18 +02:00
maliakal_d 05b7e0ef42 conflict merge fix 2021-07-22 11:53:00 +02:00
maliakal_d da996314e7 merge conflict 2021-07-22 11:15:57 +02:00
maliakal_d 8ba37e99a7 added enum left right top bottom 2021-07-21 09:25:27 +02:00
maliakal_d ec7ba7c508 wip to change to enum for portposition 2021-07-20 16:05:08 +02:00
maliakal_d af16ad4040 vetoalg: wip 2021-07-20 12:58:05 +02:00
Erik Frojdh 09391b767a support for scoped enums and operators in Python 2021-07-16 14:48:22 +02:00
maliakal_d 7158dab9f5 fix to ensure numinterfaces is not called for g2 2021-07-15 17:03:29 +02:00
maliakal_d 780d4bfe0a gotthard2: vetostream (detector: only 3gbe, 10gbe via numudpinterfaces) 2021-07-15 16:21:17 +02:00