Skip to content

Commit

Permalink
Merge 0dc0625 into sapling-pr-archive-ktf
Browse files Browse the repository at this point in the history
  • Loading branch information
ktf authored Oct 27, 2023
2 parents 2029c42 + 0dc0625 commit 0aa01a8
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 38 deletions.
26 changes: 13 additions & 13 deletions Detectors/Raw/TFReaderDD/src/TFReaderSpec.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -465,28 +465,28 @@ o2f::DataProcessorSpec o2::rawdd::getTFReaderSpec(o2::rawdd::TFReaderInp& rinp)
rinp.hdVec.emplace_back(o2h::DataHeader{"CELLS", DetID::getDataOrigin(id), 0, 0}); // in abcence of real data this will be sent
rinp.hdVec.emplace_back(o2h::DataHeader{"CELLTRIGREC", DetID::getDataOrigin(id), 0, 0}); // in abcence of real data this will be sent
} else if (id == DetID::CPV) {
spec.outputs.emplace_back(o2f::OutputSpec{DetID::getDataOrigin(id), "DIGITS", 0});
spec.outputs.emplace_back(o2f::OutputSpec{DetID::getDataOrigin(id), "DIGITTRIGREC", 0});
spec.outputs.emplace_back(o2f::OutputSpec{DetID::getDataOrigin(id), "RAWHWERRORS", 0});
rinp.hdVec.emplace_back(o2h::DataHeader{"DIGITS", DetID::getDataOrigin(id), 0, 0}); // in abcence of real data this will be sent
rinp.hdVec.emplace_back(o2h::DataHeader{"DIGITTRIGREC", DetID::getDataOrigin(id), 0, 0}); // in abcence of real data this will be sent
rinp.hdVec.emplace_back(o2h::DataHeader{"RAWHWERRORS", DetID::getDataOrigin(id), 0, 0}); // in abcence of real data this will be sent
spec.outputs.emplace_back(DetID::getDataOrigin(id), "DIGITS", 0);
spec.outputs.emplace_back(DetID::getDataOrigin(id), "DIGITTRIGREC", 0);
spec.outputs.emplace_back(DetID::getDataOrigin(id), "RAWHWERRORS", 0);
rinp.hdVec.emplace_back("DIGITS", DetID::getDataOrigin(id), 0, 0); // in abcence of real data this will be sent
rinp.hdVec.emplace_back("DIGITTRIGREC", DetID::getDataOrigin(id), 0, 0); // in abcence of real data this will be sent
rinp.hdVec.emplace_back("RAWHWERRORS", DetID::getDataOrigin(id), 0, 0); // in abcence of real data this will be sent
} else if (id == DetID::EMC) {
spec.outputs.emplace_back(o2f::OutputSpec{o2f::ConcreteDataTypeMatcher{DetID::getDataOrigin(id), "CELLS"}});
spec.outputs.emplace_back(o2f::OutputSpec{o2f::ConcreteDataTypeMatcher{DetID::getDataOrigin(id), "CELLSTRGR"}});
spec.outputs.emplace_back(o2f::OutputSpec{o2f::ConcreteDataTypeMatcher{DetID::getDataOrigin(id), "DECODERERR"}});
rinp.hdVec.emplace_back(o2h::DataHeader{"CELLS", DetID::getDataOrigin(id), 0, 0}); // in abcence of real data this will be sent
rinp.hdVec.emplace_back(o2h::DataHeader{"CELLSTRGR", DetID::getDataOrigin(id), 0, 0}); // in abcence of real data this will be sent
rinp.hdVec.emplace_back(o2h::DataHeader{"DECODERERR", DetID::getDataOrigin(id), 0, 0}); // in abcence of real data this will be sent
rinp.hdVec.emplace_back("CELLS", DetID::getDataOrigin(id), 0, 0); // in abcence of real data this will be sent
rinp.hdVec.emplace_back("CELLSTRGR", DetID::getDataOrigin(id), 0, 0); // in abcence of real data this will be sent
rinp.hdVec.emplace_back("DECODERERR", DetID::getDataOrigin(id), 0, 0); // in abcence of real data this will be sent
} else if (id == DetID::FOC) {
spec.outputs.emplace_back(o2f::OutputSpec{o2f::ConcreteDataTypeMatcher{DetID::getDataOrigin(id), "PADLAYERS"}});
spec.outputs.emplace_back(o2f::OutputSpec{o2f::ConcreteDataTypeMatcher{DetID::getDataOrigin(id), "PIXELHITS"}});
spec.outputs.emplace_back(o2f::OutputSpec{o2f::ConcreteDataTypeMatcher{DetID::getDataOrigin(id), "PIXELCHIPS"}});
spec.outputs.emplace_back(o2f::OutputSpec{o2f::ConcreteDataTypeMatcher{DetID::getDataOrigin(id), "TRIGGERS"}});
rinp.hdVec.emplace_back(o2h::DataHeader{"PADLAYERS", DetID::getDataOrigin(id), 0, 0}); // in abcence of real data this will be sent
rinp.hdVec.emplace_back(o2h::DataHeader{"PIXELHITS", DetID::getDataOrigin(id), 0, 0}); // in abcence of real data this will be sent
rinp.hdVec.emplace_back(o2h::DataHeader{"PIXELCHIPS", DetID::getDataOrigin(id), 0, 0}); // in abcence of real data this will be sent
rinp.hdVec.emplace_back(o2h::DataHeader{"TRIGGERS", DetID::getDataOrigin(id), 0, 0}); // in abcence of real data this will be sent
rinp.hdVec.emplace_back("PADLAYERS", DetID::getDataOrigin(id), 0, 0); // in abcence of real data this will be sent
rinp.hdVec.emplace_back("PIXELHITS", DetID::getDataOrigin(id), 0, 0); // in abcence of real data this will be sent
rinp.hdVec.emplace_back("PIXELCHIPS", DetID::getDataOrigin(id), 0, 0); // in abcence of real data this will be sent
rinp.hdVec.emplace_back("TRIGGERS", DetID::getDataOrigin(id), 0, 0); // in abcence of real data this will be sent
}
}
}
Expand Down
1 change: 1 addition & 0 deletions Detectors/gconfig/g4config.in
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
/mcPhysics/emModel/setEmModel PAI
/mcPhysics/emModel/setRegions TRD_Gas-mix
/mcPhysics/emModel/setParticles all
/mcPrimaryGenerator/skipUnknownParticles true # don't crash when seeing unknown ion etc. (issue warning)

