Merge branch 'JeffersonLab:development' into development

efuchey · web-flow · commit c6632f8b55fb · 2025-02-11T15:08:03.000-05:00
diff --git a/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CodaEventDecoder.java b/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CodaEventDecoder.java
@@ -156,7 +156,7 @@ else if(tiEntries.size()>1) {
                     if(this.timeStampErrors<100) {
                         System.err.println("WARNING: mismatch in TI time stamps: crate " 
                                         + tiEntries.get(i).getDescriptor().getCrate() + " reports " 
-                                        + tiEntries.get(i).getTimeStamp() + " instead of the " + ts
+                                        + tiEntries.get(i).getTimeStamp() + " instead of the " + tiEntries.get(i0).getTimeStamp()
                                         + " from crate " + tiEntries.get(i0).getDescriptor().getCrate());
                     }
                     else if(this.timeStampErrors==100) {

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ else if(tiEntries.size()>1) {`
`156`	`156`	`if(this.timeStampErrors<100) {`
`157`	`157`	`System.err.println("WARNING: mismatch in TI time stamps: crate "`
`158`	`158`	`+ tiEntries.get(i).getDescriptor().getCrate() + " reports "`
`159`		`- + tiEntries.get(i).getTimeStamp() + " instead of the " + ts`
	`159`	`+ + tiEntries.get(i).getTimeStamp() + " instead of the " + tiEntries.get(i0).getTimeStamp()`
`160`	`160`	`+ " from crate " + tiEntries.get(i0).getDescriptor().getCrate());`
`161`	`161`	`}`
`162`	`162`	`else if(this.timeStampErrors==100) {`