AliceO2Group · shahor02 · Jul 31, 2019 · Jul 19, 2019 · Jul 19, 2019 · Jul 19, 2019
@@ -58,8 +58,8 @@ class DetID
  static constexpr ID MCH = 9;
  static constexpr ID MID = 10;
  static constexpr ID ZDC = 11;
-  static constexpr ID T0 = 12;
-  static constexpr ID V0 = 13;
+  static constexpr ID FT0 = 12;
+  static constexpr ID FV0 = 13;
  static constexpr ID FDD = 14;
  static constexpr ID ACO = 15;
  static constexpr ID First = ITS;
@@ -108,13 +108,13 @@ class DetID

  static constexpr const char* sDetNames[nDetectors + 1] = ///< defined detector names

-    { "ITS", "TPC", "TRD", "TOF", "PHS", "CPV", "EMC", "HMP", "MFT", "MCH", "MID", "ZDC", "T0", "V0", "FDD", "ACO", nullptr };
+    { "ITS", "TPC", "TRD", "TOF", "PHS", "CPV", "EMC", "HMP", "MFT", "MCH", "MID", "ZDC", "FT0", "FV0", "FDD", "ACO", nullptr };

  // detector names, will be defined in DataSources
  static constexpr std::array<mask_t, nDetectors> sMasks = ///< detectot masks
    { utils::bit2Mask(ITS), utils::bit2Mask(TPC), utils::bit2Mask(TRD), utils::bit2Mask(TOF), utils::bit2Mask(PHS),
      utils::bit2Mask(CPV), utils::bit2Mask(EMC), utils::bit2Mask(HMP), utils::bit2Mask(MFT), utils::bit2Mask(MCH),
-      utils::bit2Mask(MID), utils::bit2Mask(ZDC), utils::bit2Mask(T0), utils::bit2Mask(V0), utils::bit2Mask(FDD), utils::bit2Mask(ACO) };
+      utils::bit2Mask(MID), utils::bit2Mask(ZDC), utils::bit2Mask(FT0), utils::bit2Mask(FV0), utils::bit2Mask(FDD), utils::bit2Mask(ACO) };

  ClassDefNV(DetID, 1);
 };

@@ -25,7 +25,7 @@ constexpr std::array<DetID::mask_t, DetID::nDetectors> DetID::sMasks;

 // redundant declarations
 constexpr DetID::ID DetID::ITS, DetID::TPC, DetID::TRD, DetID::TOF, DetID::PHS, DetID::CPV, DetID::EMC,
-  DetID::HMP, DetID::MFT, DetID::MCH, DetID::MID, DetID::ZDC, DetID::T0, DetID::V0, DetID::FDD, DetID::ACO, DetID::First, DetID::Last;
+  DetID::HMP, DetID::MFT, DetID::MCH, DetID::MID, DetID::ZDC, DetID::FT0, DetID::FV0, DetID::FDD, DetID::ACO, DetID::First, DetID::Last;

 constexpr int DetID::nDetectors;


@@ -8,6 +8,6 @@
 # granted to it by virtue of its status as an Intergovernmental Organization or
 # submit itself to any jurisdiction.

-add_subdirectory(T0)
-add_subdirectory(V0)
 add_subdirectory(FDD)
+add_subdirectory(FT0)
+add_subdirectory(FV0)
@@ -8,13 +8,13 @@
 # granted to it by virtue of its status as an Intergovernmental Organization or
 # submit itself to any jurisdiction.

-o2_add_library(DataFormatsFITT0
+o2_add_library(DataFormatsFT0
               SOURCES src/Digit.cxx src/RecPoints.cxx
               PUBLIC_LINK_LIBRARIES O2::CommonDataFormat
                                     O2::SimulationDataFormat)

-o2_target_root_dictionary(DataFormatsFITT0
-                          HEADERS include/DataFormatsFITT0/Digit.h
-                                  include/DataFormatsFITT0/RecPoints.h
-                                  include/DataFormatsFITT0/MCLabel.h
-                                  include/DataFormatsFITT0/HitType.h)
+o2_target_root_dictionary(DataFormatsFT0
+                          HEADERS include/DataFormatsFT0/Digit.h
+                                  include/DataFormatsFT0/RecPoints.h
+                                  include/DataFormatsFT0/MCLabel.h
+                                  include/DataFormatsFT0/HitType.h)
@@ -18,7 +18,7 @@

 namespace o2
 {
-namespace t0
+namespace ft0
 {

 struct ChannelData {
@@ -105,6 +105,6 @@ class Digit : public DigitBase
 };

 std::ostream& operator<<(std::ostream& stream, const Digit& digi);
-} // namespace t0
+} // namespace ft0
 } // namespace o2
 #endif
@@ -20,23 +20,23 @@

 namespace o2
 {
-namespace t0
+namespace ft0
 {
 class HitType : public o2::BasicXYZEHit<float>
 {
 public:
  using BasicXYZEHit<float>::BasicXYZEHit;
 };

-} // namespace t0
+} // namespace ft0

 } // namespace o2

 #ifdef USESHM
 namespace std
 {
 template <>
-class allocator<o2::t0::HitType> : public o2::utils::ShmAllocator<o2::t0::HitType>
+class allocator<o2::ft0::HitType> : public o2::utils::ShmAllocator<o2::ft0::HitType>
 {
 };
 } // namespace std

