From f35d4b0e379b43a038c75bb7b207a73b4a40bdbf Mon Sep 17 00:00:00 2001 From: czhang Date: Wed, 24 Jan 2024 13:36:01 +0100 Subject: [PATCH] Deleting unused sub-directory --- .../MUON/MCH/Align/Aligner/CMakeLists.txt | 63 ------------------- Detectors/MUON/MCH/Align/CMakeLists.txt | 55 ++++++++++++++-- .../{Aligner => }/include/MCHAlign/Aligner.h | 0 .../include/MCHAlign/AlignmentSpec.h | 0 .../include/MCHAlign/MatrixSparse.h | 0 .../{Aligner => }/include/MCHAlign/MatrixSq.h | 0 .../include/MCHAlign/MillePede2.h | 0 .../include/MCHAlign/MillePedeRecord.h | 0 .../include/MCHAlign/MinResSolve.h | 0 .../include/MCHAlign/RectMatrix.h | 0 .../include/MCHAlign/SymBDMatrix.h | 0 .../include/MCHAlign/SymMatrix.h | 0 .../include/MCHAlign/VectorSparse.h | 0 .../MCH/Align/{Aligner => }/src/Aligner.cxx | 0 .../Align/{Aligner => }/src/AlignmentSpec.cxx | 0 .../Align/{Aligner => }/src/MCHAlignLinkDef.h | 0 .../Align/{Aligner => }/src/MatrixSparse.cxx | 0 .../MCH/Align/{Aligner => }/src/MatrixSq.cxx | 0 .../Align/{Aligner => }/src/MillePede2.cxx | 0 .../{Aligner => }/src/MillePedeRecord.cxx | 0 .../Align/{Aligner => }/src/MinResSolve.cxx | 0 .../Align/{Aligner => }/src/RectMatrix.cxx | 0 .../Align/{Aligner => }/src/SymBDMatrix.cxx | 0 .../MCH/Align/{Aligner => }/src/SymMatrix.cxx | 0 .../Align/{Aligner => }/src/VectorSparse.cxx | 0 .../{Aligner => }/src/alignment-workflow.cxx | 0 26 files changed, 51 insertions(+), 67 deletions(-) delete mode 100644 Detectors/MUON/MCH/Align/Aligner/CMakeLists.txt rename Detectors/MUON/MCH/Align/{Aligner => }/include/MCHAlign/Aligner.h (100%) rename Detectors/MUON/MCH/Align/{Aligner => }/include/MCHAlign/AlignmentSpec.h (100%) rename Detectors/MUON/MCH/Align/{Aligner => }/include/MCHAlign/MatrixSparse.h (100%) rename Detectors/MUON/MCH/Align/{Aligner => }/include/MCHAlign/MatrixSq.h (100%) rename Detectors/MUON/MCH/Align/{Aligner => }/include/MCHAlign/MillePede2.h (100%) rename Detectors/MUON/MCH/Align/{Aligner => }/include/MCHAlign/MillePedeRecord.h (100%) rename Detectors/MUON/MCH/Align/{Aligner => }/include/MCHAlign/MinResSolve.h (100%) rename Detectors/MUON/MCH/Align/{Aligner => }/include/MCHAlign/RectMatrix.h (100%) rename Detectors/MUON/MCH/Align/{Aligner => }/include/MCHAlign/SymBDMatrix.h (100%) rename Detectors/MUON/MCH/Align/{Aligner => }/include/MCHAlign/SymMatrix.h (100%) rename Detectors/MUON/MCH/Align/{Aligner => }/include/MCHAlign/VectorSparse.h (100%) rename Detectors/MUON/MCH/Align/{Aligner => }/src/Aligner.cxx (100%) rename Detectors/MUON/MCH/Align/{Aligner => }/src/AlignmentSpec.cxx (100%) rename Detectors/MUON/MCH/Align/{Aligner => }/src/MCHAlignLinkDef.h (100%) rename Detectors/MUON/MCH/Align/{Aligner => }/src/MatrixSparse.cxx (100%) rename Detectors/MUON/MCH/Align/{Aligner => }/src/MatrixSq.cxx (100%) rename Detectors/MUON/MCH/Align/{Aligner => }/src/MillePede2.cxx (100%) rename Detectors/MUON/MCH/Align/{Aligner => }/src/MillePedeRecord.cxx (100%) rename Detectors/MUON/MCH/Align/{Aligner => }/src/MinResSolve.cxx (100%) rename Detectors/MUON/MCH/Align/{Aligner => }/src/RectMatrix.cxx (100%) rename Detectors/MUON/MCH/Align/{Aligner => }/src/SymBDMatrix.cxx (100%) rename Detectors/MUON/MCH/Align/{Aligner => }/src/SymMatrix.cxx (100%) rename Detectors/MUON/MCH/Align/{Aligner => }/src/VectorSparse.cxx (100%) rename Detectors/MUON/MCH/Align/{Aligner => }/src/alignment-workflow.cxx (100%) diff --git a/Detectors/MUON/MCH/Align/Aligner/CMakeLists.txt b/Detectors/MUON/MCH/Align/Aligner/CMakeLists.txt deleted file mode 100644 index c5f8cb72f80bc..0000000000000 --- a/Detectors/MUON/MCH/Align/Aligner/CMakeLists.txt +++ /dev/null @@ -1,63 +0,0 @@ -# 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_library(MCHAlign - SOURCES - src/Aligner.cxx - src/MillePede2.cxx - src/MillePedeRecord.cxx - src/MinResSolve.cxx - src/MatrixSparse.cxx - src/MatrixSq.cxx - src/SymBDMatrix.cxx - src/RectMatrix.cxx - src/VectorSparse.cxx - src/SymMatrix.cxx - src/AlignmentSpec.cxx - PUBLIC_LINK_LIBRARIES - O2::MathUtils - O2::CCDB - O2::DataFormatsMCH - O2::MCHTracking - O2::MCHGeometryTransformer - O2::MCHGeometryCreator - O2::MCHGeometryTest - O2::CommonUtils - O2::DataFormatsParameters - O2::DetectorsBase - O2::Framework - O2::DetectorsRaw - O2::Headers - O2::ReconstructionDataFormats - O2::DetectorsCommonDataFormats) - -o2_target_root_dictionary(MCHAlign - HEADERS - include/MCHAlign/Aligner.h - include/MCHAlign/MillePede2.h - include/MCHAlign/MillePedeRecord.h - include/MCHAlign/MinResSolve.h - include/MCHAlign/MatrixSparse.h - include/MCHAlign/MatrixSq.h - include/MCHAlign/SymBDMatrix.h - include/MCHAlign/RectMatrix.h - include/MCHAlign/VectorSparse.h - include/MCHAlign/SymMatrix.h - include/MCHAlign/AlignmentSpec.h) - -o2_add_executable( - alignment-workflow - SOURCES src/alignment-workflow.cxx - COMPONENT_NAME mch - PUBLIC_LINK_LIBRARIES - O2::MCHAlign - Boost::program_options) - diff --git a/Detectors/MUON/MCH/Align/CMakeLists.txt b/Detectors/MUON/MCH/Align/CMakeLists.txt index 370fd3e2fe162..c5f8cb72f80bc 100644 --- a/Detectors/MUON/MCH/Align/CMakeLists.txt +++ b/Detectors/MUON/MCH/Align/CMakeLists.txt @@ -9,8 +9,55 @@ # granted to it by virtue of its status as an Intergovernmental Organization # or submit itself to any jurisdiction. -add_subdirectory(Aligner) -if (BUILD_TESTING) -add_subdirectory(Test) -endif() +o2_add_library(MCHAlign + SOURCES + src/Aligner.cxx + src/MillePede2.cxx + src/MillePedeRecord.cxx + src/MinResSolve.cxx + src/MatrixSparse.cxx + src/MatrixSq.cxx + src/SymBDMatrix.cxx + src/RectMatrix.cxx + src/VectorSparse.cxx + src/SymMatrix.cxx + src/AlignmentSpec.cxx + PUBLIC_LINK_LIBRARIES + O2::MathUtils + O2::CCDB + O2::DataFormatsMCH + O2::MCHTracking + O2::MCHGeometryTransformer + O2::MCHGeometryCreator + O2::MCHGeometryTest + O2::CommonUtils + O2::DataFormatsParameters + O2::DetectorsBase + O2::Framework + O2::DetectorsRaw + O2::Headers + O2::ReconstructionDataFormats + O2::DetectorsCommonDataFormats) + +o2_target_root_dictionary(MCHAlign + HEADERS + include/MCHAlign/Aligner.h + include/MCHAlign/MillePede2.h + include/MCHAlign/MillePedeRecord.h + include/MCHAlign/MinResSolve.h + include/MCHAlign/MatrixSparse.h + include/MCHAlign/MatrixSq.h + include/MCHAlign/SymBDMatrix.h + include/MCHAlign/RectMatrix.h + include/MCHAlign/VectorSparse.h + include/MCHAlign/SymMatrix.h + include/MCHAlign/AlignmentSpec.h) + +o2_add_executable( + alignment-workflow + SOURCES src/alignment-workflow.cxx + COMPONENT_NAME mch + PUBLIC_LINK_LIBRARIES + O2::MCHAlign + Boost::program_options) diff --git a/Detectors/MUON/MCH/Align/Aligner/include/MCHAlign/Aligner.h b/Detectors/MUON/MCH/Align/include/MCHAlign/Aligner.h similarity index 100% rename from Detectors/MUON/MCH/Align/Aligner/include/MCHAlign/Aligner.h rename to Detectors/MUON/MCH/Align/include/MCHAlign/Aligner.h diff --git a/Detectors/MUON/MCH/Align/Aligner/include/MCHAlign/AlignmentSpec.h b/Detectors/MUON/MCH/Align/include/MCHAlign/AlignmentSpec.h similarity index 100% rename from Detectors/MUON/MCH/Align/Aligner/include/MCHAlign/AlignmentSpec.h rename to Detectors/MUON/MCH/Align/include/MCHAlign/AlignmentSpec.h diff --git a/Detectors/MUON/MCH/Align/Aligner/include/MCHAlign/MatrixSparse.h b/Detectors/MUON/MCH/Align/include/MCHAlign/MatrixSparse.h similarity index 100% rename from Detectors/MUON/MCH/Align/Aligner/include/MCHAlign/MatrixSparse.h rename to Detectors/MUON/MCH/Align/include/MCHAlign/MatrixSparse.h diff --git a/Detectors/MUON/MCH/Align/Aligner/include/MCHAlign/MatrixSq.h b/Detectors/MUON/MCH/Align/include/MCHAlign/MatrixSq.h similarity index 100% rename from Detectors/MUON/MCH/Align/Aligner/include/MCHAlign/MatrixSq.h rename to Detectors/MUON/MCH/Align/include/MCHAlign/MatrixSq.h diff --git a/Detectors/MUON/MCH/Align/Aligner/include/MCHAlign/MillePede2.h b/Detectors/MUON/MCH/Align/include/MCHAlign/MillePede2.h similarity index 100% rename from Detectors/MUON/MCH/Align/Aligner/include/MCHAlign/MillePede2.h rename to Detectors/MUON/MCH/Align/include/MCHAlign/MillePede2.h diff --git a/Detectors/MUON/MCH/Align/Aligner/include/MCHAlign/MillePedeRecord.h b/Detectors/MUON/MCH/Align/include/MCHAlign/MillePedeRecord.h similarity index 100% rename from Detectors/MUON/MCH/Align/Aligner/include/MCHAlign/MillePedeRecord.h rename to Detectors/MUON/MCH/Align/include/MCHAlign/MillePedeRecord.h diff --git a/Detectors/MUON/MCH/Align/Aligner/include/MCHAlign/MinResSolve.h b/Detectors/MUON/MCH/Align/include/MCHAlign/MinResSolve.h similarity index 100% rename from Detectors/MUON/MCH/Align/Aligner/include/MCHAlign/MinResSolve.h rename to Detectors/MUON/MCH/Align/include/MCHAlign/MinResSolve.h diff --git a/Detectors/MUON/MCH/Align/Aligner/include/MCHAlign/RectMatrix.h b/Detectors/MUON/MCH/Align/include/MCHAlign/RectMatrix.h similarity index 100% rename from Detectors/MUON/MCH/Align/Aligner/include/MCHAlign/RectMatrix.h rename to Detectors/MUON/MCH/Align/include/MCHAlign/RectMatrix.h diff --git a/Detectors/MUON/MCH/Align/Aligner/include/MCHAlign/SymBDMatrix.h b/Detectors/MUON/MCH/Align/include/MCHAlign/SymBDMatrix.h similarity index 100% rename from Detectors/MUON/MCH/Align/Aligner/include/MCHAlign/SymBDMatrix.h rename to Detectors/MUON/MCH/Align/include/MCHAlign/SymBDMatrix.h diff --git a/Detectors/MUON/MCH/Align/Aligner/include/MCHAlign/SymMatrix.h b/Detectors/MUON/MCH/Align/include/MCHAlign/SymMatrix.h similarity index 100% rename from Detectors/MUON/MCH/Align/Aligner/include/MCHAlign/SymMatrix.h rename to Detectors/MUON/MCH/Align/include/MCHAlign/SymMatrix.h diff --git a/Detectors/MUON/MCH/Align/Aligner/include/MCHAlign/VectorSparse.h b/Detectors/MUON/MCH/Align/include/MCHAlign/VectorSparse.h similarity index 100% rename from Detectors/MUON/MCH/Align/Aligner/include/MCHAlign/VectorSparse.h rename to Detectors/MUON/MCH/Align/include/MCHAlign/VectorSparse.h diff --git a/Detectors/MUON/MCH/Align/Aligner/src/Aligner.cxx b/Detectors/MUON/MCH/Align/src/Aligner.cxx similarity index 100% rename from Detectors/MUON/MCH/Align/Aligner/src/Aligner.cxx rename to Detectors/MUON/MCH/Align/src/Aligner.cxx diff --git a/Detectors/MUON/MCH/Align/Aligner/src/AlignmentSpec.cxx b/Detectors/MUON/MCH/Align/src/AlignmentSpec.cxx similarity index 100% rename from Detectors/MUON/MCH/Align/Aligner/src/AlignmentSpec.cxx rename to Detectors/MUON/MCH/Align/src/AlignmentSpec.cxx diff --git a/Detectors/MUON/MCH/Align/Aligner/src/MCHAlignLinkDef.h b/Detectors/MUON/MCH/Align/src/MCHAlignLinkDef.h similarity index 100% rename from Detectors/MUON/MCH/Align/Aligner/src/MCHAlignLinkDef.h rename to Detectors/MUON/MCH/Align/src/MCHAlignLinkDef.h diff --git a/Detectors/MUON/MCH/Align/Aligner/src/MatrixSparse.cxx b/Detectors/MUON/MCH/Align/src/MatrixSparse.cxx similarity index 100% rename from Detectors/MUON/MCH/Align/Aligner/src/MatrixSparse.cxx rename to Detectors/MUON/MCH/Align/src/MatrixSparse.cxx diff --git a/Detectors/MUON/MCH/Align/Aligner/src/MatrixSq.cxx b/Detectors/MUON/MCH/Align/src/MatrixSq.cxx similarity index 100% rename from Detectors/MUON/MCH/Align/Aligner/src/MatrixSq.cxx rename to Detectors/MUON/MCH/Align/src/MatrixSq.cxx diff --git a/Detectors/MUON/MCH/Align/Aligner/src/MillePede2.cxx b/Detectors/MUON/MCH/Align/src/MillePede2.cxx similarity index 100% rename from Detectors/MUON/MCH/Align/Aligner/src/MillePede2.cxx rename to Detectors/MUON/MCH/Align/src/MillePede2.cxx diff --git a/Detectors/MUON/MCH/Align/Aligner/src/MillePedeRecord.cxx b/Detectors/MUON/MCH/Align/src/MillePedeRecord.cxx similarity index 100% rename from Detectors/MUON/MCH/Align/Aligner/src/MillePedeRecord.cxx rename to Detectors/MUON/MCH/Align/src/MillePedeRecord.cxx diff --git a/Detectors/MUON/MCH/Align/Aligner/src/MinResSolve.cxx b/Detectors/MUON/MCH/Align/src/MinResSolve.cxx similarity index 100% rename from Detectors/MUON/MCH/Align/Aligner/src/MinResSolve.cxx rename to Detectors/MUON/MCH/Align/src/MinResSolve.cxx diff --git a/Detectors/MUON/MCH/Align/Aligner/src/RectMatrix.cxx b/Detectors/MUON/MCH/Align/src/RectMatrix.cxx similarity index 100% rename from Detectors/MUON/MCH/Align/Aligner/src/RectMatrix.cxx rename to Detectors/MUON/MCH/Align/src/RectMatrix.cxx diff --git a/Detectors/MUON/MCH/Align/Aligner/src/SymBDMatrix.cxx b/Detectors/MUON/MCH/Align/src/SymBDMatrix.cxx similarity index 100% rename from Detectors/MUON/MCH/Align/Aligner/src/SymBDMatrix.cxx rename to Detectors/MUON/MCH/Align/src/SymBDMatrix.cxx diff --git a/Detectors/MUON/MCH/Align/Aligner/src/SymMatrix.cxx b/Detectors/MUON/MCH/Align/src/SymMatrix.cxx similarity index 100% rename from Detectors/MUON/MCH/Align/Aligner/src/SymMatrix.cxx rename to Detectors/MUON/MCH/Align/src/SymMatrix.cxx diff --git a/Detectors/MUON/MCH/Align/Aligner/src/VectorSparse.cxx b/Detectors/MUON/MCH/Align/src/VectorSparse.cxx similarity index 100% rename from Detectors/MUON/MCH/Align/Aligner/src/VectorSparse.cxx rename to Detectors/MUON/MCH/Align/src/VectorSparse.cxx diff --git a/Detectors/MUON/MCH/Align/Aligner/src/alignment-workflow.cxx b/Detectors/MUON/MCH/Align/src/alignment-workflow.cxx similarity index 100% rename from Detectors/MUON/MCH/Align/Aligner/src/alignment-workflow.cxx rename to Detectors/MUON/MCH/Align/src/alignment-workflow.cxx