7395 Commits

Author SHA1 Message Date
54c24b3de7 tests m3 for vth and counters 2021-05-26 19:55:47 +02:00
0a7b0a6d5e ctb tests dac fixed 2021-05-26 18:57:29 +02:00
a69e6e7faa other detectors dac tests 2021-05-26 18:51:10 +02:00
2809d2b83d tests dac depreciated fix for m3 2021-05-26 18:37:34 +02:00
47c3d7fc47 binaries in 2021-05-26 13:00:11 +02:00
3079e41c3b all loading pattern so far takes in logDEBUG5 print level as it is at detector start up. commands to call loadpattern can call logINFO level 2021-05-26 12:59:19 +02:00
89898beced m3:different exception message for vths when counter disabled 2021-05-26 12:23:46 +02:00
240ec12485 binaries in 2021-05-25 16:46:56 +02:00
ff4472aecf Merge branch 'm3dacfix' of github.com:slsdetectorgroup/slsDetectorPackage into m3dacfix 2021-05-25 16:46:08 +02:00
d9525e9a92 m3: vthreshold and vthx gives correct exception messages (binaries not in) 2021-05-25 16:46:01 +02:00
6ab640100b replaced trimfile name with sn0000 extension 2021-05-25 16:23:36 +02:00
9626b2b8f9 Merge branch 'm3dacfix' of github.com:slsdetectorgroup/slsDetectorPackage into m3dacfix 2021-05-25 15:09:52 +02:00
d05b0ef77f produced new mythen3 trimfiles with the gaincap for 4000,6000,8000,12000eV all trimbits to 0 2021-05-25 15:09:28 +02:00
bd8f51fb1a binaries in 2021-05-25 15:04:02 +02:00
9ac836c2f4 setting vthreshold exception message fix when not all counters enabled, appropriate message 2021-05-25 15:03:05 +02:00
45e7187e7c binaries in 2021-05-25 11:25:27 +02:00
a6a2a91fea m3 server: refactor 2021-05-20 16:46:10 +02:00
224c8d9f8d m3 server: setting counter mask, set vth[i] for counter[i] and its M_VTH1, not VTH1 2021-05-20 14:51:37 +02:00
Erik Frojdh
ac613171ec added conda pkgs for moench 2021-05-11 10:22:15 +02:00
Erik Frojdh
085ea3aee7 dont add detector id for .trim 2021.5.10.dev0 2021-04-27 08:28:05 +02:00
Erik Frojdh
c054ad3af3 Merge branch 'my3regs' into developer 2021-04-26 08:39:46 +02:00
Erik Frojdh
28c7d533e9 fixed compile defs for moench zmq 2021-04-22 08:29:15 +02:00
fa6a685508 fixed moenchZmq executables 2021-04-21 17:25:51 +02:00
d5c10aa3e7 stop command: Support single (half)module stop 2021-04-21 15:40:51 +02:00
Erik Frojdh
be5fee8126 M3: fixed gain bits with negative polarity 2021-04-12 16:44:47 +02:00
Erik Frojdh
d9cd780386 p gaincap 0 2021-04-12 13:31:10 +02:00
Erik Frojdh
55b4a92453 using setChipStatusRegister 2021-04-07 16:27:40 +02:00
Erik Frojdh
0299d315d5 added command line option 2021-04-01 10:06:37 +02:00
Erik Frojdh
779a2a0199 CSR in trim files 2021-04-01 08:09:04 +02:00
Erik Frojdh
01c785271f WIP 2021-03-31 16:26:36 +02:00
Erik Frojdh
05ddc5caaf pybind11 back to 2.6.2 2021-03-29 17:02:00 +02:00
Erik Frojdh
fa25340e5c allow bitwise op on the gain cap 2021-03-29 16:14:10 +02:00
e65e7ac42f energyCalibration updated with Sophie's version 2021-03-29 15:35:27 +02:00
Erik Frojdh
7d605c2c87 names 2021-03-29 14:50:08 +02:00
Erik Frojdh
043d582616 initial implementation 2021-03-29 14:21:48 +02:00
Erik Frojdh
7c4f9ee044 read back of csr 2021-03-26 17:46:11 +01:00
Erik Frojdh
a2007b78e7 updated pybind also for my3regs 2021-03-23 11:48:35 +01:00
Erik Frojdh
7004f43a9a Merge branch 'developer' into my3regs 2021-03-23 11:44:52 +01:00
Erik Frojdh
2b3b5af303 report developer as version 2021-03-23 11:44:25 +01:00
Erik Frojdh
7a67d7e88a minor cmake and servers now reflect developer 2021-03-23 10:54:01 +01:00
Erik Frojdh
60e3fb8aab fixing conflics after merging back release to developer 2021-03-23 10:50:09 +01: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>
5.1.0
2021-03-22 14:43:11 +01:00
7955426682 my3: added function to change the gain + some functions for my3 flags added 2021-02-26 18:02:48 +01:00
63259ec5c8 Modified my3 functions for the pattern generator and moved to separate file; created loadPattern function - but should still be used in readDefaultPattern 2021-02-26 16:53:30 +01:00
Erik Fröjdh
e8fe203940
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.

The new server has been compiled

Co-authored-by: lopez_c <carlos.lopez-cuenca@psi.ch>
2021-02-25 10:26:39 +01:00
Erik Fröjdh
10b315c2bd
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
2021-02-08 13:28:37 +01:00
Erik Frojdh
f35de3bc2b updated pybind11 to 2.6.2 2021-02-02 14:38:16 +01:00
Erik Frojdh
4caf4cced2 replacing dac values that are out of range after interpolation 2021-01-26 18:11:18 +01:00
Erik Frojdh
1eb70f63ad replacing out of range trimbits with edge values 2021-01-26 17:04:09 +01:00
Erik Frojdh
997e5dd96c fixed buffer overflow but caused by using global instead of local enum 2021.01.26.dev0 2021-01-26 16:15:40 +01:00