Skip to content

Kalman dev #859

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
pbutti merged 3 commits into from
May 11, 2021
Merged

Kalman dev #859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cdeb483
Fix some problems found by Norman when looking for tracks flagged by …
robertprestonjohnson May 6, 2021
f2ce3ea
Forgot in the previous commit to remove a debug printout. That is fix…
robertprestonjohnson May 6, 2021
14d891f
Turned off a debug printout
robertprestonjohnson May 8, 2021
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
4 changes: 2 additions & 2 deletions tracking/src/main/java/org/hps/recon/tracking/kalman/KalHit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ String toString(String s) {
if (s=="short") {
int idx = module.hits.indexOf(hit);
if (module.isStereo) {
str = String.format(" {%d %d %d %d %5.1f} ", module.Layer, module.detector, idx, ntks, hit.time);
str = String.format(" {%d %d %d %d %5.1f %6.3f} ", module.Layer, module.detector, idx, ntks, hit.time, hit.energy);
} else {
str = String.format(" (%d %d %d %d %5.1f) ", module.Layer, module.detector, idx, ntks, hit.time);
str = String.format(" (%d %d %d %d %5.1f %6.3f) ", module.Layer, module.detector, idx, ntks, hit.time, hit.energy);
}
} else {
str = String.format("Hit %s in layer %d, detector %d, hit %d, value=%10.5f, #tkrs=%d, candidate chi2=", s, module.Layer, module.detector, module.hits.indexOf(hit), hit.v, ntks);
Expand Down
23 changes: 10 additions & 13 deletions tracking/src/main/java/org/hps/recon/tracking/kalman/KalmanParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,9 @@
import java.util.ArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
//import org.hps.conditions.beam.BeamPosition;
//import org.hps.conditions.beam.BeamPosition.BeamPositionCollection;
//import org.hps.conditions.database.DatabaseConditionsManager;

/**
* Parameters used by the Kalman-Filter pattern recognition and fitting
* @author Robert Johnson
*
*/
public class KalmanParams {
static final int mxTrials = 2; // Max number of iterations through the entire pattern recognition; not configurable
Expand Down Expand Up @@ -119,7 +114,7 @@ public void print() {

minSeedE = new double[numLayers];
for (int lyr=0; lyr<numLayers; ++lyr) {
minSeedE[lyr] = 1.5;
minSeedE[lyr] = 1.3;
}

// Set all the default values
Expand All @@ -132,12 +127,12 @@ public void print() {
kMax[0] = 4.0; // Maximum curvature for seed
kMax[1] = 8.0;
kMin = 0.; // Minimum curvature for seed
tanlMax[0] = 0.10; // Maximum tan(lambda) for seed
tanlMax[0] = 0.104; // Maximum tan(lambda) for seed
tanlMax[1] = 0.13;
dRhoMax[0] = 15.; // Maximum dRho at target plane for seed
dRhoMax[1] = 25.;
dzMax[0] = 4.; // Maximum z at target plane for seed
dzMax[1] = 10.;
dzMax[0] = 3.; // Maximum z at target plane for seed
dzMax[1] = 7.5;
chi2mx1[0] = 8.0; // Maximum chi**2/#hits for good track
chi2mx1[1] = 16.0;
mxChi2Vtx = 1.0; // Maximum chi**2 for 5-hit tracks with vertex constraint
Expand Down Expand Up @@ -183,11 +178,13 @@ public void print() {
addStrategy("000SABS");
addStrategy("0BBS000");
addStrategy("0SBB000");
addStrategy("0000BBS");
addStrategy("000SSBA");
addStrategy("000BSSA");
addStrategy("ABSS000");
addStrategy("SBB0000");
addStrategy("SABS000");
maxListIter1 = 14; // The maximum index for lyrList for the first iteration
maxListIter1 = 16; // The maximum index for lyrList for the first iteration

beamSpot = new double[3];
beamSpot[0] = 0.;
Expand Down Expand Up @@ -301,7 +298,7 @@ public void setMaxK(double kMx) {
}
logger.log(Level.CONFIG,String.format("Setting the maximum 1/pt to %8.2f.", kMx));
kMax[1] = kMx;
kMax[0] = Math.min(kMax[0], 0.6*kMx);
kMax[0] = Math.min(kMax[0], 0.5*kMx);
}

void setMinK(double kMn) {
Expand Down Expand Up @@ -349,7 +346,7 @@ public void setMaxdZ(double zMx) {
}
logger.log(Level.CONFIG,String.format("Setting the maximum dz to %8.2f mm.", zMx));
dzMax[1] = zMx;
dzMax[0] = Math.min(dzMax[0], 0.6*zMx);
dzMax[0] = Math.min(dzMax[0], 0.4*zMx);
}

public void setMaxChi2(double xMx) {
Expand All @@ -359,7 +356,7 @@ public void setMaxChi2(double xMx) {
}
logger.log(Level.CONFIG,String.format("Setting the maximum chi^2/hit to %8.2f.", xMx));
chi2mx1[1] = xMx;
chi2mx1[0] = Math.min(chi2mx1[0], 0.6*xMx);
chi2mx1[0] = Math.min(chi2mx1[0], 0.5*xMx);
}

public void setMaxChi2Vtx(double xMx) {
Expand Down
Loading