Skip to content

Commit fe0c39d

Browse files
sarahherrmannsarahherrmann
authored
Merge branch 'AliceO2Group:master' into brJuly
2 parents dbfcd3f + 6a5a7dc commit fe0c39d

113 files changed

Lines changed: 4772 additions & 846 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.

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@ jobs:
6262
6363
- name: Create pull request with applied fixes
6464
uses: alisw/pull-request@v2
65-
if: steps.ml.outputs.has_updated_sources == 1 && ${{ github.event.repository.owner.login == 'AliceO2Group' }}
65+
if: >-
66+
steps.ml.outputs.has_updated_sources == 1 &&
67+
github.event.repository.owner.login == 'AliceO2Group'
6668
with:
6769
source_branch: 'alibuild:alibot-cleanup-ml-${{ env.PR_NUMBER }}'
6870
destination_branch: '${{ github.event.pull_request.head.label }}'

‎ALICE3/Core/TOFResoALICE3.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
#define O2_ANALYSIS_PID_TOFRESOALICE3_H_
2121

2222
// O2 includes
23-
#include "Common/Core/PID/ParamBase.h"
23+
#include "PID/ParamBase.h"
24+
#include "PID/DetectorResponse.h"
25+
#include "PID/PIDTOF.h"
2426
#include "ReconstructionDataFormats/PID.h"
2527

2628
namespace o2::pid::tof

‎ALICE3/TableProducer/alice3-pidTOF.cxx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include "ReconstructionDataFormats/Track.h"
2323
#include <CCDB/BasicCCDBManager.h>
2424
#include "Common/DataModel/PIDResponse.h"
25-
#include "Common/Core/PID/PIDTOF.h"
2625
#include "ALICE3/Core/TOFResoALICE3.h"
2726
#include "Common/DataModel/TrackSelectionTables.h"
2827
#include "Framework/RunningWorkflowInfo.h"
@@ -125,8 +124,7 @@ struct ALICE3pidTOFTask {
125124
return -999.f;
126125
}
127126
return ((track.trackTime() - track.collision().collisionTime()) * 1000.f - tof::ExpTimes<Trks::iterator, id>::ComputeExpectedTime(track.tofExpMom() / o2::pid::tof::kCSPEED,
128-
track.length(),
129-
o2::track::PID::getMass2Z(id))) /
127+
track.length())) /
130128
sigma<id>(track);
131129
}
132130
void process(Trks const& tracks, Coll const&)

‎ALICE3/Tasks/alice3-cdeuteron.cxx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,13 +172,15 @@ struct Alice3CDeuteron {
172172
#undef MakeHistos
173173
}
174174

