From de53f813adf6197da35aaaaa0dce892c1cb32c67 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Mon, 6 Jan 2025 15:10:42 -0500 Subject: [PATCH 1/3] show undefined efficiency --- .../src/main/java/org/jlab/analysis/efficiency/Truth.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common-tools/clas-analysis/src/main/java/org/jlab/analysis/efficiency/Truth.java b/common-tools/clas-analysis/src/main/java/org/jlab/analysis/efficiency/Truth.java index 6442e69d31..0376174c96 100644 --- a/common-tools/clas-analysis/src/main/java/org/jlab/analysis/efficiency/Truth.java +++ b/common-tools/clas-analysis/src/main/java/org/jlab/analysis/efficiency/Truth.java @@ -154,7 +154,10 @@ public String toTable() { for (int i=0; i 0) + s.append(String.format("%7.4f",get(validPids.get(i),validPids.get(j)))); + else + s.append(String.format("%7s","-")); if (validPids.size()==j+1) s.append("\n"); } } From ed968ccc7d01999482f879a1d477314a15ca66e3 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Mon, 6 Jan 2025 15:16:01 -0500 Subject: [PATCH 2/3] export efficiency denominator --- .../src/main/java/org/jlab/analysis/efficiency/Truth.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common-tools/clas-analysis/src/main/java/org/jlab/analysis/efficiency/Truth.java b/common-tools/clas-analysis/src/main/java/org/jlab/analysis/efficiency/Truth.java index 0376174c96..80fb2041a2 100644 --- a/common-tools/clas-analysis/src/main/java/org/jlab/analysis/efficiency/Truth.java +++ b/common-tools/clas-analysis/src/main/java/org/jlab/analysis/efficiency/Truth.java @@ -171,16 +171,19 @@ public String toTable() { public JsonObject toJson() { JsonObject effs = new JsonObject(); JsonArray pids = new JsonArray(); + JsonObject gens = new JsonObject(); for (int i=0; i Date: Mon, 6 Jan 2025 16:03:48 -0500 Subject: [PATCH 3/3] bugfix --- .../src/main/java/org/jlab/analysis/efficiency/Truth.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common-tools/clas-analysis/src/main/java/org/jlab/analysis/efficiency/Truth.java b/common-tools/clas-analysis/src/main/java/org/jlab/analysis/efficiency/Truth.java index 80fb2041a2..a99865570c 100644 --- a/common-tools/clas-analysis/src/main/java/org/jlab/analysis/efficiency/Truth.java +++ b/common-tools/clas-analysis/src/main/java/org/jlab/analysis/efficiency/Truth.java @@ -154,7 +154,7 @@ public String toTable() { for (int i=0; i 0) + if (mcTallies[i] > 0) s.append(String.format("%7.4f",get(validPids.get(i),validPids.get(j)))); else s.append(String.format("%7s","-")); @@ -178,7 +178,7 @@ public JsonObject toJson() { for (int j=0; j