Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Target

Show changes

Only incoming changes from source

Include changes to target after source was created

Commits on Source 3441

631c1eb1 Nicafemto
Apr 26, 2021
9c673630 Fix unwanted FATAL when TOF not used
Apr 27, 2021
2c4396f6 Turn on ghost suppresion in L1
Apr 27, 2021
82a728d6 Fix config scripts
Apr 27, 2021
f39a30d0 Fix config scripts (again)
Apr 27, 2021
43a7c5cf fix empty fields
Apr 27, 2021
e62205fe add some default cuts for QA
Apr 27, 2021
d834d43c squash minor changes: clang-format, change binning, AT vesion in comment
Apr 27, 2021
fab9afc1 add end of line and rerun clang format
Apr 27, 2021
57525b13 Fix config scripts (again)
Apr 28, 2021
ee94af22 fix: install CbmConfigBase.h, small change in geometry setting
Apr 28, 2021
5a3d5bfd Implement CbmEvent for RICH reconstruction.
Apr 29, 2021
2d11c5b0 Restored primary vertex branch in event-based reconstruction. Refs #2096.
Apr 29, 2021
86fd73e0 Add shell script to run test in the installation
Apr 30, 2021
42edd5cb Install macros which are in the test suite
Apr 30, 2021
b91b7de1 Changes in RICH reconstruction log.
May 3, 2021
23909542 Install missing headers for the mCBM2018 library
May 3, 2021
7a120e0c bugfix in L1Vector
May 3, 2021
35281016 Update run_reco.C and remove obsolete reco macros in macro/run. Refs #1874.
May 4, 2021
8f20a3bc bugfix: wrong usage of TClonesArray::GetEntries() that slows down L1 reconstruction
May 4, 2021
a4ff6ac2 Removed fatal error from CbmMCTrack if PDG code not found in TDatabasePDG. Refs #1826.
May 5, 2021
982dfb7c Fix name clash of define statement
May 7, 2021
5a61dfff Fix missing registration of TofTracks to CbmEvent in littrack, needed for...
May 12, 2021
d98d11bd Fix bug in run_reco.C, concerning proper settings for the MUCH hit finder. Refs #2112.
May 15, 2021
1d9ba4a0 Fix a bug in the TRD cluster finder; the index of registering TRD hits to...
May 15, 2021
f97e12b9 L1 turn on clone merge prosedure
May 17, 2021
8c9e55f9 Updates geometry hash
May 27, 2021
15ce8e3d Apply clang-format to complete code base
May 27, 2021
18ec3137 Add missing include files
May 27, 2021
f983bc0a Adds license header to .cxx, .cpp, .h, and .C files
May 31, 2021
6f6619b0 Short license declarations for .sh files
May 31, 2021
1b43f8b1 Fix build system when using the release tar file
Jun 1, 2021
e5d82170 Add license file
Jun 1, 2021
63b40961 Fix build system for macosx 11.4
Jun 2, 2021
4fdffafa Fix build system for some Linux systems
Jun 2, 2021
a4888728 Add copyright header to author declared files.
Jun 5, 2021
35afe0ea Changes from doxygen to plain comment
Jun 8, 2021
131d9ce2 Cleanup license headers
Jun 9, 2021
eaf9e68d Much Online Monitoring based on Task and Algo.
Jun 10, 2021
9be5f0e6 Apply clang-format
Jun 10, 2021
7836f189 File Format changed for MonitorAlgoMuchLite class.
Jun 10, 2021
153b0e87 More cleanup of license headers
Jun 10, 2021
70db16f2 Do not use cuts by default in AnalysisTreeQA, install file with cuts
Jun 11, 2021
d531af70 L1 add interface to save global tracks
Jun 14, 2021
7dce4b0d mCBM CbmHadronAnalysis use mc info only if matches are provided
Jun 14, 2021
fcec79d4 L1 fix bug for mCBM ToF hit indexes
Jun 14, 2021
dc524012 Bug #1799 Fixed
Jun 15, 2021
70063a58 Add MQ monitor for PSD detector
Jun 16, 2021
9d4abe7a Remove obsolete test
Jun 16, 2021
180334b3 [MQ] In MultiSample and T0Monitor, move all messaging from InitTask to Run method
Jun 17, 2021
bca4c043 [MQ] Add possibility of using single MQ channel as multi-purpose input for HistoServer
Jun 17, 2021
5f6cc057 [FLES IPC] In Multi-part subscriber, move the init out of the constructor to...
Jun 17, 2021
2dc858da Apply clang format
Jun 17, 2021
eac784fa Fixes to T0 and TOF monitors algos found during high-rate beamtime
Jun 17, 2021
deb4102d [mCBM] In TOF unpacker, add protection against MS blocks without epochs (FW bug)
Jun 17, 2021
bb4711dd [mCBM 2021] Add parameters and macro for mTOF HR run
Jun 17, 2021
0dfd3e5e Add Sample, consummer example and Monitors following Rep-Req relation
Jun 17, 2021
49bb42d3 Fix a compilation error introduced with MR 323
Jun 18, 2021
1d4fe16d Update autoinstall script
Jun 18, 2021
6f7f4568 Update flesnet version
Jun 21, 2021
9999e3e5 Fix compiler error
Jun 21, 2021
5ce518ba add data versioning anf calibration in parameter container
Jun 21, 2021
992bb457 New PSD data format
Jun 22, 2021
71f304dd New PSD GBT data reader
Jun 22, 2021
fa5a06cf moni + unpack for new raw data format
Jun 22, 2021
ccf9553c monitoring macro
Jun 22, 2021
cf769402 gitignore and cleanup in the mCBM2021 macro folder
Jun 22, 2021
80509000 Fix boost compiler warnings
Jun 22, 2021
dc107b3b Update parameters hash
Jun 23, 2021
a55adc5e Fix compiler warnings from PSD code
Jun 24, 2021
05148cc3 Fix compiler warnings in L1 code
Jun 24, 2021
a06be064 Fix compiler warnings
Jun 24, 2021
3e8b1e65 Fix boost compiler warnings
Jun 24, 2021
e0958f5c Fix a linker issue for macosx 11
Jun 24, 2021
ac4e8fd7 Update FairRoot version for macosx build test
Jun 24, 2021
73342a7d Include script which allows a costum setup file to be created.
Jun 25, 2021
7edfee56 Adding lmvm combinatorial pairs procedure
Jun 25, 2021
7aa29407 Add a new runner for CI pipeline
Jun 25, 2021
bdc18a96 Generalize the build stage
Jun 25, 2021
475f503d Implement the first job in a job matrix
Jun 25, 2021
37023bcf Move a second job/runner in the job matrix
Jun 25, 2021
8b4d798a Move all existing build/test runners to the matrix build
Jun 25, 2021
0a1e55f8 Add another image for singularity
Jun 25, 2021
3ae668d9 Improve the test script
Jun 25, 2021
f239c8bd Test more FairSoft/FairRoot versions
Jun 25, 2021
1b39dd33 Don't test with latest FairSoft/FairRoot versions
Jun 25, 2021
c62171f7 Use correct FairRoot version for macosx tests
Jun 25, 2021
95d79fc3 Fix merge pipeline
Jun 25, 2021
703107b2 Adding peak fits to CbmMcbmCheckTimingAlgo
Jun 25, 2021
e5bc631c Formatting of CbmMcbmCheckTimingAlgo.cxx
Jun 25, 2021
e569b090 Fix clang-format
Jun 25, 2021
3313b884 Update parameter hash to include latest Trd parameter files
Jun 30, 2021
c6dce670 bug fix in assigning the strip id's to STS hits
Jul 1, 2021
f34c3be9 L1Tracker: prevent potential problems in assigning strip and hit id's
Jul 1, 2021
2434553f L1Vector update
Jul 1, 2021
b32ec26e bugfix in L1: wrong number of OpenMP locks
Jul 1, 2021
cc7e56c2 macosx compilation fix
Jul 1, 2021
0ecdacec L1 license correction
Jul 1, 2021
a27006d2 cosmetics
Jul 1, 2021
19e02e79 Add tests on macosx 1015 and 11
Jul 7, 2021

3,341 additional commits have been omitted to prevent performance issues.

Some changes are not shown.

For a faster browsing experience, only 41 of 1000 files are shown. Download one of the files below to see all changes.

