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: 0 additions & 2 deletions PWGCF/Femto/Core/cascadeHistManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,6 @@ class CascadeHistManager
{
mHistogramRegistry = registry;
mPdgCode = std::abs(ConfCascadeSelection.pdgCodeAbs.value);

int bachelorPdgCodeAbs = 0;
int posDauPdgCodeAbs = 0;
int negDauPdgCodeAbs = 0;
Expand Down Expand Up @@ -328,7 +327,6 @@ class CascadeHistManager
} else {
LOG(fatal) << "PDG code for Cascade has to be either Xi or Omega";
}

mBachelorManager.template init<mode>(registry, BachelorSpecs, absCharge, signBachelor, bachelorPdgCodeAbs);
mPosDauManager.template init<mode>(registry, PosDauSpecs, absCharge, signPlus, posDauPdgCodeAbs);
mNegDauManager.template init<mode>(registry, NegDauSpecs, absCharge, signMinus, negDauPdgCodeAbs);
Expand Down
6 changes: 3 additions & 3 deletions PWGCF/Femto/Core/closeTripletRejection.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ constexpr char PrefixTrack1V0DaughterMe[] = "CPR_Track1V0Dau/ME/";
constexpr char PrefixTrack2V0DaughterMe[] = "CPR_Track2V0Dau/ME/";

constexpr char PrefixTrack1CascadeBachelorSe[] = "CPR_Track1CascadeBachelor/SE/";
constexpr char PrefixTrack2CascadeBachelorSe[] = "CPR_TrackCascadeBachelor/SE/";
constexpr char PrefixTrack1CascadeBachelorMe[] = "CPR_TrackCascadeBachelor/ME/";
constexpr char PrefixTrack2CascadeBachelorMe[] = "CPR_TrackCascadeBachelor/ME/";
constexpr char PrefixTrack2CascadeBachelorSe[] = "CPR_Track2CascadeBachelor/SE/";
constexpr char PrefixTrack1CascadeBachelorMe[] = "CPR_Track1CascadeBachelor/ME/";
constexpr char PrefixTrack2CascadeBachelorMe[] = "CPR_Track2CascadeBachelor/ME/";

