From 4134bc868544735af1fab4c70003358f67568226 Mon Sep 17 00:00:00 2001
From: Nathan Baltzell <baltzell@gmx.com>
Date: Fri, 18 Sep 2026 11:18:58 -0400
Subject: [PATCH 1/3] remove bogus total timer

---
 .../org/jlab/utils/benchmark/Benchmark.java   | 19 ++++++++-----------
 .../jlab/utils/benchmark/BenchmarkTimer.java  |  3 +++
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/common-tools/clas-utils/src/main/java/org/jlab/utils/benchmark/Benchmark.java b/common-tools/clas-utils/src/main/java/org/jlab/utils/benchmark/Benchmark.java
index 708cf988c5..7f17efab57 100644
--- a/common-tools/clas-utils/src/main/java/org/jlab/utils/benchmark/Benchmark.java
+++ b/common-tools/clas-utils/src/main/java/org/jlab/utils/benchmark/Benchmark.java
@@ -7,7 +7,6 @@
 import java.util.Timer;
 import java.util.TimerTask;
 import org.jlab.utils.benchmark.BenchmarkTimer.BenchmarkMultiTimer;
-import org.jlab.utils.benchmark.BenchmarkTimer.BenchmarkTimerTotal;
 
 /**
  *
@@ -74,13 +73,6 @@ public BenchmarkTimer getTimer(String name){
         return timerStore.getOrDefault(name, null);
     }
 
-    public BenchmarkTimer getTotal(String name) {
-        BenchmarkTimerTotal total = new BenchmarkTimerTotal(name);
-        for (BenchmarkTimer b : timerStore.values())
-            total.add(b);
-        return total;
-    }
-
     @Override
     public String toString(){
         StringBuilder s = new StringBuilder();
@@ -100,15 +92,20 @@ public String toString(){
                 s.append(b);
                 s.append("   *\n");
             }
-            s.append("*   ");
-            s.append(getTotal(""));
-            s.append("   *\n");
             s.append(margins);
             s.append("\n");
         }
         return s.toString();
     }
 
+    public String[] toCSV() {
+        return new String[]{
+            String.join(",",timerStore.keySet()) + ",TOTAL",
+            String.join(",",timerStore.values().stream().map(x -> String.valueOf(x.getMillisecondsPerCall())).toList())
+                + "," + timerStore.values().stream().mapToDouble(x -> x.getMillisecondsPerCall()).sum()
+        };
+    }
+
     public static void main(String[] args){
         Benchmark b = getInstance();
         b.printTimer(10);
diff --git a/common-tools/clas-utils/src/main/java/org/jlab/utils/benchmark/BenchmarkTimer.java b/common-tools/clas-utils/src/main/java/org/jlab/utils/benchmark/BenchmarkTimer.java
index 8092d63024..35c569a699 100644
--- a/common-tools/clas-utils/src/main/java/org/jlab/utils/benchmark/BenchmarkTimer.java
+++ b/common-tools/clas-utils/src/main/java/org/jlab/utils/benchmark/BenchmarkTimer.java
@@ -36,6 +36,7 @@ public void reset(){
         }
     }
 
+<<<<<<< HEAD
     public static class BenchmarkTimerTotal extends BenchmarkMultiTimer {
         ArrayList<BenchmarkTimer> benchmarks = new ArrayList<>();
         public BenchmarkTimerTotal(String name) { super(name); }
@@ -46,6 +47,8 @@ public void add(BenchmarkTimer b) {
         }
     }
 
+=======
+>>>>>>> a3d7828a8 (remove bogus total timer)
     private String timerName = "generic";
     private long timeAtResume = 0;
     private Boolean isPaused = true;

From d04117eca1b491126c7b52bd5e78b4798517b82d Mon Sep 17 00:00:00 2001
From: Nathan Baltzell <baltzell@gmx.com>
Date: Fri, 18 Sep 2026 11:23:39 -0400
Subject: [PATCH 2/3] fix merge mistake

---
 .../jlab/utils/benchmark/BenchmarkTimer.java    | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/common-tools/clas-utils/src/main/java/org/jlab/utils/benchmark/BenchmarkTimer.java b/common-tools/clas-utils/src/main/java/org/jlab/utils/benchmark/BenchmarkTimer.java
index 35c569a699..6fbb19be2c 100644
--- a/common-tools/clas-utils/src/main/java/org/jlab/utils/benchmark/BenchmarkTimer.java
+++ b/common-tools/clas-utils/src/main/java/org/jlab/utils/benchmark/BenchmarkTimer.java
@@ -36,19 +36,6 @@ public void reset(){
         }
     }
 
-<<<<<<< HEAD
-    public static class BenchmarkTimerTotal extends BenchmarkMultiTimer {
-        ArrayList<BenchmarkTimer> benchmarks = new ArrayList<>();
-        public BenchmarkTimerTotal(String name) { super(name); }
-        public void add(BenchmarkTimer b) {
-            benchmarks.add(b);
-            totalTime.addAndGet(b.totalTime.get());
-            numberOfCalls.addAndGet(b.numberOfCalls.get());
-        }
-    }
-
-=======
->>>>>>> a3d7828a8 (remove bogus total timer)
     private String timerName = "generic";
     private long timeAtResume = 0;
     private Boolean isPaused = true;
@@ -99,10 +86,10 @@ public double getSeconds(){
     @Override
     public String toString() {
         return String.format("%-15s : #Calls %12d, Total = %12.2f sec, Unit = %12.3f msec",
-            getName(), numberOfCalls.get(), getSeconds(), getTimePerCall());
+            getName(), numberOfCalls.get(), getSeconds(), getMillisecondsPerCall());
     }
 
-    public double getTimePerCall() {
+    public double getMillisecondsPerCall() {
         return numberOfCalls.get() > 0 ? getMilliseconds() / numberOfCalls.get() : 0;
     }
 }

From fad6c3fc90f4e36a7b2ae856af54c249d47f90bc Mon Sep 17 00:00:00 2001
From: Christopher Dilks <c-dilks@users.noreply.github.com>
Date: Fri, 18 Sep 2026 14:54:43 -0400
Subject: [PATCH 3/3] ci: re-trigger