Skip to content

Commit

Permalink
Merge pull request #23333 from eeremenk/master
Browse files Browse the repository at this point in the history 
Fix of fastjet pseudojet vector that caused train test crash
  • Loading branch information
@alibuild
alibuild authored Mar 28, 2024
2 parents a75966d + 3ba00d0 commit 93854b7
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 15 deletions.
26 changes: 14 additions & 12 deletions PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskStrangenessInJets.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ AliAnalysisTaskStrangenessInJets::AliAnalysisTaskStrangenessInJets():
fFastJetWrapper("AliEmcalJetTask","AliEmcalJetTask"),
//fFastJetWrapperBG("AliEmcalJetTask","AliEmcalJetTask"),
fFastJetWrapperMCGen("AliEmcalJetTask","AliEmcalJetTask"),

fAODIn(0),
fAODOut(0),
fRandom(0),
Expand Down Expand Up @@ -1051,7 +1051,6 @@ Bool_t AliAnalysisTaskStrangenessInJets::FillHistograms()
//open AOD
if(fDebug > 0) printf("%s %s::%s: %s\n", GetName(), ClassName(), __func__, "Start");


//clear the TClonesArray from the previous event
fV0CandidateArray->Clear();
fGenMCV0->Clear();
Expand All @@ -1060,7 +1059,8 @@ Bool_t AliAnalysisTaskStrangenessInJets::FillHistograms()
//fFastJetWrapperBG.Clear();
fFastJetWrapperMCGen.Clear();

InputBgParticles.clear(); //clear the particle vector for the bg estimator
std::vector<fastjet::PseudoJet> InputBgParticles;
//InputBgParticles.clear(); //clear the particle vector for the bg estimator

fh1EventCounterCut->Fill(0); // all available selected events (collision candidates)

Expand Down Expand Up @@ -1589,7 +1589,7 @@ Bool_t AliAnalysisTaskStrangenessInJets::FillHistograms()
if(fDebug > 0) printf("%s %s::%s: %s\n", GetName(), ClassName(), __func__, "End of V0 loop");

if(fV0CandidateArray->GetEntriesFast() > 0) {
AddEventTracks(fV0CandidateArray, fTracks);
AddEventTracks(fV0CandidateArray, fTracks, InputBgParticles);
}

fh1V0CandPerEvent->Fill(iNV0CandTot);
Expand Down Expand Up @@ -2126,7 +2126,7 @@ Bool_t AliAnalysisTaskStrangenessInJets::IsFromGoodGenerator(Int_t index)
return kTRUE;
}