175+
Preslice<aod::McParticles_000> perMcCollision = aod::mcparticle::mcCollisionId;
176+
175177
void process(const soa::Join<o2::aod::Collisions, o2::aod::McCollisionLabels>::iterator& coll,
176178
const o2::aod::McCollisions& Mccoll,
177179
const soa::Join<o2::aod::Tracks, o2::aod::McTrackLabels, o2::aod::TracksExtra, o2::aod::TracksCov,
178180
aod::pidTOFFullPi, aod::pidTOFFullKa, aod::pidTOFFullDe>& tracks,
179181
const aod::McParticles_000& mcParticles)
180182
{
181-
const auto particlesInCollision = mcParticles.sliceBy(aod::mcparticle::mcCollisionId, coll.mcCollision().globalIndex());
183+
const auto particlesInCollision = mcParticles.sliceBy(perMcCollision, coll.mcCollision().globalIndex());
182184
for (const auto& i : particlesInCollision) {
183185
histos.get<TH1>(HIST("event/particlespdg"))->Fill(Form("%i", i.pdgCode()), 1);
184186
if (i.pdgCode() != 12345) {

‎CODEOWNERS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
/PWGEM @alibuild @mikesas @rbailhac
2929
/PWGEM/Dilepton @alibuild @mikesas @rbailhac @dsekihat @ivorobye
3030
/PWGEM/PhotonMeson @alibuild @mikesas @rbailhac @m-c-danisch @novitzky
31-
/PWGHF @alibuild @ginnocen @vkucera @fcolamar
31+
/PWGHF @alibuild @ginnocen @vkucera @fcolamar @cterrevo
3232
/PWGHF/D2H @alibuild @ginnocen @vkucera @fcolamar @cterrevo @xinyepeng @lvermunt
3333
/PWGHF/HFC @alibuild @ginnocen @vkucera @fcolamar @cterrevo @mmazzilli
34-
/PWGHF/HFJ @alibuild @ginnocen @vkucera @fcolamar @cterrevo @nzardosh
34+
/PWGHF/HFJ @alibuild @ginnocen @vkucera @fcolamar @cterrevo @nzardosh @rvertesi
3535
/PWGHF/HFL @alibuild @ginnocen @vkucera @fcolamar @cterrevo @NicoleBastid @mvolkl
3636
/PWGLF @alibuild @njacazio
3737
/PWGMM @alibuild @aalkin

‎Common/CCDB/EventSelectionParams.cxx‎

Lines changed: 86 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -45,76 +45,108 @@ const char* selectionLabels[kNsel] = {
4545
"kNoInconsistentVtx",
4646
"kNoPileupInMultBins",
4747
"kNoPilupMV",
48-
"kNoPileupTPC"};
48+
"kNoPileupTPC"
49+
"kIsTriggerTVX",
50+
"kIsINT1"};
4951
}
5052

51-
EventSelectionParams::EventSelectionParams(int system)
53+
EventSelectionParams::EventSelectionParams(int system, int run)
5254
{
5355
memset(selectionBarrel, 0, sizeof(selectionBarrel));
5456
memset(selectionMuonWithPileupCuts, 0, sizeof(selectionMuonWithPileupCuts));
5557
memset(selectionMuonWithoutPileupCuts, 0, sizeof(selectionMuonWithoutPileupCuts));
5658

57-
if (system == 0 || system == 1 || system == 2) { // pp, pA or Ap
58-
// default barrel selection
59+
if (run == 1) {
5960
selectionBarrel[kIsBBV0A] = 1;
6061
selectionBarrel[kIsBBV0C] = 1;
61-
selectionBarrel[kNoV0MOnVsOfPileup] = 1;
62-
selectionBarrel[kNoSPDOnVsOfPileup] = 1;
63-
selectionBarrel[kNoV0Casymmetry] = 1;
64-
selectionBarrel[kIsGoodTimeRange] = 1;
65-
selectionBarrel[kNoIncompleteDAQ] = 1;
66-
selectionBarrel[kNoTPCHVdip] = 1;
67-
selectionBarrel[kNoPileupFromSPD] = 1;
68-
selectionBarrel[kNoV0PFPileup] = 1;
69-
selectionBarrel[kNoSPDClsVsTklBG] = 1;
70-
selectionBarrel[kNoV0C012vsTklBG] = 1;
71-
72-
// similar to Barrel but without kNoTPCHVdip and kIsGoodTimeRange checks
73-
selectionMuonWithPileupCuts[kIsBBV0A] = 1;
74-
selectionMuonWithPileupCuts[kIsBBV0C] = 1;
75-
selectionMuonWithPileupCuts[kNoV0MOnVsOfPileup] = 1;
76-
selectionMuonWithPileupCuts[kNoSPDOnVsOfPileup] = 1;
77-
selectionMuonWithPileupCuts[kNoV0Casymmetry] = 1;
78-
selectionMuonWithPileupCuts[kNoIncompleteDAQ] = 1;
79-
selectionMuonWithPileupCuts[kNoPileupFromSPD] = 1;
80-
selectionMuonWithPileupCuts[kNoV0PFPileup] = 1;
81-
selectionMuonWithPileupCuts[kNoSPDClsVsTklBG] = 1;
82-
selectionMuonWithPileupCuts[kNoV0C012vsTklBG] = 1;
83-
84-
// basic checks for muon analyses without in/out-of-bunch pileup rejection
85-
selectionMuonWithoutPileupCuts[kIsBBV0A] = 1;
86-
selectionMuonWithoutPileupCuts[kIsBBV0C] = 1;
87-
selectionMuonWithoutPileupCuts[kNoV0Casymmetry] = 1;
88-
selectionMuonWithoutPileupCuts[kNoIncompleteDAQ] = 1;
89-
selectionMuonWithoutPileupCuts[kNoV0C012vsTklBG] = 1;
90-
}
91-
92-
if (system == 1) { // additional ZDC checks in pA
93-
selectionBarrel[kNoBGZNA] = 1;
94-
selectionMuonWithPileupCuts[kNoBGZNA] = 1;
95-
selectionBarrel[kNoBGZNA] = 1;
96-
}
97-
98-
if (system == 2) { // additional ZDC checks in Ap
99-
selectionBarrel[kNoBGZNC] = 1;
100-
selectionMuonWithPileupCuts[kNoBGZNC] = 1;
101-
selectionBarrel[kNoBGZNC] = 1;
102-
}
103-
104-
if (system == 3) { // AA
105-
selectionBarrel[kIsBBV0A] = 1;
106-
selectionBarrel[kIsBBV0C] = 1;
107-
selectionBarrel[kIsBBZAC] = 1;
108-
selectionBarrel[kIsGoodTimeRange] = 1;
10962
selectionBarrel[kNoTPCHVdip] = 1;
63+
selectionBarrel[kNoIncompleteDAQ] = 1;
64+
selectionBarrel[kNoTPCLaserWarmUp] = 1;
11065

11166
selectionMuonWithPileupCuts[kIsBBV0A] = 1;
11267
selectionMuonWithPileupCuts[kIsBBV0C] = 1;
113-
selectionMuonWithPileupCuts[kIsBBZAC] = 1;
11468

11569
selectionMuonWithoutPileupCuts[kIsBBV0A] = 1;
11670
selectionMuonWithoutPileupCuts[kIsBBV0C] = 1;
117-
selectionMuonWithoutPileupCuts[kIsBBZAC] = 1;
71+
72+
if (system == 1) { // additional ZDC checks in pA
73+
selectionBarrel[kNoBGZNA] = 1;
74+
selectionMuonWithPileupCuts[kNoBGZNA] = 1;
75+
selectionMuonWithoutPileupCuts[kNoBGZNA] = 1;
76+
}
77+
if (system == 2) { // additional ZDC checks in Ap
78+
selectionBarrel[kNoBGZNC] = 1;
79+
selectionMuonWithPileupCuts[kNoBGZNC] = 1;
80+
selectionMuonWithoutPileupCuts[kNoBGZNC] = 1;
81+
}
82+
if (system == 3) { // AA
83+
selectionBarrel[kIsBBZAC] = 1;
84+
selectionMuonWithPileupCuts[kIsBBZAC] = 1;
85+
selectionMuonWithoutPileupCuts[kIsBBZAC] = 1;
86+
}
87+
} else if (run == 2) {
88+
if (system == 0 || system == 1 || system == 2) { // pp, pA or Ap
89+
// default barrel selection
90+
selectionBarrel[kIsBBV0A] = 1;
91+
selectionBarrel[kIsBBV0C] = 1;
92+
selectionBarrel[kNoV0MOnVsOfPileup] = 1;
93+
selectionBarrel[kNoSPDOnVsOfPileup] = 1;
94+
selectionBarrel[kNoV0Casymmetry] = 1;
95+
selectionBarrel[kIsGoodTimeRange] = 1;
96+
selectionBarrel[kNoIncompleteDAQ] = 1;
97+
selectionBarrel[kNoTPCHVdip] = 1;
98+
selectionBarrel[kNoPileupFromSPD] = 1;
99+
selectionBarrel[kNoV0PFPileup] = 1;
100+
selectionBarrel[kNoSPDClsVsTklBG] = 1;
101+
selectionBarrel[kNoV0C012vsTklBG] = 1;
102+
103+
// similar to Barrel but without kNoTPCHVdip and kIsGoodTimeRange checks
104+
selectionMuonWithPileupCuts[kIsBBV0A] = 1;
105+
selectionMuonWithPileupCuts[kIsBBV0C] = 1;
106+
selectionMuonWithPileupCuts[kNoV0MOnVsOfPileup] = 1;
107+
selectionMuonWithPileupCuts[kNoSPDOnVsOfPileup] = 1;
108+
selectionMuonWithPileupCuts[kNoV0Casymmetry] = 1;
109+
selectionMuonWithPileupCuts[kNoIncompleteDAQ] = 1;
110+
selectionMuonWithPileupCuts[kNoPileupFromSPD] = 1;
111+
selectionMuonWithPileupCuts[kNoV0PFPileup] = 1;
112+
selectionMuonWithPileupCuts[kNoSPDClsVsTklBG] = 1;
113+
selectionMuonWithPileupCuts[kNoV0C012vsTklBG] = 1;
114+
115+
// basic checks for muon analyses without in/out-of-bunch pileup rejection
116+
selectionMuonWithoutPileupCuts[kIsBBV0A] = 1;
117+
selectionMuonWithoutPileupCuts[kIsBBV0C] = 1;
118+
selectionMuonWithoutPileupCuts[kNoV0Casymmetry] = 1;
119+
selectionMuonWithoutPileupCuts[kNoIncompleteDAQ] = 1;
120+
selectionMuonWithoutPileupCuts[kNoV0C012vsTklBG] = 1;
121+
}
122+
123+
if (system == 1) { // additional ZDC checks in pA
124+
selectionBarrel[kNoBGZNA] = 1;
125+
selectionMuonWithPileupCuts[kNoBGZNA] = 1;
126+
selectionMuonWithoutPileupCuts[kNoBGZNA] = 1;
127+
}
128+
129+
if (system == 2) { // additional ZDC checks in Ap
130+
selectionBarrel[kNoBGZNC] = 1;
131+
selectionMuonWithPileupCuts[kNoBGZNC] = 1;
132+
selectionMuonWithoutPileupCuts[kNoBGZNC] = 1;
133+
}
134+
135+
if (system == 3) { // AA
136+
selectionBarrel[kIsBBV0A] = 1;
137+
selectionBarrel[kIsBBV0C] = 1;
138+
selectionBarrel[kIsBBZAC] = 1;
139+
selectionBarrel[kIsGoodTimeRange] = 1;
140+
selectionBarrel[kNoTPCHVdip] = 1;
141+
142+
selectionMuonWithPileupCuts[kIsBBV0A] = 1;
143+
selectionMuonWithPileupCuts[kIsBBV0C] = 1;
144+
selectionMuonWithPileupCuts[kIsBBZAC] = 1;
145+
146+
selectionMuonWithoutPileupCuts[kIsBBV0A] = 1;
147+
selectionMuonWithoutPileupCuts[kIsBBV0C] = 1;
148+
selectionMuonWithoutPileupCuts[kIsBBZAC] = 1;
149+
}
118150
}
119151
}
120152

‎Common/CCDB/EventSelectionParams.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ enum EventSelectionFlags {
5252
kNoPileupMV, // no pileup according to multi-vertexer
5353
kNoPileupTPC, // no pileup in TPC
5454
kIsTriggerTVX, // FT0 vertex (acceptable FT0C-FT0A time difference) at trigger level
55+
kIsINT1, // SPDGFO >= 1 || V0A || V0C
5556
kNsel // counter
5657
};
5758

@@ -64,7 +65,7 @@ using namespace evsel;
6465
class EventSelectionParams
6566
{
6667
public:
67-
EventSelectionParams(int system = 0);
68+
EventSelectionParams(int system = 0, int run = 2);
6869
void DisableOutOfBunchPileupCuts();
6970
void SetOnVsOfParams(float newV0MOnVsOfA, float newV0MOnVsOfB, float newSPDOnVsOfA, float newSPDOnVsOfB);
7071
bool* GetSelection(int iSelection);
@@ -134,7 +135,7 @@ class EventSelectionParams
134135
float fV0CasymA = -25.f;
135136
float fV0CasymB = 0.15f;
136137

137-
ClassDefNV(EventSelectionParams, 2)
138+
ClassDefNV(EventSelectionParams, 3)
138139
};
139140

140141
#endif

‎Common/CCDB/TriggerAliases.cxx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ const char* aliasLabels[kNaliases] = {
2424
"kCUP9",
2525
"kMUP10",
2626
"kMUP11",
27+
"kINT1",
28+
"kUnbiased",
2729
"kALL"};
2830

2931
void TriggerAliases::AddClassIdToAlias(uint32_t aliasId, int classId)

‎Common/CCDB/TriggerAliases.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ enum triggerAliases {
2929
kCUP9,
3030
kMUP10,
3131
kMUP11,
32+
kINT1,
33+
kUnbiased,
3234
kALL,
3335
kNaliases
3436
};
@@ -52,7 +54,7 @@ class TriggerAliases
5254
std::map<uint32_t, std::string> mAliasToClassNames;
5355
std::map<uint32_t, ULong64_t> mAliasToTriggerMask;
5456
std::map<uint32_t, ULong64_t> mAliasToTriggerMaskNext50;
55-
ClassDefNV(TriggerAliases, 3)
57+
ClassDefNV(TriggerAliases, 4)
5658
};
5759

5860
#endif

‎Common/CCDB/macros/upload_event_selection_params.C‎

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,48 @@ void upload_event_selection_params()
3333
bool isNew[nPeriodsMax] = {0};
3434

3535
int n = 0;
36+
period[n] = "pp2010";
37+
par[n] = new EventSelectionParams(0, 1);
38+
runFirst[n] = 114786;
39+
runLast[n] = 136377;
40+
41+
n++;
42+
period[n] = "PbPb_10h";
43+
par[n] = new EventSelectionParams(3, 1);
44+
runFirst[n] = 137135;
45+
runLast[n] = 139517;
46+
47+
n++;
48+
period[n] = "pp2011";
49+
par[n] = new EventSelectionParams(0, 1);
50+
runFirst[n] = 144871;
51+
runLast[n] = 159582;
52+
53+
n++;
54+
period[n] = "PbPb_11h";
55+
par[n] = new EventSelectionParams(3, 1);
56+
runFirst[n] = 167915;
57+
runLast[n] = 170593;
58+
59+
n++;
60+
period[n] = "pp2012";
61+
par[n] = new EventSelectionParams(0, 2);
62+
runFirst[n] = 176661;
63+
runLast[n] = 193752;
64+
65+
n++;
66+
period[n] = "pPb2013";
67+
par[n] = new EventSelectionParams(1, 1);
68+
runFirst[n] = 195344;
69+
runLast[n] = 196310;
70+
71+
n++;
72+
period[n] = "Pbp2013";
73+
par[n] = new EventSelectionParams(2, 1);
74+
runFirst[n] = 196433;
75+
runLast[n] = 197388;
76+
77+
n++;
3678
period[n] = "defaultRun2";
3779
par[n] = new EventSelectionParams(0);
3880
runFirst[n] = 209122;
@@ -213,7 +255,7 @@ void upload_event_selection_params()
213255
ccdb.storeAsTFileAny(par[i], "EventSelection/EventSelectionParams", metadata, sor, eor);
214256
}
215257

216-
if (1) { // Default Run 3 object
258+
if (0) { // Default Run 3 object
217259
ULong64_t sorRun3 = 1543767116001;
218260
ULong64_t eorRun3 = 1893445200000;
219261
metadata["period"] = "Default Run 3";

0 commit comments

Comments
 (0)