.ci/online/Dockerfile

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		ARG TAG=12-fair202211.4-rocm5.4
		ARG REGISTRY=hub.cbm.gsi.de/computing/images/online

		FROM ${REGISTRY}/dev:${TAG} as build
		ARG SOURCE_DIR=/opt/cbm/src
		WORKDIR ${SOURCE_DIR}
		# Kaniko doesn't support RUN --mount, so we have to copy the source code instead
		COPY . .
		RUN .ci/online/scripts/install.sh

		FROM ${REGISTRY}/runtime:${TAG}
		ARG CBMROOT_PATH=/opt/cbm/cbmroot
		ARG FAIRSOFT_PATH=/opt/cbm/fairsoft
		COPY --from=build ${CBMROOT_PATH}/bin ${CBMROOT_PATH}/bin
		COPY --from=build ${CBMROOT_PATH}/lib/*.so ${CBMROOT_PATH}/lib/
		# FIXME HACK FOR DC OCT 23
		COPY --from=build ${FAIRSOFT_PATH}/lib/libGenVector.so ${FAIRSOFT_PATH}/lib/.
		COPY --from=build ${FAIRSOFT_PATH}/lib/libGenVector.so.6.26 ${FAIRSOFT_PATH}/lib/.
		COPY --from=build ${FAIRSOFT_PATH}/lib/libGenVector.so.6.26.10 ${FAIRSOFT_PATH}/lib/.
		COPY --from=build ${FAIRSOFT_PATH}/lib/libCore.so ${FAIRSOFT_PATH}/lib/.
		COPY --from=build ${FAIRSOFT_PATH}/lib/libCore.so.6.26 ${FAIRSOFT_PATH}/lib/.
		COPY --from=build ${FAIRSOFT_PATH}/lib/libCore.so.6.26.10 ${FAIRSOFT_PATH}/lib/.

		ENV LD_LIBRARY_PATH=${CBMROOT_PATH}/lib:${FAIRSOFT_PATH}/lib:/opt/rocm/lib:${LD_LIBRARY_PATH}
		ENV PATH=${CBMROOT_PATH}/bin:${PATH}
		CMD ["cbmreco"]

.ci/online/DockerfileBuild

0 → 100644

+13 −0

Original line number	Diff line number	Diff line
		FROM gcr.io/kaniko-project/executor:v1.16.0-debug
		ARG USERNAME="username"
		ARG PASSWORD="your_password"
		ARG REGISTRY="hub.cbm.gsi.de"
		ARG IMAGE="${REGISTRY}/computing/cbmroot/cbm_online"
		ARG TAG="${USER}-debug"
		RUN mkdir -p /kaniko/.docker
		RUN echo "{\"auths\":{\"${REGISTRY}\":{\"username\":\"${USERNAME}\",\"password\":\"${PASSWORD}\"}}}" > /kaniko/.docker/config.json
		# TODO: Mount CbmRoot source instead of copying it into the container (-> same with authentification...)
		COPY . /workspace
		ENV IMAGE=${IMAGE}
		ENV TAG=${TAG}
		ENTRYPOINT ["/bin/sh" , "-xc", "/kaniko/executor --context dir:///workspace --dockerfile /workspace/algo/containers/cbm_online/Dockerfile --destination $IMAGE:$TAG"]

.ci/online/make_build_image.sh

0 → 100755

+44 −0

Original line number	Diff line number	Diff line
		#!/bin/bash

		set -e

		user="$1"
		password="$2"

		script=$(readlink -f "$0")

		function check_arg() {
		if [ -z "$1" ]; then
		echo "Error: No $2 specified."
		echo "Usage: $script <user> <password>"
		exit 1
		fi
		}

		check_arg "$user" "user"
		check_arg "$password" "password"

		# Set tag as optional third argument
		if [ -z "$3" ]; then
		tag="$user-debug"
		else
		tag="$3"
		fi

		# This script must be run from the CbmRoot top level directory.
		# Check for .git, .clang-format, and .gitlab-ci.yml
		if [ ! -d .git ] \|\| [ ! -f .clang-format ] \|\| [ ! -f .gitlab-ci.yml ]; then
		echo "Error: This script must be run from the CbmRoot top level directory."
		exit 1
		fi

		registry="hub.cbm.gsi.de/computing/cbmroot"
		image="cbm_online"

		build_args=" \
		--build-arg="USERNAME=$user" \
		--build-arg="PASSWORD=$password" \
		--build-arg="TAG=$tag" \
		"
		dockerfile="algo/containers/cbm_online/DockerfileBuild"
		docker build --progress plain $build_args -f $dockerfile -t cbm_online_builder .

.ci/online/scripts/install.sh

0 → 100755

+24 −0

Original line number	Diff line number	Diff line
		#!/bin/bash

		set -e

		srcdir=cbmroot
		build_type=RelWithDebInfo
		install_prefix=/opt/cbm/cbmroot
		fairsoft_path=/opt/cbm/fairsoft
		enable_hip=ON
		rocm_root=/opt/rocm
		hip_archs="gfx906;gfx908" # MI50;MI100
		n_jobs=16

		cmake_args="-DCMAKE_INSTALL_PREFIX=$install_prefix \
		-DCMAKE_BUILD_TYPE=$build_type \
		-DSIMPATH=$fairsoft_path \
		-DXPU_ENABLE_HIP=$enable_hip \
		-DXPU_ROCM_ROOT=$rocm_root \
		-DXPU_HIP_ARCH=$hip_archs \
		"

		ln -s ../cmake algo/cmake
		cmake -S algo -B build $cmake_args
		cmake --build build -j$n_jobs --target install

.ci/online/test_run.sh

0 → 100755

+22 −0

Original line number	Diff line number	Diff line
		#! /bin/bash

		set -e

		IMAGE=hub.cbm.gsi.de/fweig/containers/cbm_online:online-container
		DOCKER_FLAGS=" \
		--rm \
		-it \
		--mount type=bind,source=$HOME/cbm/params,target=/opt/cbm/params \
		--mount type=bind,source=/home/cbmdata/mcbm22/2391,target=/opt/cbm/data \
		"

		CMD="cbmreco"
		CMD_FLAGS=" \
		-p /opt/cbm/params \
		-i /opt/cbm/data/2391_node8_1_0000.tsa \
		-n 1 \
		--omp 1 \
		"

		docker run $DOCKER_FLAGS $IMAGE $CMD $CMD_FLAGS
		# docker run $DOCKER_FLAGS $IMAGE ls -l /opt/cbm/data

.ci/online/test_run_gpu.sh

0 → 100755

+30 −0

Original line number	Diff line number	Diff line
		#! /bin/bash

		set -e

		IMAGE=hub.cbm.gsi.de/fweig/containers/cbm_online:online-container
		DOCKER_FLAGS=" \
		--rm \
		-it \
		--mount type=bind,source=$HOME/cbm/params,target=/opt/cbm/params \
		--mount type=bind,source=/home/cbmdata/mcbm22/2391,target=/opt/cbm/data \
		--device=/dev/kfd \
		--device=/dev/dri \
		--security-opt seccomp=unconfined \
		--group-add video
		"

		CMD="cbmreco"
		CMD_FLAGS=" \
		-p /opt/cbm/params \
		-i /opt/cbm/data/2391_node8_1_0000.tsa \
		-n 1 \
		--omp 1\
		-l info \
		-d hip1 \
		"
		# CMD=xpuinfo
		# CMD_FLAGS=

		docker run $DOCKER_FLAGS $IMAGE $CMD $CMD_FLAGS
		# docker run $DOCKER_FLAGS $IMAGE ls -l /opt/cbm/data

.clang-format

+17 −6

Original line number	Diff line number	Diff line
		---
		AccessModifierOffset: -2
		AccessModifierOffset: -1

		AlignAfterOpenBracket: Align
		AlignConsecutiveAssignments: true
		@@ -14,11 +14,11 @@ AllowAllArgumentsOnNextLine: false
		AllowAllConstructorInitializersOnNextLine: false
		AllowAllParametersOfDeclarationOnNextLine: false

		AllowShortBlocksOnASingleLine: Always
		AllowShortBlocksOnASingleLine: Never
		AllowShortCaseLabelsOnASingleLine: true
		AllowShortEnumsOnASingleLine: false
		AllowShortFunctionsOnASingleLine: All
		AllowShortIfStatementsOnASingleLine: Always
		AllowShortIfStatementsOnASingleLine: WithoutElse
		AllowShortLambdasOnASingleLine: All
		AllowShortLoopsOnASingleLine: false

		@@ -80,18 +80,26 @@ IncludeCategories:
		Priority: 1
		- Regex: '^("\|<).*/Cbm'
		Priority: 1
		- Regex: '".*"'
		Priority: 1
		- Regex: '^("\|<).*slice'
		Priority: 2
		- Regex: '^("\|<)Monitor.hpp'
		Priority: 2
		- Regex: '^("\|<)System.hpp'
		Priority: 2
		- Regex: '^("\|<)Fair'
		Priority: 3
		- Regex: '^("\|<)Logger.h'
		Priority: 3
		- Regex: '^("\|<)T'
		- Regex: '^("\|<)T.*\.h'
		Priority: 4
		- Regex: '^("\|<)Rt'
		- Regex: '^("\|<)Rt.*\.h'
		Priority: 4
		- Regex: '^("\|<)boost'
		Priority: 5
		- Regex: '^<.*[^\.]h>'
		Priority: 6
		- Regex: '^<.*[^\.h]>'
		Priority: 6
		- Regex: '^<.*>'
		@@ -126,7 +134,7 @@ SpaceAfterCStyleCast: true
		#SpaceAfterLogicalNot: true
		SpaceAfterTemplateKeyword: false
		SpaceBeforeAssignmentOperators: true
		SpaceBeforeCpp11BracedList: true
		SpaceBeforeCpp11BracedList: false
		SpaceBeforeCtorInitializerColon: true
		SpaceBeforeInheritanceColon: true
		SpaceBeforeParens: ControlStatements
		@@ -142,6 +150,9 @@ SpacesInContainerLiterals: false
		SpacesInParentheses: false
		SpacesInSquareBrackets: false

		WhitespaceSensitiveMacros: ['CBM_ENUM_DICT', 'CBM_YAML_PROPERTIES']
		StatementMacros: ['CBM_PARALLEL_FOR']

		Standard: c++11

		TabWidth: 8

.clang-tidy

0 → 100644

+9 −0

Original line number	Diff line number	Diff line
		Checks: '-*,modernize-deprecated-headers'
		WarningsAsErrors: ''
		HeaderFilterRegex: '.*'
		AnalyzeTemporaryDtors: false
		FormatStyle: file
		CheckOptions:
		- key: modernize-deprecated-headers.CheckHeaderFile
		value: 'true'
		...

.dockerignore

0 → 100644

+8 −0

Original line number	Diff line number	Diff line
		.git
		.vscode

		/geometry
		/input
		/parameters
		/build
		/algo/external

.gitignore

+23 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,29 @@
		/geometry
		/input
		/parameters
		/qa_data
		/build
		/algo/external

		# Comment some single files
		Dart*.cfg

		# gdb Crash dumps
		*/core_dump_

		# Git rebase backoup files
		*/.orig

		# IDEs
		.vscode
		.cache

		# Housekeeping
		*~
		.*
		!.gitignore
		!.gitlab-ci.yml
		!.dockerignore
		!.clang-format
		!.clang-tidy
		!.ci/

.gitlab-ci.yml

+436 −117