template <const char* prefixTrack1Track2,
const char* prefixTrack2Track3,
Expand Down
6 changes: 0 additions & 6 deletions PWGCF/Femto/Core/tripletBuilder.h
Original file line number Diff line number Diff line change
Expand Up @@ -702,25 +702,20 @@ class TripletTrackTrackCascadeBuilder
{
// check if correlate the same tracks or not
mTrack1Track2AreSameSpecies = confMixing.particle12AreSameSpecies.value;

mColHistManager.template init<mode>(registry, colHistSpec, confCollisionBinning);
mTripletHistManagerSe.template init<mode>(registry, tripletHistSpec, confTripletBinning, confTripletCuts);
mTripletHistManagerMe.template init<mode>(registry, tripletHistSpec, confTripletBinning, confTripletCuts);

mTc.template init<mode>(confTripletCuts);

if (mTrack1Track2AreSameSpecies) {
// Track1 & Track2 & are the same particle species and track 3 is something else
mTrackHistManager1.template init<mode>(registry, trackHistSpec1, confTrackSelection1);
mCascadeHistManager.template init<mode>(registry, cascadeHistSpec, confCascadeSelection, bachelorHistSpec, posDauHistSpec, negDauHistSpec);

mTrackCleaner.init(confTrackCleaner);
mCascadeCleaner.init(confCascadeCleaner);

mTripletHistManagerSe.setMass(confTrackSelection1.pdgCodeAbs.value, confTrackSelection1.pdgCodeAbs.value, confCascadeSelection.pdgCodeAbs.value);
mTripletHistManagerSe.setCharge(confTrackSelection1.chargeAbs.value, confTrackSelection1.chargeAbs.value, 1);
mCtrSe.init(registry, ctrHistSpec, cprHistSpecBachelor, cprHistSpecV0Daughter, confCtr, confCprBachelor, confCprV0Daughter, confTrackSelection1.chargeAbs.value, confTrackSelection1.chargeAbs.value);

mTripletHistManagerMe.setMass(confTrackSelection1.pdgCodeAbs.value, confTrackSelection1.pdgCodeAbs.value, confCascadeSelection.pdgCodeAbs.value);
mTripletHistManagerMe.setCharge(confTrackSelection1.chargeAbs.value, confTrackSelection1.chargeAbs.value, 1);
mCtrMe.init(registry, ctrHistSpec, cprHistSpecBachelor, cprHistSpecV0Daughter, confCtr, confCprBachelor, confCprV0Daughter, confTrackSelection1.chargeAbs.value, confTrackSelection1.chargeAbs.value);
Expand All @@ -742,7 +737,6 @@ class TripletTrackTrackCascadeBuilder
// setup mixing
mMixingPolicy = static_cast<triplethistmanager::MixingPolicy>(confMixing.policy.value);
mMixingDepth = confMixing.depth.value;

// setup rng if necessary
if (confMixing.seed.value >= 0) {
uint64_t randomSeed = 0;
Expand Down
7 changes: 2 additions & 5 deletions PWGCF/Femto/Tasks/femtoTripletTrackTrackCascade.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
using namespace o2::analysis::femto;

struct FemtoTripletTrackTrackCascade {

// setup tables
using FemtoCollisions = o2::soa::Join<o2::aod::FCols, o2::aod::FColMasks>;
using FilteredFemtoCollisions = o2::soa::Filtered<FemtoCollisions>;
Expand All @@ -65,7 +64,6 @@ struct FemtoTripletTrackTrackCascade {
using FemtoOmegasWithLabel = o2::soa::Join<FemtoOmegas, o2::aod::FK0shortLabels>;

o2::framework::SliceCache cache;

// setup collisions
collisionbuilder::ConfCollisionSelection collisionSelection;
o2::framework::expressions::Filter collisionFilter = MAKE_COLLISION_FILTER(collisionSelection);
Expand Down Expand Up @@ -196,7 +194,6 @@ struct FemtoTripletTrackTrackCascade {
if (processXi && processOmega) {
LOG(fatal) << "Both xi-track and omega-track processing is enabled. Breaking...";
}

// setup columnpolicy for binning
// default values are used during instantiation, so we need to explicity update them here
mixBinsVtxMult = {{confMixing.vtxBins, confMixing.multBins.value}, true};
Expand All @@ -223,7 +220,7 @@ struct FemtoTripletTrackTrackCascade {
colHistSpec = colhistmanager::makeColHistSpecMap(confCollisionBinning);
trackHistSpec1 = trackhistmanager::makeTrackHistSpecMap(confTrackBinning1);
trackHistSpec2 = trackhistmanager::makeTrackHistSpecMap(confTrackBinning2);
omegaHistSpec = cascadehistmanager::makeCascadeHistSpecMap(confOmegaBinning);
bachelorHistSpec = trackhistmanager::makeTrackHistSpecMap(confBachelorBinning);
posDauSpec = trackhistmanager::makeTrackHistSpecMap(confPosDauBinning);
negDauSpec = trackhistmanager::makeTrackHistSpecMap(confNegDauBinning);
tripletTrackTrackCascadeHistSpec = triplethistmanager::makeTripletHistSpecMap(confTripletBinning);
Expand Down Expand Up @@ -278,7 +275,7 @@ struct FemtoTripletTrackTrackCascade {
}
PROCESS_SWITCH(FemtoTripletTrackTrackCascade, processXiMixedEventMc, "Enable processing mixed event processing for tracks and xis with mc information", false);

void processOmegaSameEvent(FilteredFemtoCollision const& col, FemtoTracks const& tracks, FemtoOmegas const& /*omegas*/)
void processOmegaSameEvent(FilteredFemtoCollision const& col, FemtoTracks const& tracks, FemtoOmegas const& /*omega*/)
{
tripletTrackTrackOmegaBuilder.processSameEvent<modes::Mode::kAnalysis>(col, tracks, trackPartition1, trackPartition2, omegaPartition, cache);
}
Expand Down
Loading