Skip to content

Commit ea31afb

Browse files
zchochulzchochul
authored
Merge branch 'master' into FemtoUniversepPhi-04-11-2026
2 parents 705c78e + 5c9b8d0 commit ea31afb

122 files changed

Lines changed: 9117 additions & 3292 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.

‎DPG/Tasks/AOTEvent/detectorOccupancyQa.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ struct DetectorOccupancyQaTask {
162162
}
163163
// track QA counters
164164
histos.add("nTrackCounter_after_cuts_QA", "", kTH1D, {{12, -0.5, 11.5, "track QA"}});
165-
TAxis* axTrackCounters = reinterpret_cast<TAxis*>(histos.get<TH1>(HIST("nTrackCounter_after_cuts_QA"))->GetXaxis());
165+
TAxis* axTrackCounters = histos.get<TH1>(HIST("nTrackCounter_after_cuts_QA"))->GetXaxis();
166166
axTrackCounters->SetBinLabel(1, "all");
167167
axTrackCounters->SetBinLabel(2, "PVcontrib");
168168
axTrackCounters->SetBinLabel(3, "ptCut");

‎DPG/Tasks/AOTEvent/eventSelectionQa.cxx‎

Lines changed: 45 additions & 104 deletions
Large diffs are not rendered by default.

‎DPG/Tasks/AOTEvent/lumiQa.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,13 +162,13 @@ struct LumiQaTask {
162162
return;
163163
}
164164

165-
hCalibV0A = reinterpret_cast<TH1*>(callst->FindObject("hCalibZeqFV0"));
165+
hCalibV0A = dynamic_cast<TH1*>(callst->FindObject("hCalibZeqFV0"));
166166
if (hCalibV0A == nullptr) {
167167
LOGF(info, "hCalibZeqFV0 histogram is not available for run=%d at timestamp=%llu", runNumber, ts);
168168
return;
169169
}
170170

