Skip to content

Commit 4335e0d

Browse files
PaolaVTPaolaVT
authored
Merge branch 'AliceO2Group:master' into master
2 parents fdbfd78 + 49906a9 commit 4335e0d

File tree

389 files changed

+13667
-8232
lines changed

Some content is hidden

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

389 files changed

+13667
-8232
lines changed

‎.github/workflows/o2-linter.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Find issues in O2 code
33
name: O2 linter
44

5-
#"on": [pull_request_target, push]
5+
"on": [pull_request_target, push]
66
permissions: {}
77
env:
88
BRANCH_MAIN: master
@@ -20,12 +20,12 @@ jobs:
2020
steps:
2121
- name: Set branches
2222
run: |
23-
if [[ "${{ github.event_name }}" == "push" ]]; then
23+
if [[ "${{ github.event_name }}" == "push" || "${{ github.event_name }}" == "pull_request" ]]; then
2424
branch_head="${{ github.ref }}"
25-
branch_base="${{ env.BRANCH_MAIN }}"
25+
branch_base="origin/${{ env.BRANCH_MAIN }}"
2626
else
2727
branch_head="refs/pull/${{ github.event.pull_request.number }}/merge"
28-
branch_base="${{ github.event.pull_request.base.ref }}"
28+
branch_base="origin/${{ github.event.pull_request.base.ref }}"
2929
fi
3030
echo BRANCH_HEAD="$branch_head" >> "$GITHUB_ENV"
3131
echo BRANCH_BASE="$branch_base" >> "$GITHUB_ENV"
@@ -37,9 +37,10 @@ jobs:
3737
- name: Run tests
3838
id: linter
3939
run: |
40+
git log -n 1 --pretty='format:%ci %h %s %d%n'
4041
# Diff against the common ancestor of the source (head) branch and the target (base) branch.
4142
echo "Diffing ${{ env.BRANCH_HEAD }} against ${{ env.BRANCH_BASE }}."
42-
readarray -t files < <(git diff --diff-filter d --name-only origin/${{ env.BRANCH_BASE }}...)
43+
readarray -t files < <(git diff --diff-filter d --name-only ${{ env.BRANCH_BASE }}...)
4344
if [ ${#files[@]} -eq 0 ]; then
4445
echo "::notice::No files to lint."
4546
echo "linter_ran=0" >> "$GITHUB_OUTPUT"

‎ALICE3/Macros/drawFastTracker.C‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ void drawFastTracker(float magneticField = 5.f, // in units of kGauss
7575
fastTracker.AddLayer("B11", 100., 250, x0OB, xrhoOB, resRPhiOB, resZOB, eff, 1);
7676
} else {
7777
std::vector<float> pixelRes{0.025, 0.025, 0.01, 0.01};
78-
fastTracker.AddSiliconALICE3v4(pixelRes);
78+
// fastTracker.AddSiliconALICE3v4(pixelRes); // FIXME
7979
}
8080

8181
fastTracker.Print();

‎ALICE3/Macros/testFastTracker.C‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ void testFastTracker(std::string geometryFile = "a3geo.ini")
2727
// auto& ccdb = o2::ccdb::BasicCCDBManager::instance();
2828
// ccdb.setURL("http://alice-ccdb.cern.ch");
2929
o2::fastsim::FastTracker fastTracker;
30-
fastTracker.AddGenericDetector(geometryFile);
30+
// fastTracker.AddGenericDetector(geometryFile); // FIXME
3131
// fastTracker.AddGenericDetector(geometryFile, &ccdb);
3232
fastTracker.Print();
3333
}

‎ALICE3/TableProducer/alice3-decayfinder.cxx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ using std::array;
6666
// #define bitcheck(var, nbit) ((var) & (static_cast<uint32_t>(1) << (nbit)))
6767

6868
// For MC association in pre-selection
69-
using Alice3TracksWPid = soa::Join<aod::Tracks, aod::TracksCov, aod::Alice3DecayMaps, aod::McTrackLabels, aod::TracksDCA, aod::UpgradeTrkPids, aod::UpgradeTofs, aod::UpgradeRichs>;
69+
using Alice3TracksWPid = soa::Join<aod::Tracks, aod::TracksCov, aod::Alice3DecayMaps, aod::McTrackLabels, aod::TracksDCA, aod::UpgradeTofs, aod::UpgradeRichs>;
70+
using Alice3TracksWTrkPid = soa::Join<Alice3TracksWPid, aod::UpgradeTrkPids>;
7071

7172
struct alice3decayFinder {
7273
SliceCache cache;
@@ -185,18 +186,17 @@ struct alice3decayFinder {
185186
((aod::a3DecayMap::decayMap & trackSelectionKaMinusFromD) == trackSelectionKaMinusFromD) && aod::track::signed1Pt < 0.0f && nabs(aod::track::dcaXY) > kaFromD_dcaXYconstant + kaFromD_dcaXYpTdep* nabs(aod::track::signed1Pt);
186187

187188
// partitions for Lc baryons
188-
Partition<Alice3TracksWPid> tracksPiPlusFromLc =
189+
Partition<Alice3TracksWTrkPid> tracksPiPlusFromLc =
189190
((aod::a3DecayMap::decayMap & trackSelectionPiPlusFromLc) == trackSelectionPiPlusFromLc) && aod::track::signed1Pt > 0.0f && nabs(aod::track::dcaXY) > piFromLc_dcaXYconstant + piFromLc_dcaXYpTdep* nabs(aod::track::signed1Pt);
190-
Partition<Alice3TracksWPid> tracksKaPlusFromLc =
191+
Partition<Alice3TracksWTrkPid> tracksKaPlusFromLc =
191192
((aod::a3DecayMap::decayMap & trackSelectionKaPlusFromLc) == trackSelectionKaPlusFromLc) && aod::track::signed1Pt > 0.0f && nabs(aod::track::dcaXY) > kaFromLc_dcaXYconstant + kaFromLc_dcaXYpTdep* nabs(aod::track::signed1Pt);
192-
Partition<Alice3TracksWPid> tracksPrPlusFromLc =
193+
Partition<Alice3TracksWTrkPid> tracksPrPlusFromLc =
193194
((aod::a3DecayMap::decayMap & trackSelectionPrPlusFromLc) == trackSelectionPrPlusFromLc) && aod::track::signed1Pt > 0.0f && nabs(aod::track::dcaXY) > prFromLc_dcaXYconstant + prFromLc_dcaXYpTdep* nabs(aod::track::signed1Pt);
194-
// partitions for Lc baryons
195-
Partition<Alice3TracksWPid> tracksPiMinusFromLc =
195+
Partition<Alice3TracksWTrkPid> tracksPiMinusFromLc =
196196
((aod::a3DecayMap::decayMap & trackSelectionPiMinusFromLc) == trackSelectionPiMinusFromLc) && aod::track::signed1Pt < 0.0f && nabs(aod::track::dcaXY) > piFromLc_dcaXYconstant + piFromLc_dcaXYpTdep* nabs(aod::track::signed1Pt);
197-
Partition<Alice3TracksWPid> tracksKaMinusFromLc =
197+
Partition<Alice3TracksWTrkPid> tracksKaMinusFromLc =
198198
((aod::a3DecayMap::decayMap & trackSelectionKaMinusFromLc) == trackSelectionKaMinusFromLc) && aod::track::signed1Pt < 0.0f && nabs(aod::track::dcaXY) > kaFromLc_dcaXYconstant + kaFromLc_dcaXYpTdep* nabs(aod::track::signed1Pt);
199-
Partition<Alice3TracksWPid> tracksPrMinusFromLc =
199+
Partition<Alice3TracksWTrkPid> tracksPrMinusFromLc =
200200
((aod::a3DecayMap::decayMap & trackSelectionPrMinusFromLc) == trackSelectionPrMinusFromLc) && aod::track::signed1Pt < 0.0f && nabs(aod::track::dcaXY) > prFromLc_dcaXYconstant + prFromLc_dcaXYpTdep* nabs(aod::track::signed1Pt);
201201

202202
// Helper struct to pass candidate information
@@ -1068,7 +1068,7 @@ struct alice3decayFinder {
10681068

10691069
void processFindLc(aod::Collision const& collision,
10701070
aod::McParticles const& mcParticles,
1071-
Alice3TracksWPid const& tracks)
1071+
Alice3TracksWTrkPid const& tracks)
10721072
{
10731073
LOG(debug) << "Processing Lc candidates for collision " << collision.globalIndex() << " with " << tracks.size() << " tracks";
10741074
for (auto const& track : tracks) {

‎CODEOWNERS‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@
5050
/PWGCF/Tutorial @alibuild @ariedel-cern @victor-gonzalez @otonvd @shouqiye
5151

5252
/PWGDQ @alibuild @iarsene @mcoquet642 @lucamicheletti93 @XiaozhiBai
53-
/PWGEM @alibuild @feisenhu @dsekihat @ivorobye @jokonig
54-
/PWGEM/Dilepton @alibuild @mikesas @rbailhac @dsekihat @ivorobye @feisenhu @hscheid @jokonig
55-
/PWGEM/PhotonMeson @alibuild @mikesas @rbailhac @m-c-danisch @novitzky @mhemmer-cern @dsekihat @jokonig
53+
/PWGEM @alibuild @feisenhu @dsekihat @jokonig @hscheid
54+
/PWGEM/Dilepton @alibuild @mikesas @rbailhac @dsekihat @feisenhu @hscheid @jokonig
55+
/PWGEM/PhotonMeson @alibuild @mhemmer-cern @dsekihat @jokonig @hscheid @amaringarcia
5656
/PWGHF @alibuild @vkucera @fcolamar @fgrosa @fcatalan92 @mfaggin @mmazzilli @deepathoms @NicoleBastid @hahassan7 @jpxrk @apalasciano @zhangbiao-phy @gluparel @stefanopolitano @xinyepeng @singhra1994
5757
# PWG-LF
5858
/PWGLF @alibuild @omvazque @skundu692 @mpuccio

0 commit comments

Comments
 (0)