Skip to content

Commit 0361e22

Browse files
feisenhufeisenhu
committed
PWGDQ/EM: fix MegaLinter errors
1 parent 990cb81 commit 0361e22

File tree

5 files changed

+37
-37
lines changed

5 files changed

+37
-37
lines changed

‎PWGDQ/Tasks/dileptonMuMu.cxx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
//
1212
// Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
1313
//
14+
#include <iostream>
15+
#include <vector>
16+
#include <algorithm>
17+
#include <TH1F.h>
18+
#include <THashList.h>
19+
#include <TString.h>
1420
#include "Framework/runDataProcessing.h"
1521
#include "Framework/AnalysisTask.h"
1622
#include "Framework/AnalysisDataModel.h"
@@ -24,12 +30,6 @@
2430
#include "PWGDQ/Core/HistogramsLibrary.h"
2531
#include "PWGDQ/Core/CutsLibrary.h"
2632
#include "PWGDQ/Core/MixingLibrary.h"
27-
#include <TH1F.h>
28-
#include <THashList.h>
29-
#include <TString.h>
30-
#include <iostream>
31-
#include <vector>
32-
#include <algorithm>
3333

3434
using std::cout;
3535
using std::endl;

‎PWGDQ/Tasks/dqEfficiency.cxx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@
1313
//
1414
// Analysis task for processing O2::DQ MC skimmed AODs
1515
//
16+
#include <iostream>
17+
#include <vector>
18+
#include <TMath.h>
19+
#include <TH1F.h>
20+
#include <THashList.h>
21+
#include <TString.h>
1622
#include "Framework/runDataProcessing.h"
1723
#include "Framework/AnalysisTask.h"
1824
#include "Framework/AnalysisDataModel.h"
@@ -26,12 +32,6 @@
2632
#include "PWGDQ/Core/CutsLibrary.h"
2733
#include "PWGDQ/Core/MCSignal.h"
2834
#include "PWGDQ/Core/MCSignalLibrary.h"
29-
#include <TMath.h>
30-
#include <TH1F.h>
31-
#include <THashList.h>
32-
#include <TString.h>
33-
#include <iostream>
34-
#include <vector>
3535

3636
using std::cout;
3737
using std::endl;

‎PWGDQ/Tasks/filterPP.cxx‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,14 @@
1111
//
1212
// Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
1313
//
14+
#include <iostream>
15+
#include <vector>
16+
#include <memory>
17+
#include <cstring>
18+
#include <TH1F.h>
19+
#include <TH2I.h>
20+
#include <THashList.h>
21+
#include <TString.h>
1422
#include "CCDB/BasicCCDBManager.h"
1523
#include "Framework/runDataProcessing.h"
1624
#include "Framework/AnalysisTask.h"
@@ -30,14 +38,6 @@
3038
#include "PWGDQ/Core/HistogramsLibrary.h"
3139
#include "Common/DataModel/PIDResponse.h"
3240
#include "Common/DataModel/TrackSelectionTables.h"
33-
#include <TH1F.h>
34-
#include <TH2I.h>
35-
#include <THashList.h>
36-
#include <TString.h>
37-
#include <iostream>
38-
#include <vector>
39-
#include <memory>
40-
#include <cstring>
4141

