Skip to content

Commit 756f2c7

Browse files
jgrosseojgrosseo
authored
Fixing timestamp lookup (#4515)
1 parent dc3c75e commit 756f2c7

3 files changed

Lines changed: 13 additions & 12 deletions

File tree

‎Analysis/Tasks/centralityTable.cxx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ struct CentralityTableTask {
2929
ccdb->setLocalObjectValidityChecking();
3030
}
3131

32-
void process(soa::Join<aod::Collisions, aod::Mults>::iterator const& collision, aod::Timestamps& timestamps, aod::BCs const& bcs)
32+
void process(soa::Join<aod::Collisions, aod::Mults>::iterator const& collision, aod::BCsWithTimestamps const&)
3333
{
34-
auto ts = timestamps.iteratorAt(collision.bcId());
35-
LOGF(debug, "timestamp=%llu", ts.timestamp());
36-
TH1F* hCumMultV0M = ccdb->getForTimeStamp<TH1F>("Multiplicity/CumMultV0M", ts.timestamp());
34+
auto bc = collision.bc_as<aod::BCsWithTimestamps>();
35+
LOGF(debug, "timestamp=%llu", bc.timestamp());
36+
TH1F* hCumMultV0M = ccdb->getForTimeStamp<TH1F>("Multiplicity/CumMultV0M", bc.timestamp());
3737
if (!hCumMultV0M) {
38-
LOGF(fatal, "V0M centrality calibration is not available in CCDB for run=%d at timestamp=%llu", collision.bc().runNumber(), ts.timestamp());
38+
LOGF(fatal, "V0M centrality calibration is not available in CCDB for run=%d at timestamp=%llu", bc.runNumber(), bc.timestamp());
3939
}
4040
float centV0M = hCumMultV0M->GetBinContent(hCumMultV0M->FindFixBin(collision.multV0M()));
4141

‎Analysis/Tasks/eventSelection.cxx‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include "Analysis/EventSelection.h"
1414
#include "Analysis/TriggerAliases.h"
1515
#include <CCDB/BasicCCDBManager.h>
16-
#include <map>
1716

1817
using namespace o2;
1918
using namespace o2::framework;
@@ -93,15 +92,15 @@ struct EventSelectionTask {
9392
ccdb->setLocalObjectValidityChecking();
9493
}
9594

96-
void process(aod::Collision const& collision, aod::BCs const& bcs, aod::Timestamps& timestamps, aod::Zdcs const& zdcs, aod::Run2V0s const& vzeros, aod::FDDs const& fdds)
95+
void process(aod::Collision const& collision, aod::BCsWithTimestamps const&, aod::Zdcs const& zdcs, aod::Run2V0s const& vzeros, aod::FDDs const& fdds)
9796
{
98-
auto ts = timestamps.iteratorAt(collision.bcId());
99-
LOGF(debug, "timestamp=%llu", ts.timestamp());
100-
TriggerAliases* aliases = ccdb->getForTimeStamp<TriggerAliases>("Trigger/TriggerAliases", ts.timestamp());
97+
auto bc = collision.bc_as<aod::BCsWithTimestamps>();
98+
LOGF(debug, "timestamp=%llu", bc.timestamp());
99+
TriggerAliases* aliases = ccdb->getForTimeStamp<TriggerAliases>("Trigger/TriggerAliases", bc.timestamp());
101100
if (!aliases) {
102-
LOGF(fatal, "Trigger aliases are not available in CCDB for run=%d at timestamp=%llu", collision.bc().runNumber(), ts.timestamp());
101+
LOGF(fatal, "Trigger aliases are not available in CCDB for run=%d at timestamp=%llu", bc.runNumber(), bc.timestamp());
103102
}
104-
uint64_t triggerMask = collision.bc().triggerMask();
103+
uint64_t triggerMask = bc.triggerMask();
105104
LOGF(debug, "triggerMask=%llu", triggerMask);
106105

107106
// fill fired aliases

‎Framework/Core/include/Framework/AnalysisDataModel.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ DECLARE_SOA_COLUMN(Timestamp, timestamp, uint64_t);
4242

4343
DECLARE_SOA_TABLE(Timestamps, "AOD", "TIMESTAMPS", timestamp::Timestamp);
4444

45+
using BCsWithTimestamps = soa::Join<aod::BCs, aod::Timestamps>;
46+
4547
namespace collision
4648
{
4749
DECLARE_SOA_INDEX_COLUMN(BC, bc);

0 commit comments

Comments
 (0)