Merger: add ability to configure compression level

Author: ktf

Framework/AODMerger/src/aodMerger.cxx

@@ -39,6 +39,7 @@ int main(int argc, char* argv[])
   bool skipParentFilesList = false;
   int verbosity = 2;
   int exitCode = 0; // 0: success, >0: failure
+  int compression = 505;
 
   int option_index = 0;
   static struct option long_options[] = {
@@ -47,8 +48,9 @@ int main(int argc, char* argv[])
     {"max-size", required_argument, nullptr, 2},
     {"skip-non-existing-files", no_argument, nullptr, 3},
     {"skip-parent-files-list", no_argument, nullptr, 4},
-    {"verbosity", required_argument, nullptr, 5},
-    {"help", no_argument, nullptr, 6},
+    {"compression", no_argument, nullptr, 5},
+    {"verbosity", required_argument, nullptr, 'v'},
+    {"help", no_argument, nullptr, 'h'},
     {nullptr, 0, nullptr, 0}};
 
   while (true) {
@@ -66,14 +68,17 @@ int main(int argc, char* argv[])
     } else if (c == 4) {
       skipParentFilesList = true;
     } else if (c == 5) {
+      compression = atoi(optarg);
+    } else if (c == 'v') {
       verbosity = atoi(optarg);
-    } else if (c == 6) {
+    } else if (c == 'h') {
       printf("AO2D merging tool. Options: \n");
       printf("  --input <inputfile.txt>      Contains path to files to be merged. Default: %s\n", inputCollection.c_str());
       printf("  --output <outputfile.root>   Target output ROOT file. Default: %s\n", outputFileName.c_str());
       printf("  --max-size <size in Bytes>   Target directory size. Default: %ld. Set to 0 if file is not self-contained.\n", maxDirSize);
       printf("  --skip-non-existing-files    Flag to allow skipping of non-existing files in the input list.\n");
       printf("  --skip-parent-files-list     Flag to allow skipping the merging of the parent files list.\n");
+      printf("  --compression <root compression id>  Compression algorithm / level to use (default: %d)\n", compression);
       printf("  --verbosity <flag>           Verbosity of output (default: %d).\n", verbosity);
       return -1;
     } else {
@@ -95,7 +100,7 @@ int main(int argc, char* argv[])
   std::map<std::string, int> offsets;
   std::map<std::string, int> unassignedIndexOffset;
 
-  auto outputFile = TFile::Open(outputFileName.c_str(), "RECREATE", "", 505);
+  auto outputFile = TFile::Open(outputFileName.c_str(), "RECREATE", "", compression);
   TDirectory* outputDir = nullptr;
   long currentDirSize = 0;
 

Framework/AODMerger/src/aodStrainer.cxx

@@ -39,6 +39,7 @@ int main(int argc, char* argv[])
   double downsampling = 1.0;
   int verbosity = 2;
   int exitCode = 0; // 0: success, >0: failure
+  int compression = 505;
 
   std::random_device rd;  // Seed generator
   std::mt19937 gen(rd()); // Mersenne Twister generator
@@ -51,7 +52,8 @@ int main(int argc, char* argv[])
     {"verbosity", required_argument, nullptr, 2},
     {"tables", required_argument, nullptr, 3},
     {"downsampling", required_argument, nullptr, 4},
-    {"help", no_argument, nullptr, 5},
+    {"compression", required_argument, nullptr, 5},
+    {"help", no_argument, nullptr, 'h'},
     {nullptr, 0, nullptr, 0}};
 
   while (true) {
@@ -69,12 +71,15 @@ int main(int argc, char* argv[])
     } else if (c == 4) {
       downsampling = atof(optarg);
     } else if (c == 5) {
+      compression = atof(optarg);
+    } else if (c == 'h') {
       printf("AO2D strainer tool. Options: \n");
       printf("  --input <%s>      Contains path to files to be merged. Default: %s\n", inputAO2D.c_str(), inputAO2D.c_str());
       printf("  --output <%s>   Target output ROOT file. Default: %s\n", outputFileName.c_str(), outputFileName.c_str());
       printf("  --verbosity <flag>           Verbosity of output (default: %d).\n", verbosity);
       printf("  --tables <list of tables>    Comma separated list of tables (default: %s).\n", tables.c_str());
       printf("  --downsampling <downsample>  Fraction of DF to be kept (default: %f)\n", downsampling);
+      printf("  --compression <root compression id>  Compression algorithm / level to use (default: %d)\n", compression);
       return -1;
     } else {
       return -2;
@@ -95,7 +100,7 @@ int main(int argc, char* argv[])
     listOfTables.push_back(token);
   }
 
-  auto outputFile = TFile::Open(outputFileName.c_str(), "RECREATE", "", 505);
+  auto outputFile = TFile::Open(outputFileName.c_str(), "RECREATE", "", compression);
   TDirectory* outputDir = nullptr;
   TString line(inputAO2D.c_str());
   if (line.BeginsWith("alien://") && !gGrid && !TGrid::Connect("alien:")) {

Framework/AODMerger/src/aodThinner.cxx

@@ -42,6 +42,7 @@ int main(int argc, char* argv[])
   std::string outputFileName("AO2D_thinned.root");
   int exitCode = 0; // 0: success, !=0: failure
   bool bOverwrite = false;
+  int compression = 505;
 
   int option_index = 1;
 
@@ -50,6 +51,7 @@ int main(int argc, char* argv[])
     {"input", required_argument, nullptr, 'i'},
     {"output", required_argument, nullptr, 'o'},
     {"overwrite", no_argument, nullptr, 'O'},
+    {"compression", no_argument, nullptr, 'c'},
     {"help", no_argument, nullptr, 'h'},
     {nullptr, 0, nullptr, 0}};
 
@@ -69,12 +71,16 @@ int main(int argc, char* argv[])
         bOverwrite = true;
         printf("Overwriting existing output file if existing\n");
         break;
+      case 'c':
+        compression = atoi(optarg);
+        break;
       case 'h':
       case '?':
       default:
         printf("AO2D thinning tool. Options: \n");
         printf("  --input/-i <inputfile.root>     Contains input file path to the file to be thinned. Default: %s\n", inputFileName.c_str());
         printf("  --output/-o <outputfile.root>   Target output ROOT file. Default: %s\n", outputFileName.c_str());
+        printf("  --compression/-c <compression id>   ROOT compression algorithm / level. Default: %d\n", compression);
         printf("\n");
         printf("  Optional Arguments:\n");
         printf("  --overwrite/-O                  Overwrite existing output file\n");
@@ -89,7 +95,7 @@ int main(int argc, char* argv[])
   TStopwatch clock;
   clock.Start(kTRUE);
 
-  auto outputFile = TFile::Open(outputFileName.c_str(), (bOverwrite) ? "RECREATE" : "CREATE", "", 505);
+  auto outputFile = TFile::Open(outputFileName.c_str(), (bOverwrite) ? "RECREATE" : "CREATE", "", compression);
   if (outputFile == nullptr) {
     printf("Error: File %s exists or cannot be created!\n", outputFileName.c_str());
     return 1;