171-
hCalibT0C = reinterpret_cast<TH1*>(callst->FindObject("hCalibZeqFT0C"));
171+
hCalibT0C = dynamic_cast<TH1*>(callst->FindObject("hCalibZeqFT0C"));
172172
if (hCalibT0C == nullptr) {
173173
LOGF(info, "hCalibZeqFT0C histogram is not available for run=%d at timestamp=%llu", runNumber, ts);
174174
return;

‎DPG/Tasks/AOTEvent/timeDependentQa.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ struct TimeDependentQaTask {
294294
// ### QA event selection bits
295295
int nEvSelBits = enNumEvSelBits;
296296
histos.add("hSecondsEventSelBits", "", kTH2F, {axisSecondsWideBins, {nEvSelBits, -0.5, nEvSelBits - 0.5, "Monitoring of event selection bits"}});
297-
TAxis* axSelBits = reinterpret_cast<TAxis*>(histos.get<TH2>(HIST("hSecondsEventSelBits"))->GetYaxis());
297+
TAxis* axSelBits = histos.get<TH2>(HIST("hSecondsEventSelBits"))->GetYaxis();
298298
axSelBits->SetBinLabel(1 + enCollisionsAll, "collisionsAll");
299299
axSelBits->SetBinLabel(1 + enIsTriggerTVX, "IsTriggerTVX");
300300
axSelBits->SetBinLabel(1 + enNoTimeFrameBorder, "NoTimeFrameBorder");
@@ -330,7 +330,7 @@ struct TimeDependentQaTask {
330330
// ### QA RCT flags
331331
int nRctFlagsTotal = enNumRctFlagsTotal;
332332
histos.add("hSecondsRCTflags", "", kTH2F, {axisSecondsWideBins, {nRctFlagsTotal + 2, -0.5, nRctFlagsTotal + 2 - 0.5, "Monitoring of RCT flags"}});
333-
axRctFlags = reinterpret_cast<TAxis*>(histos.get<TH2>(HIST("hSecondsRCTflags"))->GetYaxis());
333+
axRctFlags = histos.get<TH2>(HIST("hSecondsRCTflags"))->GetYaxis();
334334
axRctFlags->SetBinLabel(1, "NcollisionsSel8");
335335
axRctFlags->SetBinLabel(2, "CcdbNotFound");
336336
axRctFlags->SetBinLabel(3 + kCPVBad, "CPVBad");

‎DPG/Tasks/AOTTrack/MonitorFilterBit.cxx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,15 @@ struct CheckFilterBit {
103103
using Tracksextension = soa::Join<aod::Tracks, aod::TracksExtra, aod::TrackSelection, aod::TrackSelectionExtension, aod::TracksDCA>;
104104
using TracksextensionMC = soa::Join<Tracksextension, aod::McTrackLabels>;
105105
SliceCache cache;
106-
Partition<Tracksextension> positiveTPConlyTracks = o2::aod::track::signed1Pt > fzero&& o2::aod::track::tpcNClsFindable > (uint8_t)0 && o2::aod::track::itsChi2NCl < (float_t)0 && o2::aod::track::trackType == (uint8_t)o2::aod::track::TrackTypeEnum::Track; //&& (o2::aod::track::detectorMap & o2::aod::track::TPC) ==o2::aod::track::TPC && (o2::aod::track::detectorMap & o2::aod::track::ITS) ==0;
107-
Partition<Tracksextension> negativeTPConlyTracks = o2::aod::track::signed1Pt < fzero && o2::aod::track::tpcNClsFindable > (uint8_t)0 && o2::aod::track::itsChi2NCl < (float_t)0 && o2::aod::track::trackType == (uint8_t)o2::aod::track::TrackTypeEnum::Track; //&& (o2::aod::track::detectorMap & o2::aod::track::TPC) ==o2::aod::track::TPC && (o2::aod::track::detectorMap & o2::aod::track::ITS) ==0;
108-
Partition<Tracksextension> positiveITSonlyTracks = o2::aod::track::signed1Pt > fzero&& o2::aod::track::tpcChi2NCl<(float_t)0 && o2::aod::track::itsChi2NCl>(float_t) 0 && o2::aod::track::trackType == (uint8_t)o2::aod::track::TrackTypeEnum::Track; // && (o2::aod::track::detectorMap & o2::aod::track::TPC) ==0 && (o2::aod::track::detectorMap & o2::aod::track::ITS) ==o2::aod::track::ITS && o2::aod::track::passedITSNCls==true;// && o2::aod::track::itsNCls==7;
109-
Partition<Tracksextension> negativeITSonlyTracks = o2::aod::track::signed1Pt < fzero && o2::aod::track::tpcChi2NCl < (float_t)0 && o2::aod::track::itsChi2NCl > (float_t)0 && o2::aod::track::trackType == (uint8_t)o2::aod::track::TrackTypeEnum::Track; // && (o2::aod::track::detectorMap & o2::aod::track::TPC) ==0 &&(o2::aod::track::detectorMap & o2::aod::track::ITS) ==o2::aod::track::ITS && o2::aod::track::passedITSNCls==true;// && o2::aod::track::itsNCls==7;
110-
111-
Partition<TracksextensionMC> positiveTPConlyTracksMC = o2::aod::track::signed1Pt > fzero&& o2::aod::track::tpcNClsFindable > (uint8_t)0 && o2::aod::track::itsChi2NCl < (float_t)0 && o2::aod::track::trackType == (uint8_t)o2::aod::track::TrackTypeEnum::Track; //&& (o2::aod::track::detectorMap & o2::aod::track::TPC) ==o2::aod::track::TPC && (o2::aod::track::detectorMap & o2::aod::track::ITS) ==0;
112-
Partition<TracksextensionMC> negativeTPConlyTracksMC = o2::aod::track::signed1Pt < fzero && o2::aod::track::tpcNClsFindable > (uint8_t)0 && o2::aod::track::itsChi2NCl < (float_t)0 && o2::aod::track::trackType == (uint8_t)o2::aod::track::TrackTypeEnum::Track; //&& (o2::aod::track::detectorMap & o2::aod::track::TPC) ==o2::aod::track::TPC && (o2::aod::track::detectorMap & o2::aod::track::ITS) ==0;
113-
Partition<TracksextensionMC> positiveITSonlyTracksMC = o2::aod::track::signed1Pt > fzero&& o2::aod::track::tpcChi2NCl<(float_t)0 && o2::aod::track::itsChi2NCl>(float_t) 0 && o2::aod::track::trackType == (uint8_t)o2::aod::track::TrackTypeEnum::Track; // && (o2::aod::track::detectorMap & o2::aod::track::TPC) ==0 && (o2::aod::track::detectorMap & o2::aod::track::ITS) ==o2::aod::track::ITS && o2::aod::track::passedITSNCls==true;// && o2::aod::track::itsNCls==7;
114-
Partition<TracksextensionMC> negativeITSonlyTracksMC = o2::aod::track::signed1Pt < fzero && o2::aod::track::tpcChi2NCl < (float_t)0 && o2::aod::track::itsChi2NCl > (float_t)0 && o2::aod::track::trackType == (uint8_t)o2::aod::track::TrackTypeEnum::Track; // && (o2::aod::track::detectorMap & o2::aod::track::TPC) ==0 &&(o2::aod::track::detectorMap & o2::aod::track::ITS) ==o2::aod::track::ITS && o2::aod::track::passedITSNCls==true;// && o2::aod::track::itsNCls==7;
106+
Partition<Tracksextension> positiveTPConlyTracks = o2::aod::track::signed1Pt > fzero&& o2::aod::track::tpcNClsFindable > static_cast<uint8_t>(0) && o2::aod::track::itsChi2NCl < static_cast<float_t>(0) && o2::aod::track::trackType == static_cast<uint8_t>(o2::aod::track::TrackTypeEnum::Track); //&& (o2::aod::track::detectorMap & o2::aod::track::TPC) ==o2::aod::track::TPC && (o2::aod::track::detectorMap & o2::aod::track::ITS) ==0;
107+
Partition<Tracksextension> negativeTPConlyTracks = o2::aod::track::signed1Pt < fzero && o2::aod::track::tpcNClsFindable > static_cast<uint8_t>(0) && o2::aod::track::itsChi2NCl < static_cast<float_t>(0) && o2::aod::track::trackType == static_cast<uint8_t>(o2::aod::track::TrackTypeEnum::Track); //&& (o2::aod::track::detectorMap & o2::aod::track::TPC) ==o2::aod::track::TPC && (o2::aod::track::detectorMap & o2::aod::track::ITS) ==0;
108+
Partition<Tracksextension> positiveITSonlyTracks = o2::aod::track::signed1Pt > fzero&& o2::aod::track::tpcChi2NCl<static_cast<float_t>(0) && o2::aod::track::itsChi2NCl> static_cast<float_t>(0) && o2::aod::track::trackType == static_cast<uint8_t>(o2::aod::track::TrackTypeEnum::Track); // && (o2::aod::track::detectorMap & o2::aod::track::TPC) ==0 && (o2::aod::track::detectorMap & o2::aod::track::ITS) ==o2::aod::track::ITS && o2::aod::track::passedITSNCls==true;// && o2::aod::track::itsNCls==7;
109+
Partition<Tracksextension> negativeITSonlyTracks = o2::aod::track::signed1Pt < fzero && o2::aod::track::tpcChi2NCl < static_cast<float_t>(0) && o2::aod::track::itsChi2NCl > static_cast<float_t>(0) && o2::aod::track::trackType == static_cast<uint8_t>(o2::aod::track::TrackTypeEnum::Track); // && (o2::aod::track::detectorMap & o2::aod::track::TPC) ==0 &&(o2::aod::track::detectorMap & o2::aod::track::ITS) ==o2::aod::track::ITS && o2::aod::track::passedITSNCls==true;// && o2::aod::track::itsNCls==7;
110+
111+
Partition<TracksextensionMC> positiveTPConlyTracksMC = o2::aod::track::signed1Pt > fzero&& o2::aod::track::tpcNClsFindable > static_cast<uint8_t>(0) && o2::aod::track::itsChi2NCl < static_cast<float_t>(0) && o2::aod::track::trackType == static_cast<uint8_t>(o2::aod::track::TrackTypeEnum::Track); //&& (o2::aod::track::detectorMap & o2::aod::track::TPC) ==o2::aod::track::TPC && (o2::aod::track::detectorMap & o2::aod::track::ITS) ==0;
112+
Partition<TracksextensionMC> negativeTPConlyTracksMC = o2::aod::track::signed1Pt < fzero && o2::aod::track::tpcNClsFindable > static_cast<uint8_t>(0) && o2::aod::track::itsChi2NCl < static_cast<float_t>(0) && o2::aod::track::trackType == static_cast<uint8_t>(o2::aod::track::TrackTypeEnum::Track); //&& (o2::aod::track::detectorMap & o2::aod::track::TPC) ==o2::aod::track::TPC && (o2::aod::track::detectorMap & o2::aod::track::ITS) ==0;
113+
Partition<TracksextensionMC> positiveITSonlyTracksMC = o2::aod::track::signed1Pt > fzero&& o2::aod::track::tpcChi2NCl<static_cast<float_t>(0) && o2::aod::track::itsChi2NCl> static_cast<float_t>(0) && o2::aod::track::trackType == static_cast<uint8_t>(o2::aod::track::TrackTypeEnum::Track); // && (o2::aod::track::detectorMap & o2::aod::track::TPC) ==0 && (o2::aod::track::detectorMap & o2::aod::track::ITS) ==o2::aod::track::ITS && o2::aod::track::passedITSNCls==true;// && o2::aod::track::itsNCls==7;
114+
Partition<TracksextensionMC> negativeITSonlyTracksMC = o2::aod::track::signed1Pt < fzero && o2::aod::track::tpcChi2NCl < static_cast<float_t>(0) && o2::aod::track::itsChi2NCl > static_cast<float_t>(0) && o2::aod::track::trackType == static_cast<uint8_t>(o2::aod::track::TrackTypeEnum::Track); // && (o2::aod::track::detectorMap & o2::aod::track::TPC) ==0 &&(o2::aod::track::detectorMap & o2::aod::track::ITS) ==o2::aod::track::ITS && o2::aod::track::passedITSNCls==true;// && o2::aod::track::itsNCls==7;
115115

116116
void init(InitContext const&)
117117
{

‎DPG/Tasks/AOTTrack/PID/HMPID/CMakeLists.txt‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,13 @@ o2physics_add_dpl_workflow(hmpid-table-producer
2020
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::HMPIDBase
2121
COMPONENT_NAME Analysis)
2222

23-
o2physics_add_dpl_workflow(hmpid-deuteron
24-
SOURCES hmpidDeuteron.cxx
23+
o2physics_add_dpl_workflow(hmpid-abs-cross-section
24+
SOURCES hmpidAbsCrossSection.cxx
2525
PUBLIC_LINK_LIBRARIES O2::Framework O2::DetectorsBase O2::ReconstructionDataFormats O2Physics::AnalysisCore
2626
COMPONENT_NAME Analysis)
27+
28+
o2physics_add_dpl_workflow(hmpid-cross-section-corrections
29+
SOURCES hmpidCrossSectionCorrections.cxx
30+
PUBLIC_LINK_LIBRARIES O2::Framework O2::DetectorsBase O2::ReconstructionDataFormats O2Physics::AnalysisCore
31+
COMPONENT_NAME Analysis)
32+

0 commit comments

Comments
 (0)