File changed.

Preview size limit exceeded, changes collapsed.

CMakeLists.txt

+256 −443

File changed.

Preview size limit exceeded, changes collapsed.

CODEOWNERS

+61 −41

Original line number	Diff line number	Diff line
		@@ -10,61 +10,72 @@
		/fles/ @f.uhlig @p.-a.loizeau
		/macro/ @f.uhlig @p.-a.loizeau

		/macro/C2F/ @i.selyuzhenkov
		/macro/analysis/ @i.selyuzhenkov
		/macro/KF/ @se.gorbunov @v.akishina
		/macro/C2F/ @a.andronic @k.piasecki
		/macro/analysis/ @a.andronic @k.piasecki
		/macro/KF/ @se.gorbunov

		# Core
		/core/ @f.uhlig @v.friese @p.-a.loizeau
		/core/qa/ @se.gorbunov
		/core/qa/ @se.gorbunov @s.zharko
		/core/data/test/ @f.uhlig
		/core/data/raw/ @p.-a.loizeau
		/core/base/utils/ @f.uhlig @s.lebedev
		/core/base/report/ @s.lebedev
		/core/base/draw/ @s.lebedev
		/core/base/utils/ @f.uhlig
		/core/base/report/ @f.uhlig
		/core/base/draw/ @f.uhlig

		# Algo
		/algo/ @d.smith @fweig

		# Simulation
		/sim/ @f.uhlig @v.friese @p.-a.loizeau
		/sim/transport/geosetup/ @e.lavrik
		#/sim/transport/geosetup/ @e.lavrik

		# Reco
		/reco/ @f.uhlig @v.friese @p.-a.loizeau
		/reco/littrack/ @s.lebedev @andrey.lebedev
		/reco/L1/ @se.gorbunov @v.akishina
		/reco/littrack/ @se.gorbunov
		/reco/L1/ @se.gorbunov @s.zharko
		/reco/eventbuilder/ @d.smith
		/reco/KF/ @se.gorbunov @v.akishina
		/reco/KF/ @se.gorbunov @s.zharko

		# Analysis
		/analysis/ @i.selyuzhenkov
		/analysis/ @a.andronic @k.piasecki
		/analysis/PWGC2F/femtoscopy/ @wielanek_AT_if.pw.edu.pl
		/analysis/common/ @i.selyuzhenkov
		/analysis/PWGHAD/ @i.selyuzhenkov
		/analysis/PWGCHA/ @i.selyuzhenkov
		/analysis/PWGDIL/ @i.selyuzhenkov
		/analysis/common/ @a.andronic @k.piasecki
		/analysis/PWGHAD/ @a.andronic @k.piasecki
		/analysis/PWGCHA/ @a.andronic @k.piasecki
		/analysis/PWGDIL/ @a.andronic @k.piasecki
		/analysis/PWGDIL/dielectron/pi0eta/ @c.pauly
		/analysis/PWGDIL/dielectron/papaframework/ @praisig @ebechtel_AT_ikf.uni-frankfurt.de
		/analysis/PWGDIL/dielectron/lmvm/ @i.selyuzhenkov
		/analysis/PWGDIL/dielectron/papaframework/ @a_meye37_AT_uni-muenster.de
		/analysis/PWGDIL/dielectron/lmvm/ @a.andronic @k.piasecki
		/analysis/PWGDIL/dielectron/conversion/ @c.pauly
		/analysis/PWGDIL/dimuon/ @i.selyuzhenkov
		/analysis/PWGDIL/dimuon/ @a.andronic @k.piasecki

		## Detectors

		# TRD
		/core/data/trd/ @praisig
		/core/data/test/trd/ @praisig
		/core/detectors/trd/ @praisig
		/macro/trd/ @praisig
		/sim/detectors/trd/ @praisig
		/reco/detectors/trd/ @praisig
		/core/data/trd/ @a.bercuci @p.kaehler
		/core/data/test/trd/ @a.bercuci @p.kaehler
		/core/detectors/trd/ @a.bercuci @p.kaehler
		/macro/trd/ @a.bercuci @p.kaehler
		/sim/detectors/trd/ @a.bercuci @p.kaehler
		/reco/detectors/trd/ @a.bercuci @p.kaehler
		/algo/detectors/trd/ @a.bercuci @p.kaehler

		# PSD
		/analysis/detectors/psd/ @karpushkin_AT_inr.ru
		/core/data/psd/ @karpushkin_AT_inr.ru
		/core/data/test/psd/ @karpushkin_AT_inr.ru
		/core/detectors/psd/ @karpushkin_AT_inr.ru
		/macro/psd/ @karpushkin_AT_inr.ru
		/sim/detectors/psd/ @karpushkin_AT_inr.ru
		/reco/detectors/psd/ @karpushkin_AT_inr.ru
		/analysis/detectors/psd/ @v.friese
		/core/data/psd/ @v.friese
		/core/data/test/psd/ @v.friese
		/core/detectors/psd/ @v.friese
		/macro/psd/ @v.friese
		/sim/detectors/psd/ @v.friese
		/reco/detectors/psd/ @v.friese

		# FSD
		/analysis/detectors/fsd/ @dvorar10_AT_fjfi.cvut.cz
		/core/data/fsd/ @dvorar10_AT_fjfi.cvut.cz
		/core/detectors/fsd/ @dvorar10_AT_fjfi.cvut.cz
		/sim/detectors/fsd/ @dvorar10_AT_fjfi.cvut.cz
		/reco/detectors/fsd/ @dvorar10_AT_fjfi.cvut.cz

		# MUCH
		/core/data/much/ @v.singhal
		@@ -73,6 +84,8 @@
		/macro/much/ @v.singhal
		/sim/detectors/much/ @v.singhal
		/reco/detectors/much/ @v.singhal
		/algo/detectors/much/ @v.singhal
		/macro/analysis/much/ @v.singhal

		# TOF
		/analysis/detectors/tof/ @n.herrmann @i.deppner
		@@ -85,14 +98,16 @@
		/reco/detectors/tof/ @n.herrmann @i.deppner
		/MQ/eTOF/ @n.herrmann @i.deppner
		/MQ/hitbuilder/ @n.herrmann @i.deppner
		/algo/detectors/tof/ @n.herrmann @i.deppner

		# RICH
		/core/data/rich/ @s.lebedev
		/core/data/test/rich/ @s.lebedev
		/core/detectors/rich/ @s.lebedev
		/macro/rich/ @s.lebedev
		/sim/detectors/rich/ @s.lebedev
		/reco/detectors/rich/ @s.lebedev
		/core/data/rich/ @ma.beyer
		/core/data/test/rich/ @ma.beyer
		/core/detectors/rich/ @ma.beyer
		/macro/rich/ @ma.beyer
		/sim/detectors/rich/ @ma.beyer
		/reco/detectors/rich/ @ma.beyer
		/algo/detectors/rich/ @ma.beyer

		# STS
		/analysis/detectors/sts/ @v.friese
		@@ -103,8 +118,13 @@
		/sim/detectors/sts/ @v.friese
		/reco/detectors/sts/ @v.friese
		/MQ/sts/ @v.friese
		/algo/detectors/sts/ @v.friese
		/algo/data/sts/ @v.friese

		# MVD
		/core/data/mvd/ @c.muentz @m.deveaux
		/macro/mvd/ @c.muentz @m.deveaux
		/mvd/ @c.muentz @m.deveaux
		/reco/detectors/mvd/ @c.muentz @m.deveaux @j.stroth
		/core/detectors/mvd/ @c.muentz @m.deveaux @j.stroth
		/core/data/mvd/ @c.muentz @m.deveaux @j.stroth
		/analysis/detectors/mvd/ @c.muentz @m.deveaux @j.stroth
		/macro/mvd/ @c.muentz @m.deveaux @j.stroth
		/sim/detectors/mvd/ @c.muentz @m.deveaux @j.stroth

CTestCustom.cmake

+20 −3

