fix: unify the loggers (#951)

* refactor!: remove `DefaultLogger`

* feat: propagate log level of `OptionParser` to its owner's class instances

* refactor: rename and document

* fix: sync levels for all classes in `postprocess`

* fix: just apply the level to all new `SplitLogger`s

* fix: syncing

* fix: depana

* doc: singleton

Author: c-dilks

common-tools/clas-analysis/src/main/java/org/jlab/analysis/eventmerger/EventMerger.java

@@ -15,7 +15,6 @@
 import org.jlab.io.hipo.HipoDataSource;
 import org.jlab.io.hipo.HipoDataSync;
 import org.jlab.jnp.hipo4.data.SchemaFactory;
-import org.jlab.logging.DefaultLogger;
 import org.jlab.utils.benchmark.ProgressPrintout;
 import org.jlab.utils.options.OptionParser;
 import org.jlab.utils.system.ClasUtilsFile;
@@ -346,8 +345,6 @@ private boolean mergeEvents(DataEvent event, int scale) {
 
     public static void main(String[] args)  {
 
-        DefaultLogger.debug();
-
         OptionParser parser = new OptionParser("bg-merger");
         parser.addRequired("-o"    ,"merged file");
         parser.addRequired("-i"    ,"signal event file");
@@ -418,4 +415,4 @@ public static void main(String[] args)  {
 
     }
 
-}
+}

common-tools/clas-analysis/src/main/java/org/jlab/analysis/eventmerger/RandomTriggerFilter.java

@@ -6,7 +6,6 @@
 import org.jlab.jnp.hipo4.io.HipoReader;
 import org.jlab.jnp.hipo4.io.HipoWriterSorted;
 import org.jlab.jnp.utils.json.JsonObject;
-import org.jlab.logging.DefaultLogger;
 import org.jlab.utils.benchmark.ProgressPrintout;
 import org.jlab.utils.options.OptionParser;
 import org.jlab.utils.system.ClasUtilsFile;
@@ -141,8 +140,6 @@ public static long readTriggerMask(String mask) {
 
     public static void main(String[] args){
 
-        DefaultLogger.debug();
-
         OptionParser parser = new OptionParser("trigger-filter");
         parser.addRequired("-o"    ,"output file");
         parser.addRequired("-b"    ,"trigger bit mask (e.g. 0x0000008000000000 to select the FC trigger");

common-tools/clas-analysis/src/main/java/org/jlab/analysis/eventmerger/RandomTriggerSplit.java

@@ -3,7 +3,6 @@
 import org.jlab.jnp.hipo4.data.*;
 import org.jlab.jnp.hipo4.io.HipoReader;
 import org.jlab.jnp.hipo4.io.HipoWriterSorted;
-import org.jlab.logging.DefaultLogger;
 import org.jlab.utils.benchmark.ProgressPrintout;
 import org.jlab.utils.options.OptionParser;
 import org.jlab.utils.system.ClasUtilsFile;
@@ -37,8 +36,6 @@ private HipoWriterSorted openOutputFile(String outputfile){
 
     public static void main(String[] args){
 
-        DefaultLogger.debug();
-
         OptionParser parser = new OptionParser("trigger-splitter");
         parser.addOption("-o"    ,"",   "output file prefix");
         parser.addOption("-n"    ,"-1", "maximum number of events to process");

common-tools/clas-analysis/src/main/java/org/jlab/analysis/postprocess/Processor.java

@@ -8,7 +8,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.jlab.logging.DefaultLogger;
 
 import org.jlab.jnp.hipo4.data.Bank;
 import org.jlab.jnp.hipo4.data.Event;
@@ -223,7 +222,6 @@ private static void replace(Map<String,String> files) {
     }
 
     public static void main(String args[]) {
-        DefaultLogger.debug();
         Processor p = new Processor(System.getenv("HOME")+"/tmp","r*.hipo",false,false);
     }
 

common-tools/clas-analysis/src/main/java/org/jlab/analysis/postprocess/Tag1ToEvent.java

@@ -36,13 +36,12 @@ public class Tag1ToEvent {
     public static void main(String[] args) {
 
         OptionParser parser = new OptionParser("postprocess");
-        parser.useExternalLogger(); // necessary, since we have `LOGGER` here
         parser.addOption("-q","0","do beam charge and livetime (0/1=false/true)");
         parser.addOption("-d","0","do delayed helicity (0/1=false/true)");
         parser.addOption("-f","0","rebuild the HEL::flip banks (0/1=false/true)");
         parser.addRequired("-o","output.hipo");
         parser.parse(args);
-        SplitLogger.configureLevel(LOGGER, parser.getLogLevel());
+        parser.syncLogLevel(LOGGER);
         if (parser.getInputList().isEmpty()) {
             parser.printUsage();
             LOGGER.severe("No input file(s) specified.");

common-tools/clas-analysis/src/main/java/org/jlab/analysis/roads/DictionaryCreator.java

@@ -7,7 +7,6 @@
 import java.util.List;
 import org.jlab.io.base.DataEvent;
 import org.jlab.io.hipo.HipoDataSource;
-import org.jlab.logging.DefaultLogger;
 import org.jlab.utils.benchmark.ProgressPrintout;
 
 import org.jlab.utils.options.OptionParser;
@@ -69,8 +68,6 @@ public void createDictionary(String inputFileName, String dictName, int maxEvent
 
 
     public static void main(String[] args) {
-        
-        DefaultLogger.debug();
 
         OptionParser parser = new OptionParser("dict-maker");
         parser.setRequiresInputList(false);
@@ -130,4 +127,4 @@ public static void main(String[] args) {
     }
 
 
-}
+}

common-tools/clas-analysis/src/main/java/org/jlab/analysis/roads/DictionaryGenerator.java

@@ -24,7 +24,6 @@
 import org.jlab.geom.prim.Path3D;
 import org.jlab.geom.prim.Point3D;
 import org.jlab.geometry.prim.Line3d;
-import org.jlab.logging.DefaultLogger;
 import org.jlab.utils.benchmark.ProgressPrintout;
 import org.jlab.utils.options.OptionParser;
 
@@ -339,8 +338,6 @@ private int swimtoLayer(int sector, int l, int sl, Swim sw) {
 
     public static void main(String[] args) {
 
-        DefaultLogger.debug();
-
         OptionParser parser = new OptionParser("dict-generator");
         parser.setRequiresInputList(false);
         parser.addRequired("-torus",   "torus scale");

common-tools/clas-analysis/src/main/java/org/jlab/analysis/roads/DictionaryMerger.java

@@ -7,7 +7,6 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.List;
-import org.jlab.logging.DefaultLogger;
 import org.jlab.utils.benchmark.ProgressPrintout;
 import org.jlab.utils.options.OptionParser;
 
@@ -30,8 +29,6 @@ public boolean init() {
 
 
     public static void main(String[] args) {
-        
-        DefaultLogger.debug();
 
         OptionParser parser = new OptionParser("dict-merger");
         parser.addOption("-o","output.txt", "output dictionary file");
@@ -104,4 +101,4 @@ public static void main(String[] args) {
     }
 
 
-}
+}

common-tools/clas-analysis/src/main/java/org/jlab/analysis/roads/DictionaryValidator.java

@@ -16,7 +16,6 @@
 import org.jlab.groot.group.DataGroup;
 import org.jlab.io.base.DataEvent;
 import org.jlab.io.hipo.HipoDataSource;
-import org.jlab.logging.DefaultLogger;
 import org.jlab.utils.benchmark.ProgressPrintout;
 
 import org.jlab.utils.options.OptionParser;
@@ -303,8 +302,6 @@ public void processFile(String fileName, int wireBin, int pcalBin, int sectorDep
 
 
     public static void main(String[] args) {
-        
-        DefaultLogger.debug();
 
         OptionParser parser = new OptionParser("dict-validator");
         parser.setRequiresInputList(false);
@@ -401,4 +398,4 @@ public static void main(String[] args) {
     }
 
 
-}
+}

common-tools/clas-decay-tools/pom.xml

@@ -45,11 +45,6 @@
       <artifactId>clas-reco</artifactId>
       <version>13.4.1-SNAPSHOT</version>
     </dependency>
-    <dependency>
-      <groupId>org.jlab.clas</groupId>
-      <artifactId>clas-logging</artifactId>
-      <version>13.4.1-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-utils</artifactId>