Skip to content
Open
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
5 changes: 2 additions & 3 deletions PWGCF/Core/PWGCFCoreLinkDef.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
// In applying this license CERN does not waive the privileges and immunities
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.
#ifndef PWGCF_CORE_PWGCFCORELINKDEF_H_
#define PWGCF_CORE_PWGCFCORELINKDEF_H_

// NOLINT(build/header_guard)

#pragma link off all globals;
#pragma link off all classes;
Expand All @@ -23,4 +23,3 @@
#pragma link C++ class o2::analysis::TrackSelectionPIDCfg + ;
#pragma link C++ class o2::analysis::SimpleInclusiveCut + ;
#pragma link C++ class CorrelationContainer + ;
#endif // PWGCF_CORE_PWGCFCORELINKDEF_H_
3 changes: 2 additions & 1 deletion PWGCF/EbyEFluctuations/Tasks/NetProtonCumulants.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#include <cmath>
#include <cstdint>
#include <memory>
#include <string>
#include <vector>

#include <math.h>
Expand Down Expand Up @@ -69,7 +70,7 @@ struct NetProtonCumulants_Table_QA {

// Filter command***********
Filter collisionFilter = nabs(aod::collision::posZ) < cfgCutVertex;
Filter trackFilter = (nabs(aod::track::eta) < 0.8f) && (aod::track::pt > cfgCutPtLower) && (aod::track::pt < 5.0f) && ((requireGlobalTrackInFilter()) || (aod::track::isGlobalTrackSDD == (uint8_t) true)) && (aod::track::tpcChi2NCl < cfgCutTpcChi2NCl);
Filter trackFilter = (nabs(aod::track::eta) < 0.8f) && (aod::track::pt > cfgCutPtLower) && (aod::track::pt < 5.0f) && ((requireGlobalTrackInFilter()) || (aod::track::isGlobalTrackSDD == (uint8_t)true)) && (aod::track::tpcChi2NCl < cfgCutTpcChi2NCl);

// Connect to ccdb
Service<ccdb::BasicCCDBManager> ccdb;
Expand Down
2 changes: 1 addition & 1 deletion PWGCF/FemtoWorld/Core/FemtoWorldTrackSelection.h
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class FemtoWorldTrackSelection : public FemtoWorldObjectSelection<float, femtoWo
dcaXYMax(-9999999.),
dcaZMax(-9999999.),
dcaMin(9999999.),
nSigmaPIDMax(9999999.) {};
nSigmaPIDMax(9999999.) {}

/// Initializes histograms for the task
/// \tparam part Type of the particle for proper naming of the folders for QA
Expand Down
6 changes: 2 additions & 4 deletions PWGCF/FemtoWorld/Core/FemtoWorldV0Selection.h
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class FemtoWorldV0Selection : public FemtoWorldObjectSelection<float, femtoWorld
fInvMassUpLimit(1.3),
fRejectKaon(false),
fInvMassKaonLowLimit(0.48),
fInvMassKaonUpLimit(0.515) {};
fInvMassKaonUpLimit(0.515) {}
/// Initializes histograms for the task
template <o2::aod::femtoworldparticle::ParticleType part, o2::aod::femtoworldparticle::ParticleType daugh, typename cutContainerType>
void init(o2::framework::HistogramRegistry* registry);
Expand Down Expand Up @@ -472,9 +472,7 @@ std::array<cutContainerType, 5> FemtoWorldV0Selection::getCutContainer(C const&
sign = -1.;
} else if (abs(nSigmaPrPos) < nSigmaPIDMax && abs(nSigmaPiNeg) < nSigmaPIDMax && diffAntiLambda < diffLambda) {
sign = 1.;
}
// if it happens that none of these are true, ignore the invariant mass
else {
} else { // if it happens that none of these are true, ignore the invariant mass
if (abs(nSigmaPrNeg) < nSigmaPIDMax && abs(nSigmaPiPos) < nSigmaPIDMax) {
sign = -1.;
} else if (abs(nSigmaPrPos) < nSigmaPIDMax && abs(nSigmaPiNeg) < nSigmaPIDMax) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
#include <Math/Vector4D.h>
#include <TMath.h>

#include <vector>

using namespace o2;
using namespace o2::analysis::femtoWorld;
using namespace o2::framework;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,12 @@
#include <Framework/runDataProcessing.h>
#include <ReconstructionDataFormats/Track.h>

#include <Math/Vector4D.h>
#include <Math/Vector4D.h> // IWYU pragma: keep (do not replace with Math/Vector4Dfwd.h)
#include <Math/Vector4Dfwd.h>
#include <TMath.h>

#include <vector>

using namespace o2;
using namespace o2::analysis::femtoWorld;
using namespace o2::framework;
Expand Down
25 changes: 16 additions & 9 deletions PWGCF/FemtoWorld/Tasks/femtoWorldPairTaskTrackTrack.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -214,32 +214,39 @@ struct femtoWorldPairTaskTrackTrack {
if (mom > 0.5) {
// if (TMath::Hypot( nsigmaTOFP, nsigmaTPCP )/TMath::Sqrt(2) < 3.0)
if (mom < 2.0) {
if (TMath::Hypot(nsigmaTOFK, nsigmaTPCK) < fNsigma)
if (TMath::Hypot(nsigmaTOFK, nsigmaTPCK) < fNsigma) {
return true;
} else if (TMath::Hypot(nsigmaTOFK, nsigmaTPCK) < fNsigma2)
}
} else if (TMath::Hypot(nsigmaTOFK, nsigmaTPCK) < fNsigma2) {
return true;
}
} else {
if (TMath::Abs(nsigmaTPCK) < fNsigma)
if (TMath::Abs(nsigmaTPCK) < fNsigma) {
return true;
}
}
} else {

if (mom < 0.4) {
if (nsigmaTOFK < -999.) {
if (TMath::Abs(nsigmaTPCK) < 2.0)
if (TMath::Abs(nsigmaTPCK) < 2.0) {
return true;
} else if (TMath::Abs(nsigmaTOFK) < 3.0 && TMath::Abs(nsigmaTPCK) < 3.0)
}
} else if (TMath::Abs(nsigmaTOFK) < 3.0 && TMath::Abs(nsigmaTPCK) < 3.0) {
return true;
}
} else if (mom >= 0.4 && mom <= 0.6) {
if (nsigmaTOFK < -999.) {
if (TMath::Abs(nsigmaTPCK) < 2.0)
if (TMath::Abs(nsigmaTPCK) < 2.0) {
return true;
} else if (TMath::Abs(nsigmaTOFK) < 3.0 && TMath::Abs(nsigmaTPCK) < 3.0)
}
} else if (TMath::Abs(nsigmaTOFK) < 3.0 && TMath::Abs(nsigmaTPCK) < 3.0) {
return true;
}
} else if (nsigmaTOFK < -999.) {
return false;
} else if (TMath::Abs(nsigmaTOFK) < 3.0 && TMath::Abs(nsigmaTPCK) < 3.0)
} else if (TMath::Abs(nsigmaTOFK) < 3.0 && TMath::Abs(nsigmaTPCK) < 3.0) {
return true;
}
}
return false;
}
Expand Down
5 changes: 1 addition & 4 deletions PWGCF/GenericFramework/Core/GenericFrameworkLinkDef.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 PWGCF_GENERICFRAMEWORK_CORE_GENERICFRAMEWORKLINKDEF_H_
#define PWGCF_GENERICFRAMEWORK_CORE_GENERICFRAMEWORKLINKDEF_H_
// NOLINT(build/header_guard)

