Add RecHit

CMakeLists.txt

@@ -20,7 +20,15 @@ target_sources(
                 include/SHiP/SimHit.hpp
                 include/SHiP/SimParticle.hpp
                 include/SHiP/SimResult.hpp
+                include/SHiP/RecHit.hpp
+                include/SHiP/TrackFitResult.hpp
                 include/SHiP/RecParticle.hpp
+                include/SHiP/detectors/UBTHit.hpp
+                include/SHiP/detectors/SBTHit.hpp
+                include/SHiP/detectors/StrawTubesHit.hpp
+                include/SHiP/detectors/CaloHit.hpp
+                include/SHiP/detectors/TimeDetHit.hpp
+                include/SHiP/detectors/DetectorID.hpp
 )
 target_link_libraries(SHiPDataModel PUBLIC ROOT::Core)
 set_target_properties(SHiPDataModel PROPERTIES LINKER_LANGUAGE CXX)
@@ -47,7 +55,14 @@ root_generate_dictionary(
   SHiP/SimHit.hpp
   SHiP/SimParticle.hpp
   SHiP/SimResult.hpp
+  SHiP/RecHit.hpp
+  SHiP/TrackFitResult.hpp
   SHiP/RecParticle.hpp
+  SHiP/detectors/UBTHit.hpp
+  SHiP/detectors/SBTHit.hpp
+  SHiP/detectors/StrawTubesHit.hpp
+  SHiP/detectors/CaloHit.hpp
+  SHiP/detectors/TimeDetHit.hpp   
   MODULE
   SHiPDataModel
   LINKDEF
@@ -60,7 +75,10 @@ install(
     TARGETS SHiPDataModel
     EXPORT SHiPDataModelTargets
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    FILE_SET headers
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    FILE_SET headers DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
 )
 install(TARGETS SHiPUnits EXPORT SHiPDataModelTargets FILE_SET headers)
 install(
@@ -93,6 +111,7 @@ install(
     DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/SHiPDataModel
 )
 
+
 include(CTest)
 if(BUILD_TESTING)
     add_subdirectory(tests)

include/SHiP/LinkDef.h

@@ -14,7 +14,23 @@
 #pragma link C++ class std::vector<SHiP::SimHit>+;
 #pragma link C++ class std::vector<SHiP::SimParticle>+;
 
+// Digitisation
+#pragma link C++ class SHiP::RecHit+;
+#pragma link C++ class std::vector<SHiP::RecHit>+;
+#pragma link C++ class SHiP::UBTHit+;
+#pragma link C++ class std::vector<SHiP::UBTHit>+;
+#pragma link C++ class SHiP::SBTHit+;
+#pragma link C++ class std::vector<SHiP::SBTHit>+;
+#pragma link C++ class SHiP::TimeDetHit+;
+#pragma link C++ class std::vector<SHiP::TimeDetHit>+;
+#pragma link C++ class SHiP::StrawTubesHit+;
+#pragma link C++ class std::vector<SHiP::StrawTubesHit>+;
+#pragma link C++ class SHiP::CaloHit+;
+#pragma link C++ class std::vector<SHiP::CaloHit>+;
+
 // Reconstruction
+#pragma link C++ class SHiP::TrackFitResult+;
+#pragma link C++ class std::vector<SHiP::TrackFitResult>+;
 #pragma link C++ class SHiP::RecParticle+;
 #pragma link C++ class std::vector<SHiP::RecParticle>+;
 #endif

include/SHiP/RecHit.hpp

@@ -0,0 +1,33 @@
+#pragma once
+
+#include <array>
+#include <cstdint>
+
+#include "SHiP/SimHit.hpp"
+
+namespace SHiP {
+
+/// Reconstructed particle
+struct RecHit {
+  std::int32_t detectorId{0};
+  std::int32_t trackId{0};
+  std::int32_t pdgCode{0};
+  std::array<double, 3> position{0, 0, 0};  ///< Hit position [mm]
+  std::array<double, 3> momentum{0, 0, 0};  ///< Momentum at hit [GeV/c]
+  double energyDeposit{0};                  ///< Energy deposited [GeV]
+  double time{0};                           ///< Global time [ns]
+  double pathLength{0};                     ///< Step length [mm]
+};
+
+inline RecHit fromSimHit(SimHit const& sp) {
+  return {.detectorId = sp.detectorId,
+          .trackId = sp.trackId,
+          .pdgCode = sp.pdgCode,
+          .position = sp.position,
+          .momentum = sp.momentum,
+          .energyDeposit = sp.energyDeposit,
+          .time = sp.time,
+          .pathLength = sp.pathLength};
+}
+
+}  // namespace SHiP

include/SHiP/RecParticle.hpp

@@ -2,7 +2,9 @@
 
 #include <array>
 #include <cstdint>
+#include <vector>
 
+#include "SHiP/RecHit.hpp"
 #include "SHiP/SimParticle.hpp"
 
 namespace SHiP {
@@ -15,8 +17,9 @@ struct RecParticle {
   std::array<double, 3> vertex{0, 0, 0};    ///< Production vertex [mm]
   std::array<double, 3> endpoint{0, 0, 0};  ///< End point [mm]
   std::array<double, 3> momentum{0, 0, 0};  ///< Initial momentum [GeV/c]
-  double energy{0};                         ///< Initial kinetic energy [GeV]
-  double time{0};                           ///< Production time [ns]
+  std::vector<RecHit> hits{};
+  double energy{0};  ///< Initial kinetic energy [GeV]
+  double time{0};    ///< Production time [ns]
   std::int32_t creatorProcess{0};
   double ipPV{0};  ///< IP wrt to the PV (at 0,0,0) [mm]
 };

include/SHiP/TrackFitResult.hpp

@@ -0,0 +1,27 @@
+#pragma once
+
+#include <array>
+#include <vector>
+#include <cstdint>
+
+namespace SHiP {
+
+/// Reconstructed particle
+struct TrackFitResult {
+  std::int32_t nMeas{0};
+  std::int32_t fitStatus{1};  // 0 = success, 1 = failure
+  double chi2{0};
+  std::int32_t ndf{0};
+  double qoverp{0};
+  double phi{0};
+  double theta{0};
+  double time{0};
+  std::array<double, 3> refLoc{0,0,0};
+  std::vector<double> inputMeasurementsX{};
+  std::vector<double> inputMeasurementsY{};
+  std::vector<double> fittedMeasurementsX{};
+  std::vector<double> fittedMeasurementsY{};
+  std::vector<double> residualsX{};
+  std::vector<double> residualsY{};
+};
+}  // namespace SHiP

include/SHiP/detectors/CaloHit.hpp

@@ -0,0 +1,11 @@
+#pragma once
+#include "SHiP/RecHit.hpp"
+
+namespace SHiP {
+
+/// Hit reconstructed by the calorimeter
+struct CaloHit{
+    RecHit recHit; ///< The reconstructed hit
+};
+
+}  // namespace SHiP

include/SHiP/detectors/DetectorID.hpp

@@ -0,0 +1,16 @@
+// SHiP/DetectorID.hpp
+#pragma once
+
+#include <cstdint>
+
+namespace SHiP {
+
+enum class DetectorID : std::int32_t {
+    StrawTubes = 2,
+    Calorimeter = 3,
+    UpstreamTagger = 0,
+    SurroundTagger = 1,
+    TimingDetector = 4
+};
+
+} // namespace SHiP

include/SHiP/detectors/SBTHit.hpp

@@ -0,0 +1,11 @@
+#pragma once
+#include "SHiP/RecHit.hpp"
+
+namespace SHiP {
+
+/// Hit reconstructed by the SBT (Surround Background Tagger)
+struct SBTHit{
+    RecHit recHit; ///< The reconstructed hit
+};
+
+}  // namespace SHiP

include/SHiP/detectors/StrawTubesHit.hpp

@@ -0,0 +1,11 @@
+#pragma once
+#include "SHiP/RecHit.hpp"
+
+namespace SHiP {
+
+/// Hit reconstructed by a layer of the straw tubes spectrometer
+struct StrawTubesHit{
+    RecHit recHit; ///< The reconstructed hit
+};
+
+}  // namespace SHiP

include/SHiP/detectors/TimeDetHit.hpp

@@ -0,0 +1,11 @@
+#pragma once
+#include "SHiP/RecHit.hpp"
+
+namespace SHiP {
+
+/// Hit reconstructed by the timing detector
+struct TimeDetHit{
+    RecHit recHit; ///< The reconstructed hit
+};
+
+}  // namespace SHiP

include/SHiP/detectors/UBTHit.hpp

@@ -0,0 +1,11 @@
+#pragma once
+#include "SHiP/RecHit.hpp"
+
+namespace SHiP {
+
+/// Hit reconstructed by the UBT (Upstream Background Tagger)
+struct UBTHit{
+    RecHit recHit; ///< The reconstructed hit
+};
+
+}  // namespace SHiP