Skip to content

Commit a2abf4a

Browse files
Tao-FangTao-Fang
authored
Merge branch 'AliceO2Group:master' into 20250827_1
2 parents 2f87cf4 + 7f81952 commit a2abf4a

File tree

84 files changed

+4605
-5530
lines changed

Some content is hidden

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

84 files changed

+4605
-5530
lines changed

‎ALICE3/TableProducer/OTF/onTheFlyTracker.cxx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -838,6 +838,10 @@ struct OnTheFlyTracker {
838838
static_cast<float>(xyz1[1]),
839839
static_cast<float>(xyz1[2])};
840840
const o2::track::TrackParametrization<float>::dim3_t hitpointcov = {currentTrackingLayer.getResolutionRPhi() * currentTrackingLayer.getResolutionRPhi(), 0.f, currentTrackingLayer.getResolutionZ() * currentTrackingLayer.getResolutionZ()};
841+
if (currentTrackingLayer.isInDeadPhiRegion(phi)) {
842+
continue; // No hit for strangeness tracking update
843+
}
844+
841845
cascadeTrack.update(hitpoint, hitpointcov);
842846
thisCascade.foundClusters++; // add to findable
843847
}

‎CODEOWNERS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
/PWGEM @alibuild @feisenhu @dsekihat @ivorobye
4040
/PWGEM/Dilepton @alibuild @mikesas @rbailhac @dsekihat @ivorobye @feisenhu @hscheid
4141
/PWGEM/PhotonMeson @alibuild @mikesas @rbailhac @m-c-danisch @novitzky @mhemmer-cern @dsekihat
42-
/PWGHF @alibuild @vkucera @fcolamar @fgrosa @fcatalan92 @mfaggin @mmazzilli @deepathoms @NicoleBastid @hahassan7 @jpxrk @apalasciano @zhangbiao-phy @gluparel @stefanopolitano
42+
/PWGHF @alibuild @vkucera @fcolamar @fgrosa @fcatalan92 @mfaggin @mmazzilli @deepathoms @NicoleBastid @hahassan7 @jpxrk @apalasciano @zhangbiao-phy @gluparel @stefanopolitano @xinyepeng
4343
# PWG-LF
4444
/PWGLF @alibuild @sustripathy @skundu692 @mpuccio
4545
/PWGLF/DataModel @alibuild @sustripathy @skundu692 @mpuccio @gbencedi @abmodak @fmazzasc @maciacco @dmallick2 @smaff92 @ercolessi @romainschotter
@@ -68,7 +68,7 @@
6868
/Tutorials/PWGCF @alibuild @jgrosseo @victor-gonzalez @zchochul
6969
/Tutorials/PWGDQ @alibuild @iarsene @mcoquet @lucamicheletti93
7070
/Tutorials/PWGEM @alibuild @mikesas @rbailhac @dsekihat @ivorobye @feisenhu
71-
/Tutorials/PWGHF @alibuild @vkucera @fcolamar @fgrosa @gluparel
71+
/Tutorials/PWGHF @alibuild @vkucera @fcolamar @fgrosa @gluparel @xinyepeng
7272
/Tutorials/PWGJE @alibuild @lhavener @maoyx @nzardosh @mfasDa @fjonasALICE
7373
/Tutorials/PWGLF @alibuild @alcaliva @lbariogl @chiarapinto @BongHwi @lbarnby @ercolessi @iravasen @njacazio @romainschotter @skundu692
7474
/Tutorials/PWGMM @alibuild @aalkin @ddobrigk

