Skip to content

Commit f1b2bfa

Browse files
AllaMaevskayaAllaMaevskaya
committed
move Hit to common
1 parent 83f3b13 commit f1b2bfa

File tree

9 files changed

+8
-44
lines changed

9 files changed

+8
-44
lines changed

‎Detectors/FIT/T0/base/CMakeLists.txt‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@ set(HEADERS
1010
include/${MODULE_NAME}/Geometry.h
1111
)
1212

13-
<<<<<<< HEAD
14-
=======
15-
16-
>>>>>>> first separation T0 V0
17-
Set(LINKDEF src/T0BaseLinkDef.h)
13+
Set(LINKDEF src/T0BaseLinkDef.h)
1814
Set(LIBRARY_NAME ${MODULE_NAME})
1915
set(BUCKET_NAME fit_base_bucket)
2016

‎Detectors/FIT/T0/simulation/include/T0Simulation/Detector.h‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -26,34 +26,10 @@ class FairVolume;
2626
class TGeoVolume;
2727
class TGraph;
2828

29-
namespace o2
30-
{
31-
namespace t0
32-
<<<<<<< HEAD:Detectors/FIT/T0/simulation/include/T0Simulation/Detector.h
33-
=======
34-
{
35-
class HitType : public o2::BasicXYZEHit<float>
36-
{
37-
public:
38-
using BasicXYZEHit<float>::BasicXYZEHit;
39-
};
40-
} // namespace t0
41-
} // namespace o2
42-
43-
#ifdef USESHM
44-
namespace std
45-
{
46-
template <>
47-
class allocator<o2::t0::HitType> : public o2::utils::ShmAllocator<o2::t0::HitType>
48-
{
49-
};
50-
} // namespace std
51-
#endif
5229

5330
namespace o2
5431
{
5532
namespace t0
56-
>>>>>>> first separation T0 V0:Detectors/FIT/T0/simulation/include/T0Simulation/Detector.h
5733
{
5834
class Geometry;
5935
}

‎Detectors/FIT/T0/simulation/include/T0Simulation/DigitizerTask.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class DigitizerTask : public FairTask
6060
const std::vector<o2::t0::HitType>* mHitsArray = nullptr; ///< Array of MC hits
6161

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

‎Detectors/FIT/T0/simulation/src/Detector.cxx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ Detector::Detector(Bool_t Active)
4444

4545
Detector::Detector(const Detector& rhs)
4646
: o2::Base::DetImpl<Detector>(rhs), mIdSens1(rhs.mIdSens1), mPMTeff(rhs.mPMTeff), mHits(o2::utils::createSimVector<o2::fit::HitType>())
47+
4748
{
4849
}
4950

‎Detectors/FIT/common/simulation/include/FITSimulation/Digitizer.h‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,6 @@ class Digitizer
5959
Double_t mEventTime; // timestamp
6060

6161
DigitizationParameters parameters;
62-
<<<<<<< HEAD:Detectors/FIT/common/simulation/include/FITSimulation/Digitizer.h
63-
=======
64-
/*
65-
Float_t mBC_clk_center = 12.5; // clk center
66-
Int_t mMCPs = (Geometry::NCellsA + Geometry::NCellsC) * 4; //number of MCPs
67-
Float_t mCFD_trsh_mip = 0.4; // = 4[mV] / 10[mV/mip]
68-
Float_t mTime_trg_gate = 4.; // ns
69-
Int_t mAmpThreshold = 100; // number of photoelectrons
70-
Float_t mTimeDiffAC = (Geometry::ZdetA - Geometry::ZdetC) * TMath::C();
71-
*/
72-
>>>>>>> first separation T0 V0:Detectors/FIT/common/simulation/include/FITSimulation/Digitizer.h
7362

7463
o2::dataformats::MCTruthContainer<o2::fit::MCLabel>* mMCLabels = nullptr;
7564

‎Detectors/FIT/common/simulation/include/FITSimulation/HitType.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ class HitType : public o2::BasicXYZEHit<float>
1414
public:
1515
using BasicXYZEHit<float>::BasicXYZEHit;
1616
};
17+
1718
} // namespace fit
19+
1820
} // namespace o2
1921

2022
#endif

‎Detectors/FIT/common/simulation/src/Digitizer.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ void Digitizer::process(const std::vector<o2::fit::HitType>* hits, Digit* digit)
7676
}
7777
}
7878

79-
<<<<<<< HEAD:Detectors/FIT/common/simulation/src/Digitizer.cxx
8079
void Digitizer::computeAverage(Digit& digit)
8180
{
8281
constexpr Float_t nPe_in_mip = 250.; // n ph. e. in one mip
@@ -199,6 +198,7 @@ void Digitizer::initParameters()
199198
void Digitizer::init()
200199
{
201200
std::cout << " @@@ Digitizer::init " << std::endl;
201+
202202
}
203203

204204
//_______________________________________________________________________

‎Steer/DigitizerWorkflow/src/FITDigitWriterSpec.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class FITDPLDigitWriter
4444
void init(framework::InitContext& ic)
4545
{
4646
std::string detStrL = mID.getName();
47-
std::transform(detStrL.begin(), detStrL.end(), detStrL.begin(), ::tolower);
47+
std::transform(detStrL.begin(), detStrL.end(), detStrL.begin(), ::tolower);
4848

4949
auto filename = ic.options().get<std::string>((detStrL + "-digit-outfile").c_str());
5050
auto treename = ic.options().get<std::string>("treename");

‎Steer/DigitizerWorkflow/src/FITDigitizerSpec.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ class FITDPLDigitizerTask
9494

9595
LOG(INFO) << "CALLING FIT DIGITIZATION";
9696

97-
static std::vector<o2::t0::HitType> hits;
97+
static std::vector<o2::fit::HitType> hits;
9898
o2::dataformats::MCTruthContainer<o2::MCCompLabel> labelAccum;
9999
o2::dataformats::MCTruthContainer<o2::MCCompLabel> labels;
100100
o2::fit::Digit digit;

0 commit comments

Comments
 (0)