Skip to content

Commit 39ce013

Browse files
prottayCMTprottayCMT
authored
Merge branch 'AliceO2Group:master' into master
2 parents f1eacce + cd781e6 commit 39ce013

40 files changed

Lines changed: 145 additions & 108 deletions

‎EventFiltering/PWGHF/HFFilter.cxx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,9 @@ struct HfFilter { // Main struct for HF triggers
481481
{
482482
for (const auto& collision : collisions) {
483483

484+
// all processed collisions
485+
hProcessedEvents->Fill(0);
486+
484487
bool keepEvent[kNtriggersHF]{false};
485488
bool isSelectedTVX = evSel.applyTVX ? collision.selection_bit(o2::aod::evsel::kIsTriggerTVX) : true;
486489
bool isSelectedTFBorder = evSel.applyTFBorderCut ? collision.selection_bit(o2::aod::evsel::kNoTimeFrameBorder) : true;
@@ -527,8 +530,6 @@ struct HfFilter { // Main struct for HF triggers
527530
currentRun = bc.runNumber();
528531
}
529532

530-
hProcessedEvents->Fill(0);
531-
532533
std::vector<std::vector<int64_t>> indicesDau2Prong{}, indicesDau2ProngPrompt{};
533534

534535
auto cand2ProngsThisColl = cand2Prongs.sliceBy(hf2ProngPerCollision, thisCollId);

‎EventFiltering/PWGHF/HFFilterHelpers.h‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -640,6 +640,15 @@ class HfFilterHelper
640640
mSigmaPars3Prongs[1] = 0.00176f;
641641
mDeltaMassPars3Prongs[0] = -0.013f;
642642
mDeltaMassPars3Prongs[1] = 0.00029f;
643+
} else if (recoPass == "2026_pass1") {
644+
mSigmaPars2Prongs[0] = 0.01424f;
645+
mSigmaPars2Prongs[1] = 0.00178f;
646+
mDeltaMassPars2Prongs[0] = 0.004f;
647+
mDeltaMassPars2Prongs[1] = 0.0001f;
648+
mSigmaPars3Prongs[0] = 0.00796f;
649+
mSigmaPars3Prongs[1] = 0.00176f;
650+
mDeltaMassPars3Prongs[0] = 0.004f;
651+
mDeltaMassPars3Prongs[1] = 0.0001f;
643652
} else {
644653
LOGP(fatal, "Mass resolution parametrisation {} not supported! Please set 2023_pass3", recoPass.data());
645654
}

‎PWGHF/ALICE3/TableProducer/candidateCreatorChic.cxx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
#include "ALICE3/DataModel/ECAL.h"
2323
#include "Common/Core/trackUtilities.h"
2424

25-
#include "CommonConstants/PhysicsConstants.h"
26-
#include "DCAFitter/DCAFitterN.h"
27-
#include "Framework/AnalysisTask.h"
28-
#include "ReconstructionDataFormats/DCA.h"
29-
#include "ReconstructionDataFormats/V0.h"
25+
#include <CommonConstants/PhysicsConstants.h>
26+
#include <DCAFitter/DCAFitterN.h>
27+
#include <Framework/AnalysisTask.h>
28+
#include <ReconstructionDataFormats/DCA.h>
29+
#include <ReconstructionDataFormats/V0.h>
3030

3131
#include <utility>
3232
#include <vector>
@@ -44,7 +44,7 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
4444
workflowOptions.push_back(optionDoMC);
4545
}
4646

47-
#include "Framework/runDataProcessing.h"
47+
#include <Framework/runDataProcessing.h>
4848

4949
/// Reconstruction of Chic candidates
5050
struct HfCandidateCreatorChic {

‎PWGHF/ALICE3/TableProducer/candidateCreatorX.cxx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222

2323
#include "Common/Core/trackUtilities.h"
2424

25-
#include "CommonConstants/PhysicsConstants.h"
26-
#include "DCAFitter/DCAFitterN.h"
27-
#include "Framework/AnalysisTask.h"
28-
#include "ReconstructionDataFormats/DCA.h"
29-
#include "ReconstructionDataFormats/V0.h"
25+
#include <CommonConstants/PhysicsConstants.h>
26+
#include <DCAFitter/DCAFitterN.h>
27+
#include <Framework/AnalysisTask.h>
28+
#include <ReconstructionDataFormats/DCA.h>
29+
#include <ReconstructionDataFormats/V0.h>
3030

3131
#include <utility>
3232
#include <vector>
@@ -44,7 +44,7 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
4444
workflowOptions.push_back(optionDoMC);
4545
}
4646

47-
#include "Framework/runDataProcessing.h"
47+
#include <Framework/runDataProcessing.h>
4848

4949
/// Reconstruction of X candidates
5050
struct HfCandidateCreatorX {

‎PWGHF/ALICE3/TableProducer/candidateSelectorChicToJpsiGamma.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
2121
#include "PWGHF/DataModel/CandidateSelectionTables.h"
2222

23-
#include "CommonConstants/PhysicsConstants.h"
24-
#include "Framework/AnalysisTask.h"
25-
#include "Framework/runDataProcessing.h"
23+
#include <CommonConstants/PhysicsConstants.h>
24+
#include <Framework/AnalysisTask.h>
25+
#include <Framework/runDataProcessing.h>
2626

2727
#include <vector>
2828

‎PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Barrel.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121

2222
#include "ALICE3/DataModel/RICH.h"
2323

24-
#include "CommonConstants/PhysicsConstants.h"
25-
#include "Framework/AnalysisTask.h"
26-
#include "Framework/runDataProcessing.h"
24+
#include <CommonConstants/PhysicsConstants.h>
25+
#include <Framework/AnalysisTask.h>
26+
#include <Framework/runDataProcessing.h>
2727

2828
#include <algorithm>
2929
#include <vector>

‎PWGHF/ALICE3/TableProducer/candidateSelectorD0Alice3Forward.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121

2222
#include "ALICE3/DataModel/RICH.h"
2323

24-
#include "CommonConstants/PhysicsConstants.h"
25-
#include "Framework/AnalysisTask.h"
26-
#include "Framework/runDataProcessing.h"
24+
#include <CommonConstants/PhysicsConstants.h>
25+
#include <Framework/AnalysisTask.h>
26+
#include <Framework/runDataProcessing.h>
2727

2828
#include <algorithm>
2929
#include <vector>

‎PWGHF/ALICE3/TableProducer/candidateSelectorD0ParametrizedPid.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121

2222
#include "ALICE3/DataModel/RICH.h"
2323

24-
#include "CommonConstants/PhysicsConstants.h"
25-
#include "Framework/AnalysisTask.h"
26-
#include "Framework/runDataProcessing.h"
24+
#include <CommonConstants/PhysicsConstants.h>
25+
#include <Framework/AnalysisTask.h>
26+
#include <Framework/runDataProcessing.h>
2727

2828
#include <algorithm>
2929
#include <vector>

‎PWGHF/ALICE3/TableProducer/candidateSelectorJpsi.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
#include "ALICE3/DataModel/RICH.h"
2525
#include "Common/Core/TrackSelectorPID.h"
2626

27-
#include "CommonConstants/PhysicsConstants.h"
28-
#include "Framework/AnalysisTask.h"
27+
#include <CommonConstants/PhysicsConstants.h>
28+
#include <Framework/AnalysisTask.h>
2929

3030
#include <vector>
3131

@@ -59,7 +59,7 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
5959
workflowOptions.push_back(isAlice3);
6060
}
6161

62-
#include "Framework/runDataProcessing.h"
62+
#include <Framework/runDataProcessing.h>
6363

6464
/// Struct for applying J/ψ → e+ e−, μ+ μ− selection cuts
6565
struct HfCandidateSelectorJpsi {

‎PWGHF/ALICE3/TableProducer/candidateSelectorLcAlice3.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323
#include "ALICE3/DataModel/RICH.h"
2424

25-
#include "CommonConstants/PhysicsConstants.h"
26-
#include "Framework/AnalysisTask.h"
27-
#include "Framework/runDataProcessing.h"
25+
#include <CommonConstants/PhysicsConstants.h>
26+
#include <Framework/AnalysisTask.h>
27+
#include <Framework/runDataProcessing.h>
2828

2929
#include <vector>
3030

0 commit comments

Comments
 (0)