Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions PWGDQ/Core/AnalysisCut.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@

#include "PWGDQ/Core/AnalysisCut.h"

#include <iostream>

Check failure on line 14 in PWGDQ/Core/AnalysisCut.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[include-iostream]

Do not include iostream. Use O2 logging instead.
#include <vector>

using std::cout;
using std::endl;

Expand Down Expand Up @@ -58,5 +60,5 @@
//____________________________________________________________________________
void AnalysisCut::PrintCuts()
{
cout << "**************** AnalysisCut::PrintCuts" << endl;

Check failure on line 63 in PWGDQ/Core/AnalysisCut.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[logging]

Use O2 logging (LOG, LOGF, LOGP).
}
9 changes: 6 additions & 3 deletions PWGDQ/Core/MCSignalLibrary.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,14 @@
#ifndef PWGDQ_CORE_MCSIGNALLIBRARY_H_
#define PWGDQ_CORE_MCSIGNALLIBRARY_H_

#include <string>
#include "rapidjson/document.h"
#include "PWGDQ/Core/MCProng.h"
#include "PWGDQ/Core/MCSignal.h"

#include "rapidjson/document.h"

#include <string>
#include <vector>

namespace o2::aod
{
namespace dqmcsignals
Expand All @@ -36,7 +39,7 @@ MCProng* ParseJSONMCProng(T prongJSON, const char* prongName);

template <typename T>
bool ValidateJSONMCProng(T prongJSON, const char* prongName);
}
} // namespace dqmcsignals
} // namespace o2::aod

#endif // PWGDQ_CORE_MCSIGNALLIBRARY_H_
14 changes: 8 additions & 6 deletions PWGDQ/Core/MixingHandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,20 @@
// Class to define and fill histograms
//

#ifndef MixingHandler_H
#define MixingHandler_H
#ifndef PWGDQ_CORE_MIXINGHANDLER_H_
#define PWGDQ_CORE_MIXINGHANDLER_H_

#include "PWGDQ/Core/HistogramManager.h"
#include "PWGDQ/Core/VarManager.h"

#include <TNamed.h>
#include <TArrayF.h>
#include <TArrayI.h>
#include <TClonesArray.h>
#include <TList.h>
#include <TNamed.h>
#include <TString.h>

#include "PWGDQ/Core/HistogramManager.h"
#include "PWGDQ/Core/VarManager.h"
#include <vector>

class MixingHandler : public TNamed
{
Expand Down Expand Up @@ -61,4 +63,4 @@ class MixingHandler : public TNamed
ClassDef(MixingHandler, 1);
};

#endif
#endif // PWGDQ_CORE_MIXINGHANDLER_H_
3 changes: 3 additions & 0 deletions PWGDQ/Core/MixingLibrary.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
//
#include "PWGDQ/Core/MixingLibrary.h"

#include <string>
#include <vector>

void o2::aod::dqmixing::SetUpMixing(MixingHandler* mh, const char* mixingVarible)
{
std::string nameStr = mixingVarible;
Expand Down
2 changes: 2 additions & 0 deletions PWGDQ/TableProducer/generatedQuarkoniaMC.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@
#include <cstdlib>
#include <iterator>
#include <map>
#include <string>
#include <utility>
#include <vector>

using namespace o2;
using namespace o2::framework;
Expand Down Expand Up @@ -192,21 +194,21 @@
for (auto& mcp : mcParticles) {
if (TMath::Abs(mcp.y()) < 0.5 /* && mcp.isPhysicalPrimary()*/) {
auto binNumber = hBinFinder->FindBin(mcCollision.bestCollisionCentFT0C(), mcp.pt()); // caution: pack
if (mcp.pdgCode() == 441)

Check failure on line 197 in PWGDQ/TableProducer/generatedQuarkoniaMC.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code]

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.
genEtaC1S[binNumber]++;
if (mcp.pdgCode() == 443)

Check failure on line 199 in PWGDQ/TableProducer/generatedQuarkoniaMC.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code]

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.
genJPsi[binNumber]++;
if (mcp.pdgCode() == 10441)

Check failure on line 201 in PWGDQ/TableProducer/generatedQuarkoniaMC.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code]

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.
genChiC0[binNumber]++;
if (mcp.pdgCode() == 20443)

