7130 Commits

Author SHA1 Message Date
cf7828e0ce eiger server: blocking software trigger 2021-06-02 16:59:20 +02:00
Dhanya Thattil
129ec6930f
Merge pull request #246 from slsdetectorgroup/rxpartial
virtual prints extra missing packets instead of negative
2021-05-28 16:49:15 +02:00
b1556faa36 virtual prints extra missing packets instead of negative 2021-05-27 11:33:00 +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
Xiaoqiang Wang
7aeb394514
Pattern.h as a public header files (#229)
It is used in Detector.h.
2021.01.20.dev0
2021-01-18 08:30:34 +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.dev0
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
85bc37f04d release updated 2020-12-04 17:01:57 +01:00
Erik Frojdh
a3f5315015 updated RELEASE.txt 2020-12-04 16:49:49 +01:00
Erik Frojdh
d63a182996 updated RELEASE.txt 2020-12-04 14:37:29 +01:00
Erik Frojdh
f147c7bfcb updated RELEASE.txt 2020-12-04 14:36:08 +01:00
4218fe5f2f bugfix from 5.0.2: potentital memory leak in receiver if setDetectorType called directly from outside 2020-12-04 14:33:53 +01:00
Dhanya Thattil
511f5a7ca5
Update RELEASE.txt 2020-12-04 14:33:11 +01:00
Erik Frojdh
a5ab5c1fa0 additional constructors for scanPrameters in python 2020-12-04 14:31:08 +01:00
Erik Frojdh
8b7023d9a3 added scanParameters in Python 2020-12-04 14:27:57 +01:00
c8c7bca6e0 bugfix: avoid potentital memory leak in receiver if called outside constructor context 2020-12-04 14:18:16 +01:00
Dhanya Thattil
8ddc407e62
Merge pull request #226 from esrf-bliss/potential-generaldata-memory-leak
slsReceiver: avoid potential memory leak: Implementation::generalData
2020-12-04 14:15:12 +01:00
Erik Frojdh
7a2827f693 additional constructors for scanPrameters in python 2020-12-04 13:50:08 +01:00
Alejandro Homs Puron
f4be0b8efa slsReceiver: avoid potential memory leak around Implementation::generalData 2020-12-04 13:20:50 +01:00