Skip to content

Commit fac8bc5

Browse files
committed
Merge branch 'master' into cast-PWGCF
2 parents 42d9c49 + 0249407 commit fac8bc5

93 files changed

Lines changed: 2329 additions & 766 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎PWGCF/Core/CorrelationContainer.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ TH2* CorrelationContainer::getSumOfRatios(CorrelationContainer* mixed, Correlati
626626
double finiteBinCorrection = -1.0 / (2 * mTrackEtaCut) * binWidthEta / 2 + 1;
627627
LOGF(info, "Finite bin correction: %f", finiteBinCorrection);
628628
mixedNorm /= finiteBinCorrection;
629-
mixedNormError /= finiteBinCorrection;
629+
// mixedNormError /= finiteBinCorrection; // FIXME: unused
630630
} else {
631631
LOGF(error, "ERROR: mTrackEtaCut not set. Finite bin correction cannot be applied. Continuing anyway...");
632632
}

‎PWGCF/EbyEFluctuations/Tasks/RobustFluctuationObservables.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1157,7 +1157,7 @@ struct RobustFluctuationObservables {
11571157
orbitSOR = orbitSOR / nOrbitsPerTF * nOrbitsPerTF; // - 1;
11581158
bcSOR = orbitSOR * nBCsPerOrbit;
11591159

1160-
magneticField = 1;
1160+
// magneticField = 1; // FIXME: unused
11611161
static o2::parameters::GRPMagField* grpo = nullptr;
11621162
grpo = ccdb->getForTimeStamp<o2::parameters::GRPMagField>("GLO/Config/GRPMagField", ts);
11631163
if (grpo == nullptr) {

‎PWGCF/EbyEFluctuations/Tasks/kaonIsospinFluctuations.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2327,7 +2327,7 @@ struct KaonIsospinFluctuations {
23272327
if (!collision.has_mcCollision()) {
23282328
continue;
23292329
}
2330-
centrality = -1;
2330+
// centrality = -1; // FIXME: unused
23312331
const auto& mcColl = collision.mcCollision();
23322332

23332333
centrality = collision.centFT0C();
@@ -2448,7 +2448,7 @@ struct KaonIsospinFluctuations {
24482448
recoEvent.fill(HIST("recoEvent/ProcessType"), doSimProcessing);
24492449
float centrality = -1;
24502450
for (const auto& mcColl : mcCollisions) {
2451-
centrality = -1;
2451+
// centrality = -1; // FIXME: unused
24522452

24532453
if (cfgVtxZCheck) {
24542454
if (std::abs(mcColl.posZ()) >= cutZvertex) {

‎PWGCF/Femto3D/Tasks/multEstimator.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ struct multEstimator {
322322
tmp_histo_per_event->Reset();
323323
if (tmp_histo_per_event->GetEntries())
324324
LOGF(fatal, "not cleared");
325-
cadidates_counter = 0;
325+
// cadidates_counter = 0; // FIXME: unused
326326
}
327327
};
328328

‎PWGCF/FemtoUniverse/Core/FemtoUniverseDetaDphiStar.h‎

Lines changed: 209 additions & 39 deletions
Large diffs are not rendered by default.

‎PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackCascadeExtended.cxx‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include <Framework/AnalysisDataModel.h>
3232
#include <Framework/AnalysisHelpers.h>
3333
#include <Framework/AnalysisTask.h>
34+
#include <Framework/Array2D.h>
3435
#include <Framework/BinningPolicy.h>
3536
#include <Framework/Configurable.h>
3637
#include <Framework/Expressions.h>
@@ -124,6 +125,8 @@ struct femtoUniversePairTaskTrackCascadeExtended { // NOLINT(cppcoreguidelines-p
124125
Configurable<bool> confCPRPlotPerRadii{"confCPRPlotPerRadii", false, "Plot CPR per radii"};
125126
Configurable<float> confCPRChosenRadii{"confCPRChosenRadii", 0.0, "Delta Eta cut for Close Pair Rejection"};
126127
Configurable<bool> confIsSameSignCPR{"confIsSameSignCPR", false, "Close Pair Rejection for same sign children of cascades"};
128+
Configurable<LabeledArray<double>> confCPRTrackCascCuts{"confCPRTrackCascCuts", {cpr_track_cascade_cuts::Cuts[0].data(), cpr_track_cascade_cuts::NDaughters, cpr_track_cascade_cuts::NCutVars, cpr_track_cascade_cuts::labelsDaughter, cpr_track_cascade_cuts::labelsCutVar}, "Per-daughter CPR DeltaPhi*/DeltaEta cuts for track-cascade (rows: posChild/negChild/bachelor, cols: dPhiStarMin/dPhiStarMax/dEtaMin/dEtaMax). A row left at all zeros falls back to the scalar confCPRdeltaPhi/dEtaCutMin/Max; when a row is used, all four of its columns apply"};
129+
Configurable<LabeledArray<double>> confCPRCascCascCuts{"confCPRCascCascCuts", {cpr_cascade_cascade_cuts::Cuts[0].data(), cpr_cascade_cascade_cuts::NPairs, cpr_cascade_cascade_cuts::NCutVars, cpr_cascade_cascade_cuts::labelsPair, cpr_cascade_cascade_cuts::labelsCutVar}, "Per-pair CPR DeltaPhi*/DeltaEta cuts for cascade-cascade (rows: pos-pos/pos-bach/neg-neg/neg-bach/bach-bach/bach-neg/bach-pos, cols: dPhiStarMin/dPhiStarMax/dEtaMin/dEtaMax). A row left at all zeros falls back to the scalar confCPRdeltaPhi/dEtaCutMin/Max; when a row is used, all four of its columns apply"};
127130
} cprconfigs;
128131

129132
/// configurations for correlation part
@@ -390,12 +393,16 @@ struct femtoUniversePairTaskTrackCascadeExtended { // NOLINT(cppcoreguidelines-p
390393
pairCleanerCasc.init(&qaRegistry);
391394

392395
if (cprconfigs.confIsCPR.value) {
393-
if (doprocessSameEvent || doprocessSameEventBitmask || doprocessMixedEvent || doprocessMixedEventBitmask)
396+
if (doprocessSameEvent || doprocessSameEventBitmask || doprocessMixedEvent || doprocessMixedEventBitmask) {
394397
pairCloseRejection.init(&resultRegistry, &qaRegistry, twotracksconfigs.confDeltaEtaAxis, twotracksconfigs.confDeltaPhiStarAxis, cprconfigs.confCPRdeltaPhiCutMin.value, cprconfigs.confCPRdeltaPhiCutMax.value, cprconfigs.confCPRdeltaEtaCutMin.value, cprconfigs.confCPRdeltaEtaCutMax.value, cprconfigs.confCPRChosenRadii.value, cprconfigs.confCPRPlotPerRadii.value, 0, 0, cprconfigs.confIsSameSignCPR.value);
398+
pairCloseRejection.setCPRCuts(cprconfigs.confCPRTrackCascCuts.value);
399+
}
395400
if (doprocessSameEventTrack || doprocessSameEventTrackBitmask || doprocessMixedEventTrack || doprocessMixedEventTrackBitmask)
396401
pairCloseRejectionTrack.init(&resultRegistry, &qaRegistry, twotracksconfigs.confDeltaEtaAxis, twotracksconfigs.confDeltaPhiStarAxis, cprconfigs.confCPRdeltaPhiCutMin.value, cprconfigs.confCPRdeltaPhiCutMax.value, cprconfigs.confCPRdeltaEtaCutMin.value, cprconfigs.confCPRdeltaEtaCutMax.value, cprconfigs.confCPRChosenRadii.value, cprconfigs.confCPRPlotPerRadii.value, 0, 0, cprconfigs.confIsSameSignCPR.value);
397-
if (doprocessSameEventCasc || doprocessSameEventCascBitmask || doprocessMixedEventCasc || doprocessMixedEventCascBitmask)
402+
if (doprocessSameEventCasc || doprocessSameEventCascBitmask || doprocessMixedEventCasc || doprocessMixedEventCascBitmask) {
398403
pairCloseRejectionCasc.init(&resultRegistry, &qaRegistry, twotracksconfigs.confDeltaEtaAxis, twotracksconfigs.confDeltaPhiStarAxis, cprconfigs.confCPRdeltaPhiCutMin.value, cprconfigs.confCPRdeltaPhiCutMax.value, cprconfigs.confCPRdeltaEtaCutMin.value, cprconfigs.confCPRdeltaEtaCutMax.value, cprconfigs.confCPRChosenRadii.value, cprconfigs.confCPRPlotPerRadii.value, 0, 0, cprconfigs.confIsSameSignCPR.value);
404+
pairCloseRejectionCasc.setCPRCuts(cprconfigs.confCPRCascCascCuts.value);
405+
}
399406
}
400407

401408
if (!ccdbEffLoader.confLocalEfficiency.value.empty()) {

‎PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackNucleus.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,7 @@ struct FemtoUniversePairTaskTrackNucleus {
630630

631631
if (cfgProcessMP) {
632632
doSameEvent<false>(thegroupTrack, thegroupNucleus, parts, col.magField(), col.multV0M(), 4, fillQA);
633-
fillQA = false;
633+
// fillQA = false; // FIXME: unused
634634
}
635635
}
636636
PROCESS_SWITCH(FemtoUniversePairTaskTrackNucleus, processSameEvent, "Enable processing same event", true);
@@ -663,7 +663,7 @@ struct FemtoUniversePairTaskTrackNucleus {
663663

664664
if (cfgProcessMP) {
665665
doSameEvent<false>(thegroupTrack, thegroupNucleus, parts, col.magField(), col.multV0M(), 4, fillQA);
666-
fillQA = false;
666+
// fillQA = false; // FIXME: unused
667667
}
668668
}
669669
PROCESS_SWITCH(FemtoUniversePairTaskTrackNucleus, processSameEventMC, "Enable processing same event for Monte Carlo", false);

‎PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackV0Extended.cxx‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#include <Framework/AnalysisDataModel.h>
3535
#include <Framework/AnalysisHelpers.h>
3636
#include <Framework/AnalysisTask.h>
37+
#include <Framework/Array2D.h>
3738
#include <Framework/BinningPolicy.h>
3839
#include <Framework/Configurable.h>
3940
#include <Framework/Expressions.h>
@@ -221,6 +222,8 @@ struct FemtoUniversePairTaskTrackV0Extended {
221222
Configurable<bool> confRandomizeCPR{"confRandomizeCPR", false, "Fill Dete-Dphi histograms in random order: v01, v02 or v02, v01 - does not apply to track-V0"};
222223
ConfigurableAxis confDeltaEtaAxis{"confDeltaEtaAxis", {100, -0.15, 0.15}, "DeltaEta"};
223224
ConfigurableAxis confDeltaPhiStarAxis{"confDeltaPhiStarAxis", {100, -0.15, 0.15}, "DeltaPhiStar"};
225+
Configurable<LabeledArray<double>> confCPRTrackV0Cuts{"confCPRTrackV0Cuts", {cpr_track_v0_cuts::Cuts[0].data(), cpr_track_v0_cuts::NDaughters, cpr_track_v0_cuts::NCutVars, cpr_track_v0_cuts::labelsDaughter, cpr_track_v0_cuts::labelsCutVar}, "Per-daughter CPR DeltaPhi*/DeltaEta cuts for track-V0 (rows: posChild/negChild, cols: dPhiStarMin/dPhiStarMax/dEtaMin/dEtaMax). The track-V0 branch applies an elliptic cut, so only dPhiStarMax/dEtaMax are used. A row left at all zeros falls back to the scalar confCPRdeltaPhi/dEtaCutMin/Max; when a row is used, all four of its columns apply"};
226+
Configurable<LabeledArray<double>> confCPRV0V0Cuts{"confCPRV0V0Cuts", {cpr_v0_v0_cuts::Cuts[0].data(), cpr_v0_v0_cuts::NPairs, cpr_v0_v0_cuts::NCutVars, cpr_v0_v0_cuts::labelsPair, cpr_v0_v0_cuts::labelsCutVar}, "Per-pair CPR DeltaPhi*/DeltaEta cuts for V0-V0 (rows: pos-pos/neg-neg, cols: dPhiStarMin/dPhiStarMax/dEtaMin/dEtaMax). All columns are used for the rectangular cut (confRectV0V0CPR=true); only dPhiStarMax/dEtaMax for the elliptic cut. A row left at all zeros falls back to the scalar confCPRdeltaPhi/dEtaCutMin/Max; when a row is used, all four of its columns apply"};
224227
} ConfCPR;
225228

226229
// Efficiency
@@ -457,7 +460,9 @@ struct FemtoUniversePairTaskTrackV0Extended {
457460
pairCleanerV0.init(&qaRegistry);
458461
if (ConfCPR.confIsCPR.value) {
459462
pairCloseRejection.init(&resultRegistry, &qaRegistry, ConfCPR.confDeltaEtaAxis, ConfCPR.confDeltaPhiStarAxis, ConfCPR.confCPRdeltaPhiCutMin.value, ConfCPR.confCPRdeltaPhiCutMax.value, ConfCPR.confCPRdeltaEtaCutMin.value, ConfCPR.confCPRdeltaEtaCutMax.value, ConfCPR.confCPRChosenRadii.value, ConfCPR.confCPRPlotPerRadii.value);
463+
pairCloseRejection.setCPRCuts(ConfCPR.confCPRTrackV0Cuts.value);
460464
pairCloseRejectionV0.init(&resultRegistry, &qaRegistry, ConfCPR.confDeltaEtaAxis, ConfCPR.confDeltaPhiStarAxis, ConfCPR.confCPRdeltaPhiCutMin.value, ConfCPR.confCPRdeltaPhiCutMax.value, ConfCPR.confCPRdeltaEtaCutMin.value, ConfCPR.confCPRdeltaEtaCutMax.value, ConfCPR.confCPRChosenRadii.value, ConfCPR.confCPRPlotPerRadii.value);
465+
pairCloseRejectionV0.setCPRCuts(ConfCPR.confCPRV0V0Cuts.value);
461466
}
462467

463468
if (!ccdbEffLoader.confLocalEfficiency.value.empty()) {

‎PWGCF/Flow/Tasks/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ o2physics_add_dpl_workflow(flow-directed-flow-task
119119
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
120120
COMPONENT_NAME Analysis)
121121

122-
o2physics_add_dpl_workflow(flow-transmutation
123-
SOURCES flowTransmutation.cxx
122+
o2physics_add_dpl_workflow(flow-small-systems
123+
SOURCES flowSmallSystems.cxx
124124
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::AnalysisCCDB O2Physics::GFWCore
125125
COMPONENT_NAME Analysis)

‎PWGCF/Flow/Tasks/flowEseTask.cxx‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ struct FlowEseTask {
151151
Configurable<std::string> cfgAccCorPath{"cfgAccCorPath", "", "path for pseudo acceptance correction"};
152152

153153
struct : ConfigurableGroup {
154+
Configurable<double> cfgGfwEtaGap{"cfgGfwEtaGap", 0.3, "Full eta gap between the GFW subevents for v2 and v3"};
154155
Configurable<bool> cfgGfwEffCor{"cfgGfwEffCor", false, "flag to apply charged-track efficiency correction for EP and GFW"};
155156
Configurable<std::string> cfgGfwEffCorPath{"cfgGfwEffCorPath", "", "CCDB path to charged-track efficiency correction for EP and GFW"};
156157
Configurable<bool> cfgGfwAccCor{"cfgGfwAccCor", false, "flag to apply charged-track acceptance correction for EP and GFW"};
@@ -595,10 +596,11 @@ struct FlowEseTask {
595596
fMultPVCutHigh->SetParameters(2834.66, -87.0127, 0.915126, -0.00330136, 332.513, -12.3476, 0.251663, -0.00272819, 1.12242e-05);
596597

597598
const int nPtBins = histos.get<TProfile2D>(HIST("psi2/h_PoiN03Gap22"))->GetXaxis()->GetNbins();
598-
gfwState.fGFW->AddRegion("refN03", -0.8, -0.15, 1, GFWRefMask);
599-
gfwState.fGFW->AddRegion("refP03", 0.15, 0.8, 1, GFWRefMask);
600-
gfwState.fGFW->AddRegion("poiN03", -0.8, -0.15, nPtBins + 1, GFWPoiMask);
601-
gfwState.fGFW->AddRegion("poiP03", 0.15, 0.8, nPtBins + 1, GFWPoiMask);
599+
const double halfEtaGap = cfgGfwParam.cfgGfwEtaGap.value / 2.0;
600+
gfwState.fGFW->AddRegion("refN03", -0.8, -halfEtaGap, 1, GFWRefMask);
601+
gfwState.fGFW->AddRegion("refP03", halfEtaGap, 0.8, 1, GFWRefMask);
602+
gfwState.fGFW->AddRegion("poiN03", -0.8, -halfEtaGap, nPtBins + 1, GFWPoiMask);
603+
gfwState.fGFW->AddRegion("poiP03", halfEtaGap, 0.8, nPtBins + 1, GFWPoiMask);
602604

603605
gfwState.corrRef22 = gfwState.fGFW->GetCorrelatorConfig("refN03 {2} refP03 {-2}", "Ref03Gap22", false);
604606
gfwState.corrPoiN22 = gfwState.fGFW->GetCorrelatorConfig("poiN03 {2} refP03 {-2}", "PoiN03Gap22", true);

0 commit comments

Comments
 (0)