Check failure on line 203 in PWGDQ/TableProducer/generatedQuarkoniaMC.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code]

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.
genChiC1[binNumber]++;
if (mcp.pdgCode() == 10443)

Check failure on line 205 in PWGDQ/TableProducer/generatedQuarkoniaMC.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code]

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.
genHC[binNumber]++;
if (mcp.pdgCode() == 445)

Check failure on line 207 in PWGDQ/TableProducer/generatedQuarkoniaMC.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code]

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.
genChiC2[binNumber]++;
if (mcp.pdgCode() == 100441)

Check failure on line 209 in PWGDQ/TableProducer/generatedQuarkoniaMC.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code]

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.
genEtaC2S[binNumber]++;
if (mcp.pdgCode() == 100443)

Check failure on line 211 in PWGDQ/TableProducer/generatedQuarkoniaMC.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code]

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.
genPsi2S[binNumber]++;
}
}
Expand Down
22 changes: 12 additions & 10 deletions PWGDQ/TableProducer/tableMakerJpsiHf.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,25 @@
/// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
/// \author Fabrizio Grosa <fabrizio.grosa@cern.ch>, CERN

#include <string>

#include "Framework/AnalysisTask.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/HistogramRegistry.h"
#include "Framework/runDataProcessing.h"

#include "PWGHF/Core/HfHelper.h"
#include "PWGDQ/Core/AnalysisCut.h"
#include "PWGDQ/Core/AnalysisCompositeCut.h"
#include "PWGDQ/Core/AnalysisCut.h"
#include "PWGDQ/Core/CutsLibrary.h"
#include "PWGDQ/Core/HistogramManager.h"
#include "PWGDQ/Core/HistogramsLibrary.h"
#include "PWGDQ/Core/VarManager.h"
#include "PWGDQ/DataModel/ReducedInfoTables.h"
#include "PWGHF/Core/HfHelper.h"
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
#include "PWGHF/DataModel/CandidateSelectionTables.h"
#include "PWGDQ/DataModel/ReducedInfoTables.h"

#include "Framework/AnalysisDataModel.h"
#include "Framework/AnalysisTask.h"
#include "Framework/HistogramRegistry.h"
#include "Framework/runDataProcessing.h"

#include <memory>
#include <string>
#include <vector>

using namespace o2;
using namespace o2::analysis;
Expand Down
5 changes: 5 additions & 0 deletions PWGDQ/Tasks/DalitzSelection.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@
#include "Framework/DataTypes.h"
#include "Framework/runDataProcessing.h"

#include <map>
#include <memory>
#include <string>
#include <vector>

using namespace o2;
using namespace o2::framework;
using namespace o2::framework::expressions;
Expand Down
2 changes: 2 additions & 0 deletions PWGDQ/Tasks/dqCorrelation.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@
#include <algorithm>
#include <cmath>
#include <iostream>
#include <memory>
#include <string>
#include <vector>

using std::cout;
Expand Down
2 changes: 2 additions & 0 deletions PWGDQ/Tasks/muonDCA.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
#include "Framework/runDataProcessing.h"
#include "GlobalTracking/MatchGlobalFwd.h"

#include <string>

using namespace o2;
using namespace o2::framework;
using namespace o2::aod;
Expand Down
58 changes: 32 additions & 26 deletions PWGDQ/Tasks/taskFwdTrackPid.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -13,38 +13,44 @@
/// \brief Task for the analysis of forward PID with MFT
/// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN

#include <iostream>
#include <vector>
#include <algorithm>
#include <TH1F.h>
#include <TH3F.h>
#include <THashList.h>
#include <TList.h>
#include <TString.h>
#include "CCDB/BasicCCDBManager.h"
#include "DataFormatsParameters/GRPObject.h"
#include "Framework/runDataProcessing.h"
#include "Framework/AnalysisTask.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/ASoAHelpers.h"
#include "PWGDQ/DataModel/ReducedInfoTables.h"
#include "PWGDQ/Core/VarManager.h"
#include "PWGDQ/Core/AnalysisCompositeCut.h"
#include "PWGDQ/Core/AnalysisCut.h"
#include "PWGDQ/Core/CutsLibrary.h"
#include "PWGDQ/Core/HistogramManager.h"
#include "PWGDQ/Core/MixingHandler.h"
#include "PWGDQ/Core/HistogramsLibrary.h"
#include "PWGDQ/Core/MCSignal.h"
#include "PWGDQ/Core/MCSignalLibrary.h"
#include "PWGDQ/Core/AnalysisCut.h"
#include "PWGDQ/Core/AnalysisCompositeCut.h"
#include "PWGDQ/Core/HistogramsLibrary.h"
#include "PWGDQ/Core/CutsLibrary.h"
#include "PWGDQ/Core/MixingHandler.h"
#include "PWGDQ/Core/MixingLibrary.h"
#include "PWGDQ/Core/VarManager.h"
#include "PWGDQ/DataModel/ReducedInfoTables.h"

