[hadd] change default verbosity from 99 to 2

Author: silverweed

main/src/hadd.cxx

@@ -174,7 +174,8 @@
 // gHaddVerbosity = 1: only print hadd errors + warnings
 // gHaddVerbosity = 2: print hadd errors + warnings and TFileMerger messages
 // gHaddVerbosity > 2: print all hadd and TFileMerger messages.
-static int gHaddVerbosity = 2;
+static constexpr int kDefaultHaddVerbosity = 2;
+static int gHaddVerbosity = kDefaultHaddVerbosity;
 
 namespace {
 
@@ -571,7 +572,7 @@ static std::optional<HAddArgs> ParseArgs(int argc, char **argv)
          PARSE_FLAG(FlagArg, argc, argv, argIdx, "cachesize", args.fCacheSize, {}, ConvertCacheSize);
          PARSE_FLAG(FlagArg, argc, argv, argIdx, "experimental-io-features", args.fFeatures);
          PARSE_FLAG(FlagArg, argc, argv, argIdx, "n", args.fMaxOpenedFiles);
-         PARSE_FLAG(FlagArg, argc, argv, argIdx, "v", args.fVerbosity, {99});
+         PARSE_FLAG(FlagArg, argc, argv, argIdx, "v", args.fVerbosity, {kDefaultHaddVerbosity});
          PARSE_FLAG(FlagF, arg, args);
 
 #undef PARSE_FLAG
@@ -664,7 +665,7 @@ int main(int argc, char **argv)
 
    ROOT::TIOFeatures features = args.fFeatures.value_or(ROOT::TIOFeatures{});
    Int_t maxopenedfiles = args.fMaxOpenedFiles.value_or(0);
-   gHaddVerbosity = args.fVerbosity.value_or(99);
+   gHaddVerbosity = args.fVerbosity.value_or(kDefaultHaddVerbosity);
    Int_t newcomp = args.fCompressionSettings.value_or(-1);
    TString cacheSize = args.fCacheSize.value_or("");
 
@@ -682,7 +683,7 @@ int main(int argc, char **argv)
       nProcesses = s.fCpus;
    }
    if (multiproc)
-      Info(3) << "parallelizing  with " << nProcesses << " processes.\n";
+      Info(2) << "parallelizing  with " << nProcesses << " processes.\n";
 
    // If the user specified a workingDir, use that. Otherwise, default to the system temp dir.
    std::string workingDir;
@@ -715,7 +716,7 @@ int main(int argc, char **argv)
    Info(2) << "target file: " << targetname << "\n";
 
    if (args.fCacheSize)
-      Info(3) << "Using " << cacheSize << "\n";
+      Info(2) << "Using " << cacheSize << "\n";
 
    ////////////////////////////// end flags processing /////////////////////////////////
 

roottest/root/io/evolution/versions/attmarker.ref

@@ -5,4 +5,3 @@ hadd Source file 2: hsimple20.root
 Warning in <hadd>: Sources and Target have different compression settings
 hadd merging will be slower
 hadd Target path: result.root:/
-Info in <hadd>: merged 2 (2) input (partial) files into result.root

roottest/root/io/hadd/hadd_args_cachesize.ref

@@ -3,4 +3,3 @@ Info in <hadd>: Using cachesize=100M
 Info in <hadd>: compression setting for all output: 101
 hadd Source file 1: hadd_args_in.root
 hadd Target path: hadd_args_cachesize_out.root:/
-Info in <hadd>: merged 1 (1) input (partial) files into hadd_args_cachesize_out.root

roottest/root/io/hadd/hadd_args_ff_dbg_j_2.ref

@@ -5,4 +5,3 @@ Info in <hadd>: each process should handle at least 3 files for efficiency. Sett
 hadd Source file 1: hadd_args_in.root
 hadd Source file 2: hadd_args_in.root
 hadd Target path: hadd_args_ff_dbg_j_2_out.root:/
-Info in <hadd>: merged 2 (2) input (partial) files into hadd_args_ff_dbg_j_2_out.root

roottest/root/io/hadd/hadd_args_minusminus.ref

@@ -4,4 +4,3 @@ hadd Source file 1: hadd_args_in.root
 Warning in <hadd>: Sources and Target have different compression settings
 hadd merging will be slower
 hadd Target path: --hadd_args_out.root:/
-Info in <hadd>: merged 1 (1) input (partial) files into --hadd_args_out.root

roottest/root/io/hadd/hadd_args_n0.ref

@@ -2,4 +2,3 @@ Info in <hadd>: target file: hadd_args_n0_out.root
 Info in <hadd>: compression setting for all output: 101
 hadd Source file 1: hadd_args_in.root
 hadd Target path: hadd_args_n0_out.root:/
-Info in <hadd>: merged 1 (1) input (partial) files into hadd_args_n0_out.root

roottest/root/io/hadd/hadd_args_n_1.ref

@@ -2,4 +2,3 @@ Info in <hadd>: target file: hadd_args_n_1_out.root
 Info in <hadd>: compression setting for all output: 101
 hadd Source file 1: hadd_args_in.root
 hadd Target path: hadd_args_n_1_out.root:/
-Info in <hadd>: merged 1 (1) input (partial) files into hadd_args_n_1_out.root

roottest/root/io/newstl/emulatedWrite.ref

@@ -17,4 +17,3 @@ Warning in <TClass::Init>: no dictionary for class CaloJet is available
 Warning in <TClass::Init>: no dictionary for class edm::EDCollection<CaloJet> is available
 hadd Source file 2: cmsJets_1.root
 hadd Target path: result.root:/
-Info in <hadd>: merged 2 (2) input (partial) files into result.root

roottest/root/io/transient/base/hadd_autoloadZLIB.ref

@@ -3,4 +3,3 @@ Info in <hadd>: compression setting for all output: 101
 hadd Source file 1: data1.root
 hadd Source file 2: data2.root
 hadd Target path: data_merge.root:/
-Info in <hadd>: merged 2 (2) input (partial) files into data_merge.root