Skip to content

Commit e3e2701

Browse files
committed
[PWGJE] Simplify jetDsSpecSubs task: fix histogram handling and remove unused AOD table
1 parent ad8c2df commit e3e2701

File tree

1 file changed

+6
-72
lines changed

1 file changed

+6
-72
lines changed

PWGJE/Tasks/jetDsSpecSubs.cxx

Lines changed: 6 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -48,51 +48,6 @@ using namespace o2;
4848
using namespace o2::framework;
4949
using namespace o2::framework::expressions;
5050

51-
namespace o2::aod
52-
{
53-
namespace jet_distance
54-
{
55-
DECLARE_SOA_COLUMN(JetHfDist, jetHfDist, float);
56-
DECLARE_SOA_COLUMN(JetPt, jetPt, float);
57-
DECLARE_SOA_COLUMN(JetEta, jetEta, float);
58-
DECLARE_SOA_COLUMN(JetPhi, jetPhi, float);
59-
DECLARE_SOA_COLUMN(JetNConst, jetNConst, int);
60-
DECLARE_SOA_COLUMN(HfPt, hfPt, float);
61-
DECLARE_SOA_COLUMN(HfEta, hfEta, float);
62-
DECLARE_SOA_COLUMN(HfPhi, hfPhi, float);
63-
DECLARE_SOA_COLUMN(HfMass, hfMass, float);
64-
DECLARE_SOA_COLUMN(HfY, hfY, float);
65-
DECLARE_SOA_COLUMN(HfMlScore0, hfMlScore0, float);
66-
DECLARE_SOA_COLUMN(HfMlScore1, hfMlScore1, float);
67-
DECLARE_SOA_COLUMN(HfMlScore2, hfMlScore2, float);
68-
69-
// extra
70-
DECLARE_SOA_COLUMN(JetMass, jetMass, float);
71-
DECLARE_SOA_COLUMN(JetGirth, jetGirth, float);
72-
DECLARE_SOA_COLUMN(JetThrust, jetThrust, float); // lambda_2^1
73-
DECLARE_SOA_COLUMN(JetLambda11, jetLambda11, float); // lambda_1^1
74-
} // namespace jet_distance
75-
76-
DECLARE_SOA_TABLE(JetDistanceTable, "AOD", "JETDISTTABLE",
77-
jet_distance::JetHfDist,
78-
jet_distance::JetPt,
79-
jet_distance::JetEta,
80-
jet_distance::JetPhi,
81-
jet_distance::JetNConst,
82-
jet_distance::HfPt,
83-
jet_distance::HfEta,
84-
jet_distance::HfPhi,
85-
jet_distance::HfMass,
86-
jet_distance::HfY,
87-
jet_distance::HfMlScore0,
88-
jet_distance::HfMlScore1,
89-
jet_distance::HfMlScore2,
90-
jet_distance::JetMass,
91-
jet_distance::JetGirth,
92-
jet_distance::JetThrust,
93-
jet_distance::JetLambda11);
94-
} // namespace o2::aod
95-
9651
struct JetDsSpecSubs {
9752
HistogramRegistry registry{
9853
"registry",
@@ -136,8 +91,6 @@ struct JetDsSpecSubs {
13691
std::vector<int> eventSelectionBits;
13792
int trackSelection = -1;
13893

139-
Produces<aod::JetDistanceTable> distJetTable;
140-
14194
template <typename JET, typename TRACKS>
14295
float computeLambda(JET const& jet, TRACKS const& tracks, float a, float k)
14396
{
@@ -279,31 +232,12 @@ struct JetDsSpecSubs {
279232
registry.fill(HIST("h_ds_eta"), dsCandidate.eta());
280233
registry.fill(HIST("h_ds_phi"), dsCandidate.phi());
281234

282-
const float mass = dsCandidate.m();
283-
const float pt = dsCandidate.pt();
284-
const float z = zParallel;
285-
const float dR = axisDistance;
286-
287-
// Main THnSparse: invariant mass, pT, z, and ΔR
288-
registry.fill(HIST("hSparse_ds"), mass, pt, z, dR);
289-
290-
// --- output table ---
291-
auto scores = dsCandidate.mlScores();
292-
constexpr int kScore0 = 0;
293-
constexpr int kScore1 = 1;
294-
constexpr int kScore2 = 2;
295-
296-
const float s0 = (scores.size() > kScore0) ? scores[kScore0] : -999.f;
297-
const float s1 = (scores.size() > kScore1) ? scores[kScore1] : -999.f;
298-
const float s2 = (scores.size() > kScore2) ? scores[kScore2] : -999.f;
299-
300-
distJetTable(static_cast<float>(axisDistance),
301-
jet.pt(), jet.eta(), jet.phi(),
302-
static_cast<int>(jetTracks.size()),
303-
dsCandidate.pt(), dsCandidate.eta(), dsCandidate.phi(),
304-
dsCandidate.m(), dsCandidate.y(),
305-
s0, s1, s2,
306-
mjet, girth, lambda12, lambda11);
235+
// Main THnSparse: invariant mass, pT, z, and DeltaR
236+
registry.fill(HIST("hSparse_ds"),
237+
dsCandidate.m(),
238+
dsCandidate.pt(),
239+
zParallel,
240+
axisDistance);
307241
}
308242

309243
// Jet-level quantities (filled once per jet containing at least one Ds)

0 commit comments

Comments
 (0)