Skip to content

Commit 3467a40

Browse files
tongtongcaotongtongcao
authored
Change logger level from FINE to FINEST for DC codes at the event level (#699)
1 parent 966cec3 commit 3467a40

File tree

13 files changed

+81
-81
lines changed

13 files changed

+81
-81
lines changed

‎common-tools/clas-tracking/src/main/java/org/jlab/clas/tracking/kalmanfilter/zReference/StateVecs.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public Matrix transport(int sector, int i, double Zf, StateVec iVec, AMeasVecs m
9797
Matrix5x5.copy(fVec.CM, cMat);
9898
s = Math.signum(Zf - zInit) * stepSize;
9999

100-
// LOGGER.log(Level.FINE, " from "+(float)Z[i]+" to "+(float)Z[f]+" at "+(float)z+" By is "+bf[1]+" B is "+Math.sqrt(bf[0]*bf[0]+bf[1]*bf[1]+bf[2]*bf[2])/Bmax+" stepSize is "+s);
100+
// LOGGER.log(Level.FINEST, " from "+(float)Z[i]+" to "+(float)Z[f]+" at "+(float)z+" By is "+bf[1]+" B is "+Math.sqrt(bf[0]*bf[0]+bf[1]*bf[1]+bf[2]*bf[2])/Bmax+" stepSize is "+s);
101101
if (Math.signum(Zf - zInit) * (z + s) > Math.signum(Zf - zInit) * Zf) {
102102
s = Math.signum(Zf - zInit) * Math.abs(Zf - z);
103103
}
@@ -195,7 +195,7 @@ public double getDeltaPath(int sector, int i, double Zf, StateVec iVec, AMeasVec
195195
Matrix5x5.copy(fVec.CM, cMat);
196196
s = Math.signum(Zf - zInit) * stepSize;
197197

198-
// LOGGER.log(Level.FINE, " from "+(float)Z[i]+" to "+(float)Z[f]+" at "+(float)z+" By is "+bf[1]+" B is "+Math.sqrt(bf[0]*bf[0]+bf[1]*bf[1]+bf[2]*bf[2])/Bmax+" stepSize is "+s);
198+
// LOGGER.log(Level.FINEST, " from "+(float)Z[i]+" to "+(float)Z[f]+" at "+(float)z+" By is "+bf[1]+" B is "+Math.sqrt(bf[0]*bf[0]+bf[1]*bf[1]+bf[2]*bf[2])/Bmax+" stepSize is "+s);
199199
if (Math.signum(Zf - zInit) * (z + s) > Math.signum(Zf - zInit) * Zf) {
200200
s = Math.signum(Zf - zInit) * Math.abs(Zf - z);
201201
}
@@ -296,7 +296,7 @@ public boolean transport(int sector, int i, int f, StateVec iVec, AMeasVecs mv,
296296
Matrix5x5.copy(fVec.CM, cMat);
297297
s = Math.signum(zFinal - zInit) * stepSize;
298298

299-
// LOGGER.log(Level.FINE, " from "+(float)Z[i]+" to "+(float)Z[f]+" at "+(float)z+" By is "+bf[1]+" B is "+Math.sqrt(bf[0]*bf[0]+bf[1]*bf[1]+bf[2]*bf[2])/Bmax+" stepSize is "+s);
299+
// LOGGER.log(Level.FINEST, " from "+(float)Z[i]+" to "+(float)Z[f]+" at "+(float)z+" By is "+bf[1]+" B is "+Math.sqrt(bf[0]*bf[0]+bf[1]*bf[1]+bf[2]*bf[2])/Bmax+" stepSize is "+s);
300300
if (Math.signum(zFinal - zInit) * (z + s) > Math.signum(zFinal - zInit) * zFinal) {
301301
s = Math.signum(zFinal - zInit) * Math.abs(zFinal - z);
302302
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ private void read_HBHits(TimeToDistanceEstimator tde) {
352352
String pointName = bankNames.getInputIdsBank();
353353
String recBankName = bankNames.getRecEventBank();
354354

355-
LOGGER.log(Level.FINE,"Reading hb banks for "+ bankName + ", " + pointName + " " + recBankName);
355+
LOGGER.log(Level.FINEST,"Reading hb banks for "+ bankName + ", " + pointName + " " + recBankName);
356356

357357
_HBHits = new ArrayList<>();
358358

@@ -489,7 +489,7 @@ private void read_HBHits(TimeToDistanceEstimator tde) {
489489
//if(hit.betaFlag == 0)
490490
if(passHit(hit.betaFlag)) {
491491
this._HBHits.add(hit);
492-
LOGGER.log(Level.FINE, "Passing "+hit.printInfo()+" for "+ bankNames.getHitsBank());
492+
LOGGER.log(Level.FINEST, "Passing "+hit.printInfo()+" for "+ bankNames.getHitsBank());
493493
}
494494
}
495495
}
@@ -562,7 +562,7 @@ private void read_NNHits() {
562562
hit.NNTrkP = this.aimatch.get(clusterID)[0];
563563
hit.NNTrkTheta = this.aimatch.get(clusterID)[1];
564564
hit.NNTrkPhi = this.aimatch.get(clusterID)[2];
565-
LOGGER.log(Level.FINE, "NN"+hit.printInfo());
565+
LOGGER.log(Level.FINEST, "NN"+hit.printInfo());
566566
this._DCHits.add(hit);
567567
}
568568
}
@@ -788,11 +788,11 @@ private void swapWires(DataEvent event, int sector, int layer, int wire) {
788788
} else {
789789
for(int i = 0; i<CableSwaps.length; i++) {
790790
if(CableSwaps[i][0]==sector && CableSwaps[i][1]==layer && CableSwaps[i][2]==wire) {
791-
// LOGGER.log(Level.FINE, " swapped "+sector+", "+layer+", "+wire);
791+
// LOGGER.log(Level.FINEST, " swapped "+sector+", "+layer+", "+wire);
792792
_sector = CableSwaps[i][3];
793793
_layer = CableSwaps[i][4];
794794
_wire = CableSwaps[i][5];
795-
// LOGGER.log(Level.FINE, " to "+_sector+", "+_layer+", "+_wire);
795+
// LOGGER.log(Level.FINEST, " to "+_sector+", "+_layer+", "+_wire);
796796
}
797797
}
798798
}
@@ -812,9 +812,9 @@ public void getTriggerBits(){
812812
813813
for (int s=1; s<7; s++) {
814814
if (trigger_bits[s]) {
815-
LOGGER.log(Level.FINE, "Trigger bit set for electron in sector "+s);
815+
LOGGER.log(Level.FINEST, "Trigger bit set for electron in sector "+s);
816816
}
817-
if (trigger_bits[31])LOGGER.log(Level.FINE, "Trigger bit set from random pulser");
817+
if (trigger_bits[31])LOGGER.log(Level.FINEST, "Trigger bit set from random pulser");
818818
}
819819
}
820820
}

‎reconstruction/dc/src/main/java/org/jlab/rec/dc/cross/Cross.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -389,14 +389,14 @@ public double[] ReCalcPseudoCross(Cross c2, Cross c3) {
389389
390390
if(this.recalc==0) {
391391
392-
LOGGER.log(Level.FINE, this.recalc+"] "+this.printInfo()+" alpha "+Math.toDegrees(alpha)+" X "+X+" Y "+Y+c2.printInfo()+" "+c3.printInfo());
392+
LOGGER.log(Level.FINEST, this.recalc+"] "+this.printInfo()+" alpha "+Math.toDegrees(alpha)+" X "+X+" Y "+Y+c2.printInfo()+" "+c3.printInfo());
393393
this.set_Point(new Point3D(X, Y, this.get_Point().z()));
394394
}
395395
XY[0] = X;
396396
XY[1] = Y;
397397
398398
return XY;
399-
//LOGGER.log(Level.FINE, this.recalc+"] "+this.printInfo()+" alpha "+Math.toDegrees(alpha)+" X "+X+" Y "+Y+c2.printInfo()+" "+c3.printInfo());
399+
//LOGGER.log(Level.FINEST, this.recalc+"] "+this.printInfo()+" alpha "+Math.toDegrees(alpha)+" X "+X+" Y "+Y+c2.printInfo()+" "+c3.printInfo());
400400
}
401401
*/
402402

@@ -407,7 +407,7 @@ public void set_CrossDirIntersSegWires() {
407407
double val_it1 = this._seg1.get_fittedCluster().get_clusterLineFitIntercept();
408408
double val_it2 = this._seg2.get_fittedCluster().get_clusterLineFitIntercept();
409409

410-
LOGGER.log(Level.FINE, this._seg1.printInfo()+this._seg2.printInfo()+" insterWire: seg1 "+new Point3D(val_sl1, val_it1,999).toString()+
410+
LOGGER.log(Level.FINEST, this._seg1.printInfo()+this._seg2.printInfo()+" insterWire: seg1 "+new Point3D(val_sl1, val_it1,999).toString()+
411411
" seg2 "+new Point3D(val_sl2, val_it2,999).toString()
412412
);
413413
for(int i =0; i<this.get_Segment1().size(); i++) {
@@ -421,14 +421,14 @@ public void set_CrossDirIntersSegWires() {
421421

422422
private void calc_IntersectPlaneAtZ(double z, double wy_over_wx, double val_sl1, double val_sl2, double val_it1, double val_it2, FittedHit hit) {
423423

424-
LOGGER.log(Level.FINE, " .....insterWire: seg1 "+new Point3D(val_sl1, val_it1,z).toString()+
424+
LOGGER.log(Level.FINEST, " .....insterWire: seg1 "+new Point3D(val_sl1, val_it1,z).toString()+
425425
" seg2 "+new Point3D(val_sl2, val_it2,z).toString()
426426
);
427427
double x = 0.5 * (val_it1 + val_it2) + 0.5 * z * (val_sl1 + val_sl2);
428428
double y = 0.5 * wy_over_wx * (val_it2 - val_it1) + 0.5 * wy_over_wx * z * (val_sl2 - val_sl1);
429429

430430
if(hit.getCrossDirIntersWire()!=null && hit.getCrossDirIntersWire().x()!=x)
431-
LOGGER.log(Level.FINE, "Already exists "+hit.getCrossDirIntersWire().toString()+" for "
431+
LOGGER.log(Level.FINEST, "Already exists "+hit.getCrossDirIntersWire().toString()+" for "
432432
+hit.printInfo() +"new "+new Point3D(x,y,z).toString());
433433

434434
hit.setCrossDirIntersWire(new Point3D(x,y,z));

‎reconstruction/dc/src/main/java/org/jlab/rec/dc/nn/PatternRec.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public CrossList RecomposeCrossList(List<Segment> clusters,
113113
if(entry.getValue().size()==3)
114114
crossList.add(entry.getValue());
115115
for(Cross c : entry.getValue())
116-
LOGGER.log(Level.FINE, "AI"+c.printInfo()+c.get_Segment1().printInfo()+c.get_Segment2().printInfo());
116+
LOGGER.log(Level.FINEST, "AI"+c.printInfo()+c.get_Segment1().printInfo()+c.get_Segment2().printInfo());
117117
}
118118
return crossList;
119119
}

‎reconstruction/dc/src/main/java/org/jlab/rec/dc/segment/Segment.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ public boolean isCloseTo(Segment otherseg) {
212212
/// <center><b>|Xwires<sub>2</sub>-Xwires<sub>1</sub>| = a*Xwires<sub>1</sub> + b</b></center>\n
213213
/// where a and b are DC parameters set by DC_RSEG_a and DC_RSEG_B .\n\n
214214
boolean value = false;
215-
//LOGGER.log(Level.FINE, "in Segment DeltaW "+Math.abs(this.getAvgwire()-otherseg.getAvgwire() )+
215+
//LOGGER.log(Level.FINEST, "in Segment DeltaW "+Math.abs(this.getAvgwire()-otherseg.getAvgwire() )+
216216
// " < ? "+(Constants.DC_RSEG_A * this.getAvgwire() + Constants.DC_RSEG_B));
217217
if (Math.abs(this.getAvgwire() - otherseg.getAvgwire()) < Constants.DC_RSEG_A * this.getAvgwire() + Constants.DC_RSEG_B) {
218218
value = true;
@@ -229,7 +229,7 @@ public boolean hasNoMatchingSegment(List<Segment> othersegs) {
229229
/// <center><b>|Xwires<sub>2</sub>-Xwires<sub>1</sub>| = a*Xwires<sub>1</sub> + b</b></center>\n
230230
/// where a and b are DC parameters set by DC_RSEG_a and DC_RSEG_B .\n\n
231231
boolean value = true;
232-
//LOGGER.log(Level.FINE, "in Segment DeltaW "+Math.abs(this.getAvgwire()-otherseg.getAvgwire() )+
232+
//LOGGER.log(Level.FINEST, "in Segment DeltaW "+Math.abs(this.getAvgwire()-otherseg.getAvgwire() )+
233233
// " < ? "+(Constants.DC_RSEG_A * this.getAvgwire() + Constants.DC_RSEG_B));
234234
for(Segment otherseg : othersegs) {
235235
if (Math.abs(this.getAvgwire() - otherseg.getAvgwire()) < Constants.DC_RSEG_A * this.getAvgwire() + Constants.DC_RSEG_B) {

0 commit comments

Comments
 (0)