4242
using std::cout;
4343
using std::endl;
@@ -613,7 +613,7 @@ struct DQFilterPPTask {
613613
for (int i = 0; i < fNBarrelCuts; i++) {
614614
if (objCountersBarrel[i] >= fBarrelNreqObjs[i]) {
615615
filter |= (uint64_t(1) << i);
616-
fStats->Fill(float(i));
616+
fStats->Fill(static_cast<float>(i));
617617
if (i < kNTriggersDQ) {
618618
decisions[i] = true;
619619
}
@@ -622,7 +622,7 @@ struct DQFilterPPTask {
622622
for (int i = 0; i < fNMuonCuts; i++) {
623623
if (objCountersMuon[i] >= fMuonNreqObjs[i]) {
624624
filter |= (uint64_t(1) << (i + fNBarrelCuts));
625-
fStats->Fill(float(i + fNBarrelCuts));
625+
fStats->Fill(static_cast<float>(i + fNBarrelCuts));
626626
if (i + fNBarrelCuts < kNTriggersDQ) {
627627
decisions[i + fNBarrelCuts] = true;
628628
}

‎PWGDQ/Tasks/tableReader.cxx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
//
1212
// Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
1313
//
14+
#include <iostream>
15+
#include <vector>
16+
#include <algorithm>
17+
#include <TH1F.h>
18+
#include <THashList.h>
19+
#include <TString.h>
1420
#include "CCDB/BasicCCDBManager.h"
1521
#include "Framework/runDataProcessing.h"
1622
#include "Framework/AnalysisTask.h"
@@ -25,12 +31,6 @@
2531
#include "PWGDQ/Core/HistogramsLibrary.h"
2632
#include "PWGDQ/Core/CutsLibrary.h"
2733
#include "PWGDQ/Core/MixingLibrary.h"
28-
#include <TH1F.h>
29-
#include <THashList.h>
30-
#include <TString.h>
31-
#include <iostream>
32-
#include <vector>
33-
#include <algorithm>
3434

3535
using std::cout;
3636
using std::endl;
@@ -611,7 +611,7 @@ struct AnalysisSameEventPairing {
611611
Configurable<string> fConfigMuonCuts{"cfgMuonCuts", "", "Comma separated list of muon cuts"};
612612
Configurable<string> url{"ccdb-url", "http://ccdb-test.cern.ch:8080", "url of the ccdb repository"};
613613
Configurable<string> ccdbPath{"ccdb-path", "Users/lm", "base path to the ccdb object"};
614-
Configurable<long> nolaterthan{"ccdb-no-later-than", std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count(), "latest acceptable timestamp of creation for the object"};
614+
Configurable<int64_t> nolaterthan{"ccdb-no-later-than", std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count(), "latest acceptable timestamp of creation for the object"};
615615
Configurable<std::string> fConfigAddSEPHistogram{"cfgAddSEPHistogram", "", "Comma separated list of histograms"};
616616
Service<o2::ccdb::BasicCCDBManager> ccdb;
617617
Filter filterEventSelected = aod::dqanalysisflags::isEventSelected == 1;

‎PWGEM/Dilepton/Tasks/dileptonEE.cxx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
//
1212
// Contact: iarsene@cern.ch, i.c.arsene@fys.uio.no
1313
//
14+
#include <iostream>
15+
#include <vector>
16+
#include <algorithm>
17+
#include <TH1F.h>
18+
#include <THashList.h>
19+
#include <TString.h>
1420
#include "CCDB/BasicCCDBManager.h"
1521
#include "Framework/runDataProcessing.h"
1622
#include "Framework/AnalysisTask.h"
@@ -25,12 +31,6 @@
2531
#include "PWGDQ/Core/HistogramsLibrary.h"
2632
#include "PWGDQ/Core/CutsLibrary.h"
2733
#include "PWGDQ/Core/MixingLibrary.h"
28-
#include <TH1F.h>
29-
#include <THashList.h>
30-
#include <TString.h>
31-
#include <iostream>
32-
#include <vector>
33-
#include <algorithm>
3434

3535
using std::cout;
3636
using std::endl;
@@ -407,7 +407,7 @@ struct AnalysisSameEventPairing {
407407
Configurable<string> fConfigTrackCuts{"cfgTrackCuts", "", "Comma separated list of barrel track cuts"};
408408
Configurable<string> url{"ccdb-url", "http://ccdb-test.cern.ch:8080", "url of the ccdb repository"};
409409
Configurable<string> ccdbPath{"ccdb-path", "Users/lm", "base path to the ccdb object"};
410-
Configurable<long> nolaterthan{"ccdb-no-later-than", std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count(), "latest acceptable timestamp of creation for the object"};
410+
Configurable<int64_t> nolaterthan{"ccdb-no-later-than", std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count(), "latest acceptable timestamp of creation for the object"};
411411
Service<o2::ccdb::BasicCCDBManager> ccdb;
412412
Filter filterEventSelected = aod::dqanalysisflags::isEventSelected == 1;
413413
// NOTE: the barrel filter map contains decisions for both electrons and hadrons used in the correlation task
@@ -562,7 +562,7 @@ void DefineHistograms(HistogramManager* histMan, TString histClasses)
562562
dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "event", "trigger,cent");
563563
}
564564

565-
if (classStr.Contains("Track")) {
565+
if (classStr.Contains("Track") && !(classStr.Contains("Pairs"))) {
566566
if (classStr.Contains("Barrel")) {
567567
dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "track", "its,tpcpid,dca,tofpid");
568568
}

0 commit comments

Comments
 (0)