173 Commits

Author SHA1 Message Date
669c14d6d5 Merge branch 'm3clks' into pydoc 2020-09-09 17:36:12 +02:00
Erik Frojdh
1b214778a5 fix import 2020-09-09 17:26:50 +02:00
d5f6cbc075 Merge branch 'm3clks' into pydoc 2020-09-09 16:45:38 +02:00
02d4769f6a WIP 2020-09-09 16:39:48 +02:00
Erik Frojdh
a0f9c6fe8c updated python API 2020-09-09 15:15:36 +02:00
8e09b50c5e python and gui fix for parallel, gui: clkdivider also for jungfrau and parallel also for m3 2020-09-08 16:53:42 +02:00
503f83e8e3 Merge branch 'developer' into g2continuous 2020-09-07 17:07:09 +02:00
Erik Frojdh
c467bd677e missing file 2020-09-07 16:52:03 +02:00
5540f16116 Merge branch 'developer' into g2continuous 2020-09-07 16:36:42 +02:00
Erik Frojdh
9ee67f2cfa python rx_jsonpara 2020-09-07 16:23:28 +02:00
b20720686e gotthard2: changed order of burst mode enums, added a 4th burst mode cw internal burst mode 2020-09-07 16:13:33 +02:00
Erik Frojdh
fb8842e048 build and libname 2020-09-07 09:14:47 +02:00
Erik Frojdh
47da2540af json 2020-09-03 17:20:38 +02:00
Erik Frojdh
89f0479318 txndelay in python 2020-09-03 16:30:13 +02:00
Erik Frojdh
7048a75808 triggersl and print fix for acq 2020-09-03 16:21:15 +02:00
Erik Frojdh
22f14cacb0 virtual and vetofile 2020-09-03 15:33:12 +02:00
Erik Frojdh
6b7dee2631 added versions and parallel to python 2020-09-03 11:49:08 +02:00
Erik Frojdh
73530ddd6f python udp_srcmac 2020-09-02 16:48:51 +02:00
Erik Frojdh
38e0351068 zmqports work like command line 2020-09-02 12:20:08 +02:00
Erik Frojdh
e192cad1f2 zmqport fix 2020-09-02 12:07:47 +02:00
Erik Frojdh
b8350b070e rx_zmqip fix 2020-09-02 11:55:27 +02:00
e4274e3f95 WIP, doc 2020-08-31 14:17:09 +02:00
e0df9fcd99 wip, doc 2020-08-28 19:47:19 +02:00
30307220e3 QIP, doc 2020-08-28 18:12:08 +02:00
786b14e88b Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-08-27 17:58:21 +02:00
f19799343e WIP, doc 2020-08-27 17:58:15 +02:00
Erik Frojdh
3954913661 fixed ratecorr 0 in python 2020-08-27 16:45:14 +02:00
Erik Fröjdh
7eafceb0f9
Exposing vector of strings for loading parameters (#147) 2020-08-27 16:17:56 +02:00
a1e06ca7a9 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-08-26 17:45:17 +02:00
27c1916d63 WIP, doc 2020-08-26 17:45:12 +02:00
Erik Frojdh
64075c0e75 added tempvalues 2020-08-26 12:21:33 +02:00
9505c51404 merge conflict 2020-08-26 11:13:34 +02:00
6d8168722a WIP, doc 2020-08-26 11:11:51 +02:00
Erik Frojdh
f9261c0f32 return ratecorr in s 2020-08-26 11:00:56 +02:00
6a18a214ba Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-08-25 17:18:22 +02:00
83baf18490 WIP, doc 2020-08-25 17:18:18 +02:00
Erik Frojdh
ddf2085b4b exptime for mythen3 2020-08-25 16:55:58 +02:00
Erik Frojdh
508ec150f5 added Gotthard and Moench 2020-08-25 15:48:56 +02:00
Erik Frojdh
5eda75ebdd added patsetbit 2020-08-25 14:59:57 +02:00
Erik Frojdh
fd601128b7 enum helper 2020-08-25 09:02:31 +02:00
bc09b8bfb9 WIP doc 2020-08-21 17:13:43 +02:00
e85326d415 WIP doc 2020-08-21 16:00:33 +02:00
396685e6a9 WIP doc 2020-08-21 15:25:47 +02:00
cf6a48d7a9 WIP doc 2020-08-21 13:20:32 +02:00
4f45110cda WIP doc 2020-08-21 13:05:33 +02:00
3aa75ce167 WIP doc 2020-08-20 17:11:15 +02:00
5b364b9ad8 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-08-20 16:59:45 +02:00
550ab51f34 wip doc 2020-08-20 16:59:38 +02:00
Erik Frojdh
e782fcce62 added gotthard2 2020-08-20 16:49:55 +02:00
Erik Frojdh
6399d1bdfb added dacvalues to python 2020-08-20 15:34:06 +02:00