mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-19 16:27:13 +02:00
Compare commits
62 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 84f2560f13 | |||
| bdeb030fea | |||
| 435146ca9c | |||
| 39926497b2 | |||
| 14cd8c5d4a | |||
| 09bd91028c | |||
| 209a228f74 | |||
| d500f62852 | |||
| e5c33cf04f | |||
| 5612eabfb1 | |||
| 6fc93beee1 | |||
| 638ef57082 | |||
| da8bbc97d4 | |||
| 1ae8c5e464 | |||
| e8fe203940 | |||
| 10b315c2bd | |||
| f35de3bc2b | |||
| 4caf4cced2 | |||
| 1eb70f63ad | |||
| 997e5dd96c | |||
| 7aeb394514 | |||
| f9f50f1d84 | |||
| a62e068a9a | |||
| 85bc37f04d | |||
| a3f5315015 | |||
| d63a182996 | |||
| f147c7bfcb | |||
| 4218fe5f2f | |||
| 511f5a7ca5 | |||
| a5ab5c1fa0 | |||
| 8b7023d9a3 | |||
| c8c7bca6e0 | |||
| 8ddc407e62 | |||
| 7a2827f693 | |||
| f4be0b8efa | |||
| a6e23b0509 | |||
| 9048e7f6c4 | |||
| 1ce56764fa | |||
| 8c091eece2 | |||
| d69e238e67 | |||
| 95fe1720c0 | |||
| 69f558c072 | |||
| e382df21b9 | |||
| 8e773c97dd | |||
| c043e74c07 | |||
| d4518b2ca3 | |||
| fd3108a61b | |||
| e8fedfa55f | |||
| 0eb204bfd3 | |||
| d9b2a90651 | |||
| 8ca1d9c50c | |||
| baff0518bb | |||
| 2e669c585b | |||
| ca0bc3e0f3 | |||
| 557cab9c50 | |||
| a12dd153ef | |||
| 8bf9f974a3 | |||
| e63fa1d7c2 | |||
| 9e8c8f4bbc | |||
| c120c70678 | |||
| 10fa57ebb9 | |||
| 0ca9115cb8 |
@ -157,20 +157,10 @@ set(CMAKE_INSTALL_RPATH $ORIGIN)
|
||||
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
|
||||
|
||||
|
||||
set(ZeroMQ_HINT "" CACHE STRING "Hint where ZeroMQ could be found")
|
||||
#Adapted from: https://github.com/zeromq/cppzmq/
|
||||
|
||||
#From: https://github.com/zeromq/cppzmq/
|
||||
if (NOT TARGET libzmq)
|
||||
if(ZeroMQ_HINT)
|
||||
message(STATUS "Looking for ZeroMQ in: ${ZeroMQ_HINT}")
|
||||
find_package(ZeroMQ 4
|
||||
NO_DEFAULT_PATH
|
||||
HINTS ${ZeroMQ_DIR}
|
||||
)
|
||||
else()
|
||||
find_package(ZeroMQ 4)
|
||||
endif()
|
||||
|
||||
|
||||
find_package(ZeroMQ 4 QUIET)
|
||||
|
||||
# libzmq autotools install: fallback to pkg-config
|
||||
if(NOT ZeroMQ_FOUND)
|
||||
|
||||
29
RELEASE.txt
29
RELEASE.txt
@ -1,13 +1,14 @@
|
||||
SLS Detector Package 5.1.0 released on 22.03.2020 (Minor Release)
|
||||
SLS Detector Package 5.1.0 released on xx.xx.2020 (Minor Release)
|
||||
===================================================================
|
||||
|
||||
This document describes the differences between 5.1.0 and 5.0.1 releases.
|
||||
This document describes the differences between 5.1.0 and 5.x.x releases.
|
||||
|
||||
|
||||
|
||||
CONTENTS
|
||||
--------
|
||||
1. New Features
|
||||
1. Topics Concerning
|
||||
2. New Features
|
||||
2. Resolved Issues
|
||||
3. Known Issues
|
||||
4. Firmware Requirements
|
||||
@ -15,14 +16,22 @@ This document describes the differences between 5.1.0 and 5.0.1 releases.
|
||||
|
||||
|
||||
|
||||
1. Topics Concerning
|
||||
====================
|
||||
|
||||
1. New Features
|
||||
- potentital memory leak in receiver
|
||||
- scanParameters in Python
|
||||
- cmk.sh refactored
|
||||
- m3 settings and threshold
|
||||
|
||||
|
||||
2. New Features
|
||||
===============
|
||||
|
||||
Client
|
||||
------
|
||||
|
||||
1. Added settings and threshold features for Mythen3.
|
||||
1. Aded settings and threshold features for Mythen3.
|
||||
2. Internal modification of acquire for Mythen3.
|
||||
3. Added getMaster for Mythen3
|
||||
4. Mythen3, API function to set pattern from memory
|
||||
@ -34,7 +43,7 @@ This document describes the differences between 5.1.0 and 5.0.1 releases.
|
||||
1. Setting timing to auto, sets timing to trigger for slaves
|
||||
|
||||
|
||||
2. Resolved Issues
|
||||
3. Resolved Issues
|
||||
==================
|
||||
|
||||
|
||||
@ -52,8 +61,6 @@ This document describes the differences between 5.1.0 and 5.0.1 releases.
|
||||
|
||||
2. cmk.sh refactored to have better option handling
|
||||
|
||||
3. Fixed hardcoded path accidentally ending up in the exported CMake package
|
||||
|
||||
Server
|
||||
--------
|
||||
|
||||
@ -63,7 +70,7 @@ This document describes the differences between 5.1.0 and 5.0.1 releases.
|
||||
|
||||
|
||||
|
||||
3. Firmware Requirements
|
||||
4. Firmware Requirements
|
||||
========================
|
||||
|
||||
Mythen3: 0x210201
|
||||
@ -74,14 +81,14 @@ This document describes the differences between 5.1.0 and 5.0.1 releases.
|
||||
|
||||
|
||||
|
||||
4. Known Issues
|
||||
5. Known Issues
|
||||
===============
|
||||
|
||||
No updates from 5.0.0
|
||||
|
||||
|
||||
|
||||
5. Download, Documentation & Support
|
||||
6. Download, Documentation & Support
|
||||
====================================
|
||||
|
||||
Download
|
||||
|
||||
@ -50,12 +50,12 @@ args = parser.parse_args()
|
||||
|
||||
servers = [
|
||||
"eigerDetectorServer",
|
||||
"jungfrauDetectorServer",
|
||||
"mythen3DetectorServer",
|
||||
"gotthard2DetectorServer",
|
||||
"gotthardDetectorServer",
|
||||
"ctbDetectorServer",
|
||||
"moenchDetectorServer",
|
||||
# "jungfrauDetectorServer",
|
||||
# "mythen3DetectorServer",
|
||||
# "gotthard2DetectorServer",
|
||||
# "gotthardDetectorServer",
|
||||
# "ctbDetectorServer",
|
||||
# "moenchDetectorServer",
|
||||
]
|
||||
|
||||
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -47,7 +47,7 @@
|
||||
#define DEFAULT_HIGHGAIN_VRPREAMP (1300)
|
||||
#define DEFAULT_STANDARD_VRSHAPER (1280)
|
||||
#define DEFAULT_FAST_VRSHAPER (1500)
|
||||
#define DEFAULT_HIGHGAIN_VRSHAPER (1100)
|
||||
#define DEFAULT_HIGHGAIN_VRSHAPER (900)
|
||||
|
||||
#define DEFAULT_READOUT_C0 (10) //(100000000) // rdo_clk, 100 MHz
|
||||
#define DEFAULT_READOUT_C1 (10) //(100000000) // smp sample clk (x2), 100 MHz
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/** API versions */
|
||||
#define GITBRANCH "5.1.0"
|
||||
#define GITBRANCH "5.1.0.rc2"
|
||||
#define APICTB 0x210225
|
||||
#define APIGOTTHARD 0x210225
|
||||
#define APIGOTTHARD2 0x210225
|
||||
|
||||
Reference in New Issue
Block a user