‎Common/Tasks/qaMuon.cxx‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2591,8 +2591,15 @@ struct muonQa {
25912591
double mass = GetMuMuInvariantMass(fgValuesMuonPV1, fgValuesMuonPV2);
25922592
double pT = GetMuMuPt(fgValuesMuonPV1, fgValuesMuonPV2);
25932593
double yPair = GetMuMuRap(fgValuesMuonPV1, fgValuesMuonPV2);
2594-
double dcaXPair = muonPosPV.dcaX - muonNegPV.dcaX;
2595-
double dcaYPair = muonPosPV.dcaY - muonNegPV.dcaY;
2594+
double dcaXPair;
2595+
double dcaYPair;
2596+
if (configRealign.fDoRealign) {
2597+
dcaXPair = muonPos.dcaX - muonNeg.dcaX;
2598+
dcaYPair = muonPos.dcaY - muonNeg.dcaY;
2599+
} else {
2600+
dcaXPair = muonPosPV.dcaX - muonNegPV.dcaX;
2601+
dcaYPair = muonPosPV.dcaY - muonNegPV.dcaY;
2602+
}
25962603
// mass cuts only used for DCA of Jpsi candidates
25972604
double minJpsiMass = 2.8;
25982605
double maxJpsiMass = 3.4;

‎DPG/Tasks/AOTTrack/V0Cascades/perfK0sResolution.cxx‎

Lines changed: 474 additions & 284 deletions
Large diffs are not rendered by default.

‎DPG/Tasks/AOTTrack/derivedDataCreatorD0Calibration.cxx‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@ struct DerivedDataCreatorD0Calibration {
104104
std::string prefix = "ml";
105105
} cfgMl;
106106

107-
using TracksWCovExtraPid = soa::Join<aod::Tracks, aod::TrackToTmo, aod::TrackToTracksQA, aod::TracksCov, aod::TracksExtra, aod::TrackSelection, aod::pidTPCFullPi, aod::pidTOFFullPi, aod::pidTPCFullKa, aod::pidTOFFullKa>;
107+
using TracksWCovExtraPid = soa::Join<aod::Tracks, aod::TrackToTmo, aod::TracksCov, aod::TracksExtra, aod::TrackSelection, aod::pidTPCFullPi, aod::pidTOFFullPi, aod::pidTPCFullKa, aod::pidTOFFullKa>;
108+
using TracksWCovExtraPidAndQa = soa::Join<aod::Tracks, aod::TrackToTmo, aod::TrackToTracksQA, aod::TracksCov, aod::TracksExtra, aod::TrackSelection, aod::pidTPCFullPi, aod::pidTOFFullPi, aod::pidTPCFullKa, aod::pidTOFFullKa>;
108109
using CollisionsWEvSel = soa::Join<aod::Collisions, aod::CentFT0Cs, aod::EvSels>;
109110
using TrackMeanOccs = soa::Join<aod::TmoTrackIds, aod::TmoPrim, aod::TmoT0V0, aod::TmoRT0V0Prim, aod::TwmoPrim, aod::TwmoT0V0, aod::TwmoRT0V0Prim>;
110111

@@ -169,10 +170,10 @@ struct DerivedDataCreatorD0Calibration {
169170
}
170171

171172
// main function
172-
template <bool withTrackQa, typename TTrackQa>
173+
template <bool withTrackQa, typename TTrackQa, typename TTracks>
173174
void runDataCreation(CollisionsWEvSel const& collisions,
174175
aod::TrackAssoc const& trackIndices,
175-
TracksWCovExtraPid const&,
176+
TTracks const&,
176177
aod::BCsWithTimestamps const&,
177178
TrackMeanOccs const&,
178179
TTrackQa const&)
@@ -203,7 +204,7 @@ struct DerivedDataCreatorD0Calibration {
203204

204205
auto groupedTrackIndices = trackIndices.sliceBy(trackIndicesPerCollision, collision.globalIndex());
205206
for (auto const& trackIndexPos : groupedTrackIndices) {
206-
auto trackPos = trackIndexPos.template track_as<TracksWCovExtraPid>();
207+
auto trackPos = trackIndexPos.template track_as<TTracks>();
207208
// track selections
208209
if (trackPos.sign() < 0) { // first positive track
209210
continue;
@@ -239,7 +240,7 @@ struct DerivedDataCreatorD0Calibration {
239240
}
240241

241242
for (auto const& trackIndexNeg : groupedTrackIndices) {
242-
auto trackNeg = trackIndexNeg.template track_as<TracksWCovExtraPid>();
243+
auto trackNeg = trackIndexNeg.template track_as<TTracks>();
243244
// track selections
244245
if (trackNeg.sign() > 0) { // second negative track
245246
continue;
@@ -484,7 +485,7 @@ struct DerivedDataCreatorD0Calibration {
484485
uint8_t tmoRobustT0V0PrimUnfm80{0u};
485486
uint8_t twmoRobustT0V0PrimUnfm80{0u};
486487
if (trackPos.has_tmo()) {
487-
auto tmoFromTrack = trackPos.tmo_as<TrackMeanOccs>(); // obtain track mean occupancies
488+
auto tmoFromTrack = trackPos.template tmo_as<TrackMeanOccs>(); // obtain track mean occupancies
488489
tmoPrimUnfm80 = getCompressedOccupancy(tmoFromTrack.tmoPrimUnfm80());
489490
tmoFV0AUnfm80 = getCompressedOccupancy(tmoFromTrack.tmoFV0AUnfm80());
490491
tmoFT0AUnfm80 = getCompressedOccupancy(tmoFromTrack.tmoFT0AUnfm80());
@@ -649,7 +650,7 @@ struct DerivedDataCreatorD0Calibration {
649650
uint8_t tmoRobustT0V0PrimUnfm80{0u};
650651
uint8_t twmoRobustT0V0PrimUnfm80{0u};
651652
if (trackNeg.has_tmo()) {
652-
auto tmoFromTrack = trackNeg.tmo_as<TrackMeanOccs>(); // obtain track mean occupancies
653+
auto tmoFromTrack = trackNeg.template tmo_as<TrackMeanOccs>(); // obtain track mean occupancies
653654
tmoPrimUnfm80 = getCompressedOccupancy(tmoFromTrack.tmoPrimUnfm80());
654655
tmoFV0AUnfm80 = getCompressedOccupancy(tmoFromTrack.tmoFV0AUnfm80());
655656
tmoFT0AUnfm80 = getCompressedOccupancy(tmoFromTrack.tmoFT0AUnfm80());
@@ -835,7 +836,7 @@ struct DerivedDataCreatorD0Calibration {
835836
// process functions
836837
void processWithTrackQa(CollisionsWEvSel const& collisions,
837838
aod::TrackAssoc const& trackIndices,
838-
TracksWCovExtraPid const& tracks,
839+
TracksWCovExtraPidAndQa const& tracks,
839840
aod::BCsWithTimestamps const& bcs,
840841
TrackMeanOccs const& occ,
841842
aod::TracksQAVersion const& trackQa)

‎EventFiltering/CMakeLists.txt‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,6 @@ o2physics_add_dpl_workflow(cf-filter
5757
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore KFParticle::KFParticle O2::ReconstructionDataFormats O2::DetectorsBase
5858
COMPONENT_NAME Analysis)
5959

60-
o2physics_add_dpl_workflow(cf-filter-qa
61-
SOURCES PWGCF/CFFilterQA.cxx
62-
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
63-
COMPONENT_NAME Analysis)
64-
65-
o2physics_add_dpl_workflow(cf-filter-ppphi
66-
SOURCES PWGCF/CFFilterPPPhi.cxx
67-
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
68-
COMPONENT_NAME Analysis)
69-
7060
o2physics_add_dpl_workflow(je-filter
7161
SOURCES PWGJE/jetFilter.cxx
7262
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::PWGJECore FastJet::FastJet FastJet::Contrib

0 commit comments

Comments
 (0)