Skip to content

Commit 5a6007e

Browse files
Anoop1379Anoop1379
authored
Merge branch 'AliceO2Group:master' into master
2 parents fa4b2fe + 11c9761 commit 5a6007e

9 files changed

Lines changed: 160 additions & 0 deletions

File tree

‎PWGJE/Core/CMakeLists.txt‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,21 @@ o2physics_target_root_dictionary(PWGJECore
2727
utilsTrackMatchingEMC.h
2828
LINKDEF PWGJECoreLinkDef.h)
2929
endif()
30+
31+
# Precompiled header shared across PWGJE. Percentages are the share of the
32+
# group's workflow translation units that include the header, measured over the tree.
33+
# Jet.h reaches 90% of the group; the existing substructure carriers already
34+
# precompile it, so this one serves everything they do not cover.
35+
#
36+
# runDataProcessing.h is deliberately NOT precompiled: it requires each workflow's
37+
# customize() to be declared before it is included, so precompiling it silently
38+
# unregisters every option (the binary aborts at --dump-workflow, but links fine).
39+
#
40+
# Skipped under recc, which caches compilations remotely instead.
41+
add_library(JetDataModelPCH OBJECT jetDataModelPCH.cxx)
42+
target_link_libraries(JetDataModelPCH PUBLIC O2::Framework O2Physics::AnalysisCore O2Physics::PWGJECore)
43+
if(NOT DEFINED ENV{USE_RECC})
44+
target_precompile_headers(JetDataModelPCH PRIVATE
45+
[["PWGJE/DataModel/Jet.h"]] # 90%
46+
)
47+
endif()

‎PWGJE/Core/jetDataModelPCH.cxx‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// Copyright 2019-2026 CERN and copyright holders of ALICE O2.
2+
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
3+
// All rights not expressly granted are reserved.
4+
//
5+
// This software is distributed under the terms of the GNU General Public
6+
// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
7+
//
8+
// In applying this license CERN does not waive the privileges and immunities
9+
// granted to it by virtue of its status as an Intergovernmental Organization
10+
// or submit itself to any jurisdiction.
11+
12+
// Carrier for the JetDataModelPCH precompiled header; see this directory's
13+
// CMakeLists.txt. It exists only to own the PCH, so it has no code of its own.

‎PWGJE/JetFinders/CMakeLists.txt‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,227 +15,272 @@ if(FastJet_FOUND)
1515

1616
o2physics_add_dpl_workflow(jet-finder-data-charged
1717
SOURCES jetFinderDataCharged.cxx
18+
REUSE_FROM JetDataModelPCH
1819
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
1920
COMPONENT_NAME Analysis)
2021

2122
o2physics_add_dpl_workflow(jet-finder-mcd-charged
2223
SOURCES jetFinderMCDCharged.cxx
24+
REUSE_FROM JetDataModelPCH
2325
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
2426
COMPONENT_NAME Analysis)
2527

2628
o2physics_add_dpl_workflow(jet-finder-mcp-charged
2729
SOURCES jetFinderMCPCharged.cxx
30+
REUSE_FROM JetDataModelPCH
2831
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
2932
COMPONENT_NAME Analysis)
3033

3134
o2physics_add_dpl_workflow(jet-finder-data-full
3235
SOURCES jetFinderDataFull.cxx
36+
REUSE_FROM JetDataModelPCH
3337
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
3438
COMPONENT_NAME Analysis)
3539

3640
o2physics_add_dpl_workflow(jet-finder-mcd-full
3741
SOURCES jetFinderMCDFull.cxx
42+
REUSE_FROM JetDataModelPCH
3843
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
3944
COMPONENT_NAME Analysis)
4045

4146
o2physics_add_dpl_workflow(jet-finder-mcp-full
4247
SOURCES jetFinderMCPFull.cxx
48+
REUSE_FROM JetDataModelPCH
4349
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
4450
COMPONENT_NAME Analysis)
4551

