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
1 change: 1 addition & 0 deletions PWGLF/TableProducer/Nuspex/hyhe4builder.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
#include <cmath>
#include <cstdint>
#include <cstdlib>
#include <string>

using namespace std;
using namespace o2;
Expand Down
9 changes: 4 additions & 5 deletions PWGLF/TableProducer/Resonances/cksspinalignment.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,10 @@ struct cksspinalignment {
}

bool keepEvent(uint64_t eventIndex) const
{ /*
if (cfgKeepFraction >= 1.0f) {
return true;
}
*/
{
// if (cfgKeepFraction >= 1.0f) {
// return true;
// }
// SplitMix64 pseudo-random hash
uint64_t x = eventIndex + 0x9e3779b97f4a7c15ULL;
x = (x ^ (x >> 30)) * 0xbf58476d1ce4e5b9ULL;
Expand Down
1 change: 1 addition & 0 deletions PWGLF/TableProducer/Strangeness/lambdakzerofinder.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
#include <array>
#include <cmath>
#include <cstdlib>
#include <string>

using namespace o2;
using namespace o2::framework;
Expand Down
4 changes: 2 additions & 2 deletions PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -579,8 +579,8 @@ struct strangederivedbuilder {
// auto TraCascTable_thisColl = TraCascades.sliceBy(TraCascperCollision, collIdx);
bool strange = V0Table_thisColl.size() > 0 ||
CascTable_thisColl.size() > 0 ||
KFCascTable_thisColl.size() > 0 /* ||
TraCascTable_thisColl.size() > 0*/
KFCascTable_thisColl.size() > 0
// ||TraCascTable_thisColl.size() > 0
;

auto bc = collision.template bc_as<bcType>();
Expand Down
1 change: 1 addition & 0 deletions PWGLF/Tasks/Nuspex/AntimatterAbsorptionHMPID.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
#include <cmath>
#include <cstdlib>
#include <memory>
#include <string>

using namespace o2;
using namespace o2::framework;
Expand Down
1 change: 1 addition & 0 deletions PWGLF/Tasks/Nuspex/hypertritonAnalysis.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
#include <array>
#include <cmath>
#include <cstdlib>
#include <string>

using namespace o2;
using namespace o2::framework;
Expand Down
9 changes: 3 additions & 6 deletions PWGLF/Tasks/Resonances/lambdav2.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -209,26 +209,23 @@ struct lambdav2 {
template <typename T>
bool SelectionPID(const T& candidate, int PID)
{
if (PID == 0) // pion
{
if (PID == 0) { // pion
auto combPIDPi = TMath::Sqrt(TMath::Abs(candidate.tofNSigmaPi() * candidate.tofNSigmaPi() + candidate.tpcNSigmaPi() * candidate.tpcNSigmaPi()));
if (!candidate.hasTOF() && candidate.tpcInnerParam() < 0.6 && TMath::Abs(candidate.tpcNSigmaPi()) < nsigmaCutTPCPi) {
return true;
}
if (candidate.hasTOF() && candidate.beta() > cfgCutTOFBeta && combPIDPi < nsigmaCutTOFPi) {
return true;
}
} else if (PID == 1) // kaon
{
} else if (PID == 1) { // kaon
auto combPIDKa = TMath::Sqrt(TMath::Abs(candidate.tofNSigmaKa() * candidate.tofNSigmaKa() + candidate.tpcNSigmaKa() * candidate.tpcNSigmaKa()));
if (!candidate.hasTOF() && candidate.tpcInnerParam() < 0.45 && TMath::Abs(candidate.tpcNSigmaKa()) < nsigmaCutTPCKa) {
return true;
}
if (candidate.hasTOF() && candidate.beta() > cfgCutTOFBeta && combPIDKa < nsigmaCutTOFKa) {
return true;
}
} else // proton
{
} else { // proton
auto combPIDPr = TMath::Sqrt(TMath::Abs(candidate.tofNSigmaPr() * candidate.tofNSigmaPr() + candidate.tpcNSigmaPr() * candidate.tpcNSigmaPr()));
if (!candidate.hasTOF() && candidate.tpcInnerParam() < 0.6 && TMath::Abs(candidate.tpcNSigmaPr()) < nsigmaCutTPCPr) {
return true;
Expand Down
10 changes: 5 additions & 5 deletions PWGLF/Tasks/Strangeness/phiStrangeCorrelation.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -1303,7 +1303,7 @@ struct PhiStrangeCorrelation {

histos.fill(histoKey, collision.posZ(), mcCollision.centFT0M(), assoc.pt(), assoc.y());
}
};
}; // NOLINT(readability/braces)

fillRecoAssocSpecies(makeAssocInput<kK0S>(k0sReduced), HIST("k0s/h4K0SMCReco"));
fillRecoAssocSpecies(makeAssocInput<kLambda>(lambdaReduced), HIST("lambda/h4LambdaMCReco"));
Expand Down Expand Up @@ -1337,7 +1337,7 @@ struct PhiStrangeCorrelation {
for (const auto& mcParticle : mcParticlesThisMcColl) {
if (std::abs(mcParticle.y()) > yConfigs.cfgYAcceptance) {
continue;
};
}

auto fillGenHistos = [&](auto h3Key, auto h4Key) {
histos.fill(h3Key, mcCollision.centFT0M(), mcParticle.pt(), mcParticle.y());
Expand All @@ -1352,7 +1352,7 @@ struct PhiStrangeCorrelation {
}

fillGenHistos(h3Key, h4Key);
};
}; // NOLINT(readability/braces)

switch (std::abs(mcParticle.pdgCode())) {
case o2::constants::physics::Pdg::kPhi:
Expand Down Expand Up @@ -1404,13 +1404,13 @@ struct PhiStrangeCorrelation {
for (const auto& mcParticle : mcParticles) {
if (std::abs(mcParticle.y()) > yConfigs.cfgYAcceptance) {
continue;
};
}

auto fillPartCollection = [&]<AssociatedParticleType PartType>() {
if (activeCorrelationTypes->at(PartType) && isGenSpeciesValid<PartType>(mcParticle, minPtMcGenConfigs.bypassPtCut.value)) {
assocParticles[PartType].emplace_back(mcParticle.pt(), mcParticle.y(), mcParticle.phi());
}
};
}; // NOLINT(readability/braces)

switch (std::abs(mcParticle.pdgCode())) {
case o2::constants::physics::Pdg::kPhi:
Expand Down
5 changes: 1 addition & 4 deletions PWGLF/Utils/collisionCutsGroupLinkDef.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
///
/// \author Bong-Hwi Lim <bong-hwi.lim@cern.ch>

#ifndef PWGLF_UTILS_COLLISIONCUTSGROUPLINKDEF_H_
#define PWGLF_UTILS_COLLISIONCUTSGROUPLINKDEF_H_
// NOLINT(build/header_guard)

#pragma link off all globals;
#pragma link off all classes;
Expand All @@ -30,5 +29,3 @@
#pragma link C++ class std::vector < int> + ;
#pragma link C++ class std::vector < float> + ;
#pragma link C++ class std::vector < bool> + ;

#endif // PWGLF_UTILS_COLLISIONCUTSGROUPLINKDEF_H_
5 changes: 1 addition & 4 deletions PWGLF/Utils/v0SelectionGroupLinkDef.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

#ifndef PWGLF_UTILS_V0SELECTIONGROUPLINKDEF_H_
#define PWGLF_UTILS_V0SELECTIONGROUPLINKDEF_H_
// NOLINT(build/header_guard)

#pragma link off all globals;
#pragma link off all classes;
Expand All @@ -21,5 +20,3 @@
#pragma link C++ class std::vector < float> + ;
#pragma link C++ class std::vector < double> + ;
#pragma link C++ class std::vector < bool> + ;

#endif // PWGLF_UTILS_V0SELECTIONGROUPLINKDEF_H_
Loading