Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Detectors/Upgrades/ALICE3/TRK/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
# or submit itself to any jurisdiction.

add_subdirectory(base)
add_subdirectory(macros)
add_subdirectory(simulation)
add_subdirectory(workflow)
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

#include <memory>
#include <DetectorsCommonDataFormats/DetMatrixCache.h>
#include "DetectorsCommonDataFormats/DetID.h"

namespace o2
{
Expand Down Expand Up @@ -127,10 +128,13 @@ class GeometryTGeo : public o2::detectors::DetMatrixCache

TString getMatrixPath(int index) const;

#ifdef ENABLE_UPGRADES
static const char* composeSymNameTRK(int d)
{
return Form("%s_%d", o2::detectors::DetID(o2::detectors::DetID::TRK).getName(), d);
}
#endif

static const char* composeSymNameLayer(int d, int layer);
static const char* composeSymNameStave(int d, int layer);
static const char* composeSymNameChip(int d, int lr);
Expand Down
2 changes: 2 additions & 0 deletions Detectors/Upgrades/ALICE3/TRK/base/src/GeometryTGeo.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -367,10 +367,12 @@ void GeometryTGeo::fillMatrixCache(int mask)

//__________________________________________________________________________

#ifdef ENABLE_UPGRADES
const char* GeometryTGeo::composeSymNameLayer(int d, int lr)
{
return Form("%s/%s%d", composeSymNameTRK(d), getTRKLayerPattern(), lr);
}
#endif

const char* GeometryTGeo::composeSymNameStave(int d, int lr)
{
Expand Down
4 changes: 3 additions & 1 deletion Detectors/Upgrades/ALICE3/TRK/base/src/TRKBaseLinkDef.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@
#pragma link off all classes;
#pragma link off all functions;

#pragma link C++ class o2::conf::ConfigurableParamHelper < o2::trk::TRKBaseParam> + ;

#pragma link C++ class o2::trk::GeometryTGeo +
#pragma link C++ class o2::trk::TRKBaseParam + ;
#pragma link C++ class o2::conf::ConfigurableParamHelper < o2::trk::TRKBaseParam> + ;
#pragma link C++ class o2::trk::SegmentationChip + ;

#endif
12 changes: 12 additions & 0 deletions Detectors/Upgrades/ALICE3/TRK/macros/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Copyright 2019-2020 CERN and copyright holders of ALICE O2.
# See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
# All rights not expressly granted are reserved.
#
# This software is distributed under the terms of the GNU General Public
# License v3 (GPL Version 3), copied verbatim in the file "COPYING".
#
# In applying this license CERN does not waive the privileges and immunities
# granted to it by virtue of its status as an Intergovernmental Organization
# or submit itself to any jurisdiction.

add_subdirectory(test)
21 changes: 21 additions & 0 deletions Detectors/Upgrades/ALICE3/TRK/macros/test/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Copyright 2019-2020 CERN and copyright holders of ALICE O2.
# See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
# All rights not expressly granted are reserved.
#
# This software is distributed under the terms of the GNU General Public
# License v3 (GPL Version 3), copied verbatim in the file "COPYING".
#
# In applying this license CERN does not waive the privileges and immunities
# granted to it by virtue of its status as an Intergovernmental Organization
# or submit itself to any jurisdiction.

o2_add_test_root_macro(CheckDigits.C
PUBLIC_LINK_LIBRARIES O2::ITSMFTBase
O2::ITSMFTSimulation
O2::TRKBase
O2::TRKSimulation
O2::MathUtils
O2::SimulationDataFormat
O2::DetectorsBase
O2::Steer
LABELS trk COMPILE_ONLY)
Loading