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] != "FD") {
           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] == "FD") {
           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::FD ||
             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::FD && 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 FD = 26;
+  static constexpr ID Last = FD;
 #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", "FD", 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::gDataOriginFD
 #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::FD))
 #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/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 gDataOriginFD{"FD"};   // 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(FD)
 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/FD/CMakeLists.txt

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

Detectors/Upgrades/ALICE3/FD/README.md

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

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

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

Detectors/Upgrades/ALICE3/FD/base/README.md

@@ -0,0 +1,17 @@
+<!-- doxy
+\page refFITFV0base FV0 Base
+/doxy -->
+
+# FV0 Base
+
+## Geometry
+
+The `o2::fv0::Geometry` class represents the geometry of the FV0 detector as used in simulation. It also provides utility methods for retrieving the center locations of the detector cells. See the below example for how to use the `Geometry` class to query the FV0 cell locations. Note that these are the ideal locations, and that any misalignment is not considered.
+
+```cpp
+o2::fv0::Geometry* fv0Geometry = o2::fv0::Geometry::instance(o2::fv0::Geometry::eUninitialized);
+o2::fv0::Point3Dsimple cellPosition = fv0Geometry->getReadoutCenter(chId);
+float x = cellPosition.x;
+float y = cellPosition.y;
+float z = cellPosition.z;
+```

Detectors/Upgrades/ALICE3/FD/base/include/FDBase/Constants.h

@@ -0,0 +1,32 @@
+// 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   Constants.h
+/// \brief  General constants in FV0
+///
+/// \author Maciej Slupecki, University of Jyvaskyla, Finland
+
+#ifndef ALICEO2_FD_CONSTANTS_
+#define ALICEO2_FD_CONSTANTS_
+
+namespace o2
+{
+namespace fd
+{
+struct Constants {
+  static constexpr int nsect = 8;
+  static constexpr int nringsA = 5;
+  static constexpr int nringsC = 6;
+};
+
+} // namespace fd
+} // namespace o2
+#endif

Detectors/Upgrades/ALICE3/FD/base/include/FDBase/FDBaseParam.h

@@ -0,0 +1,38 @@
+// 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.
+
+#ifndef ALICEO2_FD_FDBASEPARAM_
+#define ALICEO2_FD_FDBASEPARAM_
+
+#include "FDBase/GeometryTGeo.h"
+#include "FDBase/Constants.h"
+#include "CommonUtils/ConfigurableParamHelper.h"
+
+namespace o2
+{
+namespace fd
+{
+struct FDBaseParam : public o2::conf::ConfigurableParamHelper<FDBaseParam> {
+
+  float ringsA[Constants::nringsA + 1] = {3., 14.8, 26.6, 38.4, 50.2, 62.};
+  float ringsC[Constants::nringsC + 1] = {3.5, 14.75, 26.0, 37.25, 48.5, 59.75, 71.};
+
+  float zmodA = 1700;
+  float zmodC = -1950;
+  float dzscint = 4.;
+
+  O2ParamDef(FDBaseParam, "FDBase");
+};
+
+} // namespace fd
+} // namespace o2
+
+#endif

Detectors/Upgrades/ALICE3/FD/base/include/FDBase/GeometryTGeo.h

@@ -0,0 +1,54 @@
+// 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.
+#ifndef ALICEO2_FD_GEOMETRYTGEO_H_
+#define ALICEO2_FD_GEOMETRYTGEO_H_
+
+#include <DetectorsCommonDataFormats/DetMatrixCache.h>
+
+#include "DetectorsBase/GeometryManager.h"
+#include "DetectorsCommonDataFormats/DetID.h"
+#include <Rtypes.h>
+#include <TGeoPhysicalNode.h>
+#include <vector>
+#include <array>
+#include <TGeoMatrix.h>
+#include <TGeoVolume.h>
+#include <TVirtualMC.h>
+
+namespace o2
+{
+namespace fd
+{
+
+/// FD Geometry type
+class GeometryTGeo : public o2::detectors::DetMatrixCache
+{
+ public:
+  GeometryTGeo(bool build = false, int loadTrans = 0);
+
+  void Build(int loadTrans);
+  void fillMatrixCache(int mask);
+  virtual ~GeometryTGeo();
+
+  static GeometryTGeo* Instance();
+
+  void getGlobalPosition(float& x, float& y, float& z);
+
+  static constexpr o2::detectors::DetID::ID getDetID() { return o2::detectors::DetID::FD; }
+
+ private:
+  static std::unique_ptr<o2::fd::GeometryTGeo> sInstance;
+
+  ClassDefNV(GeometryTGeo, 1);
+};
+} // namespace fd
+} // namespace o2
+#endif

Detectors/Upgrades/ALICE3/FD/base/src/FDBaseLinkDef.h

@@ -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.
+
+#ifdef __CLING__
+
+#pragma link off all globals;
+#pragma link off all classes;
+#pragma link off all functions;
+
+#pragma link C++ class o2::fd::Constants + ;
+#pragma link C++ class o2::fd::GeometryTGeo + ;
+#pragma link C++ class o2::fd::FDBaseParam + ;
+#pragma link C++ class o2::conf::ConfigurableParamHelper < o2::fd::FDBaseParam> + ;
+
+#endif

Detectors/Upgrades/ALICE3/FD/base/src/FDBaseParam.cxx

@@ -0,0 +1,14 @@
+// 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.
+
+#include "FDBase/FDBaseParam.h"
+
+O2ParamImpl(o2::fd::FDBaseParam);