void AliAnalysisTaskStrangenessInJets::AddEventTracks(TClonesArray* coll, TClonesArray* tracks)
void AliAnalysisTaskStrangenessInJets::AddEventTracks(TClonesArray* coll, TClonesArray* tracks, std::vector<fastjet::PseudoJet>& VectorBgPart)
{
// Add event tracks to a collection that already contains the V0 candidates, excluding the daughters of the V0 candidates

Expand Down Expand Up @@ -2159,7 +2159,8 @@ void AliAnalysisTaskStrangenessInJets::AddEventTracks(TClonesArray* coll, TClone
if (allDaughters.Remove(track) == 0) {
//adding track to the fastjet
fFastJetWrapper.AddInputVector(track->Px(), track->Py(), track->Pz(), track->E(), n);
InputBgParticles.push_back(fastjet::PseudoJet(track->Px(), track->Py(), track->Pz(), track->E()));
VectorBgPart.push_back(fastjet::PseudoJet(track->Px(), track->Py(), track->Pz(), track->E()));
//InputBgParticles.push_back(fastjet::PseudoJet(track->Px(), track->Py(), track->Pz(), track->E()));
n++;
nadded++;
AliDebug(2, Form("Track %d (pT = %.3f, eta = %.3f, phi = %.3f) is included", numbtrack, track->Pt(), track->Eta(), track->Phi()));
Expand Down Expand Up @@ -2208,7 +2209,7 @@ Double_t AliAnalysisTaskStrangenessInJets::AddDaughters(AliAODRecoDecay* cand, T

return pt;
}
void AliAnalysisTaskStrangenessInJets::AddEventTracksMC(TClonesArray* coll, TClonesArray* tracks)
void AliAnalysisTaskStrangenessInJets::AddEventTracksMC(TClonesArray* coll, TClonesArray* tracks, std::vector<fastjet::PseudoJet>& VectorBgPartMC)
{
if (!tracks) {
printf("Track container was not found. Function AddEventTracks will not run! \n");
Expand Down Expand Up @@ -2247,7 +2248,7 @@ void AliAnalysisTaskStrangenessInJets::AddEventTracksMC(TClonesArray* coll, TClo
}
//did not find track in the daughters, adding track to the fastjet
fFastJetWrapperMCGen.AddInputVector(track->Px(), track->Py(), track->Pz(), track->E(), iN);
InputBgParticles.push_back(fastjet::PseudoJet(track->Px(), track->Py(), track->Pz(), track->E()));
VectorBgPartMC.push_back(fastjet::PseudoJet(track->Px(), track->Py(), track->Pz(), track->E()));
iN++;
nadded++;

Expand Down Expand Up @@ -2458,7 +2459,8 @@ Bool_t AliAnalysisTaskStrangenessInJets::AssociateRecV0withMC( AliAODv0* vpart,
Bool_t AliAnalysisTaskStrangenessInJets::GeneratedMCParticles(TClonesArray* track, Int_t iCent)
{

InputBgParticles.clear(); //clear before using again fot the bg estim for the generated mc particles
std::vector<fastjet::PseudoJet> InputBgParticlesMC;
//InputBgParticles.clear(); //clear before using again fot the bg estim for the generated mc particles

TClonesArray* MCPartArray = 0; // array particles in the MC event
AliAODMCHeader* MCHeader = 0; // MC header
Expand Down Expand Up @@ -2571,15 +2573,15 @@ Bool_t AliAnalysisTaskStrangenessInJets::GeneratedMCParticles(TClonesArray* trac
new ((*fGenMCV0)[iNMCCand]) AliAODMCParticle(*particleMC); //
//add the MC v0 vector to the fastjetwrapper with modified id
fFastJetWrapperMCGen.AddInputVector(particleMC->Px(), particleMC->Py(), particleMC->Pz(), particleMC->E(), ind);
InputBgParticles.push_back(fastjet::PseudoJet(particleMC->Px(), particleMC->Py(), particleMC->Pz(), particleMC->E()));
InputBgParticlesMC.push_back(fastjet::PseudoJet(particleMC->Px(), particleMC->Py(), particleMC->Pz(), particleMC->E()));

iNMCCand++;
}



if(fGenMCV0->GetEntriesFast() > 0) {
AddEventTracksMC(fGenMCV0, track);
AddEventTracksMC(fGenMCV0, track, InputBgParticlesMC);
}


Expand All @@ -2590,7 +2592,7 @@ Bool_t AliAnalysisTaskStrangenessInJets::GeneratedMCParticles(TClonesArray* trac
bgeMC.set_selector(selectorBG);
fastjet::JetDefinition jetDefBG(fastjet::kt_algorithm, fdBgRadius, fastjet::pt_scheme); //define the kT jet finding which will do the average background estimation
fastjet::AreaDefinition areaDefBG(fastjet::active_area_explicit_ghosts);
fastjet::ClusterSequenceArea cluster_seq_BG(InputBgParticles, jetDefBG, areaDefBG);
fastjet::ClusterSequenceArea cluster_seq_BG(InputBgParticlesMC, jetDefBG, areaDefBG);
std::vector<fastjet::PseudoJet> jetsBGMC = sorted_by_pt(selectorBG(cluster_seq_BG.inclusive_jets())); //find the kT jets
if (jetsBGMC.size() > 0) {
bgeMC.set_jets(jetsBGMC); // give the kT jets to the background estimator
Expand Down
6 changes: 3 additions & 3 deletions PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskStrangenessInJets.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,8 @@ class AliAnalysisTaskStrangenessInJets : public AliAnalysisTaskEmcal
void ExecOnce();
Bool_t FillHistograms();
Bool_t Run();
void AddEventTracks(TClonesArray* coll, TClonesArray* tracks);
void AddEventTracksMC(TClonesArray* coll, TClonesArray* tracks);
void AddEventTracks(TClonesArray* coll, TClonesArray* tracks, std::vector<fastjet::PseudoJet>& VectorBgPart);
void AddEventTracksMC(TClonesArray* coll, TClonesArray* tracks, std::vector<fastjet::PseudoJet>& VectorBgPartMC);
Bool_t GetSortedArray(Int_t indexes[], std::vector<fastjet::PseudoJet> array) const;

TList* fOutputListStd; //! Output list for standard analysis results
Expand All @@ -196,7 +196,7 @@ class AliAnalysisTaskStrangenessInJets : public AliAnalysisTaskEmcal
//AliFJWrapper fFastJetWrapperBG; //!<!fastjet wrapper for the bg jets
AliFJWrapper fFastJetWrapperMCGen; //!<!fastjet wrapper for the bg jets

std::vector<fastjet::PseudoJet> InputBgParticles;
//std::vector<fastjet::PseudoJet> InputBgParticles;
fastjet::Selector selectorBG;

private:
Expand Down

0 comments on commit 93854b7

Please sign in to comment.