Skip to content

Change logger level from FINE to FINEST for DC codes at the event level #699

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
Jun 20, 2025
Merged

Change logger level from FINE to FINEST for DC codes at the event level #699

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions ...clas-tracking/src/main/java/org/jlab/clas/tracking/kalmanfilter/zReference/StateVecs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public Matrix transport(int sector, int i, double Zf, StateVec iVec, AMeasVecs m
Matrix5x5.copy(fVec.CM, cMat);
s = Math.signum(Zf - zInit) * stepSize;

// 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);
// 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);
if (Math.signum(Zf - zInit) * (z + s) > Math.signum(Zf - zInit) * Zf) {
s = Math.signum(Zf - zInit) * Math.abs(Zf - z);
}
Expand Down Expand Up @@ -195,7 +195,7 @@ public double getDeltaPath(int sector, int i, double Zf, StateVec iVec, AMeasVec
Matrix5x5.copy(fVec.CM, cMat);
s = Math.signum(Zf - zInit) * stepSize;

// 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);
// 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);
if (Math.signum(Zf - zInit) * (z + s) > Math.signum(Zf - zInit) * Zf) {
s = Math.signum(Zf - zInit) * Math.abs(Zf - z);
}
Expand Down Expand Up @@ -296,7 +296,7 @@ public boolean transport(int sector, int i, int f, StateVec iVec, AMeasVecs mv,
Matrix5x5.copy(fVec.CM, cMat);
s = Math.signum(zFinal - zInit) * stepSize;

// 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);
// 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);
if (Math.signum(zFinal - zInit) * (z + s) > Math.signum(zFinal - zInit) * zFinal) {
s = Math.signum(zFinal - zInit) * Math.abs(zFinal - z);
}
Expand Down
14 changes: 7 additions & 7 deletions reconstruction/dc/src/main/java/org/jlab/rec/dc/banks/HitReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ private void read_HBHits(TimeToDistanceEstimator tde) {
String pointName = bankNames.getInputIdsBank();
String recBankName = bankNames.getRecEventBank();

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

_HBHits = new ArrayList<>();

Expand Down Expand Up @@ -489,7 +489,7 @@ private void read_HBHits(TimeToDistanceEstimator tde) {
//if(hit.betaFlag == 0)
if(passHit(hit.betaFlag)) {
this._HBHits.add(hit);
LOGGER.log(Level.FINE, "Passing "+hit.printInfo()+" for "+ bankNames.getHitsBank());
LOGGER.log(Level.FINEST, "Passing "+hit.printInfo()+" for "+ bankNames.getHitsBank());
}
}
}
Expand Down Expand Up @@ -562,7 +562,7 @@ private void read_NNHits() {
hit.NNTrkP = this.aimatch.get(clusterID)[0];
hit.NNTrkTheta = this.aimatch.get(clusterID)[1];
hit.NNTrkPhi = this.aimatch.get(clusterID)[2];
LOGGER.log(Level.FINE, "NN"+hit.printInfo());
LOGGER.log(Level.FINEST, "NN"+hit.printInfo());
this._DCHits.add(hit);
}
}
Expand Down Expand Up @@ -788,11 +788,11 @@ private void swapWires(DataEvent event, int sector, int layer, int wire) {
} else {
for(int i = 0; i<CableSwaps.length; i++) {
if(CableSwaps[i][0]==sector && CableSwaps[i][1]==layer && CableSwaps[i][2]==wire) {
// LOGGER.log(Level.FINE, " swapped "+sector+", "+layer+", "+wire);
// LOGGER.log(Level.FINEST, " swapped "+sector+", "+layer+", "+wire);
_sector = CableSwaps[i][3];
_layer = CableSwaps[i][4];
_wire = CableSwaps[i][5];
// LOGGER.log(Level.FINE, " to "+_sector+", "+_layer+", "+_wire);
// LOGGER.log(Level.FINEST, " to "+_sector+", "+_layer+", "+_wire);
}
}
}
Expand All @@ -812,9 +812,9 @@ public void getTriggerBits(){

for (int s=1; s<7; s++) {
if (trigger_bits[s]) {
LOGGER.log(Level.FINE, "Trigger bit set for electron in sector "+s);
LOGGER.log(Level.FINEST, "Trigger bit set for electron in sector "+s);
}
if (trigger_bits[31])LOGGER.log(Level.FINE, "Trigger bit set from random pulser");
if (trigger_bits[31])LOGGER.log(Level.FINEST, "Trigger bit set from random pulser");
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions reconstruction/dc/src/main/java/org/jlab/rec/dc/cross/Cross.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,14 +389,14 @@ public double[] ReCalcPseudoCross(Cross c2, Cross c3) {

if(this.recalc==0) {

LOGGER.log(Level.FINE, this.recalc+"] "+this.printInfo()+" alpha "+Math.toDegrees(alpha)+" X "+X+" Y "+Y+c2.printInfo()+" "+c3.printInfo());
LOGGER.log(Level.FINEST, this.recalc+"] "+this.printInfo()+" alpha "+Math.toDegrees(alpha)+" X "+X+" Y "+Y+c2.printInfo()+" "+c3.printInfo());
this.set_Point(new Point3D(X, Y, this.get_Point().z()));
}
XY[0] = X;
XY[1] = Y;

return XY;
//LOGGER.log(Level.FINE, this.recalc+"] "+this.printInfo()+" alpha "+Math.toDegrees(alpha)+" X "+X+" Y "+Y+c2.printInfo()+" "+c3.printInfo());
//LOGGER.log(Level.FINEST, this.recalc+"] "+this.printInfo()+" alpha "+Math.toDegrees(alpha)+" X "+X+" Y "+Y+c2.printInfo()+" "+c3.printInfo());
}
*/

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

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

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

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

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

hit.setCrossDirIntersWire(new Point3D(x,y,z));
Expand Down
2 changes: 1 addition & 1 deletion reconstruction/dc/src/main/java/org/jlab/rec/dc/nn/PatternRec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public CrossList RecomposeCrossList(List<Segment> clusters,
if(entry.getValue().size()==3)
crossList.add(entry.getValue());
for(Cross c : entry.getValue())
LOGGER.log(Level.FINE, "AI"+c.printInfo()+c.get_Segment1().printInfo()+c.get_Segment2().printInfo());
LOGGER.log(Level.FINEST, "AI"+c.printInfo()+c.get_Segment1().printInfo()+c.get_Segment2().printInfo());
}
return crossList;
}
Expand Down
4 changes: 2 additions & 2 deletions reconstruction/dc/src/main/java/org/jlab/rec/dc/segment/Segment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ public boolean isCloseTo(Segment otherseg) {
/// <center><b>|Xwires<sub>2</sub>-Xwires<sub>1</sub>| = a*Xwires<sub>1</sub> + b</b></center>\n
/// where a and b are DC parameters set by DC_RSEG_a and DC_RSEG_B .\n\n
boolean value = false;
//LOGGER.log(Level.FINE, "in Segment DeltaW "+Math.abs(this.getAvgwire()-otherseg.getAvgwire() )+
//LOGGER.log(Level.FINEST, "in Segment DeltaW "+Math.abs(this.getAvgwire()-otherseg.getAvgwire() )+
// " < ? "+(Constants.DC_RSEG_A * this.getAvgwire() + Constants.DC_RSEG_B));
if (Math.abs(this.getAvgwire() - otherseg.getAvgwire()) < Constants.DC_RSEG_A * this.getAvgwire() + Constants.DC_RSEG_B) {
value = true;
Expand All @@ -229,7 +229,7 @@ public boolean hasNoMatchingSegment(List<Segment> othersegs) {
/// <center><b>|Xwires<sub>2</sub>-Xwires<sub>1</sub>| = a*Xwires<sub>1</sub> + b</b></center>\n
/// where a and b are DC parameters set by DC_RSEG_a and DC_RSEG_B .\n\n
boolean value = true;
//LOGGER.log(Level.FINE, "in Segment DeltaW "+Math.abs(this.getAvgwire()-otherseg.getAvgwire() )+
//LOGGER.log(Level.FINEST, "in Segment DeltaW "+Math.abs(this.getAvgwire()-otherseg.getAvgwire() )+
// " < ? "+(Constants.DC_RSEG_A * this.getAvgwire() + Constants.DC_RSEG_B));
for(Segment otherseg : othersegs) {
if (Math.abs(this.getAvgwire() - otherseg.getAvgwire()) < Constants.DC_RSEG_A * this.getAvgwire() + Constants.DC_RSEG_B) {
Expand Down
Loading
Loading