4652
o2physics_add_dpl_workflow(jet-finder-data-neutral
4753
SOURCES jetFinderDataNeutral.cxx
54+
REUSE_FROM JetDataModelPCH
4855
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
4956
COMPONENT_NAME Analysis)
5057

5158
o2physics_add_dpl_workflow(jet-finder-mcd-neutral
5259
SOURCES jetFinderMCDNeutral.cxx
60+
REUSE_FROM JetDataModelPCH
5361
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
5462
COMPONENT_NAME Analysis)
5563

5664
o2physics_add_dpl_workflow(jet-finder-mcp-neutral
5765
SOURCES jetFinderMCPNeutral.cxx
66+
REUSE_FROM JetDataModelPCH
5867
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
5968
COMPONENT_NAME Analysis)
6069

6170

6271
o2physics_add_dpl_workflow(jet-finder-d0-data-charged
6372
SOURCES jetFinderD0DataCharged.cxx
73+
REUSE_FROM JetDataModelPCH
6474
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
6575
COMPONENT_NAME Analysis)
6676

6777
o2physics_add_dpl_workflow(jet-finder-d0-mcd-charged
6878
SOURCES jetFinderD0MCDCharged.cxx
79+
REUSE_FROM JetDataModelPCH
6980
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
7081
COMPONENT_NAME Analysis)
7182

7283
o2physics_add_dpl_workflow(jet-finder-d0-mcp-charged
7384
SOURCES jetFinderD0MCPCharged.cxx
85+
REUSE_FROM JetDataModelPCH
7486
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
7587
COMPONENT_NAME Analysis)
7688

7789
o2physics_add_dpl_workflow(jet-finder-dplus-data-charged
7890
SOURCES jetFinderDplusDataCharged.cxx
91+
REUSE_FROM JetDataModelPCH
7992
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
8093
COMPONENT_NAME Analysis)
8194

8295
o2physics_add_dpl_workflow(jet-finder-dplus-mcd-charged
8396
SOURCES jetFinderDplusMCDCharged.cxx
97+
REUSE_FROM JetDataModelPCH
8498
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
8599
COMPONENT_NAME Analysis)
86100

87101
o2physics_add_dpl_workflow(jet-finder-dplus-mcp-charged
88102
SOURCES jetFinderDplusMCPCharged.cxx
103+
REUSE_FROM JetDataModelPCH
89104
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
90105
COMPONENT_NAME Analysis)
91106

92107
o2physics_add_dpl_workflow(jet-finder-ds-data-charged
93108
SOURCES jetFinderDsDataCharged.cxx
109+
REUSE_FROM JetDataModelPCH
94110
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
95111
COMPONENT_NAME Analysis)
96112

97113
o2physics_add_dpl_workflow(jet-finder-ds-mcd-charged
98114
SOURCES jetFinderDsMCDCharged.cxx
115+
REUSE_FROM JetDataModelPCH
99116
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
100117
COMPONENT_NAME Analysis)
101118

102119
o2physics_add_dpl_workflow(jet-finder-ds-mcp-charged
103120
SOURCES jetFinderDsMCPCharged.cxx
121+
REUSE_FROM JetDataModelPCH
104122
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
105123
COMPONENT_NAME Analysis)
106124

107125
o2physics_add_dpl_workflow(jet-finder-dstar-data-charged
108126
SOURCES jetFinderDstarDataCharged.cxx
127+
REUSE_FROM JetDataModelPCH
109128
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
110129
COMPONENT_NAME Analysis)
111130

112131
o2physics_add_dpl_workflow(jet-finder-dstar-mcd-charged
113132
SOURCES jetFinderDstarMCDCharged.cxx
133+
REUSE_FROM JetDataModelPCH
114134
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
115135
COMPONENT_NAME Analysis)
116136

