Skip to content

Remove MC-specific condition in DC hit reconstruction #441

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

Draft
wants to merge 2 commits into
base: development
Choose a base branch
from
Draft

Remove MC-specific condition in DC hit reconstruction #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1a3f70
accounting for tstart, tflight and tprop in MC tracks reconstruction
raffaelladevita Jan 3, 2025
33158cf
removed check on run number when setting the DC hit uncertainty
raffaelladevita Jan 15, 2025
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
11 changes: 1 addition & 10 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 @@ -378,11 +378,6 @@ private void read_HBHits(TimeToDistanceEstimator tde) {
tFlight[i] = this.id2tidtFlight.get(id[i]);
}

if (event.hasBank("MC::Particle") ||
event.getBank("RUN::config").getInt("run", 0) < 100) {
tProp[i] = 0;
tFlight[i] = 0;
}
}

int size = layer.length;
Expand All @@ -405,12 +400,8 @@ private void read_HBHits(TimeToDistanceEstimator tde) {
continue;
}

if (!event.hasBank("MC::Particle") &&
event.getBank("RUN::config").getInt("run", 0) > 100) {
//T_0 = this.getT0(sector[i], slayer[i], layer[i], wire[i], T0, T0ERR)[0];
if (event.hasBank(recBankName))
if (event.hasBank(recBankName))
T_Start = event.getBank(recBankName).getFloat("startTime", 0);
}

T_0 = this.getT0(sector[i], slayer[i], layer[i], wire[i], t0s)[0];
FittedHit hit = new FittedHit(sector[i], slayer[i], layer[i], wire[i], tdc[i], jitter[i], id[i]);
Expand Down
2 changes: 1 addition & 1 deletion reconstruction/dc/src/main/java/org/jlab/rec/dc/banks/RecoBankWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@ private DataBank fillTBHitsBank(DataEvent event, List<FittedHit> hitlist) {
if(bank.getDescriptor().hasEntry("beta")){
bank.setFloat("beta", i, (float) hitlist.get(i).get_Beta());
}
if(hitlist.get(i).get_AssociatedTBTrackID()>-1 && !event.hasBank("MC::Particle")) {
if(hitlist.get(i).get_AssociatedTBTrackID()>-1) {
if(hitlist.get(i).getSignalPropagTimeAlongWire()==0 || hitlist.get(i).get_AssociatedTBTrackID()<1) {
bank.setFloat("TProp", i, (float) hitlist.get(i).getTProp()); //old value if track fit failed
} else {
Expand Down
3 changes: 1 addition & 2 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 @@ -194,8 +194,7 @@ public double get_PosErr(DataEvent event, double B, IndexedTable constants0, Ind
}

double x = this.get_Doca() / this.get_CellSize();
if(event.hasBank("MC::Particle") ||
event.getBank("RUN::config").getInt("run", 0) < 100 ) { // for MC use functional form put in simulation
if(event.hasBank("MC::Particle")) { // for MC use functional form put in simulation

double p1 = constants0.getDoubleValue("parameter1", this.get_Sector(),this.get_Superlayer(),0);
double p2 = constants0.getDoubleValue("parameter2", this.get_Sector(),this.get_Superlayer(),0);
Expand Down
Loading