#
# Precise Msc for EMCAL
Expand Down
21 changes: 0 additions & 21 deletions Framework/AnalysisSupport/src/DataInputDirector.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -710,27 +710,6 @@ DataInputDescriptor* DataInputDirector::getDataInputDescriptor(header::DataHeade
return result;
}

std::unique_ptr<TTreeReader> DataInputDirector::getTreeReader(header::DataHeader dh, int counter, int numTF, std::string treename)
{
std::unique_ptr<TTreeReader> reader = nullptr;
auto didesc = getDataInputDescriptor(dh);
// if NOT match then use defaultDataInputDescriptor
if (!didesc) {
didesc = mdefaultDataInputDescriptor;
}

auto fileAndFolder = didesc->getFileFolder(counter, numTF);
if (fileAndFolder.file) {
treename = fileAndFolder.folderName + "/" + treename;
reader = std::make_unique<TTreeReader>(treename.c_str(), fileAndFolder.file);
if (!reader) {
throw std::runtime_error(fmt::format(R"(Couldn't create TTreeReader for tree "{}" in file "{}")", treename, fileAndFolder.file->GetName()));
}
}

return reader;
}

FileAndFolder DataInputDirector::getFileFolder(header::DataHeader dh, int counter, int numTF)
{
auto didesc = getDataInputDescriptor(dh);
Expand Down
1 change: 0 additions & 1 deletion Framework/AnalysisSupport/src/DataInputDirector.h
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ class DataInputDirector
DataInputDescriptor* getDataInputDescriptor(header::DataHeader dh);
int getNumberInputDescriptors() { return mdataInputDescriptors.size(); }

std::unique_ptr<TTreeReader> getTreeReader(header::DataHeader dh, int counter, int numTF, std::string treeName);
bool readTree(DataAllocator& outputs, header::DataHeader dh, int counter, int numTF, size_t& totalSizeCompressed, size_t& totalSizeUncompressed);
uint64_t getTimeFrameNumber(header::DataHeader dh, int counter, int numTF);
FileAndFolder getFileFolder(header::DataHeader dh, int counter, int numTF);
Expand Down
4 changes: 2 additions & 2 deletions Framework/Core/src/DataProcessingStates.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ void DataProcessingStates::updateState(CommandSpec cmd)
// Add a static mutex to protect the queue
// Get the next available operation in an atomic way.
int size = sizeof(CommandHeader) + cmd.size;
if (size > 8192) {
throw runtime_error_f("State size is %d for state %s. States larger than 8192 bytes not supported for now.",
if (size > 16384) {
throw runtime_error_f("State size is %d for state %s. States larger than 16384 bytes not supported for now.",
size, stateSpecs[cmd.id].name.c_str());
}
int idx = nextState.fetch_sub(size, std::memory_order_relaxed);
Expand Down
2 changes: 1 addition & 1 deletion dependencies/O2Dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ set_package_properties(Microsoft.GSL
TYPE REQUIRED
PURPOSE "Mainly for its span")

find_package(FairMQ 1.4.41 CONFIG)
find_package(FairMQ CONFIG)
set_package_properties(FairMQ PROPERTIES TYPE REQUIRED)

# find_package(protobuf CONFIG)
Expand Down

0 comments on commit 0aa01a8

Please sign in to comment.