From 8abd9dff97da96d0058c80c64b5b457cf44787f9 Mon Sep 17 00:00:00 2001 From: Jan Fiete Date: Thu, 11 Nov 2021 17:14:09 +0100 Subject: [PATCH] rawphi -> phi --- Tutorials/src/associatedExample.cxx | 2 +- Tutorials/src/eventMixing.cxx | 16 ++++++++-------- Tutorials/src/histogramRegistry.cxx | 14 +++++++------- Tutorials/src/partitions.cxx | 12 ++++++------ 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Tutorials/src/associatedExample.cxx b/Tutorials/src/associatedExample.cxx index eab36da8f0a..d1704355172 100644 --- a/Tutorials/src/associatedExample.cxx +++ b/Tutorials/src/associatedExample.cxx @@ -76,7 +76,7 @@ struct ConsumeEtaPhi { LOGF(info, "ID: %d", collision.globalIndex()); LOGF(info, "Tracks: %d", extTracks.size()); for (auto& track : extTracks) { - LOGF(info, "(%f, %f) - (%f, %f)", track.eta(), track.phiraw(), track.etas(), track.phis()); + LOGF(info, "(%f, %f) - (%f, %f)", track.eta(), track.phi(), track.etas(), track.phis()); } } }; diff --git a/Tutorials/src/eventMixing.cxx b/Tutorials/src/eventMixing.cxx index 2d1b6eee133..88530ff3580 100644 --- a/Tutorials/src/eventMixing.cxx +++ b/Tutorials/src/eventMixing.cxx @@ -146,23 +146,23 @@ struct MixedEventsPartitionedTracks { auto tracks2 = std::get(it2.associatedTables()); tracks2.bindExternalIndices(&collisions); - Partition leftPhi1 = aod::track::phiraw < philow; + Partition leftPhi1 = aod::track::phi < philow; leftPhi1.bindTable(tracks1); - Partition leftPhi2 = aod::track::phiraw < philow; + Partition leftPhi2 = aod::track::phi < philow; leftPhi2.bindTable(tracks2); - Partition rightPhi1 = aod::track::phiraw >= phiup; + Partition rightPhi1 = aod::track::phi >= phiup; rightPhi1.bindTable(tracks1); - Partition rightPhi2 = aod::track::phiraw >= phiup; + Partition rightPhi2 = aod::track::phi >= phiup; rightPhi2.bindTable(tracks2); for (auto& [t1, t2] : combinations(CombinationsFullIndexPolicy(leftPhi1, leftPhi2))) { - if (t1.phiraw() >= (float)philow || t2.phiraw() >= (float)philow) { - LOGF(info, "WRONG Mixed event left tracks pair: (%d, %d) from events (%d, %d), phi: (%.3f. %.3f) < %.3f", t1.index(), t2.index(), c1.index(), c2.index(), t1.phiraw(), t2.phiraw(), (float)philow); + if (t1.phi() >= (float)philow || t2.phi() >= (float)philow) { + LOGF(info, "WRONG Mixed event left tracks pair: (%d, %d) from events (%d, %d), phi: (%.3f. %.3f) < %.3f", t1.index(), t2.index(), c1.index(), c2.index(), t1.phi(), t2.phi(), (float)philow); } } for (auto& [t1, t2] : combinations(CombinationsFullIndexPolicy(rightPhi1, rightPhi2))) { - if (t1.phiraw() < (float)phiup || t2.phiraw() < (float)phiup) { - LOGF(info, "WRONG Mixed event right tracks pair: (%d, %d) from events (%d, %d), phi: (%.3f. %.3f) >= %.3f", t1.index(), t2.index(), c1.index(), c2.index(), t1.phiraw(), t2.phiraw(), (float)phiup); + if (t1.phi() < (float)phiup || t2.phi() < (float)phiup) { + LOGF(info, "WRONG Mixed event right tracks pair: (%d, %d) from events (%d, %d), phi: (%.3f. %.3f) >= %.3f", t1.index(), t2.index(), c1.index(), c2.index(), t1.phi(), t2.phi(), (float)phiup); } } } diff --git a/Tutorials/src/histogramRegistry.cxx b/Tutorials/src/histogramRegistry.cxx index a6f1704b459..ddbcdd18c56 100644 --- a/Tutorials/src/histogramRegistry.cxx +++ b/Tutorials/src/histogramRegistry.cxx @@ -103,17 +103,17 @@ struct DimensionTest { using namespace aod::track; // does not work with dynamic columns (e.g. Charge, NormalizedPhi) registry.fill(HIST("1d"), tracks, eta > -0.7f); - registry.fill(HIST("3d"), tracks, eta > 0.f); - registry.fill(HIST("5d"), tracks, pt > 0.15f); - registry.fill(HIST("7d"), tracks, pt > 0.15f); - registry.fill(HIST("2d-profile"), tracks, eta > -0.5f); + registry.fill(HIST("3d"), tracks, eta > 0.f); + registry.fill(HIST("5d"), tracks, pt > 0.15f); + registry.fill(HIST("7d"), tracks, pt > 0.15f); + registry.fill(HIST("2d-profile"), tracks, eta > -0.5f); // fill 4d histogram with weight (column X) - registry.fill(HIST("4d-weight"), tracks, eta > 0.f); + registry.fill(HIST("4d-weight"), tracks, eta > 0.f); - registry.fill(HIST("2d-weight"), tracks, eta > 0.f); + registry.fill(HIST("2d-weight"), tracks, eta > 0.f); - registry.fill(HIST("1d-profile-weight"), tracks, eta > 0.f); + registry.fill(HIST("1d-profile-weight"), tracks, eta > 0.f); for (auto& track : tracks) { registry.fill(HIST("2d"), track.eta(), track.pt()); diff --git a/Tutorials/src/partitions.cxx b/Tutorials/src/partitions.cxx index b9ac6597c89..f5b58529a80 100644 --- a/Tutorials/src/partitions.cxx +++ b/Tutorials/src/partitions.cxx @@ -38,9 +38,9 @@ struct PartitionOutside { using myTracks = soa::Filtered; // definition of partitions - Partition leftPhi = aod::track::phiraw < philow; - Partition midPhi = aod::track::phiraw >= philow && aod::track::phiraw < phiup; - Partition rightPhi = aod::track::phiraw >= phiup; + Partition leftPhi = aod::track::phi < philow; + Partition midPhi = aod::track::phi >= philow && aod::track::phi < phiup; + Partition rightPhi = aod::track::phi >= phiup; // partitions are created and provided within the process function void process(aod::Collision const& collision, myTracks const& tracks) @@ -52,15 +52,15 @@ struct PartitionOutside { for (auto& track : leftPhi) { LOGF(info, "id = %d, from collision: %d, collision: %d; eta: %.3f < %.3f < %.3f; phi: %.3f < %.3f; pt: %.3f < %.3f < %.3f", - track.collisionId(), track.collision().globalIndex(), collision.globalIndex(), (float)etalow, track.eta(), (float)etaup, track.phiraw(), (float)philow, (float)ptlow, track.pt(), (float)ptup); + track.collisionId(), track.collision().globalIndex(), collision.globalIndex(), (float)etalow, track.eta(), (float)etaup, track.phi(), (float)philow, (float)ptlow, track.pt(), (float)ptup); } for (auto& track : midPhi) { LOGF(info, "id = %d, from collision: %d, collision: %d; eta: %.3f < %.3f < %.3f; phi: %.3f <= %.3f < %.3f; pt: %.3f < %.3f < %.3f", - track.collisionId(), track.collision().globalIndex(), collision.globalIndex(), (float)etalow, track.eta(), (float)etaup, (float)philow, track.phiraw(), (float)phiup, (float)ptlow, track.pt(), (float)ptup); + track.collisionId(), track.collision().globalIndex(), collision.globalIndex(), (float)etalow, track.eta(), (float)etaup, (float)philow, track.phi(), (float)phiup, (float)ptlow, track.pt(), (float)ptup); } for (auto& track : rightPhi) { LOGF(info, "id = %d, from collision: %d, collision: %d; eta: %.3f < %.3f < %.3f; phi: %.3f < %.3f; pt: %.3f < %.3f < %.3f", - track.collisionId(), track.collision().globalIndex(), collision.globalIndex(), (float)etalow, track.eta(), (float)etaup, (float)phiup, track.phiraw(), (float)ptlow, track.pt(), (float)ptup); + track.collisionId(), track.collision().globalIndex(), collision.globalIndex(), (float)etalow, track.eta(), (float)etaup, (float)phiup, track.phi(), (float)ptlow, track.pt(), (float)ptup); } } };