Skip to content

Commit aba471b

Browse files
f3schshahor02
authored andcommitted
SVertexer: use mean vertex
Signed-off-by: Felix Schlepper <f3sch.git@outlook.com>
1 parent f201da9 commit aba471b

File tree

2 files changed

+20
-4
lines changed

2 files changed

+20
-4
lines changed

Detectors/GlobalTrackingWorkflow/src/SecondaryVertexingSpec.cxx

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
/// @file SecondaryVertexingSpec.cxx
1313

1414
#include <vector>
15+
#include "DataFormatsCalibration/MeanVertexObject.h"
16+
#include "Framework/CCDBParamSpec.h"
1517
#include "ReconstructionDataFormats/Decay3Body.h"
1618
#include "DataFormatsGlobalTracking/RecoContainer.h"
1719
#include "ReconstructionDataFormats/TrackTPCITS.h"
@@ -135,6 +137,11 @@ void SecondaryVertexingSpec::finaliseCCDB(ConcreteDataMatcher& matcher, void* ob
135137
mStrTracker.setClusterDictionary((const o2::itsmft::TopologyDictionary*)obj);
136138
return;
137139
}
140+
if (matcher == ConcreteDataMatcher("GLO", "MEANVERTEX", 0)) {
141+
LOG(info) << "Imposing new MeanVertex: " << ((const o2::dataformats::MeanVertexObject*)obj)->asString();
142+
mVertexer.setMeanVertex((const o2::dataformats::MeanVertexObject*)obj);
143+
return;
144+
}
138145
}
139146

140147
void SecondaryVertexingSpec::updateTimeDependentParams(ProcessingContext& pc)
@@ -179,6 +186,8 @@ void SecondaryVertexingSpec::updateTimeDependentParams(ProcessingContext& pc)
179186
mStrTracker.setupFitters();
180187
}
181188
}
189+
190+
pc.inputs().get<o2::dataformats::MeanVertexObject*>("meanvtx");
182191
}
183192

184193
DataProcessorSpec getSecondaryVertexingSpec(GTrackID::mask_t src, bool enableCasc, bool enable3body, bool enableStrangenesTracking, bool useMC)
@@ -195,6 +204,7 @@ DataProcessorSpec getSecondaryVertexingSpec(GTrackID::mask_t src, bool enableCas
195204
}
196205
dataRequest->requestTracks(src, useMC);
197206
dataRequest->requestPrimaryVertertices(useMC);
207+
dataRequest->inputs.emplace_back("meanvtx", "GLO", "MEANVERTEX", 0, Lifetime::Condition, ccdbParamSpec("GLO/Calib/MeanVertex", {}, 1));
198208
auto ggRequest = std::make_shared<o2::base::GRPGeomRequest>(false, // orbitResetTime
199209
true, // GRPECS=true
200210
false, // GRPLHCIF

Detectors/Vertexing/include/DetectorsVertexing/SVertexer.h

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#define O2_S_VERTEXER_H
1717

1818
#include "gsl/span"
19+
#include "DataFormatsCalibration/MeanVertexObject.h"
1920
#include "DataFormatsGlobalTracking/RecoContainer.h"
2021
#include "ReconstructionDataFormats/PrimaryVertex.h"
2122
#include "ReconstructionDataFormats/V0.h"
@@ -49,8 +50,6 @@ class CorrectionMapsHelper;
4950
namespace vertexing
5051
{
5152

52-
namespace o2d = o2::dataformats;
53-
5453
class SVertexer
5554
{
5655
public:
@@ -112,7 +111,14 @@ class SVertexer
112111
int getN3Bodies() const { return mN3Bodies; }
113112
int getNStrangeTracks() const { return mNStrangeTracks; }
114113
auto& getMeanVertex() const { return mMeanVertex; }
115-
void setMeanVertex(const o2d::VertexBase& v) { mMeanVertex = v; }
114+
void setMeanVertex(const o2::dataformats::MeanVertexObject* v)
115+
{
116+
if (v == nullptr) {
117+
return;
118+
}
119+
mMeanVertex = v->getMeanVertex();
120+
}
121+
116122
void setNThreads(int n);
117123
int getNThreads() const { return mNThreads; }
118124
void setUseMC(bool v) { mUseMC = v; }
@@ -161,7 +167,7 @@ class SVertexer
161167
std::array<std::vector<TrackCand>, 2> mTracksPool{}; // pools of positive and negative seeds sorted in min VtxID
162168
std::array<std::vector<int>, 2> mVtxFirstTrack{}; // 1st pos. and neg. track of the pools for each vertex
163169

164-
o2d::VertexBase mMeanVertex{{0., 0., 0.}, {0.1 * 0.1, 0., 0.1 * 0.1, 0., 0., 6. * 6.}};
170+
o2::dataformats::VertexBase mMeanVertex{{0., 0., 0.}, {0.1 * 0.1, 0., 0.1 * 0.1, 0., 0., 6. * 6.}};
165171
const SVertexerParams* mSVParams = nullptr;
166172
std::array<SVertexHypothesis, NHypV0> mV0Hyps;
167173
std::array<SVertexHypothesis, NHypCascade> mCascHyps;

0 commit comments

Comments
 (0)