Skip to content
Snippets Groups Projects

Introduce an all new unpacking scheme and implement the TRD as example #2148

Merged Pascal Raisig requested to merge praisig/cbmroot:unpacker2021 into master

This MR contains:

  • run_unpack_tsa.C/run_unpack_online.C steering macros

  • CbmSourceTsArchive implementation of a FairSource for the unpacking scheme

  • CbmRecoUnpack distributor of Timeslice components to the subsystem algorithms

  • CbmRecoUnpackConfig.tmpl template class for algorithm configuration during run initialisation

  • Subsystems can/should derive a explicit config from this template and add that to CbmRecoUnpack

  • CbmRecoUnpackAlgo.tmpl template class for the algorithms themselves

  • Subsystems can/should derive explicit implementations for the algorithms from this class

  • CbmTrdUnpackConfig implementation of CbmRecoUnpackConfig for the TRD

  • CbmTrdUnpackAlgoBaseR

  • Implementation of a TRD-1D (spadic based) unpacking algorithm base clase

  • CbmTrdUnpackAlgoR(AlgoLegacy2020R) explicit unpackers for given raw data types from the spadic

  • CbmTrdRawToDigi... implementation of feature extraction (time and energy reconstruction) from ADC samples of the Spadic

Edited by Florian Uhlig

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Pascal Raisig changed title from Introduce an all new unpacking scheme and implement the TRD as example {-https://redmine.cbm.gsi.de/issues/-}2148 to Introduce an all new unpacking scheme and implement the TRD as example #refs 2148

    changed title from Introduce an all new unpacking scheme and implement the TRD as example {-https://redmine.cbm.gsi.de/issues/-}2148 to Introduce an all new unpacking scheme and implement the TRD as example #refs 2148

  • Pascal Raisig changed title from Introduce an all new unpacking scheme and implement the TRD as example #refs 2148 to Introduce an all new unpacking scheme and implement the TRD as example #refs {+https://redmine.cbm.gsi.de/issues/+}2148

    changed title from Introduce an all new unpacking scheme and implement the TRD as example #refs 2148 to Introduce an all new unpacking scheme and implement the TRD as example #refs {+https://redmine.cbm.gsi.de/issues/+}2148

  • Pascal Raisig changed title from Introduce an all new unpacking scheme and implement the TRD as example #{-refs https://redmine.cbm.gsi.de/issues/-}2148 to Introduce an all new unpacking scheme and implement the TRD as example #<#2148>

    changed title from Introduce an all new unpacking scheme and implement the TRD as example #{-refs https://redmine.cbm.gsi.de/issues/-}2148 to Introduce an all new unpacking scheme and implement the TRD as example #<#2148>

  • Pascal Raisig changed title from Introduce an all new unpacking scheme and implement the TRD as example #<#2148> to Introduce an all new unpacking scheme and implement the TRD as example #2148

    changed title from Introduce an all new unpacking scheme and implement the TRD as example #<#2148> to Introduce an all new unpacking scheme and implement the TRD as example #2148

  • Pascal Raisig added 1 commit

    added 1 commit

    Compare with previous version

  • Pascal Raisig added 2 commits

    added 2 commits

    • 3c4dc84f - Add licence disclaimer and fix end of line status for files
    • e6e8aa56 - Fix format in the correct way :upsidedown:

    Compare with previous version

  • Pascal Raisig added 1 commit

    added 1 commit

    • c7733f69 - One empty line to much sneaked in

    Compare with previous version

  • Pascal Raisig added 1 commit

    added 1 commit

    • e9ad572d - Files slipped through check of end of file and licence

    Compare with previous version

  • Pascal Raisig added 3 commits

    added 3 commits

    • f1102976 - Remove templates from linkDef and add to installed include files
    • a1d0bbcd - Remove empty line change from file
    • 9f7e2c51 - Exchange std::uint64_t with size_t

    Compare with previous version

  • Pascal Raisig added 1 commit

    added 1 commit

    • 0cb1952a - Missed uint64_t in the last commit now also changed to size_t

    Compare with previous version

  • @f.uhlig and @v.friese I will continue working on a fix for the macOS builds. If I do interpret the build/test outputs correctly on macOS the CbmRecoSteer lib is not created correctly, due to CbmRecoUnpackAlgo. If you directly have a fix at hand, or know what I am doing wrong please let me know. Otherwise, as I said I will continue fixing it tomorrow. Cheers, Pascal

  • Pascal Raisig added 1 commit

    added 1 commit

    • de269bfb - Try to fix the lib loading issue on mac os

    Compare with previous version

  • Pascal Raisig added 1 commit

    added 1 commit

    • 89bfc6c0 - Add classDefs for both templates

    Compare with previous version

  • Pascal Raisig added 1 commit

    added 1 commit

    • 16262a00 - Minor updates of the run_unpack_online(tsa).C TRD settings

    Compare with previous version

  • Pascal Raisig added 1 commit

    added 1 commit

    Compare with previous version

  • Pascal Raisig added 1 commit

    added 1 commit

    • 5ea22e29 - Fix missing paranthesis in run_unpack_online.C

    Compare with previous version

  • Pascal Raisig added 1 commit

    added 1 commit

    • a984a34f - Fix outfile naming (one should test code before committing)

    Compare with previous version

  • Florian Uhlig mentioned in merge request !402 (merged)

    mentioned in merge request !402 (merged)

  • @praisig, @p.-a.loizeau,

    probably I found the issue why the rebase check failed for the latests commits. GitLab normally creates a shallow clone of the repo with the latest 50 commits. Since we had a problem with this number already before we increased it to 100 which obviously isn't enough for this MR. Only if increasing even more I was able to run the test in my local test environment. !402 (merged) should fix your problem. When the CI pipeline has finished I will rebase yours and check.

  • Florian Uhlig added 103 commits

    added 103 commits

    • 6b575da0 - 1 commit from branch computing:master
    • 8159b8bf - First version of source class for reading from TS archive.
    • cba60c96 - Integration of TRD unpacking, with empty implementations for unpacker, monitor...
    • a1b1a314 - Apply clang-format
    • 18a3c43f - Prepare existing trd code for unpacker update
    • c042aa00 - Introduce CbmTrdRawToDigi classes
    • 4756efa0 - Adjust GetParSetList to create smart pointers instead of dumb ones
    • 3154761b - Fix line breaks in comments
    • a3301c56 - Separate check for loaded parameters from actual function
    • 06f86de5 - Clang-Format defintions update
    • 3a8f66d6 - WIP: Add first version of Unpack in reco directory
    • 1093dac4 - Fix wrong parameter call in GetBinTimeshift
    • a908644a - Add get branch container functionality
    • 3e47592f - Some doxygen rearrangement.
    • 87b0d5bf - Add GetNrChannels function and use baseline average flag.
    • 652ce704 - Add a comment line
    • 33f0934f - Add baseline average flag usage to GetBaseline and add GetDigiTriggerType
    • c58e4885 - V1 compiling code for Task and Algo in Reco
    • 2fdf258b - Introduce the monitor class
    • 83af9dce - Remove again obsolete SPADIC class and add new implementation
    • dd3f46d4 - Add TrddEdxUtils class
    • 43b16fe5 - Integration of TRD unpacking, with empty implementations for unpacker, monitor...
    • 1d428085 - Drop CbmRecoUnpack and introduce RecoUnpackBaseTask
    • 7780ffb4 - Drop dummy classes
    • 4857cc28 - Add CbmSetup+FairRootFileSink+TrdUnpacker to macro
    • f0498ec8 - Update parameter and outbranch handling
    • eea3d689 - Comment out for this version unrequired includes
    • fc677f9b - Dropped not yet required include directories
    • a757042a - Introduce detector specific tasks
    • 38e54edd - Some mini comment updates
    • ac3a0b00 - Update of the VarMap handling
    • ae7595a5 - Add deleted copy c'tor and assignment operator
    • b675982d - Exchange Task classes with Config class
    • cd616020 - Fix namespace of GetTriggerType function
    • 249f3426 - Remove unrequired clear call
    • cf9d6fa0 - Remove some commented out code
    • f25aed2d - Remove unused function
    • 5ec824a1 - Silence the no copy c'tor and assignment operator warnings
    • 57870e00 - Swap the type of the subsystemIds, make config and algo transcient and add counter.
    • 9560959a - Swapped back to default input and run for 50 ts
    • 3bf90411 - Use std::vector::at instead of []
    • 1eb16ef2 - Add SetMsLength setter
    • 567f18c6 - Remove not required member, is already handled by the base class
    • ce31e9aa - fixup for previous commit
    • feda969f - Use SetMsLength and fix branch registering
    • ae7be8be - Change source type and use Reset function.
    • a15f5119 - Sort actions into dedicated functions and use config to define the output branches.
    • 19ff7397 - Adjust some signal extraction settings + comsetics
    • 5c4f4265 - Expand debug message to give more information.
    • f53d5cc6 - Add the message types for the new message format
    • 44d0dd53 - Add some counters and the TsMsbLength in CC
    • 07c80bd3 - Move fEpoch, fix Finish function, add TsMsbLength
    • 8364f491 - Activate algoR
    • f10b6046 - Activate Close() and add Finish()
    • 42d7494b - Working version 1 of AlgoR
    • bfb63f04 - Swap nsamples/nreqbits estimation to calc instead of lookup
    • 232c5ef4 - Remove unecessary call of Close()
    • ad39e7d8 - Introduce a simple monitor with predefined histos
    • 05b00126 - Upgrade and fix some histograms
    • fc28db76 - Move the TRD monitor configuration to an extra function, to keep the macro...
    • 1cbddcec - Add n-info msgs indicator to enum
    • c9aeb549 - Add info type extraction to algo and info type monitor
    • 7d4e2ddc - Add runId dependent parameter selection.
    • 98e39600 - Fix extraction of special avg baseline sample
    • a79feac4 - Fix TS_MSB counting and by that the time reconstruction
    • f55d07ea - Cover additional flags in the EPO msgs + improve TS_MSB counting safety
    • d3f338f1 - Include functionality to connect the source to a TimesliceMultiSubscriber.
    • 135540bc - Adjust position of arguments for smoother usage
    • 4dcf5a1a - Add HttpServer functionalities to our online monitoring
    • 95de258f - fix up
    • 3ada69cd - Add raw and other histos to the online monitor
    • d0cffc71 - Add some comments to extractSample()
    • 92e07165 - Added an outpath macro argument + removed writing of the output tree
    • 5676f2d2 - Add a functionality that allows to also stop writing out the digis
    • 87e4aca4 - Templated the functionalities that adds the new histos to the given map
    • 3ec585e1 - Rearrange some function arguments to allow inclusion to runTrd.py
    • 32117d61 - Pass the Spadic obj also to the RTD method
    • eaf69a93 - Increase capabilities of outfilename creation + MaxAdcToEnergyCal = 1
    • e20824a6 - Add the monitoring of the Microslice flags
    • 0eddb952 - Forgot to include the new histo in the getName functions
    • e1521eb2 - Correct name of the digi output branch
    • dba8d2c1 - Remove unused Monitor classes as clean up
    • 0e1ffd38 - Fix default inits for the TrdDigi c'tors
    • 92fbc363 - Add static const getter for the BranchName of this data container
    • a7e669f7 - Add templates for unpacking to the reco base directory
    • eb973724 - Fully integrate the templates into the existing code
    • e15d02ae - Fix output name extraction for trd monitor
    • 31ffc778 - Adjust trd online monitor class name in run_unpack_online
    • acf66dbd - Fix clang-format for macros
    • 695a0cad - Add licence disclaimer and fix end of line status for files
    • a15de480 - Fix format in the correct way :upsidedown:
    • 95086923 - One empty line to much sneaked in
    • ad9e406b - Files slipped through check of end of file and licence
    • f8fa42e3 - Remove templates from linkDef and add to installed include files
    • 4cf51eda - Remove empty line change from file
    • 8d8b37c3 - Exchange std::uint64_t with size_t
    • 5993c2f6 - Missed uint64_t in the last commit now also changed to size_t
    • 6dbfda50 - Try to fix the lib loading issue on mac os
    • 9dac1d2c - Add classDefs for both templates
    • 9e539e9e - Minor updates of the run_unpack_online(tsa).C TRD settings
    • 8c9094f9 - Fix clang format
    • 93da0e51 - Fix missing paranthesis in run_unpack_online.C
    • 2fecfe7d - Fix outfile naming (one should test code before committing)

    Compare with previous version

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
Please register or sign in to reply
Loading