Skip to content

Replace deprecated constants for compression level #46635

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 2 commits into from
Nov 11, 2024
Merged

Replace deprecated constants for compression level #46635

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
2453221
Replace deprecated constants for compression level
iarspider Nov 8, 2024
c0970db
Update postprocessor.py
iarspider Nov 10, 2024
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
8 changes: 4 additions & 4 deletions IOPool/Output/src/RootOutputFile.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,13 +125,13 @@ namespace edm {
}

if (om_->compressionAlgorithm() == std::string("ZLIB")) {
filePtr_->SetCompressionAlgorithm(ROOT::kZLIB);
filePtr_->SetCompressionAlgorithm(ROOT::RCompressionSetting::EAlgorithm::kZLIB);
} else if (om_->compressionAlgorithm() == std::string("LZMA")) {
filePtr_->SetCompressionAlgorithm(ROOT::kLZMA);
filePtr_->SetCompressionAlgorithm(ROOT::RCompressionSetting::EAlgorithm::kLZMA);
} else if (om_->compressionAlgorithm() == std::string("ZSTD")) {
filePtr_->SetCompressionAlgorithm(ROOT::kZSTD);
filePtr_->SetCompressionAlgorithm(ROOT::RCompressionSetting::EAlgorithm::kZSTD);
} else if (om_->compressionAlgorithm() == std::string("LZ4")) {
filePtr_->SetCompressionAlgorithm(ROOT::kLZ4);
filePtr_->SetCompressionAlgorithm(ROOT::RCompressionSetting::EAlgorithm::kLZ4);
} else {
throw Exception(errors::Configuration)
<< "PoolOutputModule configured with unknown compression algorithm '" << om_->compressionAlgorithm() << "'\n"
Expand Down
8 changes: 4 additions & 4 deletions PhysicsTools/NanoAOD/plugins/NanoAODOutputModule.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,13 +299,13 @@ void NanoAODOutputModule::openFile(edm::FileBlock const&) {
std::vector<std::string>());

if (m_compressionAlgorithm == std::string("ZLIB")) {
m_file->SetCompressionAlgorithm(ROOT::kZLIB);
m_file->SetCompressionAlgorithm(ROOT::RCompressionSetting::EAlgorithm::kZLIB);
} else if (m_compressionAlgorithm == std::string("LZMA")) {
m_file->SetCompressionAlgorithm(ROOT::kLZMA);
m_file->SetCompressionAlgorithm(ROOT::RCompressionSetting::EAlgorithm::kLZMA);
} else if (m_compressionAlgorithm == std::string("ZSTD")) {
m_file->SetCompressionAlgorithm(ROOT::kZSTD);
m_file->SetCompressionAlgorithm(ROOT::RCompressionSetting::EAlgorithm::kZSTD);
} else if (m_compressionAlgorithm == std::string("LZ4")) {
m_file->SetCompressionAlgorithm(ROOT::kLZ4);
m_file->SetCompressionAlgorithm(ROOT::RCompressionSetting::EAlgorithm::kLZ4);
} else {
throw cms::Exception("Configuration")
<< "NanoAODOutputModule configured with unknown compression algorithm '" << m_compressionAlgorithm << "'\n"
Expand Down
4 changes: 2 additions & 2 deletions PhysicsTools/NanoAOD/plugins/rntuple/NanoAODRNTupleOutputModule.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,9 @@ void NanoAODRNTupleOutputModule::openFile(edm::FileBlock const&) {
std::vector<std::string>());

if (m_compressionAlgorithm == "ZLIB") {
m_file->SetCompressionAlgorithm(ROOT::kZLIB);
m_file->SetCompressionAlgorithm(ROOT::RCompressionSetting::EAlgorithm::kZLIB);
} else if (m_compressionAlgorithm == "LZMA") {
m_file->SetCompressionAlgorithm(ROOT::kLZMA);
m_file->SetCompressionAlgorithm(ROOT::RCompressionSetting::EAlgorithm::kLZMA);
} else {
throw cms::Exception("Configuration")
<< "NanoAODOutputModule configured with unknown compression algorithm '" << m_compressionAlgorithm << "'\n"
Expand Down
6 changes: 3 additions & 3 deletions PhysicsTools/NanoAODTools/python/postprocessing/framework/postprocessor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,11 @@ def run(self):
(algo, level) = self.compression.split(":")
compressionLevel = int(level)
if algo == "LZMA":
compressionAlgo = ROOT.ROOT.kLZMA
compressionAlgo = ROOT.RCompressionSetting.EAlgorithm.kLZMA
elif algo == "ZLIB":
compressionAlgo = ROOT.ROOT.kZLIB
compressionAlgo = ROOT.RCompressionSetting.EAlgorithm.kZLIB
elif algo == "LZ4":
compressionAlgo = ROOT.ROOT.kLZ4
compressionAlgo = ROOT.RCompressionSetting.EAlgorithm.kLZ4
else:
raise RuntimeError("Unsupported compression %s" % algo)
else:
Expand Down