Skip to content
Snippets Groups Projects

L1: Interfaces updates

Merged Sergei Zharko requested to merge s.zharko/cbmroot:L1Algo-dev6 into master
All threads resolved!

NOTE: If your reconstruction macro throws fatal error after this merge, please, add the following task before CbmKF: run->AddTask(new CbmTrackingDetectorInterfaceInit());

  • Geometry parameters of L1Algo were incapsulated inside the L1Parameters, compile-time constants were moved to L1Constants.h
  • Tracking interfaces for MVD, STS, MuCh and TRD were introduced:
    • CbmMvdTrackingInterface,
    • CbmStsTrackingInterface,
    • CbmMuchTrackingInterface,
    • CbmTrdTrackingInterface
  • Consistency checks for L1Algo parameter structures were added
Edited by Sergei Zharko

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
  • @s.zharko,

    please find attached the needed patch to install the file. In my test this was enough to fix the installation test.

    diff --git a/core/base/CMakeLists.txt b/core/base/CMakeLists.txt
    index ee65ab3b..822f3d9a 100644
    --- a/core/base/CMakeLists.txt
    +++ b/core/base/CMakeLists.txt
    @@ -69,6 +69,6 @@ Set(DEPENDENCIES
     
     GENERATE_LIBRARY()
     
    -Install(FILES CbmDigitize.h report/CbmReportElement.h
    +Install(FILES CbmDigitize.h CbmTrackingDetectorInterfaceBase.h report/CbmReportElement.h
             DESTINATION include
            )
  • Sergei Zharko added 1 commit

    added 1 commit

    • e7134595 - /core/base/CMakeLists.txt patch

    Compare with previous version

  • @s.zharko,

    you also have to fix the build system of the KF package. Otherwise the linker on macosx12 isn't happy. Obviously you use some function from two libraries which you don't link

    diff --git a/reco/KF/KF.cmake b/reco/KF/KF.cmake
    index 083663bc..6a816dba 100644
    --- a/reco/KF/KF.cmake
    +++ b/reco/KF/KF.cmake
    @@ -174,7 +174,7 @@ ENDIF (SSE_FOUND)
     set(LINKDEF KFLinkDef.h)
     Set(LIBRARY_NAME KF)
     Set(DEPENDENCIES
    -  CbmStsBase CbmMvd CbmBase CbmRecoBase CbmMuchBase CbmData Base Vc.a Minuit2
    +  CbmRecoBase CbmSimSteer CbmStsBase CbmMvd CbmMuchBase CbmTrdBase CbmBase CbmData Base Vc.a Minuit2
     )
     Set(DEFINITIONS -DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -DUSE_TIMERS)
  • Sergei Zharko added 1 commit

    added 1 commit

    • 9c7c34c7 - reco/KF/KF.cmake: added dependency on CbmTrdBase lib (bugfix)

    Compare with previous version

  • @s.zharko,

    I canceled the pipeline since you missed to add CbmSimSteer.

  • Sergei Zharko added 2 commits

    added 2 commits

    • 0418b5e1 - reco/KF/KF.cmake: added dependency on CbmTrdBase lib (bugfix)
    • f17161eb - reco/KF/KF.cmake: added dependency on CbmTrdBase, CbmSimSteer lib (bugfix)

    Compare with previous version

  • Sergey Gorbunov approved this merge request

    approved this merge request

  • Sergei Zharko resolved all threads

    resolved all threads

  • Please register or sign in to reply
    Loading