FD detector

Common/SimConfig/src/SimConfig.cxx

@@ -98,7 +98,8 @@ void SimConfig::determineActiveModules(std::vector<std::string> const& inputargs
             activeModules[i] != "TF3" &&
             activeModules[i] != "RCH" &&
             activeModules[i] != "MI3" &&
-            activeModules[i] != "ECL") {
+            activeModules[i] != "ECL" &&
+            activeModules[i] != "FD3") {
           LOGP(fatal, "List of active modules contains {}, which is not a module from the upgrades.", activeModules[i]);
         }
       }
@@ -112,7 +113,8 @@ void SimConfig::determineActiveModules(std::vector<std::string> const& inputargs
             activeModules[i] == "TF3" ||
             activeModules[i] == "RCH" ||
             activeModules[i] == "MI3" ||
-            activeModules[i] == "ECL") {
+            activeModules[i] == "ECL" ||
+            activeModules[i] == "FD3") {
           LOGP(fatal, "List of active modules contains {}, which is not a run 3 module", activeModules[i]);
         }
       }
@@ -130,6 +132,7 @@ void SimConfig::determineActiveModules(std::vector<std::string> const& inputargs
             d == DetID::TF3 ||
             d == DetID::RCH ||
             d == DetID::ECL ||
+            d == DetID::FD3 ||
             d == DetID::MI3) {
           activeModules.emplace_back(DetID::getName(d));
         }
@@ -149,7 +152,7 @@ void SimConfig::determineActiveModules(std::vector<std::string> const& inputargs
       activeModules.emplace_back("SHIL");
       for (int d = DetID::First; d <= DetID::Last; ++d) {
 #ifdef ENABLE_UPGRADES
-        if (d != DetID::IT3 && d != DetID::TRK && d != DetID::FT3 && d != DetID::FCT && d != DetID::TF3 && d != DetID::RCH && d != DetID::ECL && d != DetID::MI3) {
+        if (d != DetID::IT3 && d != DetID::TRK && d != DetID::FT3 && d != DetID::FCT && d != DetID::TF3 && d != DetID::RCH && d != DetID::ECL && d != DetID::FD3 && d != DetID::MI3) {
           activeModules.emplace_back(DetID::getName(d));
         }
       }

DataFormats/Detectors/Common/include/DetectorsCommonDataFormats/DetID.h

@@ -87,7 +87,8 @@ class DetID
   static constexpr ID RCH = 23;
   static constexpr ID MI3 = 24;
   static constexpr ID ECL = 25;
-  static constexpr ID Last = ECL;
+  static constexpr ID FD3 = 26;
+  static constexpr ID Last = FD3;
 #else
   static constexpr ID Last = FOC; ///< if extra detectors added, update this !!!
 #endif
@@ -181,7 +182,7 @@ class DetID
   // detector names, will be defined in DataSources
   static constexpr const char* sDetNames[nDetectors + 1] = ///< defined detector names
 #ifdef ENABLE_UPGRADES
-    {"ITS", "TPC", "TRD", "TOF", "PHS", "CPV", "EMC", "HMP", "MFT", "MCH", "MID", "ZDC", "FT0", "FV0", "FDD", "TST", "CTP", "FOC", "IT3", "TRK", "FT3", "FCT", "TF3", "RCH", "MI3", "ECL", nullptr};
+    {"ITS", "TPC", "TRD", "TOF", "PHS", "CPV", "EMC", "HMP", "MFT", "MCH", "MID", "ZDC", "FT0", "FV0", "FDD", "TST", "CTP", "FOC", "IT3", "TRK", "FT3", "FCT", "TF3", "RCH", "MI3", "ECL", "FD3", nullptr};
 #else
     {"ITS", "TPC", "TRD", "TOF", "PHS", "CPV", "EMC", "HMP", "MFT", "MCH", "MID", "ZDC", "FT0", "FV0", "FDD", "TST", "CTP", "FOC", nullptr};
 #endif
@@ -195,7 +196,7 @@ class DetID
 #ifdef ENABLE_UPGRADES
      ,
      o2h::gDataOriginIT3, o2h::gDataOriginTRK, o2h::gDataOriginFT3, o2h::gDataOriginFCT, o2h::gDataOriginTF3,
-     o2h::gDataOriginRCH, o2h::gDataOriginMI3, o2h::gDataOriginECL
+     o2h::gDataOriginRCH, o2h::gDataOriginMI3, o2h::gDataOriginECL, o2h::gDataOriginFD3
 #endif
   };
 #endif // GPUCA_GPUCODE_DEVICE
@@ -211,10 +212,11 @@ GPUconstexpr() DetID::mask_t sMasks[DetID::nDetectors] = ///< detectot masks
    DetID::mask_t(math_utils::bit2Mask(DetID::CPV)), DetID::mask_t(math_utils::bit2Mask(DetID::EMC)), DetID::mask_t(math_utils::bit2Mask(DetID::HMP)), DetID::mask_t(math_utils::bit2Mask(DetID::MFT)), DetID::mask_t(math_utils::bit2Mask(DetID::MCH)),
    DetID::mask_t(math_utils::bit2Mask(DetID::MID)), DetID::mask_t(math_utils::bit2Mask(DetID::ZDC)), DetID::mask_t(math_utils::bit2Mask(DetID::FT0)), DetID::mask_t(math_utils::bit2Mask(DetID::FV0)), DetID::mask_t(math_utils::bit2Mask(DetID::FDD)),
    DetID::mask_t(math_utils::bit2Mask(DetID::TST)), DetID::mask_t(math_utils::bit2Mask(DetID::CTP)), DetID::mask_t(math_utils::bit2Mask(DetID::FOC))
+
 #ifdef ENABLE_UPGRADES
                                                                                                        ,
    DetID::mask_t(math_utils::bit2Mask(DetID::IT3)), DetID::mask_t(math_utils::bit2Mask(DetID::TRK)), DetID::mask_t(math_utils::bit2Mask(DetID::FT3)), DetID::mask_t(math_utils::bit2Mask(DetID::FCT)), DetID::mask_t(math_utils::bit2Mask(DetID::TF3)),
-   DetID::mask_t(math_utils::bit2Mask(DetID::RCH)), DetID::mask_t(math_utils::bit2Mask(DetID::MI3)), DetID::mask_t(math_utils::bit2Mask(DetID::ECL))
+   DetID::mask_t(math_utils::bit2Mask(DetID::RCH)), DetID::mask_t(math_utils::bit2Mask(DetID::MI3)), DetID::mask_t(math_utils::bit2Mask(DetID::ECL)), DetID::mask_t(math_utils::bit2Mask(DetID::FD3))
 #endif
 };
 } // namespace detid_internal

