move Hit to common

AliceO2Group · mslupeck · Jan 18, 2019 · Jan 22, 2019 · Jan 23, 2019 · Jan 26, 2019
commit f1b2bfac41ee833c90dcf6cc87afbee352d76015
@@ -10,11 +10,7 @@ set(HEADERS
     include/${MODULE_NAME}/Geometry.h
     )
 
-<<<<<<< HEAD
-=======
-
->>>>>>> first separation T0 V0
-Set(LINKDEF src/T0BaseLinkDef.h)
+  Set(LINKDEF src/T0BaseLinkDef.h)
 Set(LIBRARY_NAME ${MODULE_NAME})
 set(BUCKET_NAME fit_base_bucket)
 

@@ -26,34 +26,10 @@ class FairVolume;
 class TGeoVolume;
 class TGraph;
 
-namespace o2
-{
-namespace t0
-<<<<<<< HEAD:Detectors/FIT/T0/simulation/include/T0Simulation/Detector.h
-=======
-{
-class HitType : public o2::BasicXYZEHit<float>
-{
- public:
-  using BasicXYZEHit<float>::BasicXYZEHit;
-};
-} // namespace t0
-} // namespace o2
-
-#ifdef USESHM
-namespace std
-{
-template <>
-class allocator<o2::t0::HitType> : public o2::utils::ShmAllocator<o2::t0::HitType>
-{
-};
-} // namespace std
-#endif
 
 namespace o2
 {
 namespace t0
->>>>>>> first separation T0 V0:Detectors/FIT/T0/simulation/include/T0Simulation/Detector.h
 {
 class Geometry;
 }

@@ -60,7 +60,7 @@ class DigitizerTask : public FairTask
   const std::vector<o2::t0::HitType>* mHitsArray = nullptr; ///< Array of MC hits
 
   TBranch* mQEDBranch = nullptr;                               //! optional special branch of hits from QED collitions
-  const std::vector<o2::t0::HitType>* mHitsArrayQED = nullptr; //! array of MC hits from ED
+  const std::vector<o2::fit::HitType>* mHitsArrayQED = nullptr; //! array of MC hits from ED
   float mQEDEntryTimeBinNS = 0.f;                              ///< every entry in the QED branch integrates QED for so many nanosec.
   double mLastQEDTimeNS = 0.;                                  ///< center of the time-bin of last added QED bg slot (entry of mQEDBranch)
   int mLastQEDEntry = -1;                                      ///< last used QED entry

@@ -44,6 +44,7 @@ Detector::Detector(Bool_t Active)
 
 Detector::Detector(const Detector& rhs)
   : o2::Base::DetImpl<Detector>(rhs), mIdSens1(rhs.mIdSens1), mPMTeff(rhs.mPMTeff), mHits(o2::utils::createSimVector<o2::fit::HitType>())
+
 {
 }
 

@@ -59,17 +59,6 @@ class Digitizer
   Double_t mEventTime; // timestamp
 
   DigitizationParameters parameters;
-<<<<<<< HEAD:Detectors/FIT/common/simulation/include/FITSimulation/Digitizer.h
-=======
-  /*
-  Float_t mBC_clk_center = 12.5;                             // clk center
-  Int_t mMCPs = (Geometry::NCellsA + Geometry::NCellsC) * 4; //number of MCPs
-  Float_t mCFD_trsh_mip = 0.4;                               // = 4[mV] / 10[mV/mip]
-  Float_t mTime_trg_gate = 4.;                               // ns
-  Int_t mAmpThreshold = 100;                                 // number of photoelectrons
-  Float_t mTimeDiffAC = (Geometry::ZdetA - Geometry::ZdetC) * TMath::C();
-  */
->>>>>>> first separation T0 V0:Detectors/FIT/common/simulation/include/FITSimulation/Digitizer.h
 
   o2::dataformats::MCTruthContainer<o2::fit::MCLabel>* mMCLabels = nullptr;
 

@@ -14,7 +14,9 @@ class HitType : public o2::BasicXYZEHit<float>
  public:
   using BasicXYZEHit<float>::BasicXYZEHit;
 };
+
 } // namespace fit
+
 } // namespace o2
 
 #endif

@@ -76,7 +76,6 @@ void Digitizer::process(const std::vector<o2::fit::HitType>* hits, Digit* digit)
   }
 }
 
-<<<<<<< HEAD:Detectors/FIT/common/simulation/src/Digitizer.cxx
 void Digitizer::computeAverage(Digit& digit)
 {
   constexpr Float_t nPe_in_mip = 250.; // n ph. e. in one mip
@@ -199,6 +198,7 @@ void Digitizer::initParameters()
 void Digitizer::init()
 {
   std::cout << " @@@ Digitizer::init " << std::endl;
+
 }
 
 //_______________________________________________________________________

@@ -44,7 +44,7 @@ class FITDPLDigitWriter
   void init(framework::InitContext& ic)
   {
     std::string detStrL = mID.getName();
-    std::transform(detStrL.begin(), detStrL.end(), detStrL.begin(), ::tolower);
+     std::transform(detStrL.begin(), detStrL.end(), detStrL.begin(), ::tolower);
 
     auto filename = ic.options().get<std::string>((detStrL + "-digit-outfile").c_str());
     auto treename = ic.options().get<std::string>("treename");

@@ -94,7 +94,7 @@ class FITDPLDigitizerTask
 
     LOG(INFO) << "CALLING FIT DIGITIZATION";
 
-    static std::vector<o2::t0::HitType> hits;
+    static std::vector<o2::fit::HitType> hits;
     o2::dataformats::MCTruthContainer<o2::MCCompLabel> labelAccum;
     o2::dataformats::MCTruthContainer<o2::MCCompLabel> labels;
     o2::fit::Digit digit;
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,6 +44,7 @@ Detector::Detector(Bool_t Active) @@
     Detector::Detector(const Detector& rhs)
       : o2::Base::DetImpl<Detector>(rhs), mIdSens1(rhs.mIdSens1), mPMTeff(rhs.mPMTeff), mHits(o2::utils::createSimVector<o2::fit::HitType>())
     {
     }
@@ Expand Down @@