Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Remove DCAFitter from DetectorsVertexing #10689

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shahor02 merged 4 commits into from
Feb 3, 2023
Merged

Remove DCAFitter from DetectorsVertexing #10689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c711689
Remove DCAFitter from DetectorsVertexing
Feb 3, 2023
283a07c
Remove spurious tabs
Feb 3, 2023
757cafc
remove spurious tabs
ddobrigk Feb 3, 2023
49c4592
remove spurious tabs
ddobrigk Feb 3, 2023
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
3 changes: 2 additions & 1 deletion 3 Detectors/StrangenessTracking/macros/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ o2_add_test_root_macro(XiTrackingStudy.C
O2::DataFormatsITS
O2::SimulationDataFormat
O2::StrangenessTracking
LABELS strangeness-tracking)
O2::DCAFitter
LABELS strangeness-tracking)
4 changes: 2 additions & 2 deletions 4 Detectors/StrangenessTracking/macros/XiTrackingStudy.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
#include "TTree.h"
#include "TLegend.h"
#include "CommonDataFormat/RangeReference.h"
#include "DetectorsVertexing/DCAFitterN.h"
#include "DCAFitter/DCAFitterN.h"
#include "StrangenessTracking/StrangenessTracker.h"

#endif
Expand Down Expand Up @@ -641,4 +641,4 @@ double calcMass(std::vector<o2::track::TrackParCovF> tracks)
moth += prong;
}
return moth.M();
}
}
3 changes: 2 additions & 1 deletion 3 Detectors/StrangenessTracking/tracking/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ o2_add_library(StrangenessTracking
O2::SimulationDataFormat
O2::DetectorsVertexing
O2::ReconstructionDataFormats
O2::DCAFitter
)

o2_target_root_dictionary(StrangenessTracking
Expand All @@ -29,4 +30,4 @@ o2_target_root_dictionary(StrangenessTracking
include/StrangenessTracking/StrangenessTracker.h


LINKDEF src/StrangenessTrackingLinkDef.h)
LINKDEF src/StrangenessTrackingLinkDef.h)
2 changes: 1 addition & 1 deletion 2 Detectors/StrangenessTracking/tracking/include/StrangenessTracking/StrangenessTracker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include "DataFormatsITSMFT/CompCluster.h"
#include "DataFormatsGlobalTracking/RecoContainer.h"

#include "DetectorsVertexing/DCAFitterN.h"
#include "DCAFitter/DCAFitterN.h"
#include "DetectorsBase/Propagator.h"

namespace o2
Expand Down
3 changes: 2 additions & 1 deletion 3 Detectors/StrangenessTracking/workflow/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,10 @@ o2_add_library(StrangenessTrackingWorkflow
O2::ITSMFTWorkflow
O2::DetectorsCalibration
O2::GlobalTrackingWorkflowWriters
O2::DCAFitter
O2::CCDB)

o2_add_executable(strangeness-tracking-workflow
SOURCES src/strangeness-tracking-workflow.cxx
PUBLIC_LINK_LIBRARIES O2::StrangenessTrackingWorkflow
O2::GlobalTrackingWorkflowReaders)
O2::GlobalTrackingWorkflowReaders)
20 changes: 3 additions & 17 deletions 20 Detectors/Vertexing/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,13 @@

o2_add_library(DetectorsVertexing
TARGETVARNAME targetName
SOURCES src/DCAFitterN.cxx
src/PVertexer.cxx
SOURCES src/PVertexer.cxx
src/PVertexerHelpers.cxx
src/PVertexerParams.cxx
src/VertexTrackMatcher.cxx
src/SVertexer.cxx
src/SVertexerParams.cxx
src/SVertexHypothesis.cxx
src/FwdDCAFitterN.cxx
PUBLIC_LINK_LIBRARIES ROOT::Core
O2::CommonUtils
O2::ReconstructionDataFormats
Expand All @@ -32,14 +30,12 @@ o2_add_library(DetectorsVertexing
O2::FT0Reconstruction
O2::DataFormatsFT0
O2::GlobalTracking
O2::DCAFitter
Microsoft.GSL::GSL)

o2_target_root_dictionary(DetectorsVertexing
HEADERS include/DetectorsVertexing/HelixHelper.h
include/DetectorsVertexing/PVertexerHelpers.h
HEADERS include/DetectorsVertexing/PVertexerHelpers.h
include/DetectorsVertexing/PVertexerParams.h
include/DetectorsVertexing/DCAFitterN.h
include/DetectorsVertexing/FwdDCAFitterN.h
include/DetectorsVertexing/SVertexerParams.h
include/DetectorsVertexing/SVertexHypothesis.h)

Expand All @@ -48,16 +44,6 @@ if (OpenMP_CXX_FOUND)
target_link_libraries(${targetName} PRIVATE OpenMP::OpenMP_CXX)
endif()


o2_add_test(
DCAFitterN
SOURCES test/testDCAFitterN.cxx
COMPONENT_NAME DetectorsVertexing
PUBLIC_LINK_LIBRARIES O2::DetectorsVertexing ROOT::Core ROOT::Physics
LABELS vertexing
ENVIRONMENT O2_ROOT=${CMAKE_BINARY_DIR}/stage
VMCWORKDIR=${CMAKE_BINARY_DIR}/stage/${CMAKE_INSTALL_DATADIR})

o2_add_test_root_macro(test/PVFromPool.C
PUBLIC_LINK_LIBRARIES O2::DetectorsVertexing
LABELS vertexing)
2 changes: 1 addition & 1 deletion 2 Detectors/Vertexing/include/DetectorsVertexing/SVertexer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "ReconstructionDataFormats/VtxTrackIndex.h"
#include "ReconstructionDataFormats/VtxTrackRef.h"
#include "CommonDataFormat/RangeReference.h"
#include "DetectorsVertexing/DCAFitterN.h"
#include "DCAFitter/DCAFitterN.h"
#include "DetectorsVertexing/SVertexerParams.h"
#include "DetectorsVertexing/SVertexHypothesis.h"
#include "DataFormatsTPC/TrackTPC.h"
Expand Down
9 changes: 0 additions & 9 deletions 9 Detectors/Vertexing/src/DetectorsVertexingLinkDef.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,13 @@
#pragma link off all classes;
#pragma link off all functions;

#pragma link C++ class o2::vertexing::DCAFitterN < 2, o2::track::TrackParCov> + ;
#pragma link C++ class o2::vertexing::DCAFitterN < 3, o2::track::TrackParCov> + ;

#pragma link C++ class o2::vertexing::PVertexerParams + ;
#pragma link C++ class o2::conf::ConfigurableParamHelper < o2::vertexing::PVertexerParams> + ;

#pragma link C++ class o2::vertexing::SVertexHypothesis + ;
#pragma link C++ class o2::vertexing::SVertexerParams + ;
#pragma link C++ class o2::conf::ConfigurableParamHelper < o2::vertexing::SVertexerParams> + ;

#pragma link C++ class o2::track::TrackAuxPar + ;
#pragma link C++ class o2::track::CrossInfo + ;

#pragma link C++ function o2::vertexing::DCAFitter2::process(const o2::track::TrackParCov&, const o2::track::TrackParCov&);
#pragma link C++ function o2::vertexing::DCAFitter3::process(const o2::track::TrackParCov&, const o2::track::TrackParCov&, const o2::track::TrackParCov&);

#pragma link C++ class o2::vertexing::TrackVFDump + ;
#pragma link C++ class std::vector < o2::vertexing::TrackVFDump> + ;

Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.