enable hits

Author: pkurash

DataFormats/Detectors/Upgrades/CMakeLists.txt

@@ -10,4 +10,3 @@
 # or submit itself to any jurisdiction.
 
 message(STATUS "Building dataformats for upgrades")
-add_subdirectory(FVD)

DataFormats/Detectors/Upgrades/FVD/CMakeLists.txt

@@ -20,21 +20,25 @@ namespace o2
 namespace fvd
 {
 struct FVDBaseParam : public o2::conf::ConfigurableParamHelper<FVDBaseParam> {
-  static constexpr int nCellA = 40; //24
-  static constexpr int nCellC = 48; 
-  static constexpr int nRingsA = 5; //3
-  static constexpr int nRingsC = 6;
-  
-  static constexpr float dzScint =  4.;
-  static constexpr float rRingsA[int(nCellA/8)+1] = {3., 14.8, 26.6, 38.4, 50.2, 62.};
-  static constexpr float rRingsC[int(nCellC/8)+1] = {3.5, 14.8, 22.8, 37.3, 48.5, 59.8, 71.};
 
-  static constexpr float zModA = 1700;
-  static constexpr float zModC = -1950;
+//  int nringsA = 5; // 3
+//  int nringsC = 6;
+  int nsect   = 8;
+
+  float dzscint = 4.;
+  std::vector<float> ringsA = {3., 14.8, 26.6, 38.4, 50.2, 62.};
+  std::vector<float> ringsC = {3.5, 14.8, 22.8, 37.3, 48.5, 59.8, 71.};
+
+  int nringsA = ringsA.size() - 1;
+  int nringsC = ringsC.size() - 1;
+
+  float zmodA = 1700;
+  float zmodC = -1950;
 
   O2ParamDef(FVDBaseParam, "FVDBase");
 };
 
 } // namespace fvd
 } // namespace o2
+  
 #endif

DataFormats/Detectors/Upgrades/FVD/include/DataFormatsFVD/Hit.h

@@ -44,11 +44,7 @@ class GeometryTGeo : public o2::detectors::DetMatrixCache
 
   static constexpr o2::detectors::DetID::ID getDetID() { return o2::detectors::DetID::FVD; }
 
-  int getCellId(int nmod, int nring, int nsec) const;
-  int getCurrentCellId(const TVirtualMC* fMC) const;
-
  private:
-
   static std::unique_ptr<o2::fvd::GeometryTGeo> sInstance;
 
   ClassDefNV(GeometryTGeo, 1);

DataFormats/Detectors/Upgrades/FVD/src/DataFormatsFVDLinkDef.h

@@ -17,7 +17,7 @@
 #include <fairlogger/Logger.h>
 
 using namespace o2::fvd;
-namespace o2 
+namespace o2
 {
 namespace fvd
 {
@@ -46,7 +46,7 @@ GeometryTGeo* GeometryTGeo::Instance()
 
 void GeometryTGeo::Build(int loadTrans)
 {
-   if (isBuilt()) {
+  if (isBuilt()) {
     LOGP(warning, "Already built");
     return; // already initialized
   }
@@ -62,24 +62,5 @@ void GeometryTGeo::fillMatrixCache(int mask)
 {
 }
 
-int GeometryTGeo::getCellId(int nmod, int nring, int nsec) const
-{
-   return nmod * FVDBaseParam::nCellA + 8 * nring +  nsec;
-}
-
-int GeometryTGeo::getCurrentCellId(const TVirtualMC* fMC) const
-{
-  int moduleId = -1;
-  int sectorId = -1;
-  int ringId = -1;
-
-  fMC->CurrentVolOffID(2, moduleId);
-  fMC->CurrentVolOffID(1, sectorId);
-  fMC->CurrentVolOffID(0, ringId);
-  int cellId = getCellId(moduleId, ringId, sectorId); 
-
-  return cellId;
-}
-
 } // namespace fvd
-} //namespace o2
+} // namespace o2

DataFormats/Detectors/Upgrades/FVD/src/Hits.cxx

@@ -10,11 +10,12 @@
 # or submit itself to any jurisdiction.
 
 o2_add_library(FVDSimulation
-        SOURCES src/Detector.cxx
-        PUBLIC_LINK_LIBRARIES O2::SimulationDataFormat
-                              O2::DataFormatsFVD)
+               SOURCES src/Detector.cxx
+               PUBLIC_LINK_LIBRARIES O2::FVDBase
+                                     O2::ITSMFTSimulation
+                                     ROOT::Physics)
 
 o2_target_root_dictionary(FVDSimulation
-        HEADERS include/FVDSimulation/Detector.h)
-
+                          HEADERS include/FVDSimulation/Detector.h)
 
