Skip to content

Commit 3e65ef1

Browse files
committed
Merge remote-tracking branch 'upstream/master' into souravspincor
2 parents 12de1de + 2a1aac7 commit 3e65ef1

File tree

55 files changed

+3054
-4818
lines changed

Some content is hidden

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

55 files changed

+3054
-4818
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

DPG/Tasks/AOTTrack/V0Cascades/perfK0sResolution.cxx

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

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

EventFiltering/PWGCF/CFFilter.cxx

Lines changed: 0 additions & 595 deletions
This file was deleted.

EventFiltering/PWGCF/CFFilterPPPhi.cxx

Lines changed: 0 additions & 543 deletions
This file was deleted.

0 commit comments

Comments
 (0)