Merge pull request #46635 from iarspider/root-compression-move

Replace deprecated constants for compression level

Author: cmsbuild

IOPool/Output/src/RootOutputFile.cc

@@ -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"

PhysicsTools/NanoAOD/plugins/NanoAODOutputModule.cc

@@ -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"

PhysicsTools/NanoAOD/plugins/rntuple/NanoAODRNTupleOutputModule.cc

@@ -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"

PhysicsTools/NanoAODTools/python/postprocessing/framework/postprocessor.py

@@ -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: