Skip to content

Dc beta time walk #424

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

Closed
zieglerv wants to merge 8 commits into from
Closed

Dc beta time walk #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e6fcc96
T2D with beta dependence.
Aug 24, 2024
e849ba4
Fix for instances where the t2d function turns over.
Aug 27, 2024
0c9dd60
Fix in last interpolation step.
Aug 27, 2024
44e6208
Fix table filling
Aug 28, 2024
be0b4fc
B-field interpolation test interpolation in B instead of B^2.
Aug 28, 2024
b3d5030
Added modularity for calibration use
Aug 28, 2024
e5ab05d
version bump
Sep 5, 2024
c44a1ff
Merge branch 'development' into DCBetaTimeWalk
Sep 5, 2024
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
18 changes: 9 additions & 9 deletions reconstruction/dc/src/main/java/org/jlab/rec/dc/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public static Constants getInstance() {
public int SECTORSELECT = 0;
public int NSUPERLAYERTRACKING = 5;
private boolean USETSTART = true;
private boolean USETIMETBETA = false;
//private boolean USETIMETBETA = false;
private boolean CHECKBETA = false;
private int T2D = 1; // 1=polynomial, 0=exponential
private boolean USEDOUBLETS = false;
Expand Down Expand Up @@ -296,13 +296,13 @@ public void setUSETSTART(boolean usetstart) {
USETSTART = usetstart;
}

public boolean useUSETIMETBETA() {
return USETIMETBETA;
}

public void setUSETIMETBETA(boolean usetimebeta) {
USETIMETBETA = usetimebeta;
}
// public boolean useUSETIMETBETA() {
// return USETIMETBETA;
// }
//
// public void setUSETIMETBETA(boolean usetimebeta) {
// USETIMETBETA = usetimebeta;
// }

public double getWIREDIST() {
return WIREDIST;
Expand Down Expand Up @@ -429,7 +429,7 @@ public void printConfig(String engine) {
LOGGER.log(Level.INFO, "["+engine+"] run with wire ministagger = " + MINISTAGGERSTATUS.getName());
LOGGER.log(Level.INFO, "["+engine+"] run with wire feedthroughs = " + FEEDTHROUGHSSTATUS.getName());
LOGGER.log(Level.INFO, "["+engine+"] run with wire distortions = " + ENDPLATESBOWING);
LOGGER.log(Level.INFO, "["+engine+"] run with with time Beta correction (is false for doca Beta correction) = " + USETIMETBETA);
//LOGGER.log(Level.INFO, "["+engine+"] run with with time Beta correction (is false for doca Beta correction) = " + USETIMETBETA);
LOGGER.log(Level.INFO, "["+engine+"] run with with Beta cut = " + CHECKBETA);
LOGGER.log(Level.INFO, "["+engine+"] run with time to distance function set to exponential/polynomial (0/1) = " + T2D);
LOGGER.log(Level.INFO, "["+engine+"] run with with hit doublets recovery = " + USEDOUBLETS);
Expand Down
43 changes: 22 additions & 21 deletions reconstruction/dc/src/main/java/org/jlab/rec/dc/hit/FittedHit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,27 +385,28 @@ public void set_TimeToDistance(DataEvent event, double trkAngle, double B, Index
double deltatime_beta = 0;
double deltadoca_beta = 0;

if(Constants.getInstance().useUSETIMETBETA()==true) {
deltatime_beta = calcDeltaTimeBetaTFCN(this.get_Time(), tab, beta);
}

if(event.hasBank("MC::Particle")==false) {
distance = tde.interpolateOnGrid(B, Math.toDegrees(ralpha),
this.getCorrectedTime(this.get_Time(), deltatime_beta),
secIdx, slIdx);
} else {
distance = tde.interpolateOnGrid(B, Math.toDegrees(ralpha),
this.getCorrectedTime(this.get_Time(), 0),
secIdx, slIdx) ;
}
//get deltadoca
if(Constants.getInstance().useUSETIMETBETA()==false) {
deltadoca_beta = calcDeltaDocaBeta(distance, tab, beta);
}

distance -=deltadoca_beta;
this.set_DeltaTimeBeta(deltatime_beta);
this.set_DeltaDocaBeta(deltadoca_beta);
// if(Constants.getInstance().useUSETIMETBETA()==true) {
// deltatime_beta = calcDeltaTimeBetaTFCN(this.get_Time(), tab, beta);
// }
//
// if(event.hasBank("MC::Particle")==false) {
// distance = tde.interpolateOnGrid(B, Math.toDegrees(ralpha),
// this.getCorrectedTime(this.get_Time(), deltatime_beta),
// secIdx, slIdx);
// } else {
// distance = tde.interpolateOnGrid(B, Math.toDegrees(ralpha),
// this.getCorrectedTime(this.get_Time(), 0),
// secIdx, slIdx) ;
// }
// //get deltadoca
// if(Constants.getInstance().useUSETIMETBETA()==false) {
// deltadoca_beta = calcDeltaDocaBeta(distance, tab, beta);
// }
//
// distance -=deltadoca_beta;
//this.set_DeltaTimeBeta(deltatime_beta);
//this.set_DeltaDocaBeta(deltadoca_beta);
distance = tde.interpolateOnGrid(B, Math.toDegrees(ralpha), beta, this.get_Time(), secIdx, slIdx);

}

Expand Down
2 changes: 1 addition & 1 deletion reconstruction/dc/src/main/java/org/jlab/rec/dc/timetodistance/T2DFunctions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ public static double polyFcnMac(double x, double alpha, double bfield, double v_
double time = 0;
// alpha correction
double cos30minusalpha=Math.cos(Math.toRadians(30.-alpha));
double dmaxalpha = dmax*cos30minusalpha;
double dmaxalpha = dmax*cos30minusalpha;
double xhatalpha = x/dmaxalpha;
// rcapital is an intermediate parameter
double rcapital = R*dmax;
Expand Down
Loading
Loading