@@ -17,7 +17,7 @@

 namespace o2
 {
-namespace t0
+namespace ft0
 {
 class MCLabel : public o2::MCCompLabel
 {
@@ -33,7 +33,7 @@ class MCLabel : public o2::MCCompLabel

  ClassDefNV(MCLabel, 1);
 };
-} // namespace t0
+} // namespace ft0
 } // namespace o2

 #endif
@@ -18,11 +18,11 @@
 #include <array>
 #include "Rtypes.h"
 #include <TObject.h>
-#include <DataFormatsFITT0/Digit.h>
+#include <DataFormatsFT0/Digit.h>

 namespace o2
 {
-namespace t0
+namespace ft0
 {

 class RecPoints
@@ -35,15 +35,15 @@ class RecPoints
  RecPoints() = default;
  RecPoints(const std::array<Float_t, 3>& collisiontime,
            Float_t vertex,
-            std::vector<o2::t0::ChannelData> timeamp)
+            std::vector<o2::ft0::ChannelData> timeamp)
    : mCollisionTime(collisiontime),
      mVertex(vertex),
      mTimeAmp(std::move(timeamp))
  {
  }
  ~RecPoints() = default;

-  void fillFromDigits(const o2::t0::Digit& digit);
+  void fillFromDigits(const o2::ft0::Digit& digit);
  float getCollisionTime(int side) const { return mCollisionTime[side]; }
  float getCollisionTimeMean() const { return getCollisionTime(TimeMean); }
  float getCollisionTimeA() const { return getCollisionTime(TimeC); }
@@ -59,9 +59,9 @@ class RecPoints

  void SetMgrEventTime(Double_t time) { mEventTime = time; }

-  const std::vector<o2::t0::ChannelData>& getChDgData() const { return mTimeAmp; }
-  void setChDgData(const std::vector<o2::t0::ChannelData>& TimeAmp) { mTimeAmp = TimeAmp; }
-  void setChDgData(std::vector<o2::t0::ChannelData>&& TimeAmp) { mTimeAmp = std::move(TimeAmp); }
+  const std::vector<o2::ft0::ChannelData>& getChDgData() const { return mTimeAmp; }
+  void setChDgData(const std::vector<o2::ft0::ChannelData>& TimeAmp) { mTimeAmp = TimeAmp; }
+  void setChDgData(std::vector<o2::ft0::ChannelData>&& TimeAmp) { mTimeAmp = std::move(TimeAmp); }

  void setInteractionRecord(uint16_t bc, uint32_t orbit)
  {
@@ -79,11 +79,11 @@ class RecPoints
                                            2 * o2::InteractionRecord::DummyTime };
  Float_t mVertex = 0;
  Double_t mEventTime = 2 * o2::InteractionRecord::DummyTime; //event time from Fair for continuous
-  std::vector<o2::t0::ChannelData> mTimeAmp;
+  std::vector<o2::ft0::ChannelData> mTimeAmp;
  o2::InteractionRecord mIntRecord; // Interaction record (orbit, bc) from digits

  ClassDefNV(RecPoints, 1);
 };
-} // namespace t0
+} // namespace ft0
 } // namespace o2
 #endif
@@ -14,18 +14,18 @@
 #pragma link off all classes;
 #pragma link off all functions;

-#pragma link C++ class o2::t0::Digit + ;
-#pragma link C++ class o2::t0::ChannelData + ;
-#pragma link C++ class vector < o2::t0::ChannelData> + ;
-#pragma link C++ class vector < o2::t0::Digit> + ;
+#pragma link C++ class o2::ft0::Digit + ;
+#pragma link C++ class o2::ft0::ChannelData + ;
+#pragma link C++ class vector < o2::ft0::ChannelData> + ;
+#pragma link C++ class vector < o2::ft0::Digit> + ;

-#pragma link C++ class o2::t0::RecPoints + ;
-#pragma link C++ class vector < o2::t0::RecPoints> + ;
+#pragma link C++ class o2::ft0::RecPoints + ;
+#pragma link C++ class vector < o2::ft0::RecPoints> + ;

-#pragma link C++ class o2::t0::MCLabel + ;
-#pragma link C++ class o2::dataformats::MCTruthContainer < o2::t0::MCLabel> + ;
+#pragma link C++ class o2::ft0::MCLabel + ;
+#pragma link C++ class o2::dataformats::MCTruthContainer < o2::ft0::MCLabel> + ;

-#pragma link C++ class o2::t0::HitType + ;
-#pragma link C++ class vector < o2::t0::HitType> + ;
+#pragma link C++ class o2::ft0::HitType + ;
+#pragma link C++ class vector < o2::ft0::HitType> + ;

 #endif
@@ -8,10 +8,10 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.

-#include "DataFormatsFITT0/Digit.h"
+#include "DataFormatsFT0/Digit.h"
 #include <iostream>

