Skip to content

Commit 420b113

Browse files
vkuceraalibuild
andauthored
[PWGJE] Fix wrong headers. Remove unused files. Fix includes. (#14128)
Co-authored-by: ALICE Builder <alibuild@users.noreply.github.com>
1 parent 12c09f3 commit 420b113

File tree

149 files changed

+2158
-1798
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+2158
-1798
lines changed

PWGJE/Core/JetDerivedDataUtilities.cxx

Lines changed: 0 additions & 15 deletions
This file was deleted.

PWGJE/Core/JetTaggingUtilities.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ bool svAcceptance(T const& sv, float svDispersionMax)
541541
* positive value is expected from secondary vertex
542542
*
543543
* @param jet
544-
* @param track which is needed aod::JTrackExtras
544+
* @param track which is needed o2::aod::JTrackExtras
545545
*/
546546
template <typename T, typename U>
547547
int getGeoSign(T const& jet, U const& track)

PWGJE/Core/JetUtilities.cxx

Lines changed: 0 additions & 15 deletions
This file was deleted.

PWGJE/Core/MlResponseHfTagging.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@
1818

1919
#include "Tools/ML/MlResponse.h"
2020

21-
#include <onnxruntime_cxx_api.h>
22-
2321
#include <Framework/Logger.h>
2422

2523
#include <onnxruntime_c_api.h>
24+
#include <onnxruntime_cxx_api.h>
2625

2726
#include <cstddef>
2827
#include <cstdint>
@@ -330,6 +329,7 @@ class TensorAllocator
330329
{
331330
protected:
332331
Ort::MemoryInfo memInfo;
332+
333333
public:
334334
TensorAllocator()
335335
: memInfo(Ort::MemoryInfo::CreateCpu(OrtAllocatorType::OrtArenaAllocator, OrtMemType::OrtMemTypeDefault))
@@ -426,7 +426,7 @@ class GNNBjetAllocator : public TensorAllocator
426426
}
427427
~GNNBjetAllocator() = default;
428428

429-
// Copy operator for initializing GNNBjetAllocator using Configurable values
429+
// Copy operator for initializing GNNBjetAllocator using o2::framework::Configurable values
430430
GNNBjetAllocator& operator=(const GNNBjetAllocator& other)
431431
{
432432
nJetFeat = other.nJetFeat;

PWGJE/DataModel/JetTagging.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
#ifndef PWGJE_DATAMODEL_JETTAGGING_H_
1919
#define PWGJE_DATAMODEL_JETTAGGING_H_
2020

21-
#include "RecoDecay.h"
22-
2321
#include "PWGJE/Core/JetTaggingUtilities.h"
2422
#include "PWGJE/DataModel/Jet.h" // IWYU pragma: keep
2523

24+
#include "Common/Core/RecoDecay.h"
25+
2626
#include <Framework/ASoA.h>
2727

2828
#include <Rtypes.h>

PWGJE/JetFinders/Duplicates/jetFinderDataCharged1.cxx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313
//
1414
/// \author Nima Zardoshti <nima.zardoshti@cern.ch>
1515

16-
#include "PWGJE/JetFinders/jetFinder.cxx"
17-
1816
#include "PWGJE/DataModel/Jet.h"
17+
#include "PWGJE/JetFinders/jetFinder.h"
1918

2019
#include <Framework/AnalysisTask.h>
2120
#include <Framework/ConfigContext.h>
@@ -24,6 +23,10 @@
2423

2524
#include <vector>
2625

26+
using namespace o2;
27+
using namespace o2::framework;
28+
using namespace o2::framework::expressions;
29+
2730
using JetFinderDataCharged1 = JetFinderTask<aod::Charged1Jets, aod::Charged1JetConstituents, aod::Charged1EventWiseSubtractedJets, aod::Charged1EventWiseSubtractedJetConstituents>;
2831

2932
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)

PWGJE/JetFinders/Duplicates/jetFinderMCDCharged1.cxx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313
//
1414
/// \author Nima Zardoshti <nima.zardoshti@cern.ch>
1515

16-
#include "PWGJE/JetFinders/jetFinder.cxx"
17-
1816
#include "PWGJE/DataModel/Jet.h"
17+
#include "PWGJE/JetFinders/jetFinder.h"
1918

2019
#include <Framework/AnalysisTask.h>
2120
#include <Framework/ConfigContext.h>
@@ -24,6 +23,10 @@
2423

2524
#include <vector>
2625

26+
using namespace o2;
27+
using namespace o2::framework;
28+
using namespace o2::framework::expressions;
29+
2730
using JetFinderMCDetectorLevelCharged1 = JetFinderTask<aod::Charged1MCDetectorLevelJets, aod::Charged1MCDetectorLevelJetConstituents, aod::Charged1MCDetectorLevelEventWiseSubtractedJets, aod::Charged1MCDetectorLevelEventWiseSubtractedJetConstituents>;
2831

2932
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)

PWGJE/JetFinders/Duplicates/jetFinderMCPCharged1.cxx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313
//
1414
/// \author Nima Zardoshti <nima.zardoshti@cern.ch>
1515

16-
#include "PWGJE/JetFinders/jetFinder.cxx"
17-
1816
#include "PWGJE/DataModel/Jet.h"
17+
#include "PWGJE/JetFinders/jetFinder.h"
1918

2019
#include <Framework/AnalysisTask.h>
2120
#include <Framework/ConfigContext.h>
@@ -24,6 +23,10 @@
2423

2524
#include <vector>
2625

26+
using namespace o2;
27+
using namespace o2::framework;
28+
using namespace o2::framework::expressions;
29+
2730
using JetFinderMCParticleLevelCharged1 = JetFinderTask<aod::Charged1MCParticleLevelJets, aod::Charged1MCParticleLevelJetConstituents, aod::Charged1MCParticleLevelEventWiseSubtractedJets, aod::Charged1MCParticleLevelEventWiseSubtractedJetConstituents>;
2831

2932
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)

0 commit comments

Comments
 (0)