Skip to content

Commit

Permalink
PWGCF: Identified Balanc Function Error fixes for PID (AliceO2Group#5056
Browse files Browse the repository at this point in the history
)

* Adding functionality for Identified two particle correlations and balance functions

* Reuploading code for Identified Balance Functions

* Fixed white space formatting error in CMakeLists.txt

* Please consider the following formatting changes

* Fixed Linter errors

* Please consider the following formatting changes

* Fixed additional linter errors

* Please consider the following formatting changes

* Fixed linter include linter error

* Fixed linter error where I wrote DataModel instead of TableProducer in header

* Adding PID values for particle species, not just charge

* Further updates to Identified Balance Function code to implement PID. Fixed issue where species and charge were considered separately

* Fixed Build Errors

* Please consider the following formatting changes

* removed whitespace

* Fixed Linter error

* Please consider the following formatting changes

* Fixed static_cast<int>(...) error from build

* removed commented out code

* removed MORE commented out code

* Please consider the following formatting changes

* Made the minimum sigma value for PID a configurable value for testing

* Adding statements for debugging. Remove before requesting merge

* Fixed error where there were not enough track names for the number of tracks causing a Segmentation Fault

* Finding error where particle centrality is always rejected

* Troubleshooting PID processes, all commented code and extraneous outputs removed

* Removed fhParticleSpecies which was leftover from testing

---------

Co-authored-by: ALICE Action Bot <[email protected]>
  • Loading branch information
bghanley1995 and alibuild authored Mar 7, 2024
1 parent 4de71cf commit 4cf7b2f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1131,7 +1131,6 @@ inline int8_t IdentifiedBfFilterTracks::AcceptTrack(TrackObject const& track)

if (matchTrackType(track)) {
if (ptlow < track.pt() && track.pt() < ptup && etalow < track.eta() && track.eta() < etaup) {

MatchRecoGenSpecies sp = trackIdentification(track);
if (sp == kWrongSpecies) {
return -1;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -611,34 +611,39 @@ inline bool centralitySelection(CollisionObject const&, float&)
template <>
inline bool centralitySelection<aod::CollisionEvSelCent>(aod::CollisionEvSelCent const& collision, float& centmult)
{

return centralitySelectionMult(collision, centmult);
}

/// \brief Centrality selection for reconstructed and detector level collision tables with Run 2 centrality/multiplicity information
template <>
inline bool centralitySelection<aod::CollisionEvSelRun2Cent>(aod::CollisionEvSelRun2Cent const& collision, float& centmult)
{

return centralitySelectionMult(collision, centmult);
}

/// \brief Centrality selection for reconstructed and detector level collision tables without centrality/multiplicity information
template <>
inline bool centralitySelection<aod::CollisionEvSel>(aod::CollisionEvSel const& collision, float& centmult)
{

return centralitySelectionNoMult(collision, centmult);
}

/// \brief Centrality selection for detector level collision tables without centrality/multiplicity
template <>
inline bool centralitySelection<soa::Join<aod::CollisionsEvSel, aod::McCollisionLabels>::iterator>(soa::Join<aod::CollisionsEvSel, aod::McCollisionLabels>::iterator const& collision, float& centmult)
{

return centralitySelectionNoMult(collision, centmult);
}

/// \brief Centrality selection for detector level collision tables with centrality/multiplicity
template <>
inline bool centralitySelection<soa::Join<aod::CollisionsEvSelCent, aod::McCollisionLabels>::iterator>(soa::Join<aod::CollisionsEvSelCent, aod::McCollisionLabels>::iterator const& collision, float& centmult)
{

return centralitySelectionMult(collision, centmult);
}

Expand Down Expand Up @@ -676,7 +681,6 @@ inline bool IsEvtSelected(CollisionObject const& collision, float& centormult)
}

bool centmultsel = centralitySelection(collision, centormult);

return trigsel && zvtxsel && centmultsel;
}

Expand Down
3 changes: 1 addition & 2 deletions PWGCF/TwoParticleCorrelations/Tasks/identifiedbf.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -905,7 +905,6 @@ struct IdentifiedBfCorrelationsTask {
void processSame(FilterdCollision const& collision, FilteredTracks const& tracks, uint64_t timestamp = 0)
{
using namespace correlationstask;

if (ccdblst == nullptr) {
if (loadfromccdb) {
ccdblst = getCCDBInput(cfginputfile.cfgCCDBPathName->c_str(), cfginputfile.cfgCCDBDate->c_str());
Expand Down Expand Up @@ -1330,6 +1329,6 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
{
WorkflowSpec workflow{
adaptAnalysisTask<IdentifiedBfCorrelationsTask>(cfgc, TaskName{"IdentifiedBfCorrelationsTaskRec"}, SetDefaultProcesses{{{"processRecLevel", true}, {"processRecLevelMixed", false}, {"processCleaner", false}}}),
adaptAnalysisTask<IdentifiedBfCorrelationsTask>(cfgc, TaskName{"IdentifiedBfCorrelationsTaskGen"}, SetDefaultProcesses{{{"processGenLevel", true}, {"processGenLevelMixed", false}, {"processCleaner", false}}})};
adaptAnalysisTask<IdentifiedBfCorrelationsTask>(cfgc, TaskName{"IdentifiedBfCorrelationsTaskGen"}, SetDefaultProcesses{{{"processGenLevel", false}, {"processGenLevelMixed", false}, {"processCleaner", true}}})};
return workflow;
}

0 comments on commit 4cf7b2f

Please sign in to comment.