117137
o2physics_add_dpl_workflow(jet-finder-dstar-mcp-charged
118138
SOURCES jetFinderDstarMCPCharged.cxx
139+
REUSE_FROM JetDataModelPCH
119140
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
120141
COMPONENT_NAME Analysis)
121142

122143
o2physics_add_dpl_workflow(jet-finder-lc-data-charged
123144
SOURCES jetFinderLcDataCharged.cxx
145+
REUSE_FROM JetDataModelPCH
124146
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
125147
COMPONENT_NAME Analysis)
126148

127149
o2physics_add_dpl_workflow(jet-finder-lc-mcd-charged
128150
SOURCES jetFinderLcMCDCharged.cxx
151+
REUSE_FROM JetDataModelPCH
129152
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
130153
COMPONENT_NAME Analysis)
131154

132155
o2physics_add_dpl_workflow(jet-finder-lc-mcp-charged
133156
SOURCES jetFinderLcMCPCharged.cxx
157+
REUSE_FROM JetDataModelPCH
134158
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
135159
COMPONENT_NAME Analysis)
136160

137161
o2physics_add_dpl_workflow(jet-finder-b0-data-charged
138162
SOURCES jetFinderB0DataCharged.cxx
163+
REUSE_FROM JetDataModelPCH
139164
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
140165
COMPONENT_NAME Analysis)
141166

142167
o2physics_add_dpl_workflow(jet-finder-b0-mcd-charged
143168
SOURCES jetFinderB0MCDCharged.cxx
169+
REUSE_FROM JetDataModelPCH
144170
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
145171
COMPONENT_NAME Analysis)
146172

147173
o2physics_add_dpl_workflow(jet-finder-b0-mcp-charged
148174
SOURCES jetFinderB0MCPCharged.cxx
175+
REUSE_FROM JetDataModelPCH
149176
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
150177
COMPONENT_NAME Analysis)
151178

152179
o2physics_add_dpl_workflow(jet-finder-bplus-data-charged
153180
SOURCES jetFinderBplusDataCharged.cxx
181+
REUSE_FROM JetDataModelPCH
154182
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
155183
COMPONENT_NAME Analysis)
156184

157185
o2physics_add_dpl_workflow(jet-finder-bplus-mcd-charged
158186
SOURCES jetFinderBplusMCDCharged.cxx
187+
REUSE_FROM JetDataModelPCH
159188
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
160189
COMPONENT_NAME Analysis)
161190

162191
o2physics_add_dpl_workflow(jet-finder-bplus-mcp-charged
163192
SOURCES jetFinderBplusMCPCharged.cxx
193+
REUSE_FROM JetDataModelPCH
164194
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
165195
COMPONENT_NAME Analysis)
166196

167197
o2physics_add_dpl_workflow(jet-finder-xictoxipipi-data-charged
168198
SOURCES jetFinderXicToXiPiPiDataCharged.cxx
199+
REUSE_FROM JetDataModelPCH
169200
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
170201
COMPONENT_NAME Analysis)
171202

172203
o2physics_add_dpl_workflow(jet-finder-xictoxipipi-mcd-charged
173204
SOURCES jetFinderXicToXiPiPiMCDCharged.cxx
205+
REUSE_FROM JetDataModelPCH
174206
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
175207
COMPONENT_NAME Analysis)
176208

177209
o2physics_add_dpl_workflow(jet-finder-xictoxipipi-mcp-charged
178210
SOURCES jetFinderXicToXiPiPiMCPCharged.cxx
211+
REUSE_FROM JetDataModelPCH
179212
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
180213
COMPONENT_NAME Analysis)
181214

182215
o2physics_add_dpl_workflow(jet-finder-v0-data-charged
183216
SOURCES jetFinderV0DataCharged.cxx
217+
REUSE_FROM JetDataModelPCH
184218
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
185219
COMPONENT_NAME Analysis)
186220

187221
o2physics_add_dpl_workflow(jet-finder-v0-mcd-charged
188222
SOURCES jetFinderV0MCDCharged.cxx
223+
REUSE_FROM JetDataModelPCH
189224
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
190225
COMPONENT_NAME Analysis)
191226

