@@ -32,6 +32,61 @@ DECLARE_SOA_CONFIGURABLE_EXPRESSION_COLUMN(Expr, expr, float, "Expr");
3232// 4. example realistic values - corrected dE/dx
3333DECLARE_SOA_CONFIGURABLE_EXPRESSION_COLUMN (RealTPCSignalN, realTPCSignalN, float , " fRealTPCSignalN" );
3434DECLARE_SOA_COLUMN (RealTPCSignalNC, realTPCSignalNC, float );
35+
36+ DECLARE_SOA_CONFIGURABLE_EXPRESSION_COLUMN (RealQMax0R0, realQMax0R0, float , " fRealQMax0R0" );
37+ DECLARE_SOA_COLUMN (RealQMax0R0C, realQMax0R0C, float );
38+ DECLARE_SOA_CONFIGURABLE_EXPRESSION_COLUMN (RealQMax1R0, realQMax1R0, float , " fRealQMax1R0" );
39+ DECLARE_SOA_COLUMN (RealQMax1R0C, realQMax1R0C, float );
40+ DECLARE_SOA_CONFIGURABLE_EXPRESSION_COLUMN (RealQMax2R0, realQMax2R0, float , " fRealQMax2R0" );
41+ DECLARE_SOA_COLUMN (RealQMax2R0C, realQMax2R0C, float );
42+ DECLARE_SOA_CONFIGURABLE_EXPRESSION_COLUMN (RealQMax3R0, realQMax3R0, float , " fRealQMax3R0" );
43+ DECLARE_SOA_COLUMN (RealQMax3R0C, realQMax3R0C, float );
44+
45+ DECLARE_SOA_CONFIGURABLE_EXPRESSION_COLUMN (RealQTot0R0, realQTot0R0, float , " fRealQTot0R0" );
46+ DECLARE_SOA_COLUMN (RealQTot0R0C, realQTot0R0C, float );
47+ DECLARE_SOA_CONFIGURABLE_EXPRESSION_COLUMN (RealQTot1R0, realQTot1R0, float , " fRealQTot1R0" );
48+ DECLARE_SOA_COLUMN (RealQTot1R0C, realQTot1R0C, float );
49+ DECLARE_SOA_CONFIGURABLE_EXPRESSION_COLUMN (RealQTot2R0, realQTot2R0, float , " fRealQTot2R0" );
50+ DECLARE_SOA_COLUMN (RealQTot2R0C, realQTot2R0C, float );
51+ DECLARE_SOA_CONFIGURABLE_EXPRESSION_COLUMN (RealQTot3R0, realQTot3R0, float , " fRealQTot3R0" );
52+ DECLARE_SOA_COLUMN (RealQTot3R0C, realQTot3R0C, float );
53+
54+ DECLARE_SOA_CONFIGURABLE_EXPRESSION_COLUMN (RealQMaxTot0, realQMaxTot0, float , " fRealQMaxTot0" );
55+ DECLARE_SOA_COLUMN (RealQMaxTot0C, realQMaxTot0C, float );
56+ DECLARE_SOA_CONFIGURABLE_EXPRESSION_COLUMN (RealQMaxTot1, realQMaxTot1, float , " fRealQMaxTot1" );
57+ DECLARE_SOA_COLUMN (RealQMaxTot1C, realQMaxTot1C, float );
58+ DECLARE_SOA_CONFIGURABLE_EXPRESSION_COLUMN (RealQMaxTot2, realQMaxTot2, float , " fRealQMaxTot2" );
59+ DECLARE_SOA_COLUMN (RealQMaxTot2C, realQMaxTot2C, float );
60+ DECLARE_SOA_CONFIGURABLE_EXPRESSION_COLUMN (RealQMaxTot3, realQMaxTot3, float , " fRealQMaxTot3" );
61+ DECLARE_SOA_COLUMN (RealQMaxTot3C, realQMaxTot3C, float );
62+
63+ DECLARE_SOA_CONFIGURABLE_EXPRESSION_COLUMN (RealQMax0R0_mad, realQMax0R0_mad, float , " fRealQMax0R0_mad" );
64+ DECLARE_SOA_COLUMN (RealQMax0R0C_mad, realQMax0R0C_mad, float );
65+ DECLARE_SOA_CONFIGURABLE_EXPRESSION_COLUMN (RealQMax1R0_mad, realQMax1R0_mad, float , " fRealQMax1R0_mad" );
66+ DECLARE_SOA_COLUMN (RealQMax1R0C_mad, realQMax1R0C_mad, float );
67+ DECLARE_SOA_CONFIGURABLE_EXPRESSION_COLUMN (RealQMax2R0_mad, realQMax2R0_mad, float , " fRealQMax2R0_mad" );
68+ DECLARE_SOA_COLUMN (RealQMax2R0C_mad, realQMax2R0C_mad, float );
69+ DECLARE_SOA_CONFIGURABLE_EXPRESSION_COLUMN (RealQMax3R0_mad, realQMax3R0_mad, float , " fRealQMax3R0_mad" );
70+ DECLARE_SOA_COLUMN (RealQMax3R0C_mad, realQMax3R0C_mad, float );
71+
72+ DECLARE_SOA_CONFIGURABLE_EXPRESSION_COLUMN (RealQTot0R0_mad, realQTot0R0_mad, float , " fRealQTot0R0_mad" );
73+ DECLARE_SOA_COLUMN (RealQTot0R0C_mad, realQTot0R0C_mad, float );
74+ DECLARE_SOA_CONFIGURABLE_EXPRESSION_COLUMN (RealQTot1R0_mad, realQTot1R0_mad, float , " fRealQTot1R0_mad" );
75+ DECLARE_SOA_COLUMN (RealQTot1R0C_mad, realQTot1R0C_mad, float );
76+ DECLARE_SOA_CONFIGURABLE_EXPRESSION_COLUMN (RealQTot2R0_mad, realQTot2R0_mad, float , " fRealQTot2R0_mad" );
77+ DECLARE_SOA_COLUMN (RealQTot2R0C_mad, realQTot2R0C_mad, float );
78+ DECLARE_SOA_CONFIGURABLE_EXPRESSION_COLUMN (RealQTot3R0_mad, realQTot3R0_mad, float , " fRealQTot3R0_mad" );
79+ DECLARE_SOA_COLUMN (RealQTot3R0C_mad, realQTot3R0C_mad, float );
80+
81+ DECLARE_SOA_CONFIGURABLE_EXPRESSION_COLUMN (RealQMaxTot0_mad, realQMaxTot0_mad, float , " fRealQMaxTot0_mad" );
82+ DECLARE_SOA_COLUMN (RealQMaxTot0C_mad, realQMaxTot0C_mad, float );
83+ DECLARE_SOA_CONFIGURABLE_EXPRESSION_COLUMN (RealQMaxTot1_mad, realQMaxTot1_mad, float , " fRealQMaxTot1_mad" );
84+ DECLARE_SOA_COLUMN (RealQMaxTot1C_mad, realQMaxTot1C_mad, float );
85+ DECLARE_SOA_CONFIGURABLE_EXPRESSION_COLUMN (RealQMaxTot2_mad, realQMaxTot2_mad, float , " fRealQMaxTot2_mad" );
86+ DECLARE_SOA_COLUMN (RealQMaxTot2C_mad, realQMaxTot2C_mad, float );
87+ DECLARE_SOA_CONFIGURABLE_EXPRESSION_COLUMN (RealQMaxTot3_mad, realQMaxTot3_mad, float , " fRealQMaxTot3_mad" );
88+ DECLARE_SOA_COLUMN (RealQMaxTot3C_mad, realQMaxTot3C_mad, float );
89+
3590} // namespace extensions
3691
3792// tables with simple and arbitrary function dynamic columns
@@ -50,21 +105,39 @@ namespace intermediate {
50105DECLARE_SOA_COLUMN (HRate, hRate, float );
51106DECLARE_SOA_COLUMN (ClampedTPCMult, clampedTPCmult, float );
52107DECLARE_SOA_COLUMN (Occupancy, occupancy, float );
53- DECLARE_SOA_COLUMN (Correction0, correction0 , float );
108+ DECLARE_SOA_COLUMN (Correction1, correction1 , float );
54109}
55110
56111// intermediate table
57112DECLARE_SOA_TABLE (TracksTemporaryExtra, " AOD" , " TRKTEMPEX" ,
58- intermediate::HRate, intermediate::ClampedTPCMult, intermediate::Occupancy, intermediate::Correction0 ,
113+ intermediate::HRate, intermediate::ClampedTPCMult, intermediate::Occupancy, intermediate::Correction1 ,
59114 aod::track::TPCSignal, aod::track::Signed1Pt, aod::track::Tgl);
60115using TracksQAEx = soa::Join<TracksQAVersion, TracksTemporaryExtra>;
61116
62117// final table
63118DECLARE_SOA_CONFIGURABLE_EXTENDED_TABLE (TracksQACorrectedE, TracksQAEx, " TRKQACORE" , extensions::RealTPCSignalN);
64119using MoreTracksFinal = soa::Join<TracksQAVersion, TracksQACorrectedECfgExtension>;
65120
121+ DECLARE_SOA_CONFIGURABLE_EXTENDED_TABLE (TracksQACorrectedEFull, TracksQAEx, " TRKQACOREF" ,
122+ extensions::RealTPCSignalN,
123+ extensions::RealQMax0R0, extensions::RealQMax1R0, extensions::RealQMax2R0, extensions::RealQMax3R0,
124+ extensions::RealQMax0R0_mad, extensions::RealQMax1R0_mad, extensions::RealQMax2R0_mad, extensions::RealQMax3R0_mad,
125+ extensions::RealQTot0R0, extensions::RealQTot1R0, extensions::RealQTot2R0, extensions::RealQTot3R0,
126+ extensions::RealQTot0R0_mad, extensions::RealQTot1R0_mad, extensions::RealQTot2R0_mad, extensions::RealQTot3R0_mad,
127+ extensions::RealQMaxTot0, extensions::RealQMaxTot1, extensions::RealQMaxTot2, extensions::RealQMaxTot3,
128+ extensions::RealQMaxTot0_mad, extensions::RealQMaxTot1_mad, extensions::RealQMaxTot2_mad, extensions::RealQMaxTot3_mad);
129+ using MoreTracksFinalFull = soa::Join<TracksQAVersion, TracksQACorrectedEFullCfgExtension>;
130+
66131// final table for direct calculation
67132DECLARE_SOA_TABLE (TracksQACorrected, " AOD" , " TRKQACOR" , extensions::RealTPCSignalNC);
133+ DECLARE_SOA_TABLE (TracksQACorrectedFull, " AOD" , " TRKQACORF" ,
134+ extensions::RealTPCSignalNC,
135+ extensions::RealQMax0R0C, extensions::RealQMax1R0C, extensions::RealQMax2R0C, extensions::RealQMax3R0C,
136+ extensions::RealQMax0R0C_mad, extensions::RealQMax1R0C_mad, extensions::RealQMax2R0C_mad, extensions::RealQMax3R0C_mad,
137+ extensions::RealQTot0R0C, extensions::RealQTot1R0C, extensions::RealQTot2R0C, extensions::RealQTot3R0C,
138+ extensions::RealQTot0R0C_mad, extensions::RealQTot1R0C_mad, extensions::RealQTot2R0C_mad, extensions::RealQTot3R0C_mad,
139+ extensions::RealQMaxTot0C, extensions::RealQMaxTot1C, extensions::RealQMaxTot2C, extensions::RealQMaxTot3C,
140+ extensions::RealQMaxTot0C_mad, extensions::RealQMaxTot1C_mad, extensions::RealQMaxTot2C_mad, extensions::RealQMaxTot3C_mad);
68141
69142using TracksD = soa::Join<TracksIU, ExtTracksD>;
70143using TracksID = soa::Join<TracksIU, ExtTracksID>;
0 commit comments