Skip to content

Commit

Permalink
8.0.1.rc (#891)
Browse files Browse the repository at this point in the history 
* forward declare zmq_msg_t and moved include

* removed zmq as dependency for slsdet (#870)

* Fixed path when building as submodule

* new moench data structure for offline processing

* meonch raw data and zmq process files updated to 7.0.3 version

* implemented config file for Zmq file

* raw data and zmq work with config file, but only with one file/interface

* zmq config change

* added config examples for zmq and rawdata

* update release notes, release versions

---------

Co-authored-by: Erik Frojdh <[email protected]>
Co-authored-by: froejdh_e <[email protected]>
Co-authored-by: Anna Bergamaschi <[email protected]>
Co-authored-by: anberga <[email protected]>
  • Loading branch information
@thattil @erikfrojdh @anberga
5 people authored Jan 16, 2024
1 parent a86fd00 commit 97f0c1f
Show file tree
Hide file tree
Showing 14 changed files with 1,013 additions and 507 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2021 Contributors to the SLS Detector Package
cmake_minimum_required(VERSION 3.14)
project(slsDetectorPackage)
set(PROJECT_VERSION 8.0.0)
set(PROJECT_VERSION 8.0.1)

set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")

Expand Down Expand Up @@ -33,7 +33,7 @@ else()
# Standard behaviour use libzmq included in this repo (libs/libzmq)
FetchContent_Declare(
libzmq
URL ${CMAKE_SOURCE_DIR}/libs/libzmq/libzmq-4.3.4.tar.gz
URL ${CMAKE_CURRENT_SOURCE_DIR}/libs/libzmq/libzmq-4.3.4.tar.gz
URL_HASH MD5=cc20b769ac10afa352e5ed2769bb23b3
)
endif()
Expand Down
256 changes: 17 additions & 239 deletions RELEASE.txt
View file
Original file line number Diff line number Diff line change
@@ -1,265 +1,43 @@
SLS Detector Package Major Release 8.0.0 released on 13.11.2023
SLS Detector Package Major Release 8.0.1 released on 16.01.2024
===============================================================

This document describes the differences between v8.0.0 and v7.0.3
This document describes the differences between v8.0.1 and v8.0.0



CONTENTS
--------
1 Compilation Changes
2 New or Changed Features
2.1 Breaking API
2.2 Resolved or Changed Features
2.3 New Features
3 On-board Detector Server Compatibility
4 Firmware Requirements
5 Kernel Requirements
6 Download, Documentation & Support
1 Resolved Issues
2 On-board Detector Server Compatibility
3 Firmware Requirements
4 Kernel Requirements
5 Download, Documentation & Support




2 Compilation Changes
=====================
1 Resolved Issues
=================


* Minimum CMake version changed from 3.12 to 3.14
Compilation
-----------


* Internal zmq lib
Building zmq from tar file in repo (libs/libzmq/libzmq-4.3.4.tar.gz),
but added option (SLS_FETCH_ZMQ_FROM_GITHUB) to pull zmq version (v4.3.4)
from github (https://github.com/zeromq/libzmq.git)
* Fixed compilation error when building without zmq-devel installed
and removed dependency on zeromq in conda build.


* Internal pybind11 lib
Building pybind11 from tar file in repo (libs/pybind11/v2.11.0.tar.gz),
but added option (SLS_FETCH_PYBIND11_FROM_GITHUB) to pull pybind11 version
(v2.11.0) from github (https://github.com/pybind/pybind11)
* Fixed libzmq compilation error to build the package as a submodule.


Calibration
-----------

2 New, Changed or Resolved Features
=====================================

* [Moench] Fixed Moench calibration


2.1 Breaking API
==================


Firmware
--------

* [Jungfrau] Status register and Sync mode fix
The regiser bit definition changed and fixes for stable control in sync mode.
Effect: Master and slaves give same status (previously master is sometimes 'idle' when acquisition is stopped), same #frames left and #nextframenumber.
Also ERROR status connected, but never noticed to occur.

For user, everything is transparent unless one touches status register
using advanced commands.


* [Moench] Status: Development mode
Moench is now being made compatible with Jungfrau v2.0 readout boards.
Hence, firmware and software is in development mode.
7.x.x will continue to have fixes for Moench until this version is deployed.


* [Ctb] Fixes and features described later on.


Client
======


* Datatype change of port numbers from int to uint16_t
API: setVirtualDetectorServers,
get/setRxPort, get/setControlPort, get/setStopPort,
get/setDestinationUDPPort(2), get/setRxZmqPort, get/setClientZmqPort


* [Eiger] versions, hardware version, febl/r firmware version
Versions command modified to give more info about hardware version ['fx30', 'fx70'] and Febl/r firmware versions.
Command line: versions (output modified), hardwareversion (added for Eiger)
API added for Eiger: getHardwareVersion, getFrontEndFirmwareVersion
Enums added: fpgaPosition {FRONT_LEFT, FRONT_RIGHT}


* [Ctb] Voltage->Power name change
Command line: voltagelist ->powerlist
API: get/setVoltage -> get/setPower, get/setVoltageList -> get/setPowerList,
getMeasuredVoltage -> getMeasuredPower



2.2 Resolved or Changed Features
================================


Detector Server
---------------


* Set bit and clear bit validation
Previously, validation expected all the other bits in the register to
not change. Now, it only validates the selected bit.


* [Jungfrau] Electron collection mode (bit 14 of 0x5D register)
Affected Command line: setbit, clearbit, reg
Affected API: setBit, clearBit, writeRegister
Electron collection mode and requires chip reconfiguration.
Temporary fix added that touching this bit will reconfigure chip if chip
is v1.1 and powered on. Permanent fix by introducing a command for the
same in future release.


* [Ctb] Fixes

- Patioctrl, patsetbit, patbitmask
MSB (64 bit unsigned) could not be set as a value of -1 was interpreted
as a 'get'. Fixed in server.

- Allow dac tristate when v_limit is set. Fixed.

- Changing fw bit from disable analog to enable analog

- Allow adc enable for 1 GbE and 10GbE to be 0.

- Slow ADCs previously misread (a high 5k+ value). Firmware updated
and software adjusted now.

- Allow non blocking acquire for 1GbE. Added Transmitting status when it
might still be reading from fifo.

- Clean memory before reading from fifo in 1GbE mode. Read fifo then
RD strobe (corresponding firmware fix) fixes number of reads, but
increases all pipelines by 1.

- Fixed pattern viewer (auto legend buf without wait and loop), allow
pyat files. (/patterngenerator)


Simulator
---------


* Unique TCP port for multiple simulators
Checks include unique TCP port-hostname combo.


Receiver
--------


* Unique TCP port for multiple receivers
7.x.x already has automatically increasing TCP ports in shared memory
for multiple receivers. Now, checks include unique TCP port-hostname
combo.


* [Ctb] Fixes

- Readout mode updated
'rx_hostname' should configure the receiver with parameters from detector,
but readout mode in receiver always configured at start up to Analog only.
Fixed.

- Incorrect image size in zmq header, which happens when dbit list is
less than 64 bits. Fixed.

- Rearranging digital data when dbit list less than 64 bits fixed.


Client
------


* [Jungfrau][Mythen3][Gotthard2] Sync mode should have at least one master
Multi module synced detectors should have at least one master when
starting acquisition, else it will throw. Once master is done acquiring
(blocking mode), status of all modules checked to ensure none of the
slaves in waiting due to hardware issues such as cabling.



2.3 New Features
================


Client
------


* [Jungfrau] Pedestal mode
Command line: pedestalmode
API: get/setPedestalMode
Example:
pedestalmode 0 # turns off pedestal mode
pedestalmode 50 10 # turns on pedestal mode (50 pedestal frames, 10 loops)

In pedestal mode, number of frames/triggers
is overwritten by '#pedestal_frames x #pedestal_loops x 2'.
In auto timing mode or trigger mode with #frames > 1, #frames is overwritten
with #triggers is 1. Otherwise, #triggers is overwritten with #frames is 1.
In pedestal mode, one cannot set #frames, #triggers or timing mode (exception).

Disabling pedestal mode will set back to normal mode with normal previous
values of #frames and #triggers.


* Source UDP IP: Auto
Command line: udp_srcip, udp_srcip2
API: get/setSourceUDPIP(2)
Allow 'auto' for udp_srcip to pick up IP from detector hostname. Not allowed
for Gotthard1.


* Custom row and column for detector UDP header
Command line: row, column
API: get/setRow, get/setColumn
By default, row and column of module is determined in a pre-determined
manner or by custom detector size (Command line: detsize).
This is useful if user accesses row and column in multi- detector UDP header
or for the GUI to rearrange for complete image.
Option now added to set custom row and column.


* [Ctb] Features

- List for ADC, signal, power, slowadc
Also allow their list to set names and to obtain their indices and values.

Command line: dacname, dacindex,
adclist, adcname, adcindex,
signallist, signalname,signalindex,
powerlist, powername, powerindex, powervalues,
slowadclist, slowadcname, slowadcindex, slowadcvalues

API: get/setDacName, getDacIndex,
get/setAdcNames, getAdcIndex, get/setAdcName,
get/setSignalNames, getSignalIndex, get/setSignalName,
get/setPowerNames, getPowerIndex, get/setPowerName, getPowerList,
get/setSlowADCNames, getSlowADCIndex, get/setSlowADCName, getSlowADCList

- Added more modes for transceiver in read out mode.
Allow to set number of samples and enable mask for transceiver.

Command line: romode (more modes: 'transceiver', 'digital_transceiver'),
tsamples, transceiverenable
API: get/setTransceiverEnableMask, get/setNumberOfTransceiverSamples,
get/setReadoutMode (more enums: TRANSCEIVER_ONLY, DIGITAL_AND_TRANSCEIVER)


- Command to get file name with path of last pattern uploaded.
Command line: patfname
API: getPatterFileName


* Automatic test script for all virtual simulators added.



2 On-board Detector Server Compatibility
Expand Down
9 changes: 2 additions & 7 deletions conda-recepie/meta.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ requirements:
- {{compiler('cxx')}}
- cmake
- qt 5.*
- zeromq
- xorg-libx11
- xorg-libice
- xorg-libxext
Expand All @@ -37,7 +36,6 @@ requirements:
host:
- libstdcxx-ng
- libgcc-ng
- zeromq
- xorg-libx11
- xorg-libice
- xorg-libxext
Expand All @@ -48,7 +46,6 @@ requirements:
- expat

run:
- zeromq
- libstdcxx-ng
- libgcc-ng

Expand All @@ -63,15 +60,11 @@ outputs:
- {{compiler('cxx')}}
- libstdcxx-ng
- libgcc-ng
- zeromq

host:
- zeromq

run:
- libstdcxx-ng
- libgcc-ng
- zeromq

- name: slsdet

Expand All @@ -84,10 +77,12 @@ outputs:
- {{compiler('cxx')}}
- {{ pin_subpackage('slsdetlib', exact=True) }}
- setuptools
- pybind11=2.11

host:
- python
- {{ pin_subpackage('slsdetlib', exact=True) }}
- pybind11=2.11


run:
Expand Down
22 changes: 22 additions & 0 deletions examples/rawdata.config
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
numfiles 1
nthreads 5,
fifosize 5000
nsigma 5
gainfile none
detectorMode counting
threshold 0
pedestalfile none
nframes 0
xMin 0
xMax 400
yMin 0
yMax 400
outdir ./
indir ./
flist none
fformat none
runmin 0
runmax -1
readnrows 400
eMin 0
eMax 16000
16 changes: 16 additions & 0 deletions examples/zmq.config
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
numinterfaces 1
rx_zmqip 10.1.2.102
rx_zmqport 1978
zmqip 129.129.202.57
zmqport 1979
nthreads 6
fifosize 5000
nsigma 5
gainfile none
nbinsx 5
nbinsy 5
etafile none
etabinsx 1000
etabinsy 1000
etamin -1
etamax 2
Loading

0 comments on commit 97f0c1f

Please sign in to comment.