#pragma link off all globals;
#pragma link off all classes;
Expand All @@ -28,5 +27,3 @@
#pragma link C++ class o2::analysis::genericframework::GFWBinningCuts + ;
#pragma link C++ class o2::analysis::genericframework::GFWRegions + ;
#pragma link C++ class o2::analysis::genericframework::GFWCorrConfigs + ;

#endif // PWGCF_GENERICFRAMEWORK_CORE_GENERICFRAMEWORKLINKDEF_H_
5 changes: 1 addition & 4 deletions PWGCF/JCorran/Core/JCORRANLinkDef.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 PWGCF_JCORRAN_CORE_JCORRANLINKDEF_H_
#define PWGCF_JCORRAN_CORE_JCORRANLINKDEF_H_
// NOLINT(build/header_guard)

#pragma link off all globals;
#pragma link off all classes;
Expand All @@ -22,5 +21,3 @@
#pragma link C++ class FlowJSPCAnalysis + ;
#pragma link C++ class FlowJSPCObservables + ;
#pragma link C++ class JEPFlowAnalysis + ;

#endif // PWGCF_JCORRAN_CORE_JCORRANLINKDEF_H_
Original file line number Diff line number Diff line change
Expand Up @@ -474,8 +474,6 @@ void EventSelectionFilterAndAnalysis::StoreArmedMask()
}
mOptArmedMask.push_back(optMask);
optMask = 0UL;
if (mTriggerSelection != nullptr) {
}
if (mZVertex != nullptr) {
armedBrick(mZVertex);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ class EventSelectionFilterAndAnalysis : public SelectionFilterAndAnalysis
template <typename CollisionToFilter, typename AssociatedTracks>
void StoreMultiplicities(CollisionToFilter const&, AssociatedTracks const&);
int CalculateMaskLength() override;
virtual void StoreArmedMask() override;
void StoreArmedMask() override;

std::vector<CutBrick<float>*> mBFieldSelection; //! the magnetic field selection cuts
MultiplicityBrick* mMultiplicityClasses; //! the multiplicity classes cuts
Expand Down Expand Up @@ -231,8 +231,6 @@ inline uint64_t EventSelectionFilterAndAnalysis::Filter(CollisionToFilter const&
bool acc = mMultiplicityClasses->ComplexBrickHelper::Filter(selectedMask, bit);
acceptcollision = acceptcollision && acc;
}
if (mTriggerSelection != nullptr) {
}
if (mZVertex != nullptr) {
bool acc = filterBrickValue(selectedMask, bit, mZVertex, col.posZ());
acceptcollision = acceptcollision && acc;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class PIDSelectionFilterAndAnalysis : public SelectionFilterAndAnalysis
PIDSelectionFilterAndAnalysis();
PIDSelectionFilterAndAnalysis(const TString&, selmodes);
PIDSelectionFilterAndAnalysis(const PIDSelectionConfigurable& pidsel, selmodes mode);
virtual ~PIDSelectionFilterAndAnalysis() override;
~PIDSelectionFilterAndAnalysis() override;

void SetPTOF(float ptof) { mPTOF = ptof; }
void SetRequireTOF(bool requiretof = false) { mRequireTOF = requiretof; }
Expand Down Expand Up @@ -133,8 +133,8 @@ class PIDSelectionFilterAndAnalysis : public SelectionFilterAndAnalysis

private:
void ConstructCutFromString(const TString&);
virtual int CalculateMaskLength() override;
virtual void StoreArmedMask() override;
int CalculateMaskLength() override;
void StoreArmedMask() override;

float mPTOF = 0.8f; ///< the p threshold for cheking TOF information
bool mRequireTOF = false; ///< is TOF required
Expand Down
Loading
Loading