+o2_data_file(COPY data  DESTINATION Detectors/FVD/simulation)

Detectors/Upgrades/ALICE3/FVD/base/include/FVDBase/FVDBaseParam.h

@@ -9,15 +9,22 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+/// \file Detector.h
+/// \brief Definition of the Detector class
+
 #ifndef ALICEO2_FVD_DETECTOR_H_
 #define ALICEO2_FVD_DETECTOR_H_
 
 #include "SimulationDataFormat/BaseHits.h"
 #include "DetectorsBase/Detector.h"
-#include "DataFormatsFVD/Hit.h"
 #include "FVDBase/GeometryTGeo.h"
+#include "FVDBase/FVDBaseParam.h"
+#include "ITSMFTSimulation/Hit.h"        
+#include "Rtypes.h"                         
+#include "TGeoManager.h"                  
+#include "TLorentzVector.h"             
+#include "TVector3.h"                  
 
-class FairModule;
 class FairVolume;
 class TGeoVolume;
 
@@ -26,23 +33,36 @@ namespace o2
 namespace fvd
 {
 class GeometryTGeo;
-class Hit;
+}
+}
+
+namespace o2
+{
+namespace fvd
+{
+
 class Detector : public o2::base::DetImpl<Detector>
 {
  public:
-  Detector(Bool_t Active);
+  Detector(bool Active);
 
   Detector() = default;
+
   ~Detector() override;
 
   void ConstructGeometry() override;
 
-  o2::fvd::Hit* addHit(Int_t trackId, Int_t 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_t particlePdg);
-
-  std::vector<o2::fvd::Hit>* getHits(Int_t iColl)
+  /// This method is an example of how to add your own point of type Hit to the clones array
+  o2::itsmft::Hit* addHit(int trackID, int detID, 
+		          const TVector3& startPos, 
+			  const TVector3& endPos,
+                          const TVector3& startMom, 
+			  double startE, 
+			  double endTime, double eLoss,
+                          unsigned int startStatus, 
+			  unsigned int endStatus);
+
+  std::vector<o2::itsmft::Hit>* getHits(Int_t iColl)
   {
     if (iColl == 0) {
       return mHits;
@@ -69,28 +89,40 @@ class Detector : public o2::base::DetImpl<Detector>
   };
 
  private:
-  Detector(const Detector& rhs);
+  Detector(const Detector&);
   Detector& operator=(const Detector&);
 
-  std::vector<o2::fvd::Hit>* mHits = nullptr;
-  GeometryTGeo* mGeometryTGeo = nullptr; 
+  std::vector<o2::itsmft::Hit>* mHits = nullptr;
+  GeometryTGeo* mGeometryTGeo = nullptr;
 
   TGeoVolumeAssembly* buildModuleA();
   TGeoVolumeAssembly* buildModuleC();
 
+  int mNumberOfRingsA;
+  int mNumberOfRingsC;
+  int mNumberOfSectors;
+  float mDzScint;
+
+  std::vector<float> mRingRadiiA;
+  std::vector<float> mRingRadiiC;
+  
+  float mZmodA;
+  float mZmodC;
+
   void defineSensitiveVolumes();
 
   /// Transient data about track passing the sensor, needed by ProcessHits()
   struct TrackData {               // this is transient
     bool mHitStarted;              //! hit creation started
-    TLorentzVector mPositionStart; //! position at entrance 
+    unsigned char mTrkStatusStart; //! track status flag
+    TLorentzVector mPositionStart; //! position at entrance
     TLorentzVector mMomentumStart; //! momentum
     double mEnergyLoss;            //! energy loss
   } mTrackData;                    //!
 
   template <typename Det>
   friend class o2::base::DetImpl;
-  ClassDefOverride(Detector, 2);
+  ClassDefOverride(Detector, 1);
 };
 
 // Input and output function for standard C++ input/output.