Skip to content

feat: add event sorting to hipo-diff #1262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
baltzell merged 1 commit into from
May 15, 2026
Merged

feat: add event sorting to hipo-diff #1262

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 58 additions & 9 deletions common-tools/clas-io/src/main/java/org/jlab/utils/HipoDiff.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.TreeMap;
import org.jlab.jnp.hipo4.io.HipoReader;
import org.jlab.jnp.hipo4.data.Bank;
import org.jlab.jnp.hipo4.data.Event;
Expand Down Expand Up @@ -96,6 +97,8 @@ public Bank getDiff(Bank b) {
static double tolerance;
static boolean verboseMode;
static boolean quietMode;
static boolean sortEvents;
static int tag;
static Bank runConfigBank;
static HipoWriter writer;
static Event event;
Expand All @@ -112,7 +115,9 @@ public static void main(String args[]) {
op.addOption("-Q", null, "verbose mode");
op.addOption("-b", null, "name of bank to diff");
op.addOption("-B", "", "names of banks to ignore (comma separated)");
op.addOption("-s", null, "sort on column index");
op.addOption("-s", null, "column indices to sort on (comma separated)");
op.addOption("-e", null, "sort events by RUN::config.event");
op.addOption("-T", "0", "event tag to compare");
op.addOption("-o", null, "output HIPO diff file");
op.setRequiresInputList(true);
op.parse(args);
Expand All @@ -128,8 +133,10 @@ public static void main(String args[]) {
}
verboseMode = op.getOption("-Q").stringValue() != null;
quietMode = op.getOption("-q").stringValue() != null;
sortEvents = op.getOption("-e").stringValue() != null;
nmax = op.getOption("-n").intValue();
tolerance = op.getOption("-t").doubleValue();
tag = op.getOption("-T").intValue();

HipoReader readerA = new HipoReader();
HipoReader readerB = new HipoReader();
Expand Down Expand Up @@ -157,22 +164,64 @@ public static void main(String args[]) {
writer.open(op.getOption("-o").stringValue());
}

compare(readerA, readerB);
compare(tag, readerA, readerB);

if (writer != null) writer.close();
}

public static int compare(HipoReader a, HipoReader b) {
public static TreeMap<Integer,Integer> getEventMap(int tag, HipoReader reader) {
TreeMap<Integer,Integer> m = new TreeMap<>();
ArrayList<Integer> duplicates = new ArrayList<>();
Event event = new Event();
for (int eventIndex=0; eventIndex<reader.getEventCount(); ++eventIndex) {
reader.getEvent(event, eventIndex);
if (event.getEventTag() != tag) continue;
event.read(runConfigBank);
if (runConfigBank.getRows() > 0) {
int eventNumber = runConfigBank.getInt("event",0);
if (m.containsKey(eventNumber)) {
System.out.println("WARNING: Duplicate event number " + eventNumber + " at event index " + eventIndex);
duplicates.add(eventNumber);
}
else {
m.put(eventNumber, eventIndex);
}
}
}
m.keySet().removeAll(duplicates);
Comment thread
raffaelladevita marked this conversation as resolved.
return m;
}

public static int compare(int tag, HipoReader a, HipoReader b) {
int ret=0;
Event eventA = new Event();
Event eventB = new Event();
while (a.hasNext() && b.hasNext() && (nmax < 1 || nevent < nmax)) {
if (++nevent % 5000 == 0) System.out.println("Analyzed " + nevent + " events");
a.nextEvent(eventA);
b.nextEvent(eventB);
eventA.read(runConfigBank);
ret += compare(eventA, eventB);
if (sortEvents) {
TreeMap<Integer,Integer> mapA = getEventMap(tag, a);
TreeMap<Integer,Integer> mapB = getEventMap(tag, b);
for (Integer eventNumber : mapA.keySet()) {
if (mapB.containsKey(eventNumber)){
if (nmax > 0 && nevent >= nmax) break;
if (++nevent % 5000 == 0) System.out.println("Analyzed " + nevent + " events");
a.getEvent(eventA, mapA.get(eventNumber));
b.getEvent(eventB, mapB.get(eventNumber));
eventA.read(runConfigBank);
ret += compare(eventA, eventB);
}
}
}
else {
a.setTags(tag);
b.setTags(tag);
while (a.hasNext() && b.hasNext() && (nmax < 1 || nevent < nmax)) {
if (++nevent % 5000 == 0) System.out.println("Analyzed " + nevent + " events");
a.nextEvent(eventA);
b.nextEvent(eventB);
eventA.read(runConfigBank);
ret += compare(eventA, eventB);
}
}

System.out.println("\n Analyzed " + nevent + " with " + nbadevent + " bad banks");
System.out.println(nbadrow + "/" + nrow + " mismatched rows");
System.out.println(nbadentry + "/" + nentry + " mismatched entry");
Expand Down