Skip to content
Snippets Groups Projects

Changes from mCBM 2022 prod to mCBM MQ devices and execution

Merged Pierre-Alain Loizeau requested to merge mcbm/cbmroot:mr_mq_gen into master
All threads resolved!

Follow-up MR of !881 (merged)

Edited by Pierre-Alain Loizeau

Merge request reports

Merge request pipeline #17964 passed

Merge request pipeline passed for 0d911867

Merged by Pierre-Alain LoizeauPierre-Alain Loizeau 2 years ago (Jul 20, 2022 12:00pm UTC)

Loading

Pipeline #17967 passed

Pipeline passed for 0d911867 on master

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • added 65 commits

    • 3c3bfc7e...26080ec4 - 5 commits from branch computing:master
    • 1b4bcb38 - [REPO] Set externals to point to latest version
    • cdcafeaa - In macro/mcbm/matbudget_sim.C, change default setup and fix line offsets
    • e79b3242 - Changes to mcbm_transport macro:
    • 6c60d616 - Add NT Correlation Plot to TRD Online Monitor
    • 2a226f91 - Add Message Rate Timeplots to TRD Monitor
    • 7ea221c8 - add support for multiple CRI boards in the TRD2D detectors
    • 18348085 - add digi buffering to fix asynchronous ADC read-out. Restore PRF for
    • 5bb20ce4 - update for TRD reco also in the mCBM fork
    • 3237800a - [Evt Builder] Restore and expand support for T0 digis in TOF vector
    • 0818695d - In EventBuilderAlgo, fix bug preventing to use max Digi Nb for anti-trigger
    • faa240de - In EventBuildRawTask, add setter for min nb of layers
    • 57bca1bd - [Evt Builder] Fix string comp in filling of separate histos for TRD 1D and 2D
    • 4432ad74 - [Evt Builder] in AlgoBuildRawEvent, check each det directly after building it and reject early
    • 8a791048 - [Evt Builder] in AlgoBuildRawEvent, add performance plots (time and data red.)
    • 0516f9de - [Evt Builder] in BuildRawEvent algo + task, add setter per det for max Digi Nb in histos
    • 39e52036 - [Task unpacker] in steering class, add performance plots (time and data exp.)
    • 383a47d8 - [TOF] Add TimeOffset getters and direct setter in Unpack templates
    • 7f687d90 - In UnpackConfig templ, make GetUnpacker return native type ptr instead of specialized base ptr
    • 0c2b376d - [mBMON] Fix/adapt to the new 16ch diamond while keeping old data support
    • fbd451ba - add updated rich analysis + macros
    • f3453826 - more plots in RICH QA
    • 4bf02fdd - [TOF] add special mapping for 2 ch of BUC in Ni and Au data
    • 51b3a2a0 - [TOF] changes to TOF tracking from NH version
    • 98f04486 - [TOF] changes to calibrator and event clusterizer from NH version
    • 58fefe80 - [TOF] Fix init with wrong data type in CbmTofDigiBdfPar::GetTrackingStation
    • 1d2b67d3 - [TOF] Add Vertex and min vrtx tracks nb empty setters in base CbmTofTrackFinder
    • 3659a624 - Changes to HadronAnalysis from NH version
    • 48c5304a - New mStsTimeWalkPar file vs T0(2160)
    • 805c9c3f - Add mTOF Iron 2022 par file including BMon and unpack+Evt build test macro
    • 3cb33b29 - add support for multiple CRI boards in the TRD2D detectors in run unpack macros
    • c86c2933 - Fix/adapt to the new 16ch diamond while keeping old data support in par and macro files
    • 4964c1b8 - Support for Nickel runs + BMon-in-Tof in unpacking macros
    • 994dc24a - Updated mRICH Tot offset corrections
    • f985790b - add a common event reconstruction macro, tested for run 2391, with the required files
    • 21461c66 - add short howTo of common analysis
    • 656710c7 - [mCBM] Run unpack macros: Ni 2022 setup auto-sel + fix + NH offsets for Ni
    • beb8376e - mMUCH: Different runs parameter files named with date + related unpack macro changes
    • e6d899b3 - deactivate hist generation + new calib selection
    • 27c1f6dd - [mCBM] Install all par files, macros and scripts for 2021 and 2022
    • aa4e12fe - SIS18 timing events macros: check macro + new default paths
    • 266630df - [mCBM 2022] Add macro and script for DigiEvent based reco (from NH)
    • b3abd133 - [mCBM 21-22] Changes to reco, ana and plotting macros from NH version + fixes
    • fce78873 - Fix mapping in TOF par file for NI and Au data (changes from A.Weber)
    • 7c9c2b90 - Add automatic setup choice from runId for Au bench runs in unpack macros
    • 70c8cfb0 - [TOF MQ] TOF MQ devices, NH versions, 2 modifs to avoid changes in common files
    • 9e38ae25 - [MQ] Add BMon monitor device
    • 096955e9 - [MQ] in event builder device, add option to skip sending the events + fixes
    • f40a77e9 - [MQ] in BuildDigiEvent device, add setter per det for max Digi Nb in histos
    • 0dad8eb0 - [MQ] in unpacker device, synchronize parameter settigns with unpack macros (fix TRD2D warning)
    • a7e1486d - [MQ] In ReqRep sampler, fix missing HWM propag. and too verbose missed TS detection
    • af5474c7 - [MQ] Fix bugs in DigiEventSink device
    • 3c1adcbe - [MQ] in DigiEventSink, add flag to control Missing TS empty writing if...
    • ca7c3471 - [MQ] in DigiEventSink, add options to set root file max size and to disable file compression
    • 30b66e86 - [MQ] Add monitoring histogram in DigiEventSink
    • 3058f787 - [MQ] Devices fixes following investigation of problems seen online in Au runs
    • dd5f96c3 - [MQ] in RepReqSampler and DigiEventSink, add option adding suffix to histos name and folder
    • 4e2c51e5 - [MQ] In histo server device, save histos to root file on shutdown (from NH changes)
    • 81805fb1 - [MQ] add slurm and sh scripts for 2022 mFLES online + install them
    • 1355e3b1 - [MQ] Sbatch scripts fixes following investigation of problems seen online in Au runs
    • 71183bc7 - [MQ] in sbatch scripts, add usage of histo suffixes when relevant

    Compare with previous version

  • Dominik Smith
  • @p.-a.loizeau @f.uhlig I looked through the changes that concern classes I was working on from these mCBM MRs. I see no obvious problems. I have only one open question (see above).

  • added 36 commits

    • a09336c0 - Fix mMUCH unpack Algo and Config classes for compat. w/ 2 GEM + RPC readout
    • be2b0a5c - Changes to HadronAnalysis from NH version
    • 7753ee4f - New mStsTimeWalkPar file vs T0(2160)
    • c413c931 - Add mTOF Iron 2022 par file including BMon and unpack+Evt build test macro
    • 26f59dc5 - add support for multiple CRI boards in the TRD2D detectors in run unpack macros
    • 9dabf5ce - Fix/adapt to the new 16ch diamond while keeping old data support in par and macro files
    • 2778bb95 - Support for Nickel runs + BMon-in-Tof in unpacking macros
    • 6d8102e1 - Updated mRICH Tot offset corrections
    • de5f41e9 - add a common event reconstruction macro, tested for run 2391, with the required files
    • 0a58216e - add short howTo of common analysis
    • a9394a86 - [mCBM] Run unpack macros: Ni 2022 setup auto-sel + fix + NH offsets for Ni
    • 65bb5471 - mMUCH: Different runs parameter files named with date + related unpack macro changes
    • 0c1a329f - deactivate hist generation + new calib selection
    • 13ac1dbc - [mCBM] Install all par files, macros and scripts for 2021 and 2022
    • 9b26548c - SIS18 timing events macros: check macro + new default paths
    • 8d429c02 - [mCBM 2022] Add macro and script for DigiEvent based reco (from NH)
    • 8b7ca806 - [mCBM 21-22] Changes to reco, ana and plotting macros from NH version + fixes
    • 543b2e14 - Fix mapping in TOF par file for NI and Au data (changes from A.Weber)
    • a3e5ff06 - Add automatic setup choice from runId for Au bench runs in unpack macros
    • 46f7b040 - Fixes to mMUCH par files for Ni and Au for compat. with 2 GEM + RPC readout
    • e97548f3 - [TOF MQ] TOF MQ devices, NH versions, 2 modifs to avoid changes in common files
    • 75132d3a - [MQ] Add BMon monitor device
    • e7e4fd1f - [MQ] in event builder device, add option to skip sending the events + fixes
    • 8f2671a0 - [MQ] in BuildDigiEvent device, add setter per det for max Digi Nb in histos
    • 401e2ce8 - [MQ] in unpacker device, synchronize parameter settigns with unpack macros (fix TRD2D warning)
    • 0d8dba93 - [MQ] In ReqRep sampler, fix missing HWM propag. and too verbose missed TS detection
    • ae34f2a9 - [MQ] Fix bugs in DigiEventSink device
    • 8bee4772 - [MQ] in DigiEventSink, add flag to control Missing TS empty writing if...
    • 588be6d2 - [MQ] in DigiEventSink, add options to set root file max size and to disable file compression
    • c6143a0d - [MQ] Add monitoring histogram in DigiEventSink
    • 98798002 - [MQ] Devices fixes following investigation of problems seen online in Au runs
    • 5b9785c2 - [MQ] in RepReqSampler and DigiEventSink, add option adding suffix to histos name and folder
    • c54f628c - [MQ] In histo server device, save histos to root file on shutdown (from NH changes)
    • 30681ee5 - [MQ] add slurm and sh scripts for 2022 mFLES online + install them
    • 63342c2d - [MQ] Sbatch scripts fixes following investigation of problems seen online in Au runs
    • a9ed182f - [MQ] in sbatch scripts, add usage of histo suffixes when relevant

    Compare with previous version

  • added 48 commits

    • bf94ae4e - [Evt Builder] in BuildRawEvent algo, fix unwanted FATAL if ref det set to...
    • ce9a34d9 - [Task unpacker] in steering class, add performance plots (time and data exp.)
    • 93ab96e2 - [TOF] Add TimeOffset getters and direct setter in Unpack templates
    • 0863b309 - In UnpackConfig templ, make GetUnpacker return native type ptr instead of specialized base ptr
    • 5cf9ff44 - [mBMON] Fix/adapt to the new 16ch diamond while keeping old data support
    • ae8d9365 - add updated rich analysis + macros
    • 6e4846f6 - more plots in RICH QA
    • f5494cc3 - [TOF] add special mapping for 2 ch of BUC in Ni and Au data
    • 50936773 - [TOF] changes to TOF tracking from NH version
    • f05354f0 - [TOF] changes to calibrator and event clusterizer from NH version
    • afcace54 - [TOF] Fix init with wrong data type in CbmTofDigiBdfPar::GetTrackingStation
    • 17e23b83 - [TOF] Add Vertex and min vrtx tracks nb empty setters in base CbmTofTrackFinder
    • 9a613a1f - Fix mMUCH unpack Algo and Config classes for compat. w/ 2 GEM + RPC readout
    • d2c4230d - Changes to HadronAnalysis from NH version
    • 3a102f8a - New mStsTimeWalkPar file vs T0(2160)
    • 8c1d17b3 - Add mTOF Iron 2022 par file including BMon and unpack+Evt build test macro
    • 24037d72 - add support for multiple CRI boards in the TRD2D detectors in run unpack macros
    • 01fc1d8b - Fix/adapt to the new 16ch diamond while keeping old data support in par and macro files
    • 4b682751 - Support for Nickel runs + BMon-in-Tof in unpacking macros
    • c8a9e3d4 - Updated mRICH Tot offset corrections
    • 4fba7855 - add a common event reconstruction macro, tested for run 2391, with the required files
    • 40235897 - add short howTo of common analysis
    • 5bae66bd - [mCBM] Run unpack macros: Ni 2022 setup auto-sel + fix + NH offsets for Ni
    • 3a96514f - mMUCH: Different runs parameter files named with date + related unpack macro changes
    • a5464205 - deactivate hist generation + new calib selection
    • ab3e1b22 - [mCBM] Install all par files, macros and scripts for 2021 and 2022
    • 73c1dfb8 - SIS18 timing events macros: check macro + new default paths
    • b84fe39a - [mCBM 2022] Add macro and script for DigiEvent based reco (from NH)
    • 5fad8edd - [mCBM 21-22] Changes to reco, ana and plotting macros from NH version + fixes
    • 4ff5db47 - Fix mapping in TOF par file for NI and Au data (changes from A.Weber)
    • a7000f3c - Add automatic setup choice from runId for Au bench runs in unpack macros
    • 8855831d - Fixes to mMUCH par files for Ni and Au for compat. with 2 GEM + RPC readout
    • 168fceec - [TOF MQ] TOF MQ devices, NH versions, 2 modifs to avoid changes in common files
    • 9a73f3a5 - [MQ] Add BMon monitor device
    • 72acc73c - [MQ] in event builder device, add option to skip sending the events + fixes
    • e0281299 - [MQ] in BuildDigiEvent device, add setter per det for max Digi Nb in histos
    • f68ed11b - [MQ] in unpacker device, synchronize parameter settigns with unpack macros (fix TRD2D warning)
    • 29393e22 - [MQ] In ReqRep sampler, fix missing HWM propag. and too verbose missed TS detection
    • ddd29aa7 - [MQ] Fix bugs in DigiEventSink device
    • 387de978 - [MQ] in DigiEventSink, add flag to control Missing TS empty writing if...
    • e9210229 - [MQ] in DigiEventSink, add options to set root file max size and to disable file compression
    • 4d4c11a9 - [MQ] Add monitoring histogram in DigiEventSink
    • 639ef408 - [MQ] Devices fixes following investigation of problems seen online in Au runs
    • 9cafa81c - [MQ] in RepReqSampler and DigiEventSink, add option adding suffix to histos name and folder
    • bc544bb5 - [MQ] In histo server device, save histos to root file on shutdown (from NH changes)
    • ab314dcd - [MQ] add slurm and sh scripts for 2022 mFLES online + install them
    • d20e2942 - [MQ] Sbatch scripts fixes following investigation of problems seen online in Au runs
    • 5c80cd21 - [MQ] in sbatch scripts, add usage of histo suffixes when relevant

    Compare with previous version

  • added 48 commits

    • 4a40c59e - [Evt Builder] in BuildRawEvent algo, fix unwanted FATAL if ref det set to...
    • 235593f1 - [Task unpacker] in steering class, add performance plots (time and data exp.)
    • 7d45c89e - [TOF] Add TimeOffset getters and direct setter in Unpack templates
    • 86ca4d1e - In UnpackConfig templ, make GetUnpacker return native type ptr instead of specialized base ptr
    • 8878e26a - [mBMON] Fix/adapt to the new 16ch diamond while keeping old data support
    • fe4ad436 - add updated rich analysis + macros
    • 31c55c8f - more plots in RICH QA
    • 83cd9c3f - [TOF] add special mapping for 2 ch of BUC in Ni and Au data
    • 087ed236 - [TOF] changes to TOF tracking from NH version
    • 0ca6678e - [TOF] changes to calibrator and event clusterizer from NH version
    • 52a0ca1f - [TOF] Fix init with wrong data type in CbmTofDigiBdfPar::GetTrackingStation
    • f921b354 - [TOF] Add Vertex and min vrtx tracks nb empty setters in base CbmTofTrackFinder
    • 401580b2 - Fix mMUCH unpack Algo and Config classes for compat. w/ 2 GEM + RPC readout
    • f947af14 - Changes to HadronAnalysis from NH version
    • b1e357cd - New mStsTimeWalkPar file vs T0(2160)
    • 55259c78 - Add mTOF Iron 2022 par file including BMon and unpack+Evt build test macro
    • 1293372c - add support for multiple CRI boards in the TRD2D detectors in run unpack macros
    • a4e8a548 - Fix/adapt to the new 16ch diamond while keeping old data support in par and macro files
    • 0ba56235 - Support for Nickel runs + BMon-in-Tof in unpacking macros
    • 6fcc7c21 - Updated mRICH Tot offset corrections
    • 65ea2cb2 - add a common event reconstruction macro, tested for run 2391, with the required files
    • 28446948 - add short howTo of common analysis
    • 97378251 - [mCBM] Run unpack macros: Ni 2022 setup auto-sel + fix + NH offsets for Ni
    • 70396aab - mMUCH: Different runs parameter files named with date + related unpack macro changes
    • a19345d4 - deactivate hist generation + new calib selection
    • f8185eb3 - [mCBM] Install all par files, macros and scripts for 2021 and 2022
    • 5858671d - SIS18 timing events macros: check macro + new default paths
    • fefd7620 - [mCBM 2022] Add macro and script for DigiEvent based reco (from NH)
    • 4de97603 - [mCBM 21-22] Changes to reco, ana and plotting macros from NH version + fixes
    • 10a3253c - Fix mapping in TOF par file for NI and Au data (changes from A.Weber)
    • 9e7680fe - Add automatic setup choice from runId for Au bench runs in unpack macros
    • b3414a03 - Fixes to mMUCH par files for Ni and Au for compat. with 2 GEM + RPC readout
    • b3ef287c - [TOF MQ] TOF MQ devices, NH versions, 2 modifs to avoid changes in common files
    • f732849e - [MQ] Add BMon monitor device
    • e0288b1a - [MQ] in event builder device, add option to skip sending the events + fixes
    • 735952f5 - [MQ] in BuildDigiEvent device, add setter per det for max Digi Nb in histos
    • 0fb058d7 - [MQ] in unpacker device, synchronize parameter settigns with unpack macros (fix TRD2D warning)
    • 3779bd55 - [MQ] In ReqRep sampler, fix missing HWM propag. and too verbose missed TS detection
    • e8a82924 - [MQ] Fix bugs in DigiEventSink device
    • e1403629 - [MQ] in DigiEventSink, add flag to control Missing TS empty writing if...
    • f251893d - [MQ] in DigiEventSink, add options to set root file max size and to disable file compression
    • 4a6404d6 - [MQ] Add monitoring histogram in DigiEventSink
    • 396de9d3 - [MQ] Devices fixes following investigation of problems seen online in Au runs
    • 7b5adc77 - [MQ] in RepReqSampler and DigiEventSink, add option adding suffix to histos name and folder
    • 6a217e61 - [MQ] In histo server device, save histos to root file on shutdown (from NH changes)
    • 0051f6cb - [MQ] add slurm and sh scripts for 2022 mFLES online + install them
    • f63861d9 - [MQ] Sbatch scripts fixes following investigation of problems seen online in Au runs
    • 51ca4a5b - [MQ] in sbatch scripts, add usage of histo suffixes when relevant

    Compare with previous version

  • Dear @d.smith, @f.uhlig, @v.friese, @p.-a.loizeau,

    you have been identified as code owner of at least one file which was changed with this merge request.

    Please check the changes and approve them or request changes.

  • added 48 commits

    • 51ca4a5b...30157d71 - 4 commits from branch computing:master
    • 35ed85cd - [mBMON] Fix/adapt to the new 16ch diamond while keeping old data support
    • d0e4cb0c - add updated rich analysis + macros
    • 3feb8b36 - more plots in RICH QA
    • 725a66c4 - [TOF] add special mapping for 2 ch of BUC in Ni and Au data
    • ec523db7 - [TOF] changes to TOF tracking from NH version
    • e5c0f34c - [TOF] changes to calibrator and event clusterizer from NH version
    • f2b4fc13 - [TOF] Fix init with wrong data type in CbmTofDigiBdfPar::GetTrackingStation
    • 82ef80d4 - [TOF] Add Vertex and min vrtx tracks nb empty setters in base CbmTofTrackFinder
    • 7cac2013 - Fix mMUCH unpack Algo and Config classes for compat. w/ 2 GEM + RPC readout
    • 2a25f9b0 - Changes to HadronAnalysis from NH version
    • cc19c93a - New mStsTimeWalkPar file vs T0(2160)
    • 8c2cdcea - Add mTOF Iron 2022 par file including BMon and unpack+Evt build test macro
    • c7ac897e - add support for multiple CRI boards in the TRD2D detectors in run unpack macros
    • ed65dd09 - Fix/adapt to the new 16ch diamond while keeping old data support in par and macro files
    • 9449059c - Support for Nickel runs + BMon-in-Tof in unpacking macros
    • 589afc83 - Updated mRICH Tot offset corrections
    • 904cb175 - add a common event reconstruction macro, tested for run 2391, with the required files
    • 22b28386 - add short howTo of common analysis
    • a1cc0b94 - [mCBM] Run unpack macros: Ni 2022 setup auto-sel + fix + NH offsets for Ni
    • 5f5e7fc3 - mMUCH: Different runs parameter files named with date + related unpack macro changes
    • d890cd35 - deactivate hist generation + new calib selection
    • 76a4a688 - [mCBM] Install all par files, macros and scripts for 2021 and 2022
    • 0ef2d892 - SIS18 timing events macros: check macro + new default paths
    • 00450bd0 - [mCBM 2022] Add macro and script for DigiEvent based reco (from NH)
    • 39b76a7e - [mCBM 21-22] Changes to reco, ana and plotting macros from NH version + fixes
    • 36d714ba - Fix mapping in TOF par file for NI and Au data (changes from A.Weber)
    • 39b3781f - Add automatic setup choice from runId for Au bench runs in unpack macros
    • 7fbae809 - Fixes to mMUCH par files for Ni and Au for compat. with 2 GEM + RPC readout
    • 4ca602d0 - [TOF MQ] TOF MQ devices, NH versions, 2 modifs to avoid changes in common files
    • d0694b51 - [MQ] Add BMon monitor device
    • d76d0df2 - [MQ] in event builder device, add option to skip sending the events + fixes
    • 2134548e - [MQ] in BuildDigiEvent device, add setter per det for max Digi Nb in histos
    • d6751caa - [MQ] in unpacker device, synchronize parameter settigns with unpack macros (fix TRD2D warning)
    • a4dafcc5 - [MQ] In ReqRep sampler, fix missing HWM propag. and too verbose missed TS detection
    • 104b9e3c - [MQ] Fix bugs in DigiEventSink device
    • 3fab6614 - [MQ] in DigiEventSink, add flag to control Missing TS empty writing if...
    • 70210533 - [MQ] in DigiEventSink, add options to set root file max size and to disable file compression
    • 5e0c3b36 - [MQ] Add monitoring histogram in DigiEventSink
    • d0b7e726 - [MQ] Devices fixes following investigation of problems seen online in Au runs
    • e1faf33a - [MQ] in RepReqSampler and DigiEventSink, add option adding suffix to histos name and folder
    • 27f9274e - [MQ] In histo server device, save histos to root file on shutdown (from NH changes)
    • 647022c8 - [MQ] add slurm and sh scripts for 2022 mFLES online + install them
    • 033df6fc - [MQ] Sbatch scripts fixes following investigation of problems seen online in Au runs
    • eb377cfd - [MQ] in sbatch scripts, add usage of histo suffixes when relevant

    Compare with previous version

  • Pierre-Alain Loizeau resolved all threads

    resolved all threads

  • added 12 commits

    • 3f18f2d6 - [MQ] in unpacker device, synchronize parameter settigns with unpack macros (fix TRD2D warning)
    • 07cd5373 - [MQ] In ReqRep sampler, fix missing HWM propag. and too verbose missed TS detection
    • 9ca9b0d0 - [MQ] Fix bugs in DigiEventSink device
    • 0a94abf7 - [MQ] in DigiEventSink, add flag to control Missing TS empty writing if...
    • 9b95faaa - [MQ] in DigiEventSink, add options to set root file max size and to disable file compression
    • ac721c3f - [MQ] Add monitoring histogram in DigiEventSink
    • bf0954f7 - [MQ] Devices fixes following investigation of problems seen online in Au runs
    • afee8925 - [MQ] in RepReqSampler and DigiEventSink, add option adding suffix to histos name and folder
    • eea1bee7 - [MQ] In histo server device, save histos to root file on shutdown (from NH changes)
    • 89523023 - [MQ] add slurm and sh scripts for 2022 mFLES online + install them
    • 318436bf - [MQ] Sbatch scripts fixes following investigation of problems seen online in Au runs
    • 0d911867 - [MQ] in sbatch scripts, add usage of histo suffixes when relevant

    Compare with previous version

  • Pierre-Alain Loizeau marked this merge request as ready

    marked this merge request as ready

  • Florian Uhlig
  • @p.-a.loizeau,

    looks okay fro me. I only went through the source code and did not check the scripts.

  • Florian Uhlig approved this merge request

    approved this merge request

  • Pierre-Alain Loizeau resolved all threads

    resolved all threads

  • Please register or sign in to reply
    Loading