DataFormats/Detectors/Common/include/DetectorsCommonDataFormats/SimTraits.h

@@ -99,7 +99,8 @@ class SimTraits
       /*TF3*/ VS{ "TF3Hit" },
       /*RCH*/ VS{ "RCHHit" },
       /*MI3*/ VS{ "MI3Hit" },
-      /*ECL*/ VS{ "ECLHit" }
+      /*ECL*/ VS{ "ECLHit" },
+      /*FD */ VS{ "FDHit" }
 #endif
     };
   // clang-format on

DataFormats/Detectors/Upgrades/ALICE3/CMakeLists.txt

@@ -0,0 +1,12 @@
+# Copyright 2019-2025 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(FD3)

DataFormats/Detectors/Upgrades/ALICE3/FD3/CMakeLists.txt

@@ -0,0 +1,23 @@
+# 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(DataFormatsFD3
+  SOURCES src/Hit.cxx
+  PUBLIC_LINK_LIBRARIES O2::FD3Base
+                        O2::SimulationDataFormat
+                        O2::CommonDataFormat
+                        Microsoft.GSL::GSL
+                        O2::DetectorsCommonDataFormats
+)
+
+o2_target_root_dictionary(DataFormatsFD3
+  HEADERS include/DataFormatsFD3/Hit.h
+)

DataFormats/Detectors/Upgrades/ALICE3/FD3/include/DataFormatsFD3/Hit.h