#include "Common/CCDB/EventSelectionParams.h"

#include "CCDB/BasicCCDBManager.h"
#include "DataFormatsParameters/GRPMagField.h"
#include "Field/MagneticField.h"
#include "TGeoGlobalMagField.h"
#include "DetectorsBase/Propagator.h"
#include "DataFormatsParameters/GRPObject.h"
#include "DetectorsBase/GeometryManager.h"
#include "DetectorsBase/Propagator.h"
#include "Field/MagneticField.h"
#include "Framework/ASoAHelpers.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/AnalysisTask.h"
#include "Framework/runDataProcessing.h"
#include "ITSMFTBase/DPLAlpideParam.h"
#include "Common/CCDB/EventSelectionParams.h"

#include "TGeoGlobalMagField.h"
#include <TH1F.h>
#include <TH3F.h>
#include <THashList.h>
#include <TList.h>
#include <TString.h>

#include <algorithm>
#include <iostream>
#include <memory>
#include <string>
#include <vector>

using namespace o2;
using namespace o2::framework;
Expand Down Expand Up @@ -150,7 +156,7 @@ struct taskFwdTrackPid {
for (const auto& mftTrack : mftTracks) {
if (TMath::Abs(mftTrack.fwdDcaX()) < fConfigMaxDCA && TMath::Abs(mftTrack.fwdDcaY()) < fConfigMaxDCA) {
if (downSampleFactor < 1.) {
float pseudoRndm = mftTrack.pt() * 1000. - (int64_t)(mftTrack.pt() * 1000);
float pseudoRndm = mftTrack.pt() * 1000. - static_cast<int64_t>(mftTrack.pt() * 1000);
if (pseudoRndm >= downSampleFactor) {
continue;
}
Expand Down
20 changes: 11 additions & 9 deletions PWGDQ/Tasks/taskJpsiHf.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,22 @@
/// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
/// \author Fabrizio Grosa <fabrizio.grosa@cern.ch>, CERN

#include <string>
#include "PWGDQ/DataModel/ReducedInfoTables.h"
#include "PWGHF/Core/HfHelper.h"
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
#include "PWGHF/DataModel/CandidateSelectionTables.h"
#include "PWGHF/Utils/utilsAnalysis.h"

#include "Common/Core/RecoDecay.h"

#include "Framework/AnalysisTask.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/AnalysisTask.h"
#include "Framework/HistogramRegistry.h"
#include "Framework/runDataProcessing.h"

#include "Common/Core/RecoDecay.h"

#include "PWGHF/Core/HfHelper.h"
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
#include "PWGHF/DataModel/CandidateSelectionTables.h"
#include "PWGHF/Utils/utilsAnalysis.h"
#include "PWGDQ/DataModel/ReducedInfoTables.h"
#include <memory>
#include <string>
#include <vector>

using namespace o2;
using namespace o2::analysis;
Expand Down
5 changes: 4 additions & 1 deletion PWGDQ/Tasks/taskMuonMchTrkEfficiency.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,14 @@
/// \author Zaida Conesa del Valle <zaida.conesa.del.valle@cern.ch>
///

#include "PWGDQ/DataModel/MchTrkEffTables.h"

#include "Framework/AnalysisTask.h"
#include "Framework/HistogramRegistry.h"
#include "Framework/runDataProcessing.h"

#include "PWGDQ/DataModel/MchTrkEffTables.h"
#include <string>
#include <vector>

using namespace o2;
using namespace o2::aod;
Expand Down
Loading