192227
o2physics_add_dpl_workflow(jet-finder-v0-mcp-charged
193228
SOURCES jetFinderV0MCPCharged.cxx
229+
REUSE_FROM JetDataModelPCH
194230
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
195231
COMPONENT_NAME Analysis)
196232

197233
o2physics_add_dpl_workflow(jet-finder-dielectron-data-charged
198234
SOURCES jetFinderDielectronDataCharged.cxx
235+
REUSE_FROM JetDataModelPCH
199236
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
200237
COMPONENT_NAME Analysis)
201238

202239
o2physics_add_dpl_workflow(jet-finder-dielectron-mcd-charged
203240
SOURCES jetFinderDielectronMCDCharged.cxx
241+
REUSE_FROM JetDataModelPCH
204242
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
205243
COMPONENT_NAME Analysis)
206244

207245
o2physics_add_dpl_workflow(jet-finder-dielectron-mcp-charged
208246
SOURCES jetFinderDielectronMCPCharged.cxx
247+
REUSE_FROM JetDataModelPCH
209248
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
210249
COMPONENT_NAME Analysis)
211250

212251
o2physics_add_dpl_workflow(jet-finder-d0d0bar-data-charged
213252
SOURCES jetFinderD0D0BarDataCharged.cxx
253+
REUSE_FROM JetDataModelPCH
214254
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
215255
COMPONENT_NAME Analysis)
216256

217257
o2physics_add_dpl_workflow(jet-finder-d0d0bar-mcd-charged
218258
SOURCES jetFinderD0D0BarMCDCharged.cxx
259+
REUSE_FROM JetDataModelPCH
219260
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
220261
COMPONENT_NAME Analysis)
221262

222263
o2physics_add_dpl_workflow(jet-finder-d0d0bar-mcp-charged
223264
SOURCES jetFinderD0D0BarMCPCharged.cxx
265+
REUSE_FROM JetDataModelPCH
224266
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
225267
COMPONENT_NAME Analysis)
226268

227269
o2physics_add_dpl_workflow(jet-finder-dplusdminus-data-charged
228270
SOURCES jetFinderDplusDminusDataCharged.cxx
271+
REUSE_FROM JetDataModelPCH
229272
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
230273
COMPONENT_NAME Analysis)
231274

232275
o2physics_add_dpl_workflow(jet-finder-dplusdminus-mcd-charged
233276
SOURCES jetFinderDplusDminusMCDCharged.cxx
277+
REUSE_FROM JetDataModelPCH
234278
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
235279
COMPONENT_NAME Analysis)
236280

237281
o2physics_add_dpl_workflow(jet-finder-dplusdminus-mcp-charged
238282
SOURCES jetFinderDplusDminusMCPCharged.cxx
283+
REUSE_FROM JetDataModelPCH
239284
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
240285
COMPONENT_NAME Analysis)
241286

‎PWGJE/JetFinders/Duplicates/CMakeLists.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,19 @@ if(FastJet_FOUND)
1414

1515
o2physics_add_dpl_workflow(jet-finder-data-charged-1
1616
SOURCES jetFinderDataCharged1.cxx
17+
REUSE_FROM JetDataModelPCH
1718
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
1819
COMPONENT_NAME Analysis)
1920

2021
o2physics_add_dpl_workflow(jet-finder-mcd-charged-1
2122
SOURCES jetFinderMCDCharged1.cxx
23+
REUSE_FROM JetDataModelPCH
2224
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
2325
COMPONENT_NAME Analysis)
2426

2527
o2physics_add_dpl_workflow(jet-finder-mcp-charged-1
2628
SOURCES jetFinderMCPCharged1.cxx
29+
REUSE_FROM JetDataModelPCH
2730
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
2831
COMPONENT_NAME Analysis)
2932

0 commit comments

Comments
 (0)