@@ -0,0 +1,125 @@
+// 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.
+
+/// \file Hit.h
+/// \brief Definition of the FD3 Hit class (based on ITSMFT and FV0)
+
+#ifndef ALICEO2_FVD_HIT_H_
+#define ALICEO2_FVD_HIT_H_
+
+#include <iosfwd>
+#include "SimulationDataFormat/BaseHits.h" // for BasicXYZEHit
+#include "Rtypes.h"                        // for Bool_t, Double_t, int, Double32_t, etc
+#include "TVector3.h"                      // for TVector3
+#include "CommonUtils/ShmAllocator.h"
+
+namespace o2
+{
+namespace fd3
+{
+
+class Hit : public o2::BasicXYZEHit<float, float>
+{
+ public:
+  /// Default constructor
+  Hit() = default;
+
+  /// Class Constructor
+  /// \param trackID Index of MCTrack
+  /// \param cellID Cell ID
+  /// \param startPos Coordinates at entrance to active volume [cm]
+  /// \param endPos Coordinates to active volume [cm]
+  /// \param startMom Momentum of track at entrance [GeV]
+  /// \param startE Energy of track at entrance [GeV]
+  /// \param endTime Final time [ns]
+  /// \param eLoss Energy deposit [GeV]
+  /// \param particlePdg PDG code of the partcile associated with the track
+  inline Hit(int trackID,
+             int cellID,
+             const math_utils::Point3D<float>& startPos,
+             const math_utils::Point3D<float>& endPos,
+             const math_utils::Vector3D<float>& startMom,
+             double startE,
+             double endTime,
+             double eLoss,
+             int particlePdg);
+
+  // Entrance position getters
+  math_utils::Point3D<float> const& GetPosStart() const { return mPositionStart; }
+  float GetStartX() const { return mPositionStart.X(); }
+  float GetStartY() const { return mPositionStart.Y(); }
+  float GetStartZ() const { return mPositionStart.Z(); }
+  template <typename F>
+  void GetStartPosition(F& x, F& y, F& z) const
+  {
+    x = GetStartX();
+    y = GetStartY();
+    z = GetStartZ();
+  }
+
+  // Momentum getters
+  math_utils::Vector3D<float> const& GetMomentum() const { return mMomentumStart; }
+  math_utils::Vector3D<float>& GetMomentum() { return mMomentumStart; }
+  float GetPx() const { return mMomentumStart.X(); }
+  float GetPy() const { return mMomentumStart.Y(); }
+  float GetPz() const { return mMomentumStart.Z(); }
+  float GetE() const { return mEnergyStart; }
+  float GetTotalEnergyAtEntrance() const { return GetE(); }
+  int GetParticlePdg() const { return mParticlePdg; }
+
+  void Print(const Option_t* opt) const;
+
+ private:
+  math_utils::Vector3D<float> mMomentumStart; ///< momentum at entrance
+  math_utils::Point3D<float> mPositionStart;  ///< position at entrance (base mPos give position on exit)
+  float mEnergyStart;                         ///< total energy at entrance
+  int mParticlePdg;                           ///< PDG code of the particle associated with this track
+
+  ClassDefNV(Hit, 1);
+};
+
+Hit::Hit(int trackID,
+         int detID,
+         const math_utils::Point3D<float>& startPos,
+         const math_utils::Point3D<float>& endPos,
+         const math_utils::Vector3D<float>& startMom,
+         double startE,
+         double endTime,
+         double eLoss,
+         int particlePdg)
+  : BasicXYZEHit(endPos.X(),
+                 endPos.Y(),
+                 endPos.Z(),
+                 endTime,
+                 eLoss,
+                 trackID,
+                 detID),
+    mMomentumStart(startMom.X(), startMom.Y(), startMom.Z()),
+    mPositionStart(startPos.X(), startPos.Y(), startPos.Z()),
+    mEnergyStart(startE),
+    mParticlePdg(particlePdg)
+{
+}
+
+} // namespace fd3
+} // namespace o2
+
+#ifdef USESHM
+namespace std
+{
+template <>
+class allocator<o2::fd3::Hit> : public o2::utils::ShmAllocator<o2::fd3::Hit>
+{
+};
+
+} // namespace std
+#endif /* USESHM */
+#endif /* ALICEO2_FD3_HIT_H_ */

