Skip to content

ITSTPC QC does not need TPC clusters, just occupancy, + related #14159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shahor02 merged 2 commits into from
Apr 10, 2025
Merged

ITSTPC QC does not need TPC clusters, just occupancy, + related #14159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5303b20
Possibility to request TPC occupancy map w/o askig for clusters
shahor02 Apr 9, 2025
81b68c8
ITSTPC QC does not need TPC clusters, just occ.
shahor02 Apr 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions DataFormats/Detectors/GlobalTracking/include/DataFormatsGlobalTracking/RecoContainer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ struct DataRequest {
void requestITSClusters(bool mc);
void requestMFTClusters(bool mc);
void requestTPCClusters(bool mc);
void requestTPCOccMap();
void requestTPCTriggers();
void requestTOFClusters(bool mc);
void requestTRDTracklets(bool mc);
Expand Down Expand Up @@ -377,6 +378,7 @@ struct RecoContainer {
void addITSClusters(o2::framework::ProcessingContext& pc, bool mc);
void addMFTClusters(o2::framework::ProcessingContext& pc, bool mc);
void addTPCClusters(o2::framework::ProcessingContext& pc, bool mc, bool shmap, bool occmap);
void addTPCOccMap(o2::framework::ProcessingContext& pc);
void addTPCTriggers(o2::framework::ProcessingContext& pc);
void addTOFClusters(o2::framework::ProcessingContext& pc, bool mc);
void addHMPClusters(o2::framework::ProcessingContext& pc, bool mc);
Expand Down
25 changes: 22 additions & 3 deletions DataFormats/Detectors/GlobalTracking/src/RecoContainer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ void DataRequest::requestTPCTracks(bool mc)
addInput({"trackTPCClRefs", "TPC", "CLUSREFS", 0, Lifetime::Timeframe});
if (requestMap.find("clusTPC") != requestMap.end()) {
addInput({"clusTPCshmap", "TPC", "CLSHAREDMAP", 0, Lifetime::Timeframe});
addInput({"clusTPCoccmap", "TPC", "TPCOCCUPANCYMAP", 0, Lifetime::Timeframe});
requestTPCOccMap();
}
if (mc) {
addInput({"trackTPCMCTR", "TPC", "TRACKSMCLBL", 0, Lifetime::Timeframe});
Expand Down Expand Up @@ -267,6 +267,12 @@ void DataRequest::requestMFTClusters(bool mc)
requestMap["clusMFT"] = mc;
}

void DataRequest::requestTPCOccMap()
{
addInput({"clusTPCoccmap", "TPC", "TPCOCCUPANCYMAP", 0, Lifetime::Timeframe});
requestMap["TPCOcc"] = false;
}

void DataRequest::requestTPCClusters(bool mc)
{
addInput({"clusTPC", ConcreteDataTypeMatcher{"TPC", "CLUSTERNATIVE"}, Lifetime::Timeframe});
Expand All @@ -275,7 +281,7 @@ void DataRequest::requestTPCClusters(bool mc)
}
if (requestMap.find("trackTPC") != requestMap.end()) {
addInput({"clusTPCshmap", "TPC", "CLSHAREDMAP", 0, Lifetime::Timeframe});
addInput({"clusTPCoccmap", "TPC", "TPCOCCUPANCYMAP", 0, Lifetime::Timeframe});
requestTPCOccMap();
}
if (mc) {
addInput({"clusTPCMC", ConcreteDataTypeMatcher{"TPC", "CLNATIVEMCLBL"}, Lifetime::Timeframe});
Expand Down Expand Up @@ -704,10 +710,17 @@ void RecoContainer::collectData(ProcessingContext& pc, const DataRequest& reques
addMFTClusters(pc, req->second);
}

req = reqMap.find("TPCOcc");
bool TPCOccDone = false;
if (req != reqMap.end()) {
TPCOccDone = true;
addTPCOccMap(pc);
}

req = reqMap.find("clusTPC");
if (req != reqMap.end()) {
auto tracksON = reqMap.find("trackTPC") != reqMap.end();
addTPCClusters(pc, req->second, tracksON, tracksON);
addTPCClusters(pc, req->second, tracksON, tracksON && (!TPCOccDone));
}

req = reqMap.find("trigTPC");
Expand Down Expand Up @@ -1100,6 +1113,12 @@ void RecoContainer::addMFTClusters(ProcessingContext& pc, bool mc)
}
}

//__________________________________________________________
void RecoContainer::addTPCOccMap(ProcessingContext& pc)
{
occupancyMapTPC = pc.inputs().get<gsl::span<unsigned int>>("clusTPCoccmap");
}

//__________________________________________________________
void RecoContainer::addTPCClusters(ProcessingContext& pc, bool mc, bool shmap, bool occmap)
{
Expand Down
4 changes: 1 addition & 3 deletions Detectors/GLOQC/src/MatchITSTPCQC.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,15 +470,14 @@ void MatchITSTPCQC::initDataRequest()
if (mDoK0QC) {
mDataRequest->requestPrimaryVertices(mUseMC);
mDataRequest->requestSecondaryVertices(mUseMC);
mDataRequest->requestTPCClusters(false);
mDataRequest->requestTPCOccMap();
}
}

//__________________________________________________________

void MatchITSTPCQC::run(o2::framework::ProcessingContext& ctx)
{

// Getting the B field
mBz = o2::base::Propagator::Instance()->getNominalBz();

Expand Down Expand Up @@ -1058,7 +1057,6 @@ void MatchITSTPCQC::run(o2::framework::ProcessingContext& ctx)
} else {
mTBinClOcc.resize(1);
}

auto v0IDs = mRecoCont.getV0sIdx();
auto nv0 = v0IDs.size();
if (nv0 > mRecoCont.getV0s().size()) {
Expand Down