Fix for branching logic in tracking core.

Changed "&&" to "||" as discussed yesterday in private conversations.

Includes !1903 (closed) and should be applied after the other MR is merged (bugfix is in the second-to-last commit here, see !1910 (0fb80229)).

algo/ca/core/tracking/CaTrackExtender.cxx

@@ -55,9 +55,9 @@ void TrackExtender::FitBranchFast(const ca::Branch& t, TrackParamV& Tout, const
   const int iFirstHit         = (direction == FitDirection::kUpstream) ? nHits - 1 : 0;
   const int iLastHit          = (direction == FitDirection::kUpstream) ? 0 : nHits - 1;
 
-  const ca::Hit& hit0 = fInputData->GetHit(hits[iFirstHit]);
-  const ca::Hit& hit1 = fInputData->GetHit(hits[iFirstHit + step]);
-  const ca::Hit& hit2 = fInputData->GetHit(hits[iFirstHit + 2 * step]);
+  const ca::Hit& hit0 = frWData->Hit(hits[iFirstHit]);
+  const ca::Hit& hit1 = frWData->Hit(hits[iFirstHit + step]);
+  const ca::Hit& hit2 = frWData->Hit(hits[iFirstHit + 2 * step]);
 
   int ista0 = hit0.Station();
   int ista1 = hit1.Station();
@@ -113,7 +113,7 @@ void TrackExtender::FitBranchFast(const ca::Branch& t, TrackParamV& Tout, const
   fld.Set(fldB2, fldZ2, fldB1, fldZ1, fldB0, fldZ0);
 
   for (int i = iFirstHit + step; step * i <= step * iLastHit; i += step) {
-    const ca::Hit& hit           = fInputData->GetHit(hits[i]);
+    const ca::Hit& hit           = frWData->Hit(hits[i]);
     int ista                     = hit.Station();
     const ca::Station<fvec>& sta = fParameters.GetStation(ista);
 
@@ -162,9 +162,9 @@ void TrackExtender::FindMoreHits(ca::Branch& t, TrackParamV& Tout, const FitDire
   const int iFirstHit         = (direction == FitDirection::kUpstream) ? 2 : t.NofHits() - 3;
   //  int ista = fInputData->GetHit(t.Hits[iFirstHit]).iSt + 2 * step; // current station. set to the end of track
 
-  const ca::Hit& hit0 = fInputData->GetHit(t.Hits()[iFirstHit]);  // optimize
-  const ca::Hit& hit1 = fInputData->GetHit(t.Hits()[iFirstHit + step]);
-  const ca::Hit& hit2 = fInputData->GetHit(t.Hits()[iFirstHit + 2 * step]);
+  const ca::Hit& hit0 = frWData->Hit(t.Hits()[iFirstHit]);  // optimize
+  const ca::Hit& hit1 = frWData->Hit(t.Hits()[iFirstHit + step]);
+  const ca::Hit& hit2 = frWData->Hit(t.Hits()[iFirstHit + 2 * step]);
 
   const int ista0 = hit0.Station();
   const int ista1 = hit1.Station();
@@ -267,7 +267,7 @@ void TrackExtender::FindMoreHits(ca::Branch& t, TrackParamV& Tout, const FitDire
 
 
     const ca::Hit& hit = frWData->Hit(iHit_best);
-    newHits.push_back(hit.Id());
+    newHits.push_back(iHit_best);
 
     fit.Extrapolate(hit.Z(), fld);
     fit.FilterHit(hit, fmask(sta.timeInfo));
@@ -308,10 +308,9 @@ void TrackExtender::FindMoreHits(ca::Branch& t, TrackParamV& Tout, const FitDire
 }  // void ca::Framework::FindMoreHits
 
 /// Try to extrapolate and find additional hits on other stations
-fscal TrackExtender::ExtendBranch(ca::Branch& t, const InputData& input, WindowData& wData)
+fscal TrackExtender::ExtendBranch(ca::Branch& t, WindowData& wData)
 {
-  fInputData = &input;
-  frWData    = &wData;
+  frWData = &wData;
   //   const unsigned int minNHits = 3;
 
   TrackParamV T;