Skip to content

[cmsShow] Fix crash on load of configuration in release CMSSW_20_X #51282

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

Open
alja wants to merge 1 commit into
base: master
Choose a base branch
from
+31 −1
Open

[cmsShow] Fix crash on load of configuration in release CMSSW_20_X #51282

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 31 additions & 1 deletion Fireworks/Core/src/FWEventItemsManager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,34 @@ void FWEventItemsManager::addTo(FWConfiguration& iTo) const {
}
}


namespace {
std::string addIoV1Namespace(std::string type)
{
const std::string reco = "reco::";
const std::string io_v1 = "io_v1::";

size_t pos = 0;
while ((pos = type.find(reco, pos)) != std::string::npos) {

// Skip if already reco::io_v1::
if (type.compare(pos + reco.size(),
io_v1.size(),
io_v1) != 0)
{
type.insert(pos + reco.size(), io_v1);
pos += reco.size() + io_v1.size();
}
else {
pos += reco.size() + io_v1.size();
}
}

return type;
}
}


/** This is responsible for resetting the status of items from configuration
*/
void FWEventItemsManager::setFrom(const FWConfiguration& iFrom) {
Expand Down Expand Up @@ -235,6 +263,8 @@ void FWEventItemsManager::setFrom(const FWConfiguration& iFrom) {

unsigned int layer = strtol((*keyValues)[7].second.value().c_str(), nullptr, 10);

std::string cr_type = addIoV1Namespace(type);

//For older configs assume name is the same as purpose
std::string purpose(name);
if (conf.version() > 1)
Expand All @@ -256,7 +286,7 @@ void FWEventItemsManager::setFrom(const FWConfiguration& iFrom) {
}

FWPhysicsObjectDesc desc(name,
TClass::GetClass(type.c_str()),
TClass::GetClass(cr_type.c_str()),
purpose,
dp,
moduleLabel,
Expand Down