Skip to content

Commit eb52e7a

Browse files
author
Marcello Di Costanzo
committed
Fix code-check
1 parent ac74f7f commit eb52e7a

3 files changed

Lines changed: 30 additions & 30 deletions

File tree

‎PWGHF/HFC/TableProducer/derivedDataCreatorCorrelationsReduced.cxx‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232

3333
#include <CCDB/BasicCCDBManager.h>
3434
#include <CommonConstants/MathConstants.h>
35-
#include <CommonConstants/PhysicsConstants.h>
3635
#include <Framework/ASoA.h>
3736
#include <Framework/AnalysisDataModel.h>
3837
#include <Framework/AnalysisHelpers.h>
@@ -378,7 +377,7 @@ struct HfDerivedDataCreatorCorrelationsReduced {
378377
return;
379378
}
380379
float cent{-1.}, mult{-1.};
381-
CentralityEstimator centDetector = static_cast<CentralityEstimator>(centEstimator.value);
380+
auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
382381
if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
383382
return;
384383
}
@@ -396,7 +395,7 @@ struct HfDerivedDataCreatorCorrelationsReduced {
396395
return;
397396
}
398397
float cent{-1.}, mult{-1.};
399-
CentralityEstimator centDetector = static_cast<CentralityEstimator>(centEstimator.value);
398+
auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
400399
if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
401400
return;
402401
}
@@ -417,7 +416,7 @@ struct HfDerivedDataCreatorCorrelationsReduced {
417416
return;
418417
}
419418
float cent{-1.}, mult{-1.};
420-
CentralityEstimator centDetector = static_cast<CentralityEstimator>(centEstimator.value);
419+
auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
421420
if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
422421
return;
423422
}
@@ -438,7 +437,7 @@ struct HfDerivedDataCreatorCorrelationsReduced {
438437
return;
439438
}
440439
float cent{-1.}, mult{-1.};
441-
CentralityEstimator centDetector = static_cast<CentralityEstimator>(centEstimator.value);
440+
auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
442441
if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
443442
return;
444443
}
@@ -460,7 +459,7 @@ struct HfDerivedDataCreatorCorrelationsReduced {
460459
return;
461460
}
462461
float cent{-1.}, mult{-1.};
463-
CentralityEstimator centDetector = static_cast<CentralityEstimator>(centEstimator.value);
462+
auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
464463
if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
465464
return;
466465
}
@@ -481,7 +480,7 @@ struct HfDerivedDataCreatorCorrelationsReduced {
481480
return;
482481
}
483482
float cent{-1.}, mult{-1.};
484-
CentralityEstimator centDetector = static_cast<CentralityEstimator>(centEstimator.value);
483+
auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
485484
if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
486485
return;
487486
}
@@ -503,7 +502,7 @@ struct HfDerivedDataCreatorCorrelationsReduced {
503502
return;
504503
}
505504
float cent{-1.}, mult{-1.};
506-
CentralityEstimator centDetector = static_cast<CentralityEstimator>(centEstimator.value);
505+
auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
507506
if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
508507
return;
509508
}
@@ -524,7 +523,7 @@ struct HfDerivedDataCreatorCorrelationsReduced {
524523
return;
525524
}
526525
float cent{-1.}, mult{-1.};
527-
CentralityEstimator centDetector = static_cast<CentralityEstimator>(centEstimator.value);
526+
auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
528527
if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
529528
return;
530529
}
@@ -546,7 +545,7 @@ struct HfDerivedDataCreatorCorrelationsReduced {
546545
return;
547546
}
548547
float cent{-1.}, mult{-1.};
549-
CentralityEstimator centDetector = static_cast<CentralityEstimator>(centEstimator.value);
548+
auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
550549
if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
551550
return;
552551
}
@@ -565,7 +564,7 @@ struct HfDerivedDataCreatorCorrelationsReduced {
565564
return;
566565
}
567566
float cent{-1.}, mult{-1.};
568-
CentralityEstimator centDetector = static_cast<CentralityEstimator>(centEstimator.value);
567+
auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
569568
if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
570569
return;
571570
}
@@ -586,7 +585,7 @@ struct HfDerivedDataCreatorCorrelationsReduced {
586585
return;
587586
}
588587
float cent{-1.}, mult{-1.};
589-
CentralityEstimator centDetector = static_cast<CentralityEstimator>(centEstimator.value);
588+
auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
590589
if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
591590
return;
592591
}
@@ -607,7 +606,7 @@ struct HfDerivedDataCreatorCorrelationsReduced {
607606
return;
608607
}
609608
float cent{-1.}, mult{-1.};
610-
CentralityEstimator centDetector = static_cast<CentralityEstimator>(centEstimator.value);
609+
auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
611610
if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
612611
return;
613612
}
@@ -629,7 +628,7 @@ struct HfDerivedDataCreatorCorrelationsReduced {
629628
return;
630629
}
631630
float cent{-1.}, mult{-1.};
632-
CentralityEstimator centDetector = static_cast<CentralityEstimator>(centEstimator.value);
631+
auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
633632
if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
634633
return;
635634
}
@@ -650,7 +649,7 @@ struct HfDerivedDataCreatorCorrelationsReduced {
650649
return;
651650
}
652651
float cent{-1.}, mult{-1.};
653-
CentralityEstimator centDetector = static_cast<CentralityEstimator>(centEstimator.value);
652+
auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
654653
if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
655654
return;
656655
}
@@ -672,7 +671,7 @@ struct HfDerivedDataCreatorCorrelationsReduced {
672671
return;
673672
}
674673
float cent{-1.}, mult{-1.};
675-
CentralityEstimator centDetector = static_cast<CentralityEstimator>(centEstimator.value);
674+
auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
676675
if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
677676
return;
678677
}
@@ -693,7 +692,7 @@ struct HfDerivedDataCreatorCorrelationsReduced {
693692
return;
694693
}
695694
float cent{-1.}, mult{-1.};
696-
CentralityEstimator centDetector = static_cast<CentralityEstimator>(centEstimator.value);
695+
auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
697696
if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
698697
return;
699698
}
@@ -710,7 +709,7 @@ struct HfDerivedDataCreatorCorrelationsReduced {
710709
TracksData const& tracks)
711710
{
712711
float cent{-1.}, mult{-1.};
713-
CentralityEstimator centDetector = static_cast<CentralityEstimator>(centEstimator.value);
712+
auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
714713
if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
715714
return;
716715
}
@@ -724,7 +723,7 @@ struct HfDerivedDataCreatorCorrelationsReduced {
724723
TracksData const& tracks)
725724
{
726725
float cent{-1.}, mult{-1.};
727-
CentralityEstimator centDetector = static_cast<CentralityEstimator>(centEstimator.value);
726+
auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
728727
if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
729728
return;
730729
}
@@ -739,7 +738,7 @@ struct HfDerivedDataCreatorCorrelationsReduced {
739738
TracksMc const& tracks)
740739
{
741740
float cent{-1.}, mult{-1.};
742-
CentralityEstimator centDetector = static_cast<CentralityEstimator>(centEstimator.value);
741+
auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
743742
if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
744743
return;
745744
}
@@ -753,7 +752,7 @@ struct HfDerivedDataCreatorCorrelationsReduced {
753752
TracksMc const& tracks)
754753
{
755754
float cent{-1.}, mult{-1.};
756-
CentralityEstimator centDetector = static_cast<CentralityEstimator>(centEstimator.value);
755+
auto centDetector = static_cast<CentralityEstimator>(centEstimator.value);
757756
if (!hfcFlowHelper.selectRecoCollision(hfEvSel, ccdb, registry, coll, centDetector, cent, mult)) {
758757
return;
759758
}
@@ -763,7 +762,7 @@ struct HfDerivedDataCreatorCorrelationsReduced {
763762
PROCESS_SWITCH(HfDerivedDataCreatorCorrelationsReduced, processMcHadronHadronME, "Process Mixed Event for hadron candidates", false);
764763
};
765764

766-
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
765+
WorkflowSpec defineDataProcessing(ConfigContext const& context)
767766
{
768-
return WorkflowSpec{adaptAnalysisTask<HfDerivedDataCreatorCorrelationsReduced>(cfgc)};
767+
return WorkflowSpec{adaptAnalysisTask<HfDerivedDataCreatorCorrelationsReduced>(context)};
769768
}

‎PWGHF/HFC/Tasks/taskCorrelationsEfficiencies.cxx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
/// \author Marcello Di Costanzo <marcello.di.costanzo@cern.ch>, Politecnico and INFN Torino
1515

1616
#include "PWGHF/Core/CentralityEstimation.h"
17-
#include "PWGHF/Core/HfHelper.h"
1817
#include "PWGHF/Core/DecayChannels.h"
1918
#include "PWGHF/DataModel/AliasTables.h"
2019
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
@@ -31,20 +30,21 @@
3130
#include "Common/DataModel/TrackSelectionTables.h"
3231

3332
#include <CCDB/BasicCCDBManager.h>
34-
#include <CommonConstants/MathConstants.h>
35-
#include <CommonConstants/PhysicsConstants.h>
3633
#include <Framework/ASoA.h>
3734
#include <Framework/AnalysisDataModel.h>
3835
#include <Framework/AnalysisHelpers.h>
3936
#include <Framework/AnalysisTask.h>
4037
#include <Framework/Configurable.h>
38+
#include <Framework/DeviceSpec.h>
4139
#include <Framework/HistogramRegistry.h>
4240
#include <Framework/HistogramSpec.h>
4341
#include <Framework/InitContext.h>
4442
#include <Framework/Logger.h>
4543
#include <Framework/runDataProcessing.h>
44+
#include <Framework/RunningWorkflowInfo.h>
4645

4746
#include <TF1.h>
47+
#include <THnSparse.h>
4848
#include <TPDGCode.h>
4949
#include <TString.h>
5050

@@ -467,7 +467,7 @@ struct HfTaskCorrelationsEfficiencies {
467467
PROCESS_SWITCH(HfTaskCorrelationsEfficiencies, processEffAssTracks, "Process efficiencies for associated tracks", true);
468468
};
469469

470-
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
470+
WorkflowSpec defineDataProcessing(ConfigContext const& context)
471471
{
472-
return WorkflowSpec{adaptAnalysisTask<HfTaskCorrelationsEfficiencies>(cfgc)};
472+
return WorkflowSpec{adaptAnalysisTask<HfTaskCorrelationsEfficiencies>(context)};
473473
}

‎PWGHF/HFC/Utils/utilsFlow.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,12 @@
2525
#include <Framework/AnalysisDataModel.h>
2626
#include <Framework/AnalysisHelpers.h>
2727
#include <Framework/HistogramRegistry.h>
28-
#include <Framework/InitContext.h>
2928
#include <Framework/Logger.h>
3029
#include <Framework/runDataProcessing.h>
3130

3231
#include <cmath>
32+
#include <csignal>
33+
#include <cstdlib>
3334
#include <utility>
3435
#include <vector>
3536

@@ -265,7 +266,7 @@ class HfcFlowHelper
265266
}
266267

267268
private:
268-
std::vector<unsigned int> classMl{};
269+
std::vector<unsigned int> classMl;
269270
float yCandMax{-999.f};
270271
};
271272

0 commit comments

Comments
 (0)