Skip to content

TPC: unrelated minor updates #12803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidrohr merged 2 commits into from
Mar 6, 2024
Merged

TPC: unrelated minor updates #12803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9cfe760
fix lifetime
wiechula Feb 6, 2024
0df77e0
better defaults, getter for vdrift
wiechula Mar 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions DataFormats/Detectors/TPC/include/DataFormatsTPC/LtrCalibData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ struct LtrCalibData {
uint64_t firstTime{}; ///< first time stamp of processed TFs
uint64_t lastTime{}; ///< last time stamp of processed TFs
long creationTime{}; ///< time of creation
float dvCorrectionA{}; ///< drift velocity correction factor A-Side (inverse multiplicative)
float dvCorrectionC{}; ///< drift velocity correction factor C-Side (inverse multiplicative)
float dvCorrectionA{1.f}; ///< drift velocity correction factor A-Side (inverse multiplicative)
float dvCorrectionC{1.f}; ///< drift velocity correction factor C-Side (inverse multiplicative)
float dvOffsetA{}; ///< drift velocity trigger offset A-Side
float dvOffsetC{}; ///< drift velocity trigger offset C-Side
float refVDrift{}; ///< reference vdrift for which factor was extracted
Expand Down Expand Up @@ -70,6 +70,8 @@ struct LtrCalibData {
return correction / nCorr;
}

float getVDrift() const { return refVDrift / getDriftVCorrection(); }

float getTimeOffset() const { return refTimeOffset + timeOffsetCorr; }

// renormalize reference and correction either to provided new reference (if >0) or to correction 1 wrt current reference
Expand Down
2 changes: 1 addition & 1 deletion Detectors/TPC/workflow/src/CalibdEdxSpec.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ DataProcessorSpec getCalibdEdxSpec(const o2::base::Propagator::MatCorrType matTy
std::vector<OutputSpec> outputs;
outputs.emplace_back(ConcreteDataTypeMatcher{o2::calibration::Utils::gDataOriginCDBPayload, "TPC_CalibdEdx"}, Lifetime::Sporadic);
outputs.emplace_back(ConcreteDataTypeMatcher{o2::calibration::Utils::gDataOriginCDBWrapper, "TPC_CalibdEdx"}, Lifetime::Sporadic);
std::vector<InputSpec> inputs{{"tracks", "TPC", "MIPS"}};
std::vector<InputSpec> inputs{{"tracks", "TPC", "MIPS", Lifetime::Sporadic}};
auto ccdbRequest = std::make_shared<o2::base::GRPGeomRequest>(true, // orbitResetTime
false, // GRPECS=true
false, // GRPLHCIF
Expand Down