adapt eb to 6-dimensional covariance matrix (#1087)

baltzell · web-flow · commit d22dc1687a0e · 2026-02-03T10:07:30.000-05:00
diff --git a/common-tools/clas-reco/src/main/java/org/jlab/clas/detector/DetectorData.java b/common-tools/clas-reco/src/main/java/org/jlab/clas/detector/DetectorData.java
@@ -521,12 +521,9 @@ public static DataBank getCovMatrixBank(List<DetectorParticle> particles, DataEv
                 }
                 bank.setShort("index", row, (short) p.getTrackIndex());
                 bank.setShort("pindex", row, (short) i);
-                for (int ii = 0; ii < 5; ii++) {
-                    for (int jj = 0; jj < 5; jj++) {
+                for (int ii = 0; ii < 6; ii++) {
+                    for (int jj = 0; jj < 6; jj++) {
                         String varName = String.format("C%d%d", ii + 1, jj + 1);
-                        if (bank.getDescriptor().hasEntry(varName) != true) {
-                            continue;
-                        }
                         bank.setFloat(varName, row, p.getCovMatrix(ii, jj));
                     }
                 }
@@ -595,11 +592,8 @@ public static List<DetectorTrack> readDetectorTracks(DataEvent event, String ban
                     }
                 }
                 if (covBank != null) {
-                    final int dimCovMat = 5;
+                    final int dimCovMat = 6;
                     for (int ii = 0; ii < covBank.rows(); ii++) {
-                        if (covBank.getInt("id", ii) != trkId) {
-                            continue;
-                        }
                         for (int jj = 1; jj <= dimCovMat; jj++) {
                             for (int kk = 1; kk <= dimCovMat; kk++) {
                                 float ele = covBank.getFloat(String.format("C%d%d", jj, kk), ii);
diff --git a/common-tools/clas-reco/src/main/java/org/jlab/clas/detector/DetectorTrack.java b/common-tools/clas-reco/src/main/java/org/jlab/clas/detector/DetectorTrack.java
@@ -134,7 +134,7 @@ public int size() {
     private Vector3      trackP = new Vector3();
     private Vector3 trackVertex = new Vector3();
 
-    private float[][] covMatrix = new float[5][5];
+    private float[][] covMatrix = new float[6][6];
     private List<Line3D> trackCrosses = new ArrayList<>();
  
     private Trajectory trajectory=new Trajectory();
diff --git a/etc/bankdefs/hipo4/event-ai.json b/etc/bankdefs/hipo4/event-ai.json
@@ -550,16 +550,22 @@
             {"name":"C13",      "type":"F", "info":"C13 covariance matrix element at last superlayer used in the fit"},
             {"name":"C14",      "type":"F", "info":"C14 covariance matrix element at last superlayer used in the fit"},
             {"name":"C15",      "type":"F", "info":"C15 covariance matrix element at last superlayer used in the fit"},
+            {"name":"C16",      "type":"F", "info":"C16 covariance matrix element at last superlayer used in the fit"},
             {"name":"C22",      "type":"F", "info":"C22 covariance matrix element at last superlayer used in the fit"},
             {"name":"C23",      "type":"F", "info":"C23 covariance matrix element at last superlayer used in the fit"},
             {"name":"C24",      "type":"F", "info":"C24 covariance matrix element at last superlayer used in the fit"},
             {"name":"C25",      "type":"F", "info":"C25 covariance matrix element at last superlayer used in the fit"},
+            {"name":"C26",      "type":"F", "info":"C26 covariance matrix element at last superlayer used in the fit"},
             {"name":"C33",      "type":"F", "info":"C33 covariance matrix element at last superlayer used in the fit"},
             {"name":"C34",      "type":"F", "info":"C34 covariance matrix element at last superlayer used in the fit"},
             {"name":"C35",      "type":"F", "info":"C35 covariance matrix element at last superlayer used in the fit"},
+            {"name":"C36",      "type":"F", "info":"C36 covariance matrix element at last superlayer used in the fit"},
             {"name":"C44",      "type":"F", "info":"C44 covariance matrix element at last superlayer used in the fit"},
             {"name":"C45",      "type":"F", "info":"C45 covariance matrix element at last superlayer used in the fit"},
-            {"name":"C55",      "type":"F", "info":"C55 covariance matrix element at last superlayer used in the fit"}
+            {"name":"C46",      "type":"F", "info":"C46 covariance matrix element at last superlayer used in the fit"},
+            {"name":"C55",      "type":"F", "info":"C55 covariance matrix element at last superlayer used in the fit"},
+            {"name":"C56",      "type":"F", "info":"C56 covariance matrix element at last superlayer used in the fit"},
+            {"name":"C66",      "type":"F", "info":"C66 covariance matrix element at last superlayer used in the fit"}
         ]
     },
     {
diff --git a/etc/bankdefs/hipo4/event.json b/etc/bankdefs/hipo4/event.json
@@ -555,16 +555,22 @@
             {"name":"C13",      "type":"F", "info":"C13 covariance matrix element at last superlayer used in the fit"},
             {"name":"C14",      "type":"F", "info":"C14 covariance matrix element at last superlayer used in the fit"},
             {"name":"C15",      "type":"F", "info":"C15 covariance matrix element at last superlayer used in the fit"},
+            {"name":"C16",      "type":"F", "info":"C16 covariance matrix element at last superlayer used in the fit"},
             {"name":"C22",      "type":"F", "info":"C22 covariance matrix element at last superlayer used in the fit"},
             {"name":"C23",      "type":"F", "info":"C23 covariance matrix element at last superlayer used in the fit"},
             {"name":"C24",      "type":"F", "info":"C24 covariance matrix element at last superlayer used in the fit"},
             {"name":"C25",      "type":"F", "info":"C25 covariance matrix element at last superlayer used in the fit"},
+            {"name":"C26",      "type":"F", "info":"C26 covariance matrix element at last superlayer used in the fit"},
             {"name":"C33",      "type":"F", "info":"C33 covariance matrix element at last superlayer used in the fit"},
             {"name":"C34",      "type":"F", "info":"C34 covariance matrix element at last superlayer used in the fit"},
             {"name":"C35",      "type":"F", "info":"C35 covariance matrix element at last superlayer used in the fit"},
+            {"name":"C36",      "type":"F", "info":"C36 covariance matrix element at last superlayer used in the fit"},
             {"name":"C44",      "type":"F", "info":"C44 covariance matrix element at last superlayer used in the fit"},
             {"name":"C45",      "type":"F", "info":"C45 covariance matrix element at last superlayer used in the fit"},
-            {"name":"C55",      "type":"F", "info":"C55 covariance matrix element at last superlayer used in the fit"}
+            {"name":"C46",      "type":"F", "info":"C46 covariance matrix element at last superlayer used in the fit"},
+            {"name":"C55",      "type":"F", "info":"C55 covariance matrix element at last superlayer used in the fit"},
+            {"name":"C56",      "type":"F", "info":"C56 covariance matrix element at last superlayer used in the fit"},
+            {"name":"C66",      "type":"F", "info":"C66 covariance matrix element at last superlayer used in the fit"}
         ]
     },
     {

Original file line number	Diff line number	Diff line change
`@@ -521,12 +521,9 @@ public static DataBank getCovMatrixBank(List<DetectorParticle> particles, DataEv`
`521`	`521`	`}`
`522`	`522`	`bank.setShort("index", row, (short) p.getTrackIndex());`
`523`	`523`	`bank.setShort("pindex", row, (short) i);`
`524`		`- for (int ii = 0; ii < 5; ii++) {`
`525`		`- for (int jj = 0; jj < 5; jj++) {`
	`524`	`+ for (int ii = 0; ii < 6; ii++) {`
	`525`	`+ for (int jj = 0; jj < 6; jj++) {`
`526`	`526`	`String varName = String.format("C%d%d", ii + 1, jj + 1);`
`527`		`- if (bank.getDescriptor().hasEntry(varName) != true) {`
`528`		`- continue;`
`529`		`- }`
`530`	`527`	`bank.setFloat(varName, row, p.getCovMatrix(ii, jj));`
`531`	`528`	`}`
`532`	`529`	`}`
`@@ -595,11 +592,8 @@ public static List<DetectorTrack> readDetectorTracks(DataEvent event, String ban`
`595`	`592`	`}`
`596`	`593`	`}`
`597`	`594`	`if (covBank != null) {`
`598`		`- final int dimCovMat = 5;`
	`595`	`+ final int dimCovMat = 6;`
`599`	`596`	`for (int ii = 0; ii < covBank.rows(); ii++) {`
`600`		`- if (covBank.getInt("id", ii) != trkId) {`
`601`		`- continue;`
`602`		`- }`
`603`	`597`	`for (int jj = 1; jj <= dimCovMat; jj++) {`
`604`	`598`	`for (int kk = 1; kk <= dimCovMat; kk++) {`
`605`	`599`	`float ele = covBank.getFloat(String.format("C%d%d", jj, kk), ii);`