Skip to content

Commit 61e2e8e

Browse files
AllaMaevskayaAllaMaevskaya
authored
few minor fixes (#6785)
1 parent 15ba8b6 commit 61e2e8e

4 files changed

Lines changed: 32 additions & 33 deletions

File tree

‎DataFormats/Detectors/FIT/FT0/include/DataFormatsFT0/RecPoints.h‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,16 @@ namespace o2
2929
{
3030
namespace ft0
3131
{
32+
3233
struct ChannelDataFloat {
3334

3435
int ChId = -1; //channel Id
3536
int ChainQTC = -1; //QTC chain
36-
double CFDTime = -20000; //time in ps, 0 at the LHC clk center
37-
double QTCAmpl = -20000; // Amplitude mV
37+
float CFDTime = -20000; //time in ps, 0 at the LHC clk center
38+
float QTCAmpl = -20000; // Amplitude mV
3839

3940
ChannelDataFloat() = default;
40-
ChannelDataFloat(int iPmt, double time, double charge, int chainQTC)
41+
ChannelDataFloat(int iPmt, float time, float charge, int chainQTC)
4142
{
4243
ChId = iPmt;
4344
CFDTime = time;
@@ -62,7 +63,7 @@ class RecPoints
6263
o2::dataformats::RangeReference<int, int> ref;
6364
o2::InteractionRecord mIntRecord; // Interaction record (orbit, bc)
6465
RecPoints() = default;
65-
RecPoints(const std::array<Float_t, 4>& collisiontime,
66+
RecPoints(const std::array<short, 4>& collisiontime,
6667
int first, int ne, o2::InteractionRecord iRec, o2::ft0::Triggers chTrig)
6768
: mCollisionTime(collisiontime)
6869
{
@@ -75,34 +76,34 @@ class RecPoints
7576

7677
void print() const;
7778

78-
o2::ft0::Triggers mTriggers; // pattern of triggers in this BC
79-
80-
float getCollisionTime(int side) const { return mCollisionTime[side]; }
81-
float getCollisionTimeMean() const { return getCollisionTime(TimeMean); }
82-
float getCollisionTimeA() const { return getCollisionTime(TimeA); }
83-
float getCollisionTimeC() const { return getCollisionTime(TimeC); }
79+
short getCollisionTime(int side) const { return mCollisionTime[side]; }
80+
short getCollisionTimeMean() const { return getCollisionTime(TimeMean); }
81+
short getCollisionTimeA() const { return getCollisionTime(TimeA); }
82+
short getCollisionTimeC() const { return getCollisionTime(TimeC); }
8483
bool isValidTime(int side) const { return getCollisionTime(side) < o2::InteractionRecord::DummyTime; }
85-
void setCollisionTime(Float_t time, int side) { mCollisionTime[side] = time; }
84+
void setCollisionTime(short time, int side) { mCollisionTime[side] = time; }
8685

87-
Float_t getVertex(Float_t vertex) const { return getCollisionTime(Vertex); }
88-
void setVertex(Float_t vertex) { mCollisionTime[Vertex] = vertex; }
86+
short getVertex() const { return getCollisionTime(Vertex); }
87+
void setVertex(short vertex) { mCollisionTime[Vertex] = vertex; }
8988

9089
o2::ft0::Triggers getTrigger() const { return mTriggers; }
90+
void setTriggers(o2::ft0::Triggers trig) { mTriggers = trig; }
9191

9292
o2::InteractionRecord getInteractionRecord() const { return mIntRecord; };
9393

94-
void SetMgrEventTime(Double_t time) { mTimeStamp = time; }
94+
// void SetMgrEventTime(Double_t time) { mTimeStamp = time; }
9595

9696
gsl::span<const ChannelDataFloat> getBunchChannelData(const gsl::span<const ChannelDataFloat> tfdata) const;
97+
short static constexpr sDummyCollissionTime = 32767;
9798

9899
private:
99-
std::array<Float_t, 4> mCollisionTime = {2 * o2::InteractionRecord::DummyTime,
100-
2 * o2::InteractionRecord::DummyTime,
101-
2 * o2::InteractionRecord::DummyTime,
102-
2 * o2::InteractionRecord::DummyTime};
103-
Double_t mTimeStamp = 2 * o2::InteractionRecord::DummyTime; //event time from Fair for continuous
100+
std::array<short, 4> mCollisionTime = {sDummyCollissionTime,
101+
sDummyCollissionTime,
102+
sDummyCollissionTime,
103+
sDummyCollissionTime};
104+
o2::ft0::Triggers mTriggers; // pattern of triggers in this BC
104105

105-
ClassDefNV(RecPoints, 2);
106+
ClassDefNV(RecPoints, 3);
106107
};
107108
} // namespace ft0
108109
} // namespace o2

‎Detectors/FIT/FT0/calibration/testWorkflow/FT0CalibCollectorWriterSpec.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class FT0CalibCollectorWriter : public o2::framework::Task
3535
public:
3636
void createAndOpenFileAndTree()
3737
{
38-
TString filename = TString::Format("collFT0_%d.root", mCount);
38+
TString filename = TString::Format("collFT0%d.root", mCount);
3939
LOG(DEBUG) << "opening file " << filename.Data();
4040
mfileOut.reset(TFile::Open(TString::Format("%s", filename.Data()), "RECREATE"));
4141
mOutputTree = std::make_unique<TTree>("treeCollectedCalibInfo", "Tree with FT0 calib info for Time Slewing");

‎Detectors/FIT/FT0/reconstruction/include/FT0Reconstruction/CollisionTimeRecoTask.h‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,11 @@ class CollisionTimeRecoTask
4848
gsl::span<o2::ft0::ChannelDataFloat> outChData);
4949
void FinishTask();
5050
void SetChannelOffset(o2::ft0::FT0ChannelTimeCalibrationObject* caliboffsets) { mCalibOffset = caliboffsets; };
51-
void SetSlew(std::array<TGraph, NCHANNELS>* calibslew) { mCalibSlew = calibslew; };
51+
void SetSlew(std::array<TGraph, NCHANNELS>* calibslew)
52+
{
53+
LOG(INFO) << "@@@SetSlew " << calibslew->size();
54+
mCalibSlew = calibslew;
55+
};
5256
int getOffset(int channel, int amp);
5357

5458
private:

‎Detectors/FIT/FT0/reconstruction/src/CollisionTimeRecoTask.cxx‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,14 @@ o2::ft0::RecPoints CollisionTimeRecoTask::process(o2::ft0::Digit const& bcd,
4242

4343
Float_t sideAtime = 0, sideCtime = 0;
4444

45-
// auto timeStamp = o2::InteractionRecord::bc2ns(bcd.mIntRecord.bc, bcd.mIntRecord.orbit);
46-
47-
// LOG(DEBUG) << " event time " << timeStamp << " orbit " << bcd.mIntRecord.orbit << " bc " << bcd.mIntRecord.bc;
48-
4945
int nch = inChData.size();
5046
const auto parInv = DigitizationParameters::Instance().mMV_2_NchannelsInverse;
5147
for (int ich = 0; ich < nch; ich++) {
5248
int offsetChannel = getOffset(ich, inChData[ich].QTCAmpl);
5349

5450
outChData[ich] = o2::ft0::ChannelDataFloat{inChData[ich].ChId,
5551
(inChData[ich].CFDTime - offsetChannel) * Geometry::ChannelWidth,
56-
(double)inChData[ich].QTCAmpl * parInv,
52+
(float)inChData[ich].QTCAmpl * parInv,
5753
inChData[ich].ChainQTC};
5854

5955
// only signals with amplitude participate in collision time
@@ -67,13 +63,11 @@ o2::ft0::RecPoints CollisionTimeRecoTask::process(o2::ft0::Digit const& bcd,
6763
}
6864
}
6965
}
70-
std::array<Float_t, 4> mCollisionTime = {2 * o2::InteractionRecord::DummyTime,
71-
2 * o2::InteractionRecord::DummyTime,
72-
2 * o2::InteractionRecord::DummyTime,
73-
2 * o2::InteractionRecord::DummyTime};
66+
auto sDummyCollissionTime = o2::ft0::RecPoints::sDummyCollissionTime;
67+
std::array<short, 4> mCollisionTime = {sDummyCollissionTime, sDummyCollissionTime, sDummyCollissionTime, sDummyCollissionTime};
7468
// !!!! tobe done::should be fix with ITS vertex
75-
mCollisionTime[TimeA] = (ndigitsA > 0) ? sideAtime / Float_t(ndigitsA) : 2 * o2::InteractionRecord::DummyTime;
76-
mCollisionTime[TimeC] = (ndigitsC > 0) ? sideCtime / Float_t(ndigitsC) : 2 * o2::InteractionRecord::DummyTime;
69+
mCollisionTime[TimeA] = (ndigitsA > 0) ? sideAtime / ndigitsA : sDummyCollissionTime; // 2 * o2::InteractionRecord::DummyTime;
70+
mCollisionTime[TimeC] = (ndigitsC > 0) ? sideCtime / ndigitsC : sDummyCollissionTime; //2 * o2::InteractionRecord::DummyTime;
7771

7872
if (ndigitsA > 0 && ndigitsC > 0) {
7973
mCollisionTime[Vertex] = (mCollisionTime[TimeA] - mCollisionTime[TimeC]) / 2.;

0 commit comments

Comments
 (0)