-using namespace o2::t0;
+using namespace o2::ft0;

 void Digit::printStream(std::ostream& stream) const
 {

@@ -8,21 +8,21 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.

-#include "DataFormatsFITT0/RecPoints.h"
+#include "DataFormatsFT0/RecPoints.h"
 #include <cmath>
 #include <cassert>
 #include <iostream>
 #include <CommonDataFormat/InteractionRecord.h>

-using namespace o2::t0;
+using namespace o2::ft0;

 namespace
 {
 constexpr int NCellsA = 24; // number of radiatiors on A side
 constexpr int NCellsC = 28; // number of radiatiors on C side
 } // namespace

-void RecPoints::fillFromDigits(const o2::t0::Digit& digit)
+void RecPoints::fillFromDigits(const o2::ft0::Digit& digit)
 {
  mCollisionTime = {};


@@ -8,9 +8,9 @@
 # granted to it by virtue of its status as an Intergovernmental Organization or
 # submit itself to any jurisdiction.

-o2_add_library(DataFormatsFITV0
+o2_add_library(DataFormatsFV0
               SOURCES src/Hit.cxx
               PUBLIC_LINK_LIBRARIES O2::SimulationDataFormat)

-o2_target_root_dictionary(DataFormatsFITV0
-                          HEADERS include/DataFormatsFITV0/Hit.h)
+o2_target_root_dictionary(DataFormatsFV0
+                          HEADERS include/DataFormatsFV0/Hit.h)
@@ -9,20 +9,20 @@
 // or submit itself to any jurisdiction.

 /// \file Hit.h
-/// \brief Definition of the FIT-V0 Hit class (based on ITSMFT)
+/// \brief Definition of the FV0 Hit class (based on ITSMFT)

-#ifndef ALICEO2_FIT_V0_HIT_H_
-#define ALICEO2_FIT_V0_HIT_H_
+#ifndef ALICEO2_FV0_HIT_H_
+#define ALICEO2_FV0_HIT_H_

+#include <iosfwd>
 #include "SimulationDataFormat/BaseHits.h" // for BasicXYZEHit
 #include "Rtypes.h"                        // for Bool_t, Double_t, Int_t, Double32_t, etc
 #include "TVector3.h"                      // for TVector3
-#include <iosfwd>
 #include "CommonUtils/ShmAllocator.h"

 namespace o2
 {
-namespace v0
+namespace fv0
 {

 class Hit : public o2::BasicXYZEHit<Float_t, Float_t>
@@ -41,8 +41,14 @@ class Hit : public o2::BasicXYZEHit<Float_t, Float_t>
  /// \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 TVector3& startPos, const TVector3& endPos,
-             const TVector3& startMom, double startE, double endTime, double eLoss,
+  inline Hit(int trackID,
+             int cellID,
+             const Point3D<float>& startPos,
+             const Point3D<float>& endPos,
+             const Vector3D<float>& startMom,
+             double startE,
+             double endTime,
+             double eLoss,
             Int_t particlePdg);

  // Entrance position getters
@@ -70,36 +76,48 @@ class Hit : public o2::BasicXYZEHit<Float_t, Float_t>
  void Print(const Option_t* opt) const;

 private:
-  Vector3D<Float_t> mMomentumStart; ///< momentum at entrance
-  Point3D<Float_t> mPositionStart;  ///< position at entrance (base mPos give position on exit)
-  Float_t mEnergyStart;             ///< total energy at entrance
-  Int_t mParticlePdg;               ///< PDG code of the particle associated with this track
+  Vector3D<float> mMomentumStart; ///< momentum at entrance
+  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 TVector3& startPos, const TVector3& endPos,
-         const TVector3& startMom, double startE, double endTime, double eLoss,
+Hit::Hit(int trackID,
+         int detID,
+         const Point3D<float>& startPos,
+         const Point3D<float>& endPos,
+         const Vector3D<float>& startMom,
+         double startE,
+         double endTime,
+         double eLoss,
         Int_t particlePdg)
-  : BasicXYZEHit(endPos.X(), endPos.Y(), endPos.Z(), endTime, eLoss, trackID, detID),
-    mMomentumStart(startMom.Px(), startMom.Py(), startMom.Pz()),
+  : 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 v0
+} // namespace fv0
 } // namespace o2

 #ifdef USESHM
 namespace std
 {
 template <>
-class allocator<o2::v0::Hit> : public o2::utils::ShmAllocator<o2::v0::Hit>
+class allocator<o2::fv0::Hit> : public o2::utils::ShmAllocator<o2::fv0::Hit>
 {
 };

 } // namespace std
 #endif /* USESHM */
-#endif /* ALICEO2_FIT_V0_HIT_H_ */
+#endif /* ALICEO2_FV0_HIT_H_ */
@@ -14,7 +14,7 @@
 #pragma link off all classes;
 #pragma link off all functions;

-#pragma link C++ class o2::v0::Hit + ;
-#pragma link C++ class vector < o2::v0::Hit> + ;
+#pragma link C++ class o2::fv0::Hit + ;
+#pragma link C++ class vector < o2::fv0::Hit> + ;

 #endif