Skip to content

Fix needed for change in root io protocol root-project/root#22744 #51432

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
cmsbuild merged 1 commit into from
Jul 8, 2026
+20 −8
Merged

Fix needed for change in root io protocol root-project/root#22744 #51432

Show file tree
Hide file tree
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
10 changes: 6 additions & 4 deletions FWStorage/TFileAdaptor/src/TFileAdaptor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,10 +192,12 @@ TFileAdaptor::TFileAdaptor(edm::ParameterSet const& pset, edm::ActivityRegistry&
addType(mgr, "^dcap:");
if (!native("gsidcap"))
addType(mgr, "^gsidcap:");
if (!native("root"))
addType(mgr, "^root:", 1); // See comments in addType
if (!native("root"))
addType(mgr, "^[x]?root:", 1); // See comments in addType
if (!native("root")) {
// See comments in addType
addType(mgr, "^root:", 1);
addType(mgr, "^[x]?root:", 1);
addType(mgr, "^[x]?root[s]?:", 1);
}

// Make sure the TStorageFactoryFile can be loaded regardless of the header auto-parsing setting
{
Expand Down
18 changes: 14 additions & 4 deletions FWStorage/TFileAdaptor/test/tfileTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,18 @@

int main(int argc, char* argv[]) {
// This list should replicate the addHandler calls in TFileAdaptor
std::array<char const*, 10> const protocols = {
{"^file:", "^http:", "^http[s]?:", "^ftp:", "^web:", "^dcache:", "^dcap:", "^gsidcap:", "^root:", "^[x]?root:"}};
std::array<char const*, 10> const uris{{"file:foo",
std::array<char const*, 11> const protocols = {{"^file:",
"^http:",
"^http[s]?:",
"^ftp:",
"^web:",
"^dcache:",
"^dcap:",
"^gsidcap:",
"^root:",
"^[x]?root:",
"^[x]?root[s]?:"}};
std::array<char const*, 11> const uris{{"file:foo",
"http://foo",
"https://foo",
"ftp://foo",
Expand All @@ -29,7 +38,8 @@ int main(int argc, char* argv[]) {
"dcap://foo",
"gsidcap://foo",
"root://foo",
"xroot://foo"}};
"xroot://foo",
"xroots://foo"}};

char const* tStorageFactoryFileFunc = "TStorageFactoryFile(char const*, Option_t*, char const*, Int_t)";
char const* tStorageFactoryFileFuncNet =
Expand Down