Skip to content

Commit e98ff90

Browse files
tongtongcaobaltzell
tongtongcao
authored and
baltzell
committed
modify banks TimeBasedTrkg::TBCovMat and TimeBasedTrkg::AICovMat to store CM in the lab frame in replacement of CM in the tilted sector frame
1 parent 2dfb023 commit e98ff90

File tree

4 files changed

+3
-120
lines changed

4 files changed

+3
-120
lines changed

‎etc/bankdefs/hipo4/dc.json‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -529,40 +529,6 @@
529529
"name": "TimeBasedTrkg::TBCovMat",
530530
"group": 20600,
531531
"item" : 37,
532-
"info": "reconstructed track covariance matrix",
533-
"entries": [
534-
{"name":"id", "type":"S", "info":"id of the track"},
535-
{"name":"C11", "type":"F", "info":"C11 covariance matrix element at last superlayer used in the fit"},
536-
{"name":"C12", "type":"F", "info":"C12 covariance matrix element at last superlayer used in the fit"},
537-
{"name":"C13", "type":"F", "info":"C13 covariance matrix element at last superlayer used in the fit"},
538-
{"name":"C14", "type":"F", "info":"C14 covariance matrix element at last superlayer used in the fit"},
539-
{"name":"C15", "type":"F", "info":"C15 covariance matrix element at last superlayer used in the fit"},
540-
{"name":"C21", "type":"F", "info":"C21 covariance matrix element at last superlayer used in the fit"},
541-
{"name":"C22", "type":"F", "info":"C22 covariance matrix element at last superlayer used in the fit"},
542-
{"name":"C23", "type":"F", "info":"C23 covariance matrix element at last superlayer used in the fit"},
543-
{"name":"C24", "type":"F", "info":"C24 covariance matrix element at last superlayer used in the fit"},
544-
{"name":"C25", "type":"F", "info":"C25 covariance matrix element at last superlayer used in the fit"},
545-
{"name":"C31", "type":"F", "info":"C31 covariance matrix element at last superlayer used in the fit"},
546-
{"name":"C32", "type":"F", "info":"C32 covariance matrix element at last superlayer used in the fit"},
547-
{"name":"C33", "type":"F", "info":"C33 covariance matrix element at last superlayer used in the fit"},
548-
{"name":"C34", "type":"F", "info":"C34 covariance matrix element at last superlayer used in the fit"},
549-
{"name":"C35", "type":"F", "info":"C35 covariance matrix element at last superlayer used in the fit"},
550-
{"name":"C41", "type":"F", "info":"C41 covariance matrix element at last superlayer used in the fit"},
551-
{"name":"C42", "type":"F", "info":"C42 covariance matrix element at last superlayer used in the fit"},
552-
{"name":"C43", "type":"F", "info":"C43 covariance matrix element at last superlayer used in the fit"},
553-
{"name":"C44", "type":"F", "info":"C44 covariance matrix element at last superlayer used in the fit"},
554-
{"name":"C45", "type":"F", "info":"C45 covariance matrix element at last superlayer used in the fit"},
555-
{"name":"C51", "type":"F", "info":"C51 covariance matrix element at last superlayer used in the fit"},
556-
{"name":"C52", "type":"F", "info":"C52 covariance matrix element at last superlayer used in the fit"},
557-
{"name":"C53", "type":"F", "info":"C53 covariance matrix element at last superlayer used in the fit"},
558-
{"name":"C54", "type":"F", "info":"C54 covariance matrix element at last superlayer used in the fit"},
559-
{"name":"C55", "type":"F", "info":"C55 covariance matrix element at last superlayer used in the fit"}
560-
]
561-
},
562-
{
563-
"name": "TimeBasedTrkg::TBCovMatLab",
564-
"group": 20600,
565-
"item" : 38,
566532
"info": "reconstructed track covariance matrix in lab frame",
567533
"entries": [
568534
{"name":"id", "type":"S", "info":"id of the track"},

‎etc/bankdefs/hipo4/dcnn.json‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -390,40 +390,6 @@
390390
"name": "TimeBasedTrkg::AICovMat",
391391
"group": 20600,
392392
"item" : 77,
393-
"info": "reconstructed track covariance matrix",
394-
"entries": [
395-
{"name":"id", "type":"S", "info":"id of the track"},
396-
{"name":"C11", "type":"F", "info":"C11 covariance matrix element at last superlayer used in the fit"},
397-
{"name":"C12", "type":"F", "info":"C12 covariance matrix element at last superlayer used in the fit"},
398-
{"name":"C13", "type":"F", "info":"C13 covariance matrix element at last superlayer used in the fit"},
399-
{"name":"C14", "type":"F", "info":"C14 covariance matrix element at last superlayer used in the fit"},
400-
{"name":"C15", "type":"F", "info":"C15 covariance matrix element at last superlayer used in the fit"},
401-
{"name":"C21", "type":"F", "info":"C21 covariance matrix element at last superlayer used in the fit"},
402-
{"name":"C22", "type":"F", "info":"C22 covariance matrix element at last superlayer used in the fit"},
403-
{"name":"C23", "type":"F", "info":"C23 covariance matrix element at last superlayer used in the fit"},
404-
{"name":"C24", "type":"F", "info":"C24 covariance matrix element at last superlayer used in the fit"},
405-
{"name":"C25", "type":"F", "info":"C25 covariance matrix element at last superlayer used in the fit"},
406-
{"name":"C31", "type":"F", "info":"C31 covariance matrix element at last superlayer used in the fit"},
407-
{"name":"C32", "type":"F", "info":"C32 covariance matrix element at last superlayer used in the fit"},
408-
{"name":"C33", "type":"F", "info":"C33 covariance matrix element at last superlayer used in the fit"},
409-
{"name":"C34", "type":"F", "info":"C34 covariance matrix element at last superlayer used in the fit"},
410-
{"name":"C35", "type":"F", "info":"C35 covariance matrix element at last superlayer used in the fit"},
411-
{"name":"C41", "type":"F", "info":"C41 covariance matrix element at last superlayer used in the fit"},
412-
{"name":"C42", "type":"F", "info":"C42 covariance matrix element at last superlayer used in the fit"},
413-
{"name":"C43", "type":"F", "info":"C43 covariance matrix element at last superlayer used in the fit"},
414-
{"name":"C44", "type":"F", "info":"C44 covariance matrix element at last superlayer used in the fit"},
415-
{"name":"C45", "type":"F", "info":"C45 covariance matrix element at last superlayer used in the fit"},
416-
{"name":"C51", "type":"F", "info":"C51 covariance matrix element at last superlayer used in the fit"},
417-
{"name":"C52", "type":"F", "info":"C52 covariance matrix element at last superlayer used in the fit"},
418-
{"name":"C53", "type":"F", "info":"C53 covariance matrix element at last superlayer used in the fit"},
419-
{"name":"C54", "type":"F", "info":"C54 covariance matrix element at last superlayer used in the fit"},
420-
{"name":"C55", "type":"F", "info":"C55 covariance matrix element at last superlayer used in the fit"}
421-
]
422-
},
423-
{
424-
"name": "TimeBasedTrkg::AICovMatLab",
425-
"group": 20600,
426-
"item" : 78,
427393
"info": "reconstructed track covariance matrix in lab frame",
428394
"entries": [
429395
{"name":"id", "type":"S", "info":"id of the track"},

‎reconstruction/dc/src/main/java/org/jlab/rec/dc/banks/Banks.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,7 @@ public String getTrajBank() {
136136

137137
public String getCovmatBank() {
138138
return this.getOutputBank("CovMat");
139-
}
140-
141-
public String getCovmatLabBank() {
142-
return this.getOutputBank("CovMatLab");
143-
}
139+
}
144140

145141
public String getRecEventBank() {
146142
return this.getRecBank("Event");

‎reconstruction/dc/src/main/java/org/jlab/rec/dc/banks/RecoBankWriter.java‎

Lines changed: 2 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -446,51 +446,7 @@ public DataBank fillHBTracksBank(DataEvent event, List<Track> candlist) {
446446
public DataBank fillHBTrajectoryBank(DataEvent event, List<Track> candlist) {
447447
return this.fillTrajectoryBank(event, candlist);
448448
}
449-
450-
/**
451-
*
452-
* @param event hipo event
453-
* @param candlist tracks
454-
* @return covariance matrix from HB fits to be used for starting TB tracking
455-
*/
456-
private DataBank fillTrackCovMatBank(DataEvent event, List<Track> candlist) {
457-
458-
DataBank bank = event.createBank(bankNames.getCovmatBank(), candlist.size());
459-
460-
for (int i = 0; i < candlist.size(); i++) {
461-
bank.setShort("id", i, (short) candlist.get(i).get_Id());
462-
if(candlist.get(i).get_CovMat()!=null) {
463-
bank.setFloat("C11", i, (float) candlist.get(i).get_CovMat().get(0, 0));
464-
bank.setFloat("C12", i, (float) candlist.get(i).get_CovMat().get(0, 1));
465-
bank.setFloat("C13", i, (float) candlist.get(i).get_CovMat().get(0, 2));
466-
bank.setFloat("C14", i, (float) candlist.get(i).get_CovMat().get(0, 3));
467-
bank.setFloat("C15", i, (float) candlist.get(i).get_CovMat().get(0, 4));
468-
bank.setFloat("C21", i, (float) candlist.get(i).get_CovMat().get(1, 0));
469-
bank.setFloat("C22", i, (float) candlist.get(i).get_CovMat().get(1, 1));
470-
bank.setFloat("C23", i, (float) candlist.get(i).get_CovMat().get(1, 2));
471-
bank.setFloat("C24", i, (float) candlist.get(i).get_CovMat().get(1, 3));
472-
bank.setFloat("C25", i, (float) candlist.get(i).get_CovMat().get(1, 4));
473-
bank.setFloat("C31", i, (float) candlist.get(i).get_CovMat().get(2, 0));
474-
bank.setFloat("C32", i, (float) candlist.get(i).get_CovMat().get(2, 1));
475-
bank.setFloat("C33", i, (float) candlist.get(i).get_CovMat().get(2, 2));
476-
bank.setFloat("C34", i, (float) candlist.get(i).get_CovMat().get(2, 3));
477-
bank.setFloat("C35", i, (float) candlist.get(i).get_CovMat().get(2, 4));
478-
bank.setFloat("C41", i, (float) candlist.get(i).get_CovMat().get(3, 0));
479-
bank.setFloat("C42", i, (float) candlist.get(i).get_CovMat().get(3, 1));
480-
bank.setFloat("C43", i, (float) candlist.get(i).get_CovMat().get(3, 2));
481-
bank.setFloat("C44", i, (float) candlist.get(i).get_CovMat().get(3, 3));
482-
bank.setFloat("C45", i, (float) candlist.get(i).get_CovMat().get(3, 4));
483-
bank.setFloat("C51", i, (float) candlist.get(i).get_CovMat().get(4, 0));
484-
bank.setFloat("C52", i, (float) candlist.get(i).get_CovMat().get(4, 1));
485-
bank.setFloat("C53", i, (float) candlist.get(i).get_CovMat().get(4, 2));
486-
bank.setFloat("C54", i, (float) candlist.get(i).get_CovMat().get(4, 3));
487-
bank.setFloat("C55", i, (float) candlist.get(i).get_CovMat().get(4, 4));
488-
}
489-
}
490-
//bank.show();
491-
return bank;
492-
}
493-
449+
494450
/**
495451
*
496452
* @param event hipo event
@@ -499,7 +455,7 @@ private DataBank fillTrackCovMatBank(DataEvent event, List<Track> candlist) {
499455
*/
500456
private DataBank fillTrackCovMatLabBank(DataEvent event, List<Track> candlist) {
501457

502-
DataBank bank = event.createBank(bankNames.getCovmatLabBank(), candlist.size());
458+
DataBank bank = event.createBank(bankNames.getCovmatBank(), candlist.size());
503459

504460
for (int i = 0; i < candlist.size(); i++) {
505461
bank.setShort("id", i, (short) candlist.get(i).get_Id());
@@ -1002,7 +958,6 @@ public void fillAllTBBanks(DataEvent event, List<FittedHit> fhits, List<FittedCl
1002958
this.fillTBCrossesBank(event, crosses),
1003959
this.fillTBTracksBank(event, trkcands),
1004960
this.fillTrajectoryBank(event, trkcands),
1005-
this.fillTrackCovMatBank(event, trkcands),
1006961
this.fillTrackCovMatLabBank(event, trkcands)
1007962
);
1008963
}

0 commit comments

Comments
 (0)