Original line number	Diff line number	Diff line
		@@ -3,8 +3,13 @@
		message(" -- Read CTestCustom.cmake --")

		# Maximum size of uploaded test output of failed tests is 100kB
		# or 10MB in case of weekly tests
		# Larger output is cutted
		if(${CBM_TEST_MODEL} MATCHES Weekly)
		set(CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE "10240000")
		else()
		set(CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE "102400")
		endif()

		# Maximum size of uploaded test output of passed tests is 1kB
		# Larger output is cutted
		@@ -43,6 +48,7 @@ set(CTEST_CUSTOM_WARNING_EXCEPTION
		# -- warnings from our external packages
		"external/flib_dpb"
		"external/ipc"
		"maybe_unused"
		"include/AnalysisTree"

		# -- remove intended fall through warnings
		@@ -53,6 +59,15 @@ set(CTEST_CUSTOM_WARNING_EXCEPTION
		"CbmDeviceUnpackTofMcbm2018.cxx.*warning: attributes at the beginning of statement are ignored"
		"CbmDeviceUnpackTofMcbm2018.cxx.*warning: this statement may fall through"
		"CbmDeviceUnpackTofMcbm2018.cxx.*note: here"
		"CbmMcbm2018TofPar.cxx.*warning: attributes at the beginning of statement are ignored"
		"CbmMcbm2018TofPar.cxx.*warning: this statement may fall through"
		"CbmMcbm2018TofPar.cxx.*note: here"

		# -- warnings from a feature we want and which is okay
		"CbmCheckEvents.cxx:86:52"

		# -- warnings about to long function for debugging
		"variable tracking size limit exceeded"

		# -- warnings from structures for HADAQ memory casting
		"struct hadaq::HadTu"
		@@ -63,8 +78,10 @@ set(CTEST_CUSTOM_WARNING_EXCEPTION
		# -- warnings from structures for MBS/LMD memory casting
		"struct mbs::Header"

		# -- warnings from my test machine demac006
		"warning: text-based stub file"
		# -- warnings from macosx test machines
		"ld: warning: dylib.was built for newer macOS version.than being linked"
		".\\^."
		"warning.*generated."

		# -- don't show pragma message warnings
		"Compiling CBM Configuration"

CbmRoot_test.cmake

+149 −115

Original line number	Diff line number	Diff line
		# Check if cmake has the required version
		# Since flesnet requires 3.14.0 we should be consistent while we
		# build it in the CbmRoot context
		cmake_minimum_required(VERSION 3.14.0 FATAL_ERROR)
		cmake_policy(VERSION 3.14...3.23)

		Set(CTEST_SOURCE_DIRECTORY $ENV{SOURCEDIR})
		Set(CTEST_BINARY_DIRECTORY $ENV{BUILDDIR})
		Set(CTEST_SITE $ENV{SITE})
		@@ -5,6 +11,11 @@ Set(CTEST_BUILD_NAME $ENV{LABEL})
		Set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
		Set(CTEST_PROJECT_NAME "CBMROOT")
		Set(EXTRA_FLAGS $ENV{EXTRA_FLAGS})
		Set(INSTALL_PROJECT $ENV{INSTALL_PROJECT})

		if(NOT CBM_TEST_MODEL)
		set(CBM_TEST_MODEL NIGHTLY)
		endif()

		include(${CTEST_SOURCE_DIRECTORY}/CTestConfig.cmake)
		Ctest_Read_Custom_Files("${CTEST_SOURCE_DIRECTORY}")
		@@ -17,31 +28,37 @@ Set(CTEST_BUILD_COMMAND "${BUILD_COMMAND} -i -k -j$ENV{number_of_processors}")
		# Extract the FairRoot version from fairroot-config
		# The version info is of the form Major.Minor.Patch e.g. 15.11.1 and
		# is stored in the variable FairRoot_VERSION
		Set(CMAKE_MODULE_PATH "${CTEST_SOURCE_DIRECTORY}/cmake/modules" ${CMAKE_MODULE_PATH})
		Include(CbmMacros)
		FairRootVersion()
		#Set(CMAKE_MODULE_PATH "${CTEST_SOURCE_DIRECTORY}/cmake/modules" ${CMAKE_MODULE_PATH})
		#set(FAIRROOTPATH $ENV{FAIRROOTPATH})
		#Include(CbmMacros)
		#FairRootVersion()

		message("Compiling with $ENV{number_of_processors} jobs in parallel.")
		message("Testing with $ENV{number_of_processors_for_test} jobs in parallel.")

		If(${FairRoot_VERSION} VERSION_LESS 16.0.0)
		Set(CTEST_USE_LAUNCHERS 0)
		Else()
		Set(CTEST_USE_LAUNCHERS 1)
		EndIf()

		If($ENV{ctest_model} MATCHES Weekly)
		Set(_Model PROFILE)
		ElseIf($ENV{ctest_model} MATCHES MergeRequest)
		Set(_Model CONTINUOUS)
		If(${CBM_TEST_MODEL} MATCHES MergeRequest OR ${CBM_TEST_MODEL} MATCHES Continuous)
		Set(_BuildType NIGHTLY)
		Set(_CMakeModel Continuous)
		elseIf(${CBM_TEST_MODEL} MATCHES Weekly OR ${CBM_TEST_MODEL} MATCHES Profile)
		Set(_BuildType PROFILE)
		Set(_CMakeModel Nightly)
		Else()
		String(TOUPPER $ENV{ctest_model} _Model)
		String(TOUPPER ${CBM_TEST_MODEL} _BuildType)
		set(_CMakeModel ${CBM_TEST_MODEL})
		EndIf()

		If(EXTRA_FLAGS)
		Set(CTEST_CONFIGURE_COMMAND " \"${CMAKE_EXECUTABLE_NAME}\" \"-G${CTEST_CMAKE_GENERATOR}\" \"-DCMAKE_BUILD_TYPE=${_Model}\" \"-DCTEST_USE_LAUNCHERS=${CTEST_USE_LAUNCHERS}\" \"${EXTRA_FLAGS}\" \"${CTEST_SOURCE_DIRECTORY}\" ")
		If(EXTRA_FLAGS AND INSTALL_PROJECT)
		Set(CTEST_CONFIGURE_COMMAND " \"${CMAKE_EXECUTABLE_NAME}\" \"-G${CTEST_CMAKE_GENERATOR}\" \"-DCBM_TEST_MODEL=${CBM_TEST_MODEL}\" \"-DCMAKE_BUILD_TYPE=${_BuildType}\" \"-DCTEST_USE_LAUNCHERS=${CTEST_USE_LAUNCHERS}\" \"${EXTRA_FLAGS}\" \"-DCMAKE_INSTALL_PREFIX=${CTEST_SOURCE_DIRECTORY}/install\" \"${CTEST_SOURCE_DIRECTORY}\" ")
		ElseIf(EXTRA_FLAGS)
		Set(CTEST_CONFIGURE_COMMAND " \"${CMAKE_EXECUTABLE_NAME}\" \"-G${CTEST_CMAKE_GENERATOR}\" \"-DCBM_TEST_MODEL=${CBM_TEST_MODEL}\" \"-DCMAKE_BUILD_TYPE=${_BuildType}\" \"-DCTEST_USE_LAUNCHERS=${CTEST_USE_LAUNCHERS}\" \"${EXTRA_FLAGS}\" \"${CTEST_SOURCE_DIRECTORY}\" ")
		Else()
		Set(CTEST_CONFIGURE_COMMAND " \"${CMAKE_EXECUTABLE_NAME}\" \"-G${CTEST_CMAKE_GENERATOR}\" \"-DCMAKE_BUILD_TYPE=${_Model}\" \"-DCTEST_USE_LAUNCHERS=${CTEST_USE_LAUNCHERS}\" \"${CTEST_SOURCE_DIRECTORY}\" ")
		Set(CTEST_CONFIGURE_COMMAND " \"${CMAKE_EXECUTABLE_NAME}\" \"-G${CTEST_CMAKE_GENERATOR}\" \"-DCBM_TEST_MODEL=${CBM_TEST_MODEL}\" \"-DCMAKE_BUILD_TYPE=${_BuildType}\" \"-DCTEST_USE_LAUNCHERS=${CTEST_USE_LAUNCHERS}\" \"${CTEST_SOURCE_DIRECTORY}\" ")
		EndIf()

		If($ENV{ctest_model} MATCHES Nightly OR $ENV{ctest_model} MATCHES Weekly OR $ENV{ctest_model} MATCHES Profile)
		#If(${CBM_TEST_MODEL} MATCHES Nightly OR ${CBM_TEST_MODEL} MATCHES Weekly OR ${CBM_TEST_MODEL} MATCHES Profile)
		If(NOT ${_BuildType} MATCHES EXPERIMENTAL)

		Find_Program(GCOV_COMMAND gcov)
		If(GCOV_COMMAND)
		@@ -49,112 +66,137 @@ If($ENV{ctest_model} MATCHES Nightly OR $ENV{ctest_model} MATCHES Weekly OR $ENV
		Set(CTEST_COVERAGE_COMMAND ${GCOV_COMMAND})
		EndIf(GCOV_COMMAND)

		If(NOT $ENV{ctest_model} MATCHES Weekly)
		Set(ENV{ctest_model} Nightly)
		EndIf()

		# get the information about conflicting or localy modified files
		# from svn, extract the relavant information about the file name
		# and put the result in the output variable
		If(EXISTS ${CTEST_SOURCE_DIRECTORY}/.svn)
		Execute_Process(COMMAND svn stat -u
		COMMAND grep ^[CM]
		COMMAND cut -c21-
		OUTPUT_VARIABLE FILELIST
		)

		# create out of the output a cmake list. This step is done to convert the
		# stream into seperated filenames.
		# The trick is to exchange an "\n" by an ";" which is the separartor in
		# a list created by cmake
		String(REGEX REPLACE "\n" ";" _result "${FILELIST}")

		ForEach(_file ${_result})
		String(STRIP "${_file}" _file1)
		Set(CTEST_NOTES_FILES ${CTEST_NOTES_FILES} "${CTEST_SOURCE_DIRECTORY}/${_file1}")
		EndForEach(_file ${_result})
		EndIf()

		CTEST_EMPTY_BINARY_DIRECTORY(${CTEST_BINARY_DIRECTORY})

		EndIf()

		If($ENV{ctest_model} MATCHES MergeRequest)
		set(ENV{ctest_model} Continuous)
		EndIf()

		Ctest_Start($ENV{ctest_model})
		Ctest_Start(${_CMakeModel})

		unset(repeat)
		If($ENV{ctest_model} MATCHES Continuous)
		if(${_CMakeModel} MATCHES Continuous)
		if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.17)
		set(repeat REPEAT UNTIL_PASS:2)
		endif()
		set(ENV{ctest_model} Nightly)
		EndIf()

		# The stop time should be a date compatible string without day nor timezone
		# Examples:
		# => CTEST_END_TIME_LIMIT=`date -d "${END_TIME}CET -5minutes" +"%H:%M:%S"`
		# => CTEST_END_TIME_LIMIT=`date -d "now +25minutes" +"%H:%M:%S"`
		unset(stop_time)
		If(DEFINED ENV{CTEST_END_TIME_LIMIT})
		set(stop_time STOP_TIME "$ENV{CTEST_END_TIME_LIMIT}")
		message(STATUS " End time for the ctest test runs set to ${stop_time}")
		EndIf()

		If(NOT $ENV{ctest_model} MATCHES Experimental)
		If(NOT ${_BuildType} MATCHES EXPERIMENTAL)
		Ctest_Update(SOURCE "${CTEST_SOURCE_DIRECTORY}")
		EndIf()

		Ctest_Configure(BUILD "${CTEST_BINARY_DIRECTORY}"
		RETURN_VALUE _RETVAL
		)

		If(NOT _RETVAL)
		Ctest_Build(BUILD "${CTEST_BINARY_DIRECTORY}")
		If($ENV{ctest_model} MATCHES Continuous)
		If(${CMAKE_VERSION} VERSION_LESS 3.14.0)
		CTest_Submit(PARTS Update Configure Build)
		Else()
		Ctest_Build(BUILD "${CTEST_BINARY_DIRECTORY}"
		NUMBER_ERRORS _NUM_ERROR
		)

		If(${_CMakeModel} MATCHES Continuous)
		CTest_Submit(PARTS Update Configure Build
		BUILD_ID cdash_build_id
		)
		if(${_NUM_ERROR} GREATER 0)
		message(STATUS " ")
		message(STATUS " You can find the produced results on the CDash server")
		message(STATUS " ")
		message(STATUS " CDash Build Summary ..: "
		"${CTEST_DROP_METHOD}://${CTEST_DROP_SITE}/buildSummary.php?buildid=${cdash_build_id}"
		)
		message(STATUS " CDash Test List ......: "
		"${CTEST_DROP_METHOD}://${CTEST_DROP_SITE}/viewTest.php?buildid=${cdash_build_id}"
		)
		message(STATUS " ")
		Message(STATUS "Build finished with ${_NUM_ERROR} errors")
		message(FATAL_ERROR "Compilation failure")
		endif()
		EndIf()

		If(DEFINED ENV{CI_TEST_STAGE_TOTAL_TIME_LIMIT})
		# Compute test stage timeout based on current time + limit from environment variable
		If(DEFINED ENV{CTEST_END_TIME_LIMIT})
		# If also full DASH run timeout defined, also compare the two and keep the earliest one
		execute_process (
		COMMAND scripts/find_citests_ctest_stop_time.sh $ENV{CTEST_END_TIME_LIMIT}
		OUTPUT_VARIABLE CI_TESTS_TOTAL_END_TIME_DATE
		)
		Else()
		# Else just get the CI jpb timeout
		execute_process (
		COMMAND scripts/find_citests_ctest_stop_time.sh
		OUTPUT_VARIABLE CI_TESTS_TOTAL_END_TIME_DATE
		)
		EndIf()
		set(stop_time STOP_TIME "${CI_TESTS_TOTAL_END_TIME_DATE}")
		message(STATUS "Due to CI mode, Set end time for the ctest test runs to ${stop_time}")
		EndIf()

		Ctest_Test(BUILD "${CTEST_BINARY_DIRECTORY}"
		PARALLEL_LEVEL $ENV{number_of_processors}
		PARALLEL_LEVEL $ENV{number_of_processors_for_test}
		${repeat}
		${stop_time}
		RETURN_VALUE _ctest_test_ret_val
		)

		If($ENV{ctest_model} MATCHES Continuous)
		If(${CMAKE_VERSION} VERSION_LESS 3.14.0)
		CTest_Submit(PARTS Test)
		Else()
		If(${_CMakeModel} MATCHES Continuous)
		CTest_Submit(PARTS Test
		BUILD_ID cdash_build_id
		)
		EndIf()
		EndIf()

		If(GCOV_COMMAND)
		Ctest_Coverage(BUILD "${CTEST_BINARY_DIRECTORY}")
		If($ENV{ctest_model} MATCHES Continuous)
		If(${CMAKE_VERSION} VERSION_LESS 3.14.0)
		CTest_Submit(PARTS Coverage)
		Else()
		If(${_CMakeModel} MATCHES Continuous)
		CTest_Submit(PARTS Coverage
		BUILD_ID cdash_build_id
		)
		EndIf()
		EndIf()
		EndIf()

		Ctest_Upload(FILES ${CTEST_NOTES_FILES})
		If(NOT $ENV{ctest_model} MATCHES Continuous)
		If(${CMAKE_VERSION} VERSION_LESS 3.14.0)
		Ctest_Submit()
		Else()
		If(NOT ${_CMakeModel} MATCHES Continuous)
		Ctest_Submit(BUILD_ID cdash_build_id)
		EndIf()

		If(EXTRA_FLAGS MATCHES "CBM_TEST_INSTALL" AND NOT _ctest_test_ret_val)
		# If(EXTRA_FLAGS MATCHES "INSTALL_PREFIX" AND EXTRA_FLAGS MATCHES "CBM_TEST_INSTALL" AND NOT _ctest_test_ret_val)
		Message("Testing Installation")
		execute_process(COMMAND ${BUILD_COMMAND} install -j$ENV{number_of_processors} WORKING_DIRECTORY ${CTEST_BINARY_DIRECTORY}
		RESULTS_VARIABLE _install_ret_value
		)
		if (NOT _install_ret_value)
		message("executing test suite in ${CTEST_BINARY_DIRECTORY}/install with source folder available")
		execute_process(COMMAND ${CTEST_SOURCE_DIRECTORY}/cmake/scripts/execute_installation_test.sh ${CTEST_SOURCE_DIRECTORY}/install
		RESULTS_VARIABLE _install_ret_value
		)
		execute_process(COMMAND ${CMAKE_EXECUTABLE_NAME} -E rm -R build MQ algo analysis core external fles reco sim
		WORKING_DIRECTORY ${CTEST_SOURCE_DIRECTORY}
		)
		message("executing test suite in ${CTEST_BINARY_DIRECTORY}/install wihout source folder available")
		execute_process(COMMAND ${CTEST_SOURCE_DIRECTORY}/cmake/scripts/execute_installation_test.sh ${CTEST_SOURCE_DIRECTORY}/install
		RESULTS_VARIABLE _install_ret_value
		)
		endif()
		Else()
		# if installation isn't tested the return value should be 0
		set(_install_ret_value false)
		EndIf()

		Message("_ctest_test_ret_val: ${_ctest_test_ret_val}")
		Message("_install_ret_value: ${_install_ret_value}")

		# Pipeline should fail also in case of failed tests
		if (_ctest_test_ret_val)
		If(${CMAKE_VERSION} VERSION_LESS 3.14.0)
		Else()
		if (_ctest_test_ret_val OR _install_ret_value)
		message(STATUS " ")
		message(STATUS " You can find the produced results on the CDash server")
		message(STATUS " ")
		@@ -165,20 +207,13 @@ If(NOT _RETVAL)
		"${CTEST_DROP_METHOD}://${CTEST_DROP_SITE}/viewTest.php?buildid=${cdash_build_id}"
		)
		message(STATUS " ")
		EndIf()
		Message(FATAL_ERROR "Some tests failed.")
		endif()

		Else()
		If(${CMAKE_VERSION} VERSION_LESS "3.14.0")
		Ctest_Submit()
		Else()
		CTest_Submit(BUILD_ID cdash_build_id)
		EndIf()
		EndIf()

		If(${CMAKE_VERSION} VERSION_LESS 3.14.0)
		Else()
		message(STATUS " ")
		message(STATUS " You can find the produced results on the CDash server")
		message(STATUS " ")
		@@ -189,4 +224,3 @@ Else()
		"${CTEST_DROP_METHOD}://${CTEST_DROP_SITE}/viewTest.php?buildid=${cdash_build_id}"
		)
		message(STATUS " ")
		EndIf()

Dart.sh

+16 −3

Original line number	Diff line number	Diff line
		#!/bin/bash
		# Copyright (C) 2007 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
		# SPDX-License-Identifier: GPL-3.0-only
		# First commited by Florian Uhlig


		function print_example(){
		echo "##################################################################"
		@@ -61,7 +65,8 @@ else
		fi

		# set the ctest model to command line parameter
		export ctest_model=$1
		#export ctest_model=$1
		ctest_model=$1

		# test for architecture
		arch=$(uname -s \| tr '[A-Z]' '[a-z]')
		@@ -114,14 +119,22 @@ then
		fi
		fi

		if [ -z $NCPU4TEST ]; then
		export number_of_processors_for_test=$number_of_processors
		else
		export number_of_processors_for_test=$NCPU4TEST
		fi

		echo "************************"
		date
		echo "LABEL: " $LABEL
		echo "SITE: " $SITE
		echo "Model: " ${ctest_model}
		echo "Nr. of processes: " $number_of_processors
		echo "Nr. of processes for build: " $number_of_processors
		echo "Nr. of processes for test: " $number_of_processors_for_test
		echo "************************"

		cd $SOURCEDIR

		ctest -S $SOURCEDIR/CbmRoot_test.cmake -V --VV
		ctest -S $SOURCEDIR/CbmRoot_test.cmake -V -DCBM_TEST_MODEL=${ctest_model}
		#ctest -S $SOURCEDIR/CbmRoot_test.cmake -V --VV

LICENSE

0 → 100644

+674 −0

File added.

Preview size limit exceeded, changes collapsed.

MQ/CMakeLists.txt

+19 −14

Original line number	Diff line number	Diff line
		If(FairSoft_VERSION VERSION_LESS 18.6.0)
		Add_Definitions(-DHAVE_FAIRMQSTATEMACHINE)
		EndIf()
		Set(FAIRMQ_LIBS FairMQStateMachine FairMQ)

		# RPATH information should be present for executables in the build as well
		# as in the installation directory

		# use, i.e. don't skip the full RPATH for the build tree
		set(CMAKE_SKIP_BUILD_RPATH FALSE)

		# when building, don't use the install RPATH already
		# (but later on when installing)
		set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)

		set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")

		# add the automatically determined parts of the RPATH
		# which point to directories outside the build tree to the install RPATH
		set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)


		if(FairMQ_HAS_StateMachine)
		Set(FAIRMQ_LIBS FairMQStateMachine FairMQ)
		else()
		Set(FAIRMQ_LIBS FairMQ)
		EndIf()

		add_subdirectory(base)
		add_subdirectory(source)
		@@ -22,9 +31,5 @@ add_subdirectory(mcbm)
		#add_subdirectory(sts)
		#add_subdirectory(test)

		# The following subdirectories contain files which do not compile with
		# FairRoot v18
		# Don't compile it for the time being
		# TODO: Fix the compilation problems
		add_subdirectory(parmq)
		add_subdirectory(hitbuilder)

MQ/base/CMakeLists.txt

+12 −34

Original line number	Diff line number	Diff line
		set(INCLUDE_DIRECTORIES
		${CMAKE_CURRENT_SOURCE_DIR}
		${CMAKE_SOURCE_DIR}/MQ/base
		)

		Set(SYSTEM_INCLUDE_DIRECTORIES
		${SYSTEM_INCLUDE_DIRECTORIES}
		${FAIRMQ_INCLUDE_DIR}
		)

		include_directories(${INCLUDE_DIRECTORIES})
		include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})

		set(LINK_DIRECTORIES
		${FAIRMQ_LIBRARY_DIR}
		)

		link_directories(${LINK_DIRECTORIES})

		set(FAIR_LIBS
		FairMQ
		)

		If(FAIRLOGGER_FOUND)
		set(FAIR_LIBS
		${FAIR_LIBS}
		FairLogger
		)
		EndIf()

		set(SRCS
		CbmMQChannels.cxx
		)

		Set(LIBRARY_NAME CbmMQBase)
		Set(DEPENDENCIES
		${FAIR_LIBS}
		set(LIBRARY_NAME CbmMQBase)
		set(PUBLIC_DEPENDENCIES
		FairMQ::FairMQ
		)

		set(INTERFACE_DEPENDENCIES
		ROOT::Net
		)

		GENERATE_LIBRARY()
		generate_cbm_library()

MQ/base/CbmMQChannels.cxx

+17 −14

Original line number	Diff line number	Diff line
		/* Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
		SPDX-License-Identifier: GPL-3.0-only
		Authors: Florian Uhlig [committer] */

		#include "CbmMQChannels.h"

		#include "FairMQDevice.h"

		CbmMQChannels::CbmMQChannels(std::vector<std::string> allowedChannels)
		: fAllowedChannels {allowedChannels} {
		CbmMQChannels::CbmMQChannels(std::vector<std::string> allowedChannels) : fAllowedChannels {allowedChannels}
		{
		fChannelsToSend.resize(fAllowedChannels.size());
		for (auto& entry : fChannelsToSend) {
		entry.push_back("");
		@@ -10,32 +15,29 @@ CbmMQChannels::CbmMQChannels(std::vector<std::string> allowedChannels)
		fComponentsToSend.resize(fAllowedChannels.size());
		}

		bool CbmMQChannels::IsChannelNameAllowed(std::string channelName) {
		bool CbmMQChannels::IsChannelNameAllowed(std::string channelName)
		{
		for (auto const& entry : fAllowedChannels) {
		std::size_t pos1 = channelName.find(entry);
		if (pos1 != std::string::npos) {
		const std::vector<std::string>::const_iterator pos =
		std::find(fAllowedChannels.begin(), fAllowedChannels.end(), entry);
		const std::vector<std::string>::size_type idx =
		pos - fAllowedChannels.begin();
		const std::vector<std::string>::size_type idx = pos - fAllowedChannels.begin();
		LOG(info) << "Found " << entry << " in " << channelName;
		LOG(info) << "Channel name " << channelName
		<< " found in list of allowed channel names at position "
		<< idx;
		LOG(info) << "Channel name " << channelName << " found in list of allowed channel names at position " << idx;
		fComponentsToSend[idx]++;
		// The array is initialized with one empty string. If the string has still teh value from initialization
		// exchnge the value by the new channel name. In any other case add one more entry to the vector
		if (fChannelsToSend[idx].size() == 1
		&& fChannelsToSend[idx].at(0).empty()) {
		if (fChannelsToSend[idx].size() == 1 && fChannelsToSend[idx].at(0).empty()) {
		fChannelsToSend[idx].at(0) = channelName;
		} else {
		}
		else {
		fChannelsToSend[idx].push_back(channelName);
		}
		return true;
		}
		}
		LOG(info) << "Channel name " << channelName
		<< " not found in list of allowed channel names.";
		LOG(info) << "Channel name " << channelName << " not found in list of allowed channel names.";
		LOG(info) << "The allowed channels are: ";
		for (auto const& entry : fAllowedChannels) {
		LOG(info) << entry;
		@@ -44,7 +46,8 @@ bool CbmMQChannels::IsChannelNameAllowed(std::string channelName) {
		return false;
		}

		bool CbmMQChannels::CheckChannels(FairMQDevice* device) {
		bool CbmMQChannels::CheckChannels(FairMQDevice* device)
		{
		// Get the information about created channels from the device
		// Check if the defined channels from the topology (by name)
		// are in the list of channels which are possible/allowed

MQ/base/CbmMQChannels.h

+7 −4

Original line number	Diff line number	Diff line
		/* Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
		SPDX-License-Identifier: GPL-3.0-only
		Authors: Florian Uhlig [committer] */

		#ifndef CBMMQCHANNELS_H_
		#define CBMMQCHANNELS_H_

		#include "FairMQDevice.h"

		#include <string>
		#include <vector>

		class FairMQDevice;

		class CbmMQChannels {
		public:
		@@ -14,9 +19,7 @@ public:
		bool CheckChannels(FairMQDevice* device);

		std::vector<int> GetComponentsToSend() { return fComponentsToSend; }
		std::vector<std::vector<std::string>> GetChannelsToSend() {
		return fChannelsToSend;
		}
		std::vector<std::vector<std::string>> GetChannelsToSend() { return fChannelsToSend; }

		private:
		std::vector<std::string> fAllowedChannels {};

MQ/base/CbmMQDefs.h

+32 −52

Original line number	Diff line number	Diff line
		//#ifdef HAVE_FAIRMQSTATEMACHINE
		//#include "FairMQStateMachine.h"
		//#endif
		/* Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
		SPDX-License-Identifier: GPL-3.0-only
		Authors: Florian Uhlig [committer] */

		#include "FairMQDevice.h"

		namespace cbm {
		namespace mq {
		enum class Transition : int {
		namespace cbm
		{
		namespace mq
		{
		enum class Transition : int
		{
		Idle,
		DeviceReady,
		Ready,
		@@ -14,69 +18,45 @@ namespace cbm {
		ErrorFound
		};

		enum class State : int { Running };
		enum class State : int
		{
		Running
		};

		void ChangeState(FairMQDevice* device, cbm::mq::Transition transition) {
		#ifdef HAVE_FAIRMQSTATEMACHINE
		if (transition == cbm::mq::Transition::ErrorFound) {
		device->ChangeState(FairMQStateMachine::Event::ERROR_FOUND);
		} else if (transition == cbm::mq::Transition::End) {
		device->ChangeState(FairMQStateMachine::Event::END);
		} else if (transition == cbm::mq::Transition::Ready) {
		device->ChangeState(FairMQStateMachine::Event::internal_READY);
		} else if (transition == cbm::mq::Transition::DeviceReady) {
		device->ChangeState(FairMQStateMachine::Event::internal_DEVICE_READY);
		} else if (transition == cbm::mq::Transition::Idle) {
		device->ChangeState(FairMQStateMachine::Event::internal_IDLE);
		} else {
		LOG(fatal) << "State Change not yet implemented";
		device->ChangeState(FairMQStateMachine::Event::ERROR_FOUND);
		}
		#else
		if (transition == cbm::mq::Transition::ErrorFound) {
		device->ChangeState(fair::mq::Transition::ErrorFound);
		} else if (transition == cbm::mq::Transition::End) {
		void ChangeState(FairMQDevice* device, cbm::mq::Transition transition)
		{
		if (transition == cbm::mq::Transition::ErrorFound) { device->ChangeState(fair::mq::Transition::ErrorFound); }
		else if (transition == cbm::mq::Transition::End) {
		device->ChangeState(fair::mq::Transition::End);
		} else if (transition == cbm::mq::Transition::Ready) {
		}
		else if (transition == cbm::mq::Transition::Ready) {
		device->ChangeState(fair::mq::Transition::ResetTask);
		} else if (transition == cbm::mq::Transition::DeviceReady) {
		}
		else if (transition == cbm::mq::Transition::DeviceReady) {
		device->ChangeState(fair::mq::Transition::ResetDevice);
		} else if (transition == cbm::mq::Transition::Idle) {
		}
		else if (transition == cbm::mq::Transition::Idle) {
		device->ChangeState(fair::mq::Transition::Stop);
		} else {
		}
		else {
		LOG(fatal) << "State Change not yet implemented";
		device->ChangeState(fair::mq::Transition::ErrorFound);
		}
		#endif
		}

		void LogState(FairMQDevice* device) {
		#ifdef HAVE_FAIRMQSTATEMACHINE
		// LOG(info) << "Current State: " << FairMQStateMachine::GetCurrentStateName();
		LOG(info) << "Current State: " << device->GetCurrentStateName();
		#else
		void LogState(FairMQDevice* device)
		{
		LOG(info) << "Current State: " << device->GetCurrentStateName();
		#endif
		}

		bool CheckCurrentState(FairMQDevice* device, cbm::mq::State state) {
		#ifdef HAVE_FAIRMQSTATEMACHINE
		if (state == cbm::mq::State::Running) {
		return device->CheckCurrentState(FairMQStateMachine::State::RUNNING);
		} else {
		LOG(fatal) << "State not yet implemented";
		device->ChangeState(FairMQStateMachine::Event::ERROR_FOUND);
		return 0;
		}
		#else
		if (state == cbm::mq::State::Running) {
		return !(device->NewStatePending());
		} else {
		bool CheckCurrentState(FairMQDevice* device, cbm::mq::State state)
		{
		if (state == cbm::mq::State::Running) { return !(device->NewStatePending()); }
		else {
		LOG(fatal) << "State not yet implemented";
		device->ChangeState(fair::mq::Transition::ErrorFound);
		return 0;
		}
		#endif
		}
		} // namespace mq
		} // namespace cbm

MQ/base/CbmMqTMessage.h

0 → 100644

+16 −0

Original line number	Diff line number	Diff line
		/* Copyright (C) 2021 Facility for Antiproton and Ion Research in Europe, Darmstadt
		SPDX-License-Identifier: GPL-3.0-only
		Authors: Pierre-Alain Loizeau [committer] */

		#ifndef CBMMQTMESSAGE_H_
		#define CBMMQTMESSAGE_H_

		#include "TMessage.h"

		// special class to expose protected TMessage constructor
		class CbmMqTMessage : public TMessage {
		public:
		CbmMqTMessage(void* buf, Int_t len) : TMessage(buf, len) { ResetBit(kIsOwner); }
		};

		#endif /* CBMMQTMESSAGE_H_ */

MQ/eTOF/CMakeLists.txt

+12 −9

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ Set(SYSTEM_INCLUDE_DIRECTORIES
		${FAIRMQ_INCLUDE_DIR}
		${FAIRMQ_INCLUDE_DIR}/options

		${IPC_INCLUDE_DIRECTORY}
		${FLES_IPC_INCLUDE_DIRECTORY}
		${CBMROOT_SOURCE_DIR}/external/cppzmq
		)

		@@ -66,13 +66,18 @@ If(FAIRLOGGER_FOUND)
		)
		EndIf()

		set(EXE_NAME EventBuilderEtofStar2019)
		set(SRCS CbmDeviceEventBuilderEtofStar2019.cxx runEventBuilderEtofStar2019.cxx)
		set(DEPENDENCIES
		# Dependencies common to all executables
		set(DEPENDENCIES_ALL
		${DEPENDENCIES}
		${FAIR_LIBS}
		${BOOST_LIBS}
		fles_ipc
		)

		set(EXE_NAME EventBuilderEtofStar2019)
		set(SRCS CbmDeviceEventBuilderEtofStar2019.cxx runEventBuilderEtofStar2019.cxx)
		set(DEPENDENCIES
		${DEPENDENCIES_ALL}
		external::fles_ipc
		CbmFlibStar2019
		CbmFlibMcbm2018
		CbmBase
		@@ -94,10 +99,8 @@ Set(NO_DICT_SRCS
		# Mask warning from file provided by STAR
		SET_SOURCE_FILES_PROPERTIES(${CBMROOT_SOURCE_DIR}/fles/star2017/unpacker/star_rhicf.c PROPERTIES COMPILE_FLAGS -Wno-pointer-sign)
		set(DEPENDENCIES
		${DEPENDENCIES}
		${FAIR_LIBS}
		${BOOST_LIBS}
		fles_ipc
		${DEPENDENCIES_ALL}
		external::fles_ipc
		CbmFlibStar2019
		CbmFlibMcbm2018
		CbmBase

MQ/eTOF/CbmDeviceEventBuilderEtofStar2019.cxx

+78 −114

File changed.

Preview size limit exceeded, changes collapsed.

MQ/eTOF/CbmDeviceEventBuilderEtofStar2019.h

+16 −28

Original line number	Diff line number	Diff line
		/* Copyright (C) 2019 PI-UHd, GSI
		SPDX-License-Identifier: GPL-3.0-only
		Authors: Norbert Herrmann [committer] */

		/**
		* CbmDeviceEventBuilderEtofStar2019.h
		*
		@@ -6,11 +10,13 @@
		#ifndef CBMDEVICEEVENTBUILDERETOFSTAR2019_H_
		#define CBMDEVICEEVENTBUILDERETOFSTAR2019_H_

		#include "FairMQDevice.h"
		#include "CbmMqTMessage.h"

		#include "TMessage.h"
		#include "Timeslice.hpp"

		#include "FairMQDevice.h"

		#include "TMessage.h"
		#include "TStopwatch.h"

		class CbmStar2019EventBuilderEtofAlgo;
		@@ -31,19 +37,15 @@ public:

		Bool_t ReInitContainers();

		void SetSandboxMode(Bool_t bSandboxMode = kTRUE) {
		fbSandboxMode = bSandboxMode;
		}
		void SetSandboxMode(Bool_t bSandboxMode = kTRUE) { fbSandboxMode = bSandboxMode; }
		void SetEventDumpEnable(Bool_t bDumpEna = kTRUE);

		/// Temp until we change from CbmMcbmUnpack to something else
		void AddMsComponentToList(size_t component, UShort_t usDetectorId);
		void SetNbMsInTs(size_t /uCoreMsNb/, size_t /uOverlapMsNb/) {};

		CbmDeviceEventBuilderEtofStar2019(const CbmDeviceEventBuilderEtofStar2019&) =
		delete;
		CbmDeviceEventBuilderEtofStar2019
		operator=(const CbmDeviceEventBuilderEtofStar2019&) = delete;
		CbmDeviceEventBuilderEtofStar2019(const CbmDeviceEventBuilderEtofStar2019&) = delete;
		CbmDeviceEventBuilderEtofStar2019 operator=(const CbmDeviceEventBuilderEtofStar2019&) = delete;

		protected:
		virtual void InitTask();
		@@ -56,13 +58,10 @@ protected:
		private:
		uint64_t fNumMessages;
		/// Control flags
		Bool_t
		fbMonitorMode; //! Switch ON the filling of a minimal set of histograms
		Bool_t
		fbDebugMonitorMode; //! Switch ON the filling of a additional set of histograms
		Bool_t fbMonitorMode; //! Switch ON the filling of a minimal set of histograms
		Bool_t fbDebugMonitorMode; //! Switch ON the filling of a additional set of histograms
		Bool_t fbSandboxMode; //! Switch OFF the emission of data toward the STAR DAQ
		Bool_t
		fbEventDumpEna; //! Switch ON the dumping of the events to a binary file
		Bool_t fbEventDumpEna; //! Switch ON the dumping of the events to a binary file

		/// Parameters management
		TList* fParCList;
		@@ -74,10 +73,7 @@ private:
		bool CheckTimeslice(const fles::Timeslice& ts);
		bool IsChannelNameAllowed(std::string channelName);

		std::vector<std::string> fAllowedChannels = {"tofcomponent",
		"parameters",
		"etofevts",
		"syscmd"};
		std::vector<std::string> fAllowedChannels = {"tofcomponent", "parameters", "etofevts", "syscmd"};
		std::vector<std::vector<std::string>> fChannelsToSend = {{}, {}, {}};

		/// Processing algo
		@@ -92,12 +88,4 @@ private:
		const UInt_t kuBinDumpEndWord = 0xFAEBDEEF;
		};

		// special class to expose protected TMessage constructor
		class CbmMQTMessage : public TMessage {
		public:
		CbmMQTMessage(void* buf, Int_t len) : TMessage(buf, len) {
		ResetBit(kIsOwner);
		}
		};

		#endif /* CBMDEVICEEVENTBUILDERETOFSTAR2019_H_ */

MQ/eTOF/CbmDeviceTriggerHandlerEtof.cxx

+36 −38

Original line number	Diff line number	Diff line
		/* Copyright (C) 2019 PI-UHd, GSI
		SPDX-License-Identifier: GPL-3.0-only
		Authors: Norbert Herrmann [committer] */

		/**
		* CbmDeviceTriggerHandlerEtof.cxx
		*
		@@ -6,6 +10,7 @@
		*/

		#include "CbmDeviceTriggerHandlerEtof.h"

		#include "CbmMQDefs.h"

		#include "FairEventHeader.h"
		@@ -18,22 +23,21 @@
		#include "FairRunOnline.h"
		#include "FairRuntimeDb.h"

		#include <thread> // this_thread::sleep_for

		#include <boost/archive/binary_iarchive.hpp>
		#include <boost/archive/binary_oarchive.hpp>
		#include <boost/serialization/vector.hpp>

		#include <chrono>
		#include <iomanip>
		#include <string>
		#include <thread> // this_thread::sleep_for

		#include <stdexcept>
		#include <string>
		struct InitTaskError : std::runtime_error {
		using std::runtime_error::runtime_error;
		};

		static std::chrono::steady_clock::time_point dctime =
		std::chrono::steady_clock::now();
		static std::chrono::steady_clock::time_point dctime = std::chrono::steady_clock::now();
		static double dSize = 0.;

		using namespace std;
		@@ -45,11 +49,14 @@ CbmDeviceTriggerHandlerEtof::CbmDeviceTriggerHandlerEtof()
		, fbDebugMonitorMode(kFALSE)
		, fbSandboxMode(kFALSE)
		, fbEventDumpEna(kFALSE)
		, fdEvent(0.) {}
		, fdEvent(0.)
		{
		}

		CbmDeviceTriggerHandlerEtof::~CbmDeviceTriggerHandlerEtof() {}

		void CbmDeviceTriggerHandlerEtof::InitTask() try {
		void CbmDeviceTriggerHandlerEtof::InitTask()
		try {
		// Get the information about created channels from the device
		// Check if the defined channels from the topology (by name)
		// are in the list of channels which are possible/allowed
		@@ -62,21 +69,20 @@ void CbmDeviceTriggerHandlerEtof::InitTask() try {
		LOG(info) << "Number of defined input channels: " << noChannel;
		for (auto const& entry : fChannels) {
		LOG(info) << "Channel name: " << entry.first;
		if (!IsChannelNameAllowed(entry.first))
		throw InitTaskError("Channel name does not match.");
		if (entry.first != "syscmd")
		OnData(entry.first, &CbmDeviceTriggerHandlerEtof::HandleData);
		if (!IsChannelNameAllowed(entry.first)) throw InitTaskError("Channel name does not match.");
		if (entry.first != "syscmd") OnData(entry.first, &CbmDeviceTriggerHandlerEtof::HandleData);
		else
		OnData(entry.first, &CbmDeviceTriggerHandlerEtof::HandleMessage);
		}
		InitWorkspace();
		} catch (InitTaskError& e) {
		}
		catch (InitTaskError& e) {
		LOG(error) << e.what();
		cbm::mq::ChangeState(this, cbm::mq::Transition::ErrorFound);
		}

		bool CbmDeviceTriggerHandlerEtof::IsChannelNameAllowed(
		std::string channelName) {
		bool CbmDeviceTriggerHandlerEtof::IsChannelNameAllowed(std::string channelName)
		{
		for (auto const& entry : fAllowedChannels) {
		std::size_t pos1 = channelName.find(entry);
		if (pos1 != std::string::npos) {
		@@ -84,19 +90,17 @@ bool CbmDeviceTriggerHandlerEtof::IsChannelNameAllowed(
		std::find(fAllowedChannels.begin(), fAllowedChannels.end(), entry);
		const vector<std::string>::size_type idx = pos - fAllowedChannels.begin();
		LOG(info) << "Found " << entry << " in " << channelName;
		LOG(info) << "Channel name " << channelName
		<< " found in list of allowed channel names at position "
		<< idx;
		LOG(info) << "Channel name " << channelName << " found in list of allowed channel names at position " << idx;
		return true;
		}
		}
		LOG(info) << "Channel name " << channelName
		<< " not found in list of allowed channel names.";
		LOG(info) << "Channel name " << channelName << " not found in list of allowed channel names.";
		LOG(error) << "Stop device.";
		return false;
		}

		Bool_t CbmDeviceTriggerHandlerEtof::InitWorkspace() {
		Bool_t CbmDeviceTriggerHandlerEtof::InitWorkspace()
		{
		LOG(info) << "Init work space for CbmDeviceTriggerHandlerEtof.";

		// steering variables
		@@ -107,19 +111,17 @@ Bool_t CbmDeviceTriggerHandlerEtof::InitWorkspace() {

		// handler is called whenever a message arrives on "data", with a reference to the message and a sub-channel index (here 0)
		//bool CbmDeviceTriggerHandlerEtof::HandleData(FairMQMessagePtr& msg, int /index/)
		bool CbmDeviceTriggerHandlerEtof::HandleData(FairMQParts& parts,
		int /index/) {
		bool CbmDeviceTriggerHandlerEtof::HandleData(FairMQParts& parts, int /index/)
		{
		// Don't do anything with the data
		// Maybe add an message counter which counts the incomming messages and add
		// an output
		fNumMessages++;
		LOG(debug) << "Received message " << fNumMessages << " with " << parts.Size()
		<< " parts"
		LOG(debug) << "Received message " << fNumMessages << " with " << parts.Size() << " parts"
		<< ", size0: " << parts.At(0)->GetSize();

		uint TrigWord {0};
		std::string msgStrE(static_cast<char*>(parts.At(0)->GetData()),
		(parts.At(0))->GetSize());
		std::string msgStrE(static_cast<char*>(parts.At(0)->GetData()), (parts.At(0))->GetSize());
		std::istringstream issE(msgStrE);
		boost::archive::binary_iarchive inputArchiveE(issE);
		inputArchiveE >> TrigWord;
		@@ -128,17 +130,13 @@ bool CbmDeviceTriggerHandlerEtof::HandleData(FairMQParts& parts,
		int iBuffSzByte = parts.At(1)->GetSize();

		// Send Subevent to STAR
		LOG(debug) << "Send Data for event " << fdEvent << ", TrigWord " << TrigWord
		<< " with size " << iBuffSzByte << Form(" at %p ", pDataBuff);
		if (kFALSE == fbSandboxMode) {
		star_rhicf_write(TrigWord, pDataBuff, iBuffSzByte);
		}
		LOG(debug) << "Send Data for event " << fdEvent << ", TrigWord " << TrigWord << " with size " << iBuffSzByte
		<< Form(" at %p ", pDataBuff);
		if (kFALSE == fbSandboxMode) { star_rhicf_write(TrigWord, pDataBuff, iBuffSzByte); }
		dSize += iBuffSzByte;
		if (0 == (int) fdEvent % 10000) {
		std::chrono::duration<double> deltatime =
		std::chrono::steady_clock::now() - dctime;
		LOG(info) << "Processed " << fdEvent
		<< " events, delta-time: " << deltatime.count()
		std::chrono::duration<double> deltatime = std::chrono::steady_clock::now() - dctime;
		LOG(info) << "Processed " << fdEvent << " events, delta-time: " << deltatime.count()
		<< ", rate: " << dSize * 1.E-6 / deltatime.count() << "MB/s";
		dctime = std::chrono::steady_clock::now();
		dSize = 0.;
		@@ -150,8 +148,8 @@ bool CbmDeviceTriggerHandlerEtof::HandleData(FairMQParts& parts,

		/************************************************************************************/

		bool CbmDeviceTriggerHandlerEtof::HandleMessage(FairMQMessagePtr& msg,
		int /index/) {
		bool CbmDeviceTriggerHandlerEtof::HandleMessage(FairMQMessagePtr& msg, int /index/)
		{
		const char* cmd = (char*) (msg->GetData());
		const char cmda[4] = {*cmd};
		LOG(info) << "Handle message " << cmd << ", " << cmd[0];

MQ/eTOF/CbmDeviceTriggerHandlerEtof.h

+12 −24

Original line number	Diff line number	Diff line
		/* Copyright (C) 2019 PI-UHd, GSI
		SPDX-License-Identifier: GPL-3.0-only
		Authors: Norbert Herrmann [committer] */

		/**
		* CbmDeviceTriggerHandlerStar2019.h
		*
		@@ -8,20 +12,19 @@
		#ifndef CBMDEVICETRIGGERHANDLERETOF_H_
		#define CBMDEVICETRIGGERHANDLERETOF_H_

		#include "FairMQDevice.h"
		#include "CbmMqTMessage.h"
		#include "CbmTofStarData2019.h"

		#include "MicrosliceDescriptor.hpp"
		#include "Timeslice.hpp"

		#include "CbmTofStarData2019.h"
		#include "FairMQDevice.h"

		#include "Rtypes.h"
		#include "TMessage.h"

		#include <map>
		#include <vector>

		class CbmMQTMessage;
		// Relevant TOF classes

		extern "C" int star_rhicf_write(unsigned int trg_word, void* dta, int bytes);
		@@ -55,11 +58,7 @@ private:
		Bool_t ReInitContainers();

		uint64_t fNumMessages;
		std::vector<std::string> fAllowedChannels = {"tofcomponent",
		"parameters",
		"etofevts",
		"tofhits",
		"syscmd"};
		std::vector<std::string> fAllowedChannels = {"tofcomponent", "parameters", "etofevts", "tofhits", "syscmd"};

		// Input variables

		@@ -68,25 +67,14 @@ private:
		// Constants or setting parameters
		Int_t fiMsgCnt;
		/// Control flags
		Bool_t
		fbMonitorMode; //! Switch ON the filling of a minimal set of histograms
		Bool_t
		fbDebugMonitorMode; //! Switch ON the filling of a additional set of histograms
		Bool_t fbMonitorMode; //! Switch ON the filling of a minimal set of histograms
		Bool_t fbDebugMonitorMode; //! Switch ON the filling of a additional set of histograms
		Bool_t fbSandboxMode; //! Switch OFF the emission of data toward the STAR DAQ
		Bool_t
		fbEventDumpEna; //! Switch ON the dumping of the events to a binary file
		Bool_t fbEventDumpEna; //! Switch ON the dumping of the events to a binary file

		Double_t fdEvent;

		// histograms
		};

		// special class to expose protected TMessage constructor
		class CbmMQTMessage : public TMessage {
		public:
		CbmMQTMessage(void* buf, Int_t len) : TMessage(buf, len) {
		ResetBit(kIsOwner);
		}
		};

		#endif /* CBMDEVICETRIGGERHANDLERETOF_H_ */

MQ/eTOF/runEventBuilderEtofStar2019.cxx

+7 −4

Original line number	Diff line number	Diff line
		/* Copyright (C) 2019 PI-UHd, GSI
		SPDX-License-Identifier: GPL-3.0-only
		Authors: Norbert Herrmann [committer] */

		#include "CbmDeviceEventBuilderEtofStar2019.h"
		#include "runFairMQDevice.h"

		#include <iomanip>
		#include <string>

		#include "runFairMQDevice.h"

		namespace bpo = boost::program_options;
		using namespace std;

		void addCustomOptions(bpo::options_description& options) { ; }

		FairMQDevicePtr getDevice(const FairMQProgOptions& /config/) {
		return new CbmDeviceEventBuilderEtofStar2019();
		}
		FairMQDevicePtr getDevice(const FairMQProgOptions& /config/) { return new CbmDeviceEventBuilderEtofStar2019(); }

MQ/eTOF/runTriggerHandlerEtof.cxx

+10 −7

Original line number	Diff line number	Diff line
		/* Copyright (C) 2019 PI-UHd, GSI
		SPDX-License-Identifier: GPL-3.0-only
		Authors: Norbert Herrmann [committer] */

		#include "CbmDeviceTriggerHandlerEtof.h"
		#include "runFairMQDevice.h"

		#include <iomanip>
		#include <string>

		#include "runFairMQDevice.h"

		namespace bpo = boost::program_options;
		using namespace std;

		void addCustomOptions(bpo::options_description& options) {
		options.add_options()(
		"SandboxMode", bpo::value<bool>()->default_value(1), "Test mode switch");
		void addCustomOptions(bpo::options_description& options)
		{
		options.add_options()("SandboxMode", bpo::value<bool>()->default_value(1), "Test mode switch");
		;
		}

		FairMQDevicePtr getDevice(const FairMQProgOptions& /config/) {
		return new CbmDeviceTriggerHandlerEtof();
		}
		FairMQDevicePtr getDevice(const FairMQProgOptions& /config/) { return new CbmDeviceTriggerHandlerEtof(); }

Source

Target

Files

Some changes are not shown.