Changes in external/TrackCovariance/VertexFit.cc [7bca620:b750b0a] in git

File:

• external/TrackCovariance/VertexFit.cc (modified) (8 diffs)

external/TrackCovariance/VertexFit.cc

@@ -17 +17 @@
 {
         fNtr = 0;
-        fRstart = -1.0;
+        fRold = -1.0;
         fVtxDone = kFALSE;
         fVtxCst = kFALSE;
@@ -31 +31 @@
 {
         fNtr = Ntr;
-        fRstart = -1.0;
+        fRold = -1.0;
         fVtxDone = kFALSE;
         fVtxCst = kFALSE;
@@ -55 +55 @@
 {
         fNtr = Ntr;
-        fRstart = -1.0;
+        fRold = -1.0;
         fVtxDone = kFALSE;
         fVtxCst = kFALSE;
@@ -220 +220 @@
         std::vector<TVectorD*> x0i;                             // Tracks at ma
         std::vector<TVectorD*> ni;                              // Track derivative wrt phase
-        std::vector<TMatrixDSym*> Ci;                           // Position error matrix at fixed phase
+        std::vector<TMatrixDSym*> Ci;                   // Position error matrix at fixed phase
         std::vector<TVectorD*> wi;                              // Ci*ni
-        std::vector<Double_t> s_in;                             // Starting phase
-        //
-        // 
         //
         // Track loop
         for (Int_t i = 0; i < fNtr; i++)
         {
+                Double_t s = 0.;
                 TVectorD par = *fPar[i];
                 TMatrixDSym Cov = *fCov[i];
-                Double_t s = 0.;
-                // Case when starting radius is provided
-                if(fRstart > TMath::Abs(par(0))){
-                        s = 2.*TMath::ASin(par(2)*TMath::Sqrt((fRstart*fRstart-par(0)*par(0))/(1.+2.*par(2)*par(0))));
-                }
-                //
-                x0i.push_back(new TVectorD(Fill_x(par, s)));
+                x0i.push_back(new TVectorD(Fill_x0(par)));
                 ni.push_back(new TVectorD(derXds(par, s)));
                 TMatrixD A = derXdPar(par, s);
@@ -243 +235 @@
                 TMatrixDSym Cinv = RegInv(*Ci[i]);
                 wi.push_back(new TVectorD(Cinv * (*ni[i])));
-                s_in.push_back(s);
         }
         //std::cout << "Vtx init completed. fNtr = "<<fNtr << std::endl;
@@ -271 +262 @@
         for (Int_t i = 0; i < fNtr; i++){
                 Double_t si = Dot(*wi[i], fXv - (*x0i[i])) / Ci[i]->Similarity(*wi[i]);
-                ffi.push_back(si+s_in[i]);
+                ffi.push_back(si);
                 //TVectorD xvi = Fill_x(*fPar[i],si);
                 //std::cout << "Fast vertex "<<i<<": xvi = "<<xvi(0)<<", "<<xvi(1)<<", "<<xvi(2) 
@@ -289 +280 @@
         Ci.clear(); 
         wi.clear();
-        s_in.clear();
 }
 //
@@ -412 +402 @@
         //
         fVtxDone = kTRUE;               // Set fit completion flag
-        //fRstart = TMath::Sqrt(fXv(0)*fXv(0) + fXv(1)*fXv(1)); // Store fit 
+        fRold = TMath::Sqrt(fXv(0)*fXv(0) + fXv(1)*fXv(1));     // Store fit 
         //std::cout << "Found vertex " << fXv(0) << ", " << fXv(1) << ", " << fXv(2) 
         //      << ", after "<<Ntry<<" iterations"<<std::endl;