164 Commits

Author SHA1 Message Date
6f54402aba g2: setting serialnumber allowed 2021-08-11 18:50:49 +02:00
9a777b13bb g2: dbitpipeline 2021-08-11 18:01:28 +02:00
fce35e35a1 wip 2021-08-10 17:26:26 +02:00
d3bbb50fc8 wip 2021-08-05 17:41:21 +02:00
074178848e minor 2021-08-05 17:29:43 +02:00
9312ef0d65 merge 2021-08-05 14:47:34 +02:00
619f3b71c1 flippeddataoverxaxis changed to flipRows 2021-08-05 14:44:25 +02:00
dd12c7c2f5 wip 2021-08-05 13:39:55 +02:00
c5d6dd0dd4 flippeddatax for jungfrau server 2021-08-05 12:39:04 +02:00
acd12bf2fa minor 2021-08-05 10:08:41 +02:00
0e5e0f346b rewrote settings enums, gainmode enums 2021-08-04 13:07:48 +02:00
6dfcd9607f Merge branch 'jungfrau1.1' into j11udpate 2021-08-03 20:31:43 +02:00
9370fd3ab0 refactor 2021-08-03 20:13:25 +02:00
0666afc642 added the other gain modes 2021-08-03 18:02:42 +02:00
9c4ecf0506 jungfrau: comp disable time 2021-08-03 13:12:58 +02:00
15f4dd97b5 wip, jungfrau: auto comp disable has time for 1.1 chip 2021-08-02 17:10:46 +02:00
9ed3a294ce jungfrau: gainmode 2021-08-02 12:44:57 +02:00
526aa3273e Merge branch 'jungfrau1.1' into j6mode 2021-08-02 08:55:46 +02:00
d64df39301 storagecells for jungfrauvchip1.1: cannot set addl, storagecelldealy and storagecell start is only from 0-3 2021-07-30 15:32:36 +02:00
02d01b8561 qip 2021-07-30 12:04:04 +02:00
9c03e83ef1 reset default dacs 2021-07-29 16:34:38 +02:00
de7f4489af defaultdac upto detector side, settings is undefined when none given 2021-07-28 20:11:58 +02:00
d9ff946b1d jungfrau: special dacs have defined values for settings. getsettings give undefined if different values for special dacs 2021-07-28 16:44:57 +02:00
f8b14c694d jungfrau: special settings and configure chip if powered on (1.1 chip) 2021-07-28 13:34:32 +02:00
7535ea315b jungfrau server: chip configuration only for chip v 1.1 2021-07-27 18:16:30 +02:00
61a99c70df j: configurechip 2021-07-23 14:08:20 +02:00
e18d6d18e6 wip 2021-07-23 11:14:40 +02:00
cb293f9945 j: 1. chipversion 2021-07-22 16:48:35 +02:00
05b7e0ef42 conflict merge fix 2021-07-22 11:53:00 +02:00
da996314e7 merge conflict 2021-07-22 11:15:57 +02:00
e02493d4e4 veotalg for g2 2021-07-20 14:57:31 +02:00
af16ad4040 vetoalg: wip 2021-07-20 12:58:05 +02:00
8354395f64 wip 2021-07-15 13:44:42 +02:00
cbdb05a3a8 wip 2021-07-01 15:11:22 +02:00
755738a42e wip 2021-06-22 20:50:50 +02:00
0afe093afc wip 2021-06-04 12:30:59 +02:00
Erik Frojdh
c054ad3af3 Merge branch 'my3regs' into developer 2021-04-26 08:39:46 +02:00
d5c10aa3e7 stop command: Support single (half)module stop 2021-04-21 15:40:51 +02:00
Erik Frojdh
0299d315d5 added command line option 2021-04-01 10:06:37 +02:00
Erik Fröjdh
2f2fe4dd47
Release of 5.1.0 (#237)
* Setting pattern from memory (#218)

* ToString accepts c-style arrays

* fixed patwait time bug in validation

* Introduced pattern class

* compile for servers too

* Python binding for Pattern

* added scanParameters in Python

* slsReceiver: avoid potential memory leak around Implementation::generalData

* additional constructors for scanPrameters in python

* bugfix: avoid potentital memory leak in receiver if called outside constructor context

* added scanParameters in Python

* additional constructors for scanPrameters in python

* M3defaultpattern (#227)

* default pattern for m3 and moench including Python bindings

* M3settings (#228)

* some changes to compile on RH7 and in the server to load the default chip status register at startup

* Updated mythen3DeectorServer_developer executable with correct initialization at startup

Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>
Co-authored-by: Anna Bergamaschi <anna.bergamaschi@psi.ch>

* Pattern.h as a public header files (#229)

* fixed buffer overflow but caused by using global instead of local enum

* replacing out of range trimbits with edge values

* replacing dac values that are out of range after interpolation

* updated pybind11 to 2.6.2

* Mythen3 improved synchronization (#231)

Disabling scans for multi module Mythen3, since there is no feedback of the detectors being ready
startDetector first starts the slaves then the master
acquire firs calls startDetector for the slaves then acquire on the master
getMaster to read back from hardware which one is master

* New server for JF to go with the new FW (#232)

* Modified Jungfrau speed settings for HW1.0 - FW fix version 1.1.1, compilation date 210218

* Corrected bug. DBIT clk phase is implemented in both HW version 1.0 and 2.0. Previous version did not update the DBIT phase shift on the configuration of a speed.

* fix for m3 scan with single module

* m3 fw version

* m3 server

* bugfix for bottom when setting quad

* new strategy for finding zmq based on cppzmq



Co-authored-by: Dhanya Thattil <dhanya.thattil@psi.ch>
Co-authored-by: Dhanya Thattil <33750417+thattil@users.noreply.github.com>
Co-authored-by: Alejandro Homs Puron <ahoms@esrf.fr>
Co-authored-by: Anna Bergamaschi <anna.bergamaschi@psi.ch>
Co-authored-by: Xiaoqiang Wang <xiaoqiangwang@gmail.com>
Co-authored-by: lopez_c <carlos.lopez-cuenca@psi.ch>
2021-03-22 14:43:11 +01:00
Dhanya Thattil
f9f50f1d84
M3settings (#228)
* added temp m3 settings files

* renames settings noise to trim

* get threshold for M3

* some changes to compile on RH7 and in the server to load the default chip status register at startup

* Updated mythen3DeectorServer_developer executable with correct initialization at startup

Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>
Co-authored-by: Anna Bergamaschi <anna.bergamaschi@psi.ch>
2021-01-14 12:34:13 +01:00
Dhanya Thattil
a62e068a9a
M3defaultpattern (#227)
* default pattern for m3 and moench including Python bindings

Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>
2020-12-09 13:28:39 +01:00
Dhanya Thattil
a6d696a0f8
Nextframenumber (#215) 2020-11-16 17:26:12 +01:00
Dhanya Thattil
4c4e2ccb6b
Defaultdacs (#214) 2020-11-13 08:31:02 +01:00
b6b9a5d598 updated release notes and changed a few command names, now->runtime, timestamp->frametime, nframes->framecounter, startingfnum->startframenumber 2020-11-12 16:48:49 +01:00
Erik Fröjdh
a15d8dd30a
Moving headers into include/sls (#212) 2020-11-02 16:05:28 +01:00
Erik Frojdh
139db216fe added function to read depreciated commands 2020-10-30 11:50:42 +01:00
Dhanya Thattil
47018b61cd
M3readout (#209)
* m3: readout command
2020-10-26 16:13:48 +01:00
b9234ee7f2 update doc 2020-10-23 15:34:20 +02:00
7f189629fb commands, set multi level but get module level enabled 2020-10-08 14:31:18 +02:00