Skip to content

GitLab

Commit d8163335 authored by Sergey Gorbunov's avatar Sergey Gorbunov
Browse files

remove variables named B0 as it conflicts with ROOT B0() macro on mac OsX

parent 30adbcea
Hide whitespace changes
Inline Side-by-side
Showing with 217 additions and 217 deletions
reco/L1/CbmL1.cxx
View file @ d8163335
......@@ -1220,9 +1220,9 @@ void CbmL1::Reconstruct(CbmEvent* event)
// algo->L1KFTrackFitter( fExtrapolateToTheEndOfSTS );
{ // track fit
L1FieldValue fB0 = algo->GetVtxFieldValue();
L1FieldValue b = algo->GetVtxFieldValue();
if ((fabs(fB0.x[0]) < 0.0000001) && (fabs(fB0.y[0]) < 0.0000001) && (fabs(fB0.z[0]) < 0.0000001)) {
if ((fabs(b.x[0]) < 0.0000001) && (fabs(b.y[0]) < 0.0000001) && (fabs(b.z[0]) < 0.0000001)) {
algo->KFTrackFitter_simple();
}
else {
......
reco/L1/CbmL1TrackFitter.cxx
View file @ d8163335
......@@ -67,25 +67,25 @@ void CbmL1::TrackFitter(vector<CbmL1Track>& Tracks, CbmL1Vtx* V)
L1Station *st0 = &(algo->vStations[ist0]);
L1Station *st1 = &(algo->vStations[ist1]);
L1Station *st2 = &(algo->vStations[ist2]);
L1FieldValue B0, B1, B2;
fvec Z0= st0->z, Z1= st1->z, Z2= st2->z ;
st0->fieldSlice.GetFieldValue( (*ih0)->x, (*ih0)->y, B0 );
st1->fieldSlice.GetFieldValue( (*ih1)->x, (*ih1)->y, B1 );
st2->fieldSlice.GetFieldValue( (*ih2)->x, (*ih2)->y, B2 );
fld[ist0].Set( B0, Z0, B1, Z1, B2, Z2 );
L1FieldValue b0, b1, b2;
fvec z0= st0->z, z1= st1->z, z2= st2->z ;
st0->fieldSlice.GetFieldValue( (*ih0)->x, (*ih0)->y, b0 );
st1->fieldSlice.GetFieldValue( (*ih1)->x, (*ih1)->y, b1 );
st2->fieldSlice.GetFieldValue( (*ih2)->x, (*ih2)->y, b2 );
fld[ist0].Set( b0, z0, b1, z1, b2, z2 );
fld[ist1] = fld[ist0];
fld[ist2] = fld[ist0];
if( ih0!=T.StsHits.end() ){
while(1){
ih2 = ih1; B2 = B1; Z2 = Z1; st2 = st1;
ih1 = ih0; B1 = B0; Z1 = Z0; st1 = st0;
ih2 = ih1; b2 = b1; z2 = z1; st2 = st1;
ih1 = ih0; b1 = b0; z1 = z0; st1 = st0;
ih0++;
if( ih0==T.StsHits.end() ) break;
ist0 = (*ih0)->iStation;
st0 = &(algo->vStations[ist0]);
Z0 = st0->z;
st0->fieldSlice.GetFieldValue( (*ih0)->x, (*ih0)->y, B0 );
fld[ist0].Set( B0, Z0, B1, Z1, B2, Z2 );
z0 = st0->z;
st0->fieldSlice.GetFieldValue( (*ih0)->x, (*ih0)->y, b0 );
fld[ist0].Set( b0, z0, b1, z1, b2, z2 );
}
}
}
......
reco/L1/L1Algo/L1Field.h
View file @ d8163335
......@@ -129,46 +129,46 @@ public:
B[2] = cz0 + cz1 * dz + cz2 * dz2;
}
void Set(const L1FieldValue& B0, const fvec B0z, const L1FieldValue& B1, const fvec B1z, const L1FieldValue& B2,
const fvec B2z)
void Set(const L1FieldValue& b0, const fvec b0z, const L1FieldValue& b1, const fvec b1z, const L1FieldValue& b2,
const fvec b2z)
{
z0 = B0z;
fvec dz1 = B1z - B0z, dz2 = B2z - B0z;
z0 = b0z;
fvec dz1 = b1z - b0z, dz2 = b2z - b0z;
fvec det = rcp(fvec(dz1 * dz2 * (dz2 - dz1)));
fvec w21 = -dz2 * det;
fvec w22 = dz1 * det;
fvec w11 = -dz2 * w21;
fvec w12 = -dz1 * w22;
fvec dB1 = B1.x - B0.x;
fvec dB2 = B2.x - B0.x;
cx0 = B0.x;
cx1 = dB1 * w11 + dB2 * w12;
cx2 = dB1 * w21 + dB2 * w22;
dB1 = B1.y - B0.y;
dB2 = B2.y - B0.y;
cy0 = B0.y;
cy1 = dB1 * w11 + dB2 * w12;
cy2 = dB1 * w21 + dB2 * w22;
dB1 = B1.z - B0.z;
dB2 = B2.z - B0.z;
cz0 = B0.z;
cz1 = dB1 * w11 + dB2 * w12;
cz2 = dB1 * w21 + dB2 * w22;
fvec db1 = b1.x - b0.x;
fvec db2 = b2.x - b0.x;
cx0 = b0.x;
cx1 = db1 * w11 + db2 * w12;
cx2 = db1 * w21 + db2 * w22;
db1 = b1.y - b0.y;
db2 = b2.y - b0.y;
cy0 = b0.y;
cy1 = db1 * w11 + db2 * w12;
cy2 = db1 * w21 + db2 * w22;
db1 = b1.z - b0.z;
db2 = b2.z - b0.z;
cz0 = b0.z;
cz1 = db1 * w11 + db2 * w12;
cz2 = db1 * w21 + db2 * w22;
}
void Set(const L1FieldValue& B0, const fvec B0z, const L1FieldValue& B1, const fvec B1z)
void Set(const L1FieldValue& b0, const fvec b0z, const L1FieldValue& b1, const fvec b1z)
{
z0 = B0z[0];
fvec dzi = rcp(fvec(B1z - B0z));
cx0 = B0.x;
cy0 = B0.y;
cz0 = B0.z;
cx1 = (B1.x - B0.x) * dzi;
cy1 = (B1.y - B0.y) * dzi;
cz1 = (B1.z - B0.z) * dzi;
z0 = b0z[0];
fvec dzi = rcp(fvec(b1z - b0z));
cx0 = b0.x;
cy0 = b0.y;
cz0 = b0.z;
cx1 = (b1.x - b0.x) * dzi;
cy1 = (b1.y - b0.y) * dzi;
cz1 = (b1.z - b0.z) * dzi;
cx2 = cy2 = cz2 = 0;
}
......
reco/L1/L1Algo/L1TrackExtender.cxx
View file @ d8163335
......@@ -105,18 +105,18 @@ void L1Algo::BranchFitterFast(const L1Branch& t, L1TrackPar& T, const bool dir,
T.C44 = 1.;
T.C55 = hit0.dt * hit0.dt;
L1FieldValue fB0, fB1, fB2 _fvecalignment;
L1FieldValue fldB0, fldB1, fldB2 _fvecalignment;
L1FieldRegion fld _fvecalignment;
fvec fz0 = sta1.z; // suppose field is smoth
fvec fz1 = sta2.z;
fvec fz2 = sta0.z;
fvec fldZ0 = sta1.z; // suppose field is smoth
fvec fldZ1 = sta2.z;
fvec fldZ2 = sta0.z;
sta1.fieldSlice.GetFieldValue(x1, y1, fB0);
sta2.fieldSlice.GetFieldValue(x2, y2, fB1);
sta0.fieldSlice.GetFieldValue(x0, y0, fB2);
sta1.fieldSlice.GetFieldValue(x1, y1, fldB0);
sta2.fieldSlice.GetFieldValue(x2, y2, fldB1);
sta0.fieldSlice.GetFieldValue(x0, y0, fldB2);
fld.Set(fB2, fz2, fB1, fz1, fB0, fz0);
fld.Set(fldB2, fldZ2, fldB1, fldZ1, fldB0, fldZ0);
int ista_prev = ista1;
int ista = ista2;
......@@ -163,16 +163,16 @@ void L1Algo::BranchFitterFast(const L1Branch& t, L1TrackPar& T, const bool dir,
FilterTime(T, hit.t, hit.dt);
fB0 = fB1;
fB1 = fB2;
fz0 = fz1;
fz1 = fz2;
fldB0 = fldB1;
fldB1 = fldB2;
fldZ0 = fldZ1;
fldZ1 = fldZ2;
fvec x, y;
StripsToCoor(u, v, x, y, sta);
sta.fieldSlice.GetFieldValue(x, y, fB2);
sta.fieldSlice.GetFieldValue(x, y, fldB2);
fz2 = sta.z;
fld.Set(fB2, fz2, fB1, fz1, fB0, fz0);
fldZ2 = sta.z;
fld.Set(fldB2, fldZ2, fldB1, fldZ1, fldB0, fldZ0);
} // i
} // void L1Algo::BranchFitterFast
......@@ -232,17 +232,17 @@ void L1Algo::FindMoreHits(L1Branch& t, L1TrackPar& T, const bool dir,
fvec x2, y2;
StripsToCoor(u2, v2, x2, y2, sta2);
L1FieldValue fB0, fB1, fB2 _fvecalignment;
L1FieldValue fldB0, fldB1, fldB2 _fvecalignment;
L1FieldRegion fld _fvecalignment;
fvec fz0 = sta1.z;
fvec fz1 = sta2.z;
fvec fz2 = sta0.z;
fvec fldZ0 = sta1.z;
fvec fldZ1 = sta2.z;
fvec fldZ2 = sta0.z;
sta1.fieldSlice.GetFieldValue(x1, y1, fB0);
sta2.fieldSlice.GetFieldValue(x2, y2, fB1);
sta0.fieldSlice.GetFieldValue(x0, y0, fB2);
sta1.fieldSlice.GetFieldValue(x1, y1, fldB0);
sta2.fieldSlice.GetFieldValue(x2, y2, fldB1);
sta0.fieldSlice.GetFieldValue(x0, y0, fldB2);
fld.Set(fB2, fz2, fB1, fz1, fB0, fz0);
fld.Set(fldB2, fldZ2, fldB1, fldZ1, fldB0, fldZ0);
int ista = ista2 + 2 * step; // skip one station. if there would be hit it has to be found on previous stap
......@@ -343,13 +343,13 @@ void L1Algo::FindMoreHits(L1Branch& t, L1TrackPar& T, const bool dir,
FilterTime(T, hit.t, hit.dt);
fB0 = fB1;
fB1 = fB2;
fz0 = fz1;
fz1 = fz2;
sta.fieldSlice.GetFieldValue(x, y, fB2);
fz2 = sta.z;
fld.Set(fB2, fz2, fB1, fz1, fB0, fz0);
fldB0 = fldB1;
fldB1 = fldB2;
fldZ0 = fldZ1;
fldZ1 = fldZ2;
sta.fieldSlice.GetFieldValue(x, y, fldB2);
fldZ2 = sta.z;
fld.Set(fldB2, fldZ2, fldB1, fldZ1, fldB0, fldZ0);
}
// save hits
......
reco/L1/L1Algo/L1TrackFitter.cxx
View file @ d8163335
......@@ -107,20 +107,20 @@ void L1Algo::KFTrackFitter_simple() // TODO: Add pipe.
T.C22 = T.C33 = vINF;
T.C44 = 1.;
// static L1FieldValue fB0, fB1, fB2 _fvecalignment;
// static L1FieldValue fldB0, fldB1, fldB2 _fvecalignment;
// static L1FieldRegion fld _fvecalignment;
L1FieldValue fB0, fB1, fB2 _fvecalignment;
L1FieldValue fldB0, fldB1, fldB2 _fvecalignment;
L1FieldRegion fld _fvecalignment;
fvec fz0 = sta1.z; // suppose field is smoth
fvec fz1 = sta2.z;
fvec fz2 = sta0.z;
fvec fldZ0 = sta1.z; // suppose field is smoth
fvec fldZ1 = sta2.z;
fvec fldZ2 = sta0.z;
sta1.fieldSlice.GetFieldValue(x1, y1, fB0);
sta2.fieldSlice.GetFieldValue(x2, y2, fB1);
sta0.fieldSlice.GetFieldValue(x0, y0, fB2);
sta1.fieldSlice.GetFieldValue(x1, y1, fldB0);
sta2.fieldSlice.GetFieldValue(x2, y2, fldB1);
sta0.fieldSlice.GetFieldValue(x0, y0, fldB2);
fld.Set(fB2, fz2, fB1, fz1, fB0, fz0);
fld.Set(fldB2, fldZ2, fldB1, fldZ1, fldB0, fldZ0);
int ista = ista2;
//cout<<"\nfit, iter=:"<<iter<<endl;
......@@ -150,14 +150,14 @@ void L1Algo::KFTrackFitter_simple() // TODO: Add pipe.
L1Filter(T, sta.frontInfo, u);
L1Filter(T, sta.backInfo, v);
fB0 = fB1;
fB1 = fB2;
fz0 = fz1;
fz1 = fz2;
sta.fieldSlice.GetFieldValue(x, y, fB2);
fz2 = sta.z;
fld.Set(fB2, fz2, fB1, fz1, fB0, fz0);
fldB0 = fldB1;
fldB1 = fldB2;
fldZ0 = fldZ1;
fldZ1 = fldZ2;
sta.fieldSlice.GetFieldValue(x, y, fldB2);
fldZ2 = sta.z;
fld.Set(fldB2, fldZ2, fldB1, fldZ1, fldB0, fldZ0);
} // i
// write received parametres in track
......@@ -245,19 +245,19 @@ void L1Algo::KFTrackFitter_simple() // TODO: Add pipe.
T.C22 = T.C33 = vINF;
T.C44 = 1.;
// static L1FieldValue fB0, fB1, fB2 _fvecalignment;
// static L1FieldValue fldB0, fldB1, fldB2 _fvecalignment;
// static L1FieldRegion fld _fvecalignment;
L1FieldValue fB0, fB1, fB2 _fvecalignment;
L1FieldValue fldB0, fldB1, fldB2 _fvecalignment;
L1FieldRegion fld _fvecalignment;
fvec fz0 = sta1.z;
fvec fz1 = sta2.z;
fvec fz2 = sta0.z;
fvec fldZ0 = sta1.z;
fvec fldZ1 = sta2.z;
fvec fldZ2 = sta0.z;
sta1.fieldSlice.GetFieldValue(x1, y1, fB0);
sta2.fieldSlice.GetFieldValue(x2, y2, fB1);
sta0.fieldSlice.GetFieldValue(x0, y0, fB2);
sta1.fieldSlice.GetFieldValue(x1, y1, fldB0);
sta2.fieldSlice.GetFieldValue(x2, y2, fldB1);
sta0.fieldSlice.GetFieldValue(x0, y0, fldB2);
fld.Set(fB2, fz2, fB1, fz1, fB0, fz0);
fld.Set(fldB2, fldZ2, fldB1, fldZ1, fldB0, fldZ0);
int ista = ista2;
for (int i = 1; i < nHits; i++) {
......@@ -282,13 +282,13 @@ void L1Algo::KFTrackFitter_simple() // TODO: Add pipe.
L1Filter(T, sta.frontInfo, u);
L1Filter(T, sta.backInfo, v);
fB0 = fB1;
fB1 = fB2;
fz0 = fz1;
fz1 = fz2;
sta.fieldSlice.GetFieldValue(x, y, fB2);
fz2 = sta.z;
fld.Set(fB2, fz2, fB1, fz1, fB0, fz0);
fldB0 = fldB1;
fldB1 = fldB2;
fldZ0 = fldZ1;
fldZ1 = fldZ2;
sta.fieldSlice.GetFieldValue(x, y, fldB2);
fldZ2 = sta.z;
fld.Set(fldB2, fldZ2, fldB1, fldZ1, fldB0, fldZ0);
}
// write received parametres in track
......@@ -328,13 +328,13 @@ void L1Algo::L1KFTrackFitter()
// cout << " Start L1 Track Fitter " << endl;
int start_hit = 0; // for interation in fRecoHits[]
// static L1FieldValue fB0, fB1, fB2 _fvecalignment;
// static L1FieldValue fldB0, fldB1, fldB2 _fvecalignment;
// static L1FieldRegion fld _fvecalignment;
L1FieldValue fB0, fB1, fB2 _fvecalignment;
L1FieldValue fldB0, fldB1, fldB2 _fvecalignment;
L1FieldRegion fld _fvecalignment;
L1FieldValue fB01, fB11, fB21 _fvecalignment;
L1FieldValue fldB01, fldB11, fldB21 _fvecalignment;
L1FieldRegion fld1 _fvecalignment;
const int nHits = NStations;
......@@ -359,7 +359,7 @@ void L1Algo::L1KFTrackFitter()
time_er_lst, d_x_lst, d_y_lst, d_xy_lst;
fvec Sy[fkMaxNstations], w[fkMaxNstations], w_time[fkMaxNstations];
fvec y_temp, x_temp;
fvec fz0, fz1, fz2, z_start, z_end;
fvec fldZ0, fldZ1, fldZ2, z_start, z_end;
L1FieldValue fB[fkMaxNstations], fB_temp _fvecalignment;
fvec ZSta[fkMaxNstations];
......@@ -475,25 +475,25 @@ void L1Algo::L1KFTrackFitter()
// fit.L1AddMaterial( T, sta[i].materialInfo, qp0, 1 );
fz1 = z[i];
fldZ1 = z[i];
sta[i].fieldSlice.GetFieldValue(T.x, T.y, fB1);
sta[i].fieldSlice.GetFieldValue(T.x, T.y, fldB1);
fB1.Combine(fB[i], w[i]);
fldB1.Combine(fB[i], w[i]);
fz2 = z[i - 2];
fvec dz = fz2 - fz1;
sta[i].fieldSlice.GetFieldValue(T.x + T.tx * dz, T.y + T.ty * dz, fB2);
fB2.Combine(fB[i - 2], w[i - 2]);
fld.Set(fB2, fz2, fB1, fz1, fB0, fz0);
fldZ2 = z[i - 2];
fvec dz = fldZ2 - fldZ1;
sta[i].fieldSlice.GetFieldValue(T.x + T.tx * dz, T.y + T.ty * dz, fldB2);
fldB2.Combine(fB[i - 2], w[i - 2]);
fld.Set(fldB2, fldZ2, fldB1, fldZ1, fldB0, fldZ0);
for (--i; i >= 0; i--) {
fz0 = z[i];
dz = (fz1 - fz0);
sta[i].fieldSlice.GetFieldValue(T.x - T.tx * dz, T.y - T.ty * dz, fB0);
fB0.Combine(fB[i], w[i]);
fld.Set(fB0, fz0, fB1, fz1, fB2, fz2);
fldZ0 = z[i];
dz = (fldZ1 - fldZ0);
sta[i].fieldSlice.GetFieldValue(T.x - T.tx * dz, T.y - T.ty * dz, fldB0);
fldB0.Combine(fB[i], w[i]);
fld.Set(fldB0, fldZ0, fldB1, fldZ1, fldB2, fldZ2);
fvec initialised = fvec(z[i] < z_end) & fvec(z_start <= z[i]);
fvec w1 = (w[i] & (initialised));
......@@ -542,10 +542,10 @@ void L1Algo::L1KFTrackFitter()
T1.Filter(time[i], timeEr[i], w1_time, sta[i].timeInfo);
fB2 = fB1;
fz2 = fz1;
fB1 = fB0;
fz1 = fz0;
fldB2 = fldB1;
fldZ2 = fldZ1;
fldB1 = fldB0;
fldZ1 = fldZ0;
}
// fit.L1AddHalfMaterial( T, sta[i].materialInfo, qp0 );
......@@ -639,22 +639,22 @@ void L1Algo::L1KFTrackFitter()
qp0 = T.qp;
qp01 = T1.fqp;
fz1 = z[i];
sta[i].fieldSlice.GetFieldValue(T.x, T.y, fB1);
fB1.Combine(fB[i], w[i]);
fldZ1 = z[i];
sta[i].fieldSlice.GetFieldValue(T.x, T.y, fldB1);
fldB1.Combine(fB[i], w[i]);
fz2 = z[i + 2];
dz = fz2 - fz1;
sta[i].fieldSlice.GetFieldValue(T.x + T.tx * dz, T.y + T.ty * dz, fB2);
fB2.Combine(fB[i + 2], w[i + 2]);
fld.Set(fB2, fz2, fB1, fz1, fB0, fz0);
fldZ2 = z[i + 2];
dz = fldZ2 - fldZ1;
sta[i].fieldSlice.GetFieldValue(T.x + T.tx * dz, T.y + T.ty * dz, fldB2);
fldB2.Combine(fB[i + 2], w[i + 2]);
fld.Set(fldB2, fldZ2, fldB1, fldZ1, fldB0, fldZ0);
for (++i; i < nHits; i++) {
fz0 = z[i];
dz = (fz1 - fz0);
sta[i].fieldSlice.GetFieldValue(T.x - T.tx * dz, T.y - T.ty * dz, fB0);
fB0.Combine(fB[i], w[i]);
fld.Set(fB0, fz0, fB1, fz1, fB2, fz2);
fldZ0 = z[i];
dz = (fldZ1 - fldZ0);
sta[i].fieldSlice.GetFieldValue(T.x - T.tx * dz, T.y - T.ty * dz, fldB0);
fldB0.Combine(fB[i], w[i]);
fld.Set(fldB0, fldZ0, fldB1, fldZ1, fldB2, fldZ2);
fvec initialised = fvec(z[i] <= z_end) & fvec(z_start < z[i]);
fvec w1 = (w[i] & (initialised));
......@@ -700,10 +700,10 @@ void L1Algo::L1KFTrackFitter()
T1.Filter(time[i], timeEr[i], w1_time, sta[i].timeInfo);
fB2 = fB1;
fz2 = fz1;
fB1 = fB0;
fz1 = fz0;
fldB2 = fldB1;
fldZ2 = fldZ1;
fldB1 = fldB0;
fldZ1 = fldZ0;
}
// fit.L1AddHalfMaterial( T, sta[i].materialInfo, qp0 );
......@@ -750,13 +750,13 @@ void L1Algo::L1KFTrackFitterMuch()
// cout << " Start L1 Track Fitter " << endl;
int start_hit = 0; // for interation in fRecoHits[]
// static L1FieldValue fB0, fB1, fB2 _fvecalignment;
// static L1FieldValue fldB0, fldB1, fldB2 _fvecalignment;
// static L1FieldRegion fld _fvecalignment;
L1FieldValue fB0, fB1, fB2 _fvecalignment;
L1FieldValue fldB0, fldB1, fldB2 _fvecalignment;
L1FieldRegion fld _fvecalignment;
L1FieldValue fB01, fB11, fB21 _fvecalignment;
L1FieldValue fldB01, fldB11, fldB21 _fvecalignment;
L1FieldRegion fld1 _fvecalignment;
const int nHits = NStations;
......@@ -782,7 +782,7 @@ void L1Algo::L1KFTrackFitterMuch()
int iSta[fkMaxNstations];
fvec Sy[fkMaxNstations], w[fkMaxNstations];
fvec y_temp, x_temp;
fvec fz0, fz1, fz2, z_start, z_end;
fvec fldZ0, fldZ1, fldZ2, z_start, z_end;
L1FieldValue fB[fkMaxNstations], fB_temp _fvecalignment;
fvec ZSta[fkMaxNstations];
......@@ -912,33 +912,33 @@ void L1Algo::L1KFTrackFitterMuch()
FilterFirst(T1, x_first, y_first, time_first, time_er_fst, staFirst, d_x_fst, d_y_fst, d_xy_fst);
fz1 = z[i];
fldZ1 = z[i];
sta[i].fieldSlice.GetFieldValue(T.x, T.y, fB1);
sta[i].fieldSlice.GetFieldValue(T.x, T.y, fldB1);
fB1.Combine(fB[i], w[i]);
fldB1.Combine(fB[i], w[i]);
fz2 = z[i + 2];
dz = fz2 - fz1;
sta[i].fieldSlice.GetFieldValue(T.x + T.tx * dz, T.y + T.ty * dz, fB2);
fB2.Combine(fB[i + 2], w[i + 2]);
fldZ2 = z[i + 2];
dz = fldZ2 - fldZ1;
sta[i].fieldSlice.GetFieldValue(T.x + T.tx * dz, T.y + T.ty * dz, fldB2);
fldB2.Combine(fB[i + 2], w[i + 2]);
fld.Set(fB2, fz2, fB1, fz1, fB0, fz0);
fld.Set(fldB2, fldZ2, fldB1, fldZ1, fldB0, fldZ0);
for (++i; i < nHits; i++) {
fvec initialised = fvec(z[i] <= z_end) & fvec(z_start < z[i]);
fvec w1 = (w[i] & (initialised));
fvec wIn = (ONE & (initialised));
fz0 = z[i];
dz = (fz1 - fz0);
fldZ0 = z[i];
dz = (fldZ1 - fldZ0);
if (i < 8) {
sta[i].fieldSlice.GetFieldValue(T.x - T.tx * dz, T.y - T.ty * dz, fB0);
fB0.Combine(fB[i], w[i]);
fld.Set(fB0, fz0, fB1, fz1, fB2, fz2);
sta[i].fieldSlice.GetFieldValue(T.x - T.tx * dz, T.y - T.ty * dz, fldB0);
fldB0.Combine(fB[i], w[i]);
fld.Set(fldB0, fldZ0, fldB1, fldZ1, fldB2, fldZ2);
L1Extrapolate(T, z[i], qp0, fld, &w1);
......@@ -952,10 +952,10 @@ void L1Algo::L1KFTrackFitterMuch()
T1.EnergyLossCorrection(fit.PipeRadThick, qp01, fvec(-1.f), wIn);
}
fB2 = fB1;
fz2 = fz1;
fB1 = fB0;
fz1 = fz0;
fldB2 = fldB1;
fldZ2 = fldZ1;
fldB1 = fldB0;
fldZ1 = fldZ0;
#ifdef USE_RL_TABLE
T1.EnergyLossCorrection(fRadThick[i].GetRadThick(T1.fx, T1.fy), qp01, fvec(-1.f), wIn);
......@@ -1218,24 +1218,24 @@ void L1Algo::L1KFTrackFitterMuch()
T1.ExtrapolateLine(z[7]);
int i_sts = i + 1;
fz1 = z[i_sts]; //7
sta[i_sts].fieldSlice.GetFieldValue(T1.fx, T1.fy, fB1);
fB1.Combine(fB[i_sts], w[i_sts]);
fldZ1 = z[i_sts]; //7
sta[i_sts].fieldSlice.GetFieldValue(T1.fx, T1.fy, fldB1);
fldB1.Combine(fB[i_sts], w[i_sts]);
fz2 = z[i_sts - 2]; //5
dz = fz2 - fz1;
fldZ2 = z[i_sts - 2]; //5
dz = fldZ2 - fldZ1;
sta[i_sts].fieldSlice.GetFieldValue(T1.fx + T1.ftx * dz, T1.fy + T1.fty * dz, fB2);
fB2.Combine(fB[i_sts - 2], w[i_sts - 2]);
sta[i_sts].fieldSlice.GetFieldValue(T1.fx + T1.ftx * dz, T1.fy + T1.fty * dz, fldB2);
fldB2.Combine(fB[i_sts - 2], w[i_sts - 2]);
}
fz0 = z[i];
dz = (fz1 - fz0);
sta[i].fieldSlice.GetFieldValue(T1.fx - T1.ftx * dz, T1.fy - T1.fty * dz, fB0);
fB0.Combine(fB[i], w[i]);
fldZ0 = z[i];
dz = (fldZ1 - fldZ0);
sta[i].fieldSlice.GetFieldValue(T1.fx - T1.ftx * dz, T1.fy - T1.fty * dz, fldB0);
fldB0.Combine(fB[i], w[i]);
fld.Set(fB0, fz0, fB1, fz1, fB2, fz2);
fld.Set(fldB0, fldZ0, fldB1, fldZ1, fldB2, fldZ2);