mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2026-07-17 11:46:04 +02:00
maliakal_dandGitHub
c3ad3d2e73
Build and Deploy on local RHEL9 / build (push) Successful in 2m13s
Build on RHEL9 docker image / build (push) Successful in 3m53s
Build and Deploy on local RHEL8 / build (push) Successful in 4m58s
Build on RHEL8 docker image / build (push) Successful in 5m47s
Run Simulator Tests on local RHEL9 / build (push) Successful in 18m55s
Run Simulator Tests on local RHEL8 / build (push) Successful in 22m26s
- changed
- command from `datastream` to `udp_datastream` to be more specific
- Detector API:
- setNumberofUDPInterfaces(pos) =>setNumberofUDPInterfaces() # no position anymore
- getDataStream(portPosition, pos) =>getUDPDataStream(portPosition, pos)
- setDataStream(portPosition, pos) => setUDPDataStream(portPosition) # no position anymore
- modified the dataprocessing thread:
- if gui or call back, start zmq processing (connecting sockets) before starting receiver (disabled ports sends dummy that the client zmq sockets are not ready for)
- if only progress, starting progress processing thread after startReceiver
-
- added
- Detector API:
- getRxDisabledUDPPortIndices()
- getPortPositionList()
- allow disabling/enabling udp interface in receiver for Jungfrua/Moench when both udp interfaces is enabled (This is to go fast, where only one half of the module matters)
- write ports type and disabled ports to master file (tests for it as well)
- tests for python commands as well
- datastream command to deprecated commands
- refactored tests to make the new parameters fit
* first draft of disabling data port at the receiver side. Todo: master file and stream for gui to use
* updated help in command
* formatting
* md5 unchanged
* fix test, check port position for detector type
* wip, udp port enable metadata in client, to:receiver, zmq streaming
* wip, master attributes
* wip, imple=> save only disabled ports with port index, 1 interface, is empty
* works in file. still needs refactoring
* updated writer versions
* udp ports type pass, disabled with api yet
* fixed disabled ports meta data as well
* fixed in developer via other PR
* renamed.more intuitive
* fix in gui that wont wait for disabled ports
* added tests for master file
* extra tests
* move the master fiel tests into its own tests with the disable marker for github tests
* refactoring
* python test
* more intuitive and doc
* release notes
* example for python
* back to before
* minor documentation fix and sending nports unnecessarily for getRxUDPPortDisableMetadata
* doc
* review fixes, 1. using std::array instead of vector, 2. moving udp_datastream command testing with different values into master attributes testing file because we test the master file
* minor
* review: update help
* progress printed before assigned
* try catch inside hdf5
* auto generated code for CLI and formatting
* missing packets should not be checked at github workflow level
* formatting
* improved python doc for udp_datastream help
* indent doc python done
35 lines
1.3 KiB
C++
35 lines
1.3 KiB
C++
// SPDX-License-Identifier: LGPL-3.0-or-other
|
|
// Copyright (C) 2021 Contributors to the SLS Detector Package
|
|
|
|
#include "CTBState.h"
|
|
#include "GeneralData.h"
|
|
|
|
namespace sls::test::acquire {
|
|
|
|
std::pair<uint64_t, int> calculate_ctb_image_size(const CTBState &test_info,
|
|
bool isXilinxCtb) {
|
|
LOG(logDEBUG1) << test_info;
|
|
CtbImageInputs inputs{};
|
|
inputs.mode = test_info.readout_mode;
|
|
inputs.nAnalogSamples = test_info.num_adc_samples;
|
|
inputs.adcMask = test_info.adc_enable_10g;
|
|
if (!isXilinxCtb && !test_info.ten_giga) {
|
|
inputs.adcMask = test_info.adc_enable_1g;
|
|
}
|
|
inputs.nTransceiverSamples = test_info.num_trans_samples;
|
|
inputs.transceiverMask = test_info.transceiver_mask;
|
|
inputs.nDigitalSamples = test_info.num_dbit_samples;
|
|
inputs.dbitOffset = test_info.dbit_offset;
|
|
inputs.dbitReorder = test_info.dbit_reorder;
|
|
inputs.dbitList = test_info.dbit_list;
|
|
|
|
auto out = computeCtbImageSize(inputs);
|
|
uint64_t image_size =
|
|
out.nAnalogBytes + out.nDigitalBytes + out.nTransceiverBytes;
|
|
LOG(logDEBUG1) << "Expected image size: " << image_size;
|
|
int npixelx = out.nPixelsX;
|
|
LOG(logDEBUG1) << "Expected number of pixels in x: " << npixelx;
|
|
return std::make_pair(image_size, npixelx);
|
|
}
|
|
|
|
} // namespace sls::test::acquire
|