DataFormats/Detectors/Upgrades/ALICE3/FD3/src/DataFormatsFD3LinkDef.h

@@ -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.
+
+#ifdef __CLING__
+
+#pragma link off all globals;
+#pragma link off all classes;
+#pragma link off all functions;
+
+#pragma link C++ class o2::fd3::Hit + ;
+#pragma link C++ class vector < o2::fd3::Hit> + ;
+
+#endif

DataFormats/Detectors/Upgrades/ALICE3/FD3/src/Hit.cxx

@@ -0,0 +1,35 @@
+// 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.
+
+/// \file Hit.cxx
+/// \brief Implementation of the Hit class
+
+#include "DataFormatsFD3/Hit.h"
+#include <iostream>
+
+ClassImp(o2::fd3::Hit);
+
+namespace o2
+{
+namespace fd3
+{
+
+void Hit::Print(const Option_t* opt) const
+{
+  printf(
+    "Det: %5d Track: %6d E.loss: %.3e P: %+.3e %+.3e %+.3e\n"
+    "PosIn: %+.3e %+.3e %+.3e PosOut: %+.3e %+.3e %+.3e\n",
+    GetDetectorID(), GetTrackID(), GetEnergyLoss(), GetPx(), GetPy(), GetPz(),
+    GetStartX(), GetStartY(), GetStartZ(), GetX(), GetY(), GetZ());
+}
+
+} // namespace fd3
+} // namespace o2

DataFormats/Detectors/Upgrades/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+# Copyright 2019-2025 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.
 #
@@ -10,3 +10,4 @@
 # or submit itself to any jurisdiction.
 
 message(STATUS "Building dataformats for upgrades")
+add_subdirectory(ALICE3)

DataFormats/Headers/include/Headers/DataHeader.h

@@ -588,6 +588,7 @@ constexpr o2::header::DataOrigin gDataOriginTF3{"TF3"};
 constexpr o2::header::DataOrigin gDataOriginRCH{"RCH"};
 constexpr o2::header::DataOrigin gDataOriginMI3{"MI3"};
 constexpr o2::header::DataOrigin gDataOriginECL{"ECL"}; // upgrades
+constexpr o2::header::DataOrigin gDataOriginFD3{"FD3"}; // upgrades
 
 constexpr o2::header::DataOrigin gDataOriginGPU{"GPU"};
 

Detectors/Upgrades/ALICE3/CMakeLists.txt

@@ -12,10 +12,11 @@
 add_subdirectory(Passive)
 add_subdirectory(TRK)
 add_subdirectory(ECal)
+add_subdirectory(FD3)
 add_subdirectory(FT3)
 add_subdirectory(FCT)
 add_subdirectory(AOD)
 add_subdirectory(IOTOF)
 add_subdirectory(RICH)
 add_subdirectory(MID)
-add_subdirectory(macros)
+add_subdirectory(macros)

Detectors/Upgrades/ALICE3/FD3/CMakeLists.txt

@@ -0,0 +1,13 @@
+# Copyright 2019-2025 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(base)
+add_subdirectory(simulation)

Detectors/Upgrades/ALICE3/FD3/README.md

@@ -0,0 +1,10 @@
+<!-- doxy
+\page refDetectorsUpgradesALICE3TRK Tracker
+/doxy -->
+
+# ALICE 3 FORWARD DETECTOR
+
+This is top page for the FD3 detector documentation.
+
+<!-- doxy
+/doxy -->

Detectors/Upgrades/ALICE3/FD3/base/CMakeLists.txt

@@ -0,0 +1,20 @@
+# Copyright 2019-2025 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(FD3Base
+        SOURCES src/GeometryTGeo.cxx
+                src/FD3BaseParam.cxx
+                PUBLIC_LINK_LIBRARIES  O2::DetectorsBase)
+
+o2_target_root_dictionary(FD3Base
+        HEADERS include/FD3Base/GeometryTGeo.h
+                include/FD3Base/Constants.h
+                include/FD3Base/FD3BaseParam.h)