Skip to content

Commit effb541

Browse files
committed
Fix errors
1 parent 5e31f7e commit effb541

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

Common/TableProducer/eventSelectionService.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ struct eventselectionRun2 {
7575
HistogramRegistry histos{"Histos", {}, OutputObjHandlingPolicy::AnalysisObject};
7676

7777
// buffering intermediate results for passing
78-
std::vector<int64_t> timestamps;
78+
std::vector<uint64_t> timestamps;
7979
std::vector<o2::common::eventselection::bcselEntry> bcselsbuffer;
8080

8181
// auxiliary
@@ -138,7 +138,7 @@ struct eventselectionRun3 {
138138

139139
// the best: have readable cursors
140140
// this: a stopgap solution to avoid spawning yet another device
141-
std::vector<int64_t> timestamps;
141+
std::vector<uint64_t> timestamps;
142142
std::vector<o2::common::eventselection::bcselEntry> bcselsbuffer;
143143

144144
// auxiliary

Common/Tools/EventSelectionTools.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ class BcSelectionModule
273273
}
274274
bcselbuffer.clear();
275275
for (const auto& bc : bcs) {
276-
auto timestamp = timestamps[bc.globalIndex()];
276+
uint64_t timestamp = timestamps[bc.globalIndex()];
277277
par = ccdb->template getForTimeStamp<EventSelectionParams>("EventSelection/EventSelectionParams", timestamp);
278278
aliases = ccdb->template getForTimeStamp<TriggerAliases>("EventSelection/TriggerAliases", timestamp);
279279
// fill fired aliases
@@ -427,7 +427,7 @@ class BcSelectionModule
427427

428428
// bc loop
429429
for (auto bc : bcs) { // o2-linter: disable=const-ref-in-for-loop (use bc as nonconst iterator)
430-
auto timestamp = timestamps[bc.globalIndex()];
430+
uint64_t timestamp = timestamps[bc.globalIndex()];
431431
// store rct flags
432432
uint32_t rct = lastRCT;
433433
int64_t thisTF = (bc.globalBC() - bcSOR) / nBCsPerTF;
@@ -732,7 +732,7 @@ class EventSelectionModule
732732
}
733733
for (const auto& col : collisions) {
734734
auto bc = col.template bc_as<soa::Join<aod::BCs, aod::Run2BCInfos, aod::Timestamps, aod::Run2MatchedToBCSparse>>();
735-
auto timestamp = timestamps[bc.globalIndex()];
735+
uint64_t timestamp = timestamps[bc.globalIndex()];
736736
EventSelectionParams* par = ccdb->template getForTimeStamp<EventSelectionParams>("EventSelection/EventSelectionParams", timestamp);
737737
bool* applySelection = par->getSelection(evselOpts.muonSelection);
738738
if (evselOpts.isMC == 1) {

Common/Tools/timestampModule.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,12 @@ class TimestampModule
104104
orbitResetTimestamp = sorTimestamp * 1000; // from ms to us
105105
} else if (runNumber < 300000) { // Run 2
106106
LOGF(debug, "Getting orbit-reset timestamp using start-of-run timestamp from CCDB");
107-
auto ctp = ccdb->template getForTimeStamp<std::vector<Long64_t>>(timestampOpts.orbit_reset_path.value.data(), sorTimestamp);
107+
auto ctp = ccdb->template getForTimeStamp<std::vector<int64_t>>(timestampOpts.orbit_reset_path.value.data(), sorTimestamp);
108108
orbitResetTimestamp = (*ctp)[0];
109109
} else {
110110
// sometimes orbit is reset after SOR. Using EOR timestamps for orbitReset query is more reliable
111111
LOGF(debug, "Getting orbit-reset timestamp using end-of-run timestamp from CCDB");
112-
auto ctp = ccdb->template getForTimeStamp<std::vector<Long64_t>>(timestampOpts.orbit_reset_path.value.data(), eorTimestamp / 2 + sorTimestamp / 2);
112+
auto ctp = ccdb->template getForTimeStamp<std::vector<int64_t>>(timestampOpts.orbit_reset_path.value.data(), eorTimestamp / 2 + sorTimestamp / 2);
113113
orbitResetTimestamp = (*ctp)[0];
114114
}
115115

0 commit comments

Comments
 (0)