Changes in external/TrackCovariance/ObsTrk.cc [ebf40fd:3a105e5] in git

File:

• external/TrackCovariance/ObsTrk.cc (modified) (5 diffs)

external/TrackCovariance/ObsTrk.cc

@@ -74 +74 @@
         fCovILC.ResizeTo(5, 5);
         fGenPar = XPtoPar(fGenX, fGenP, Q);
+        fGenParMm = ParToMm(fGenPar);
         fGenParACTS = ParToACTS(fGenPar);
         fGenParILC = ParToILC(fGenPar);
         //
         fObsPar = GenToObsPar(fGenPar);
+        fObsParMm = ParToMm(fObsPar);
         fObsParACTS = ParToACTS(fObsPar);
         fObsParILC = ParToILC(fObsPar);
@@ -83 +85 @@
         fObsP = ParToP(fObsPar);
         fObsQ = ParToQ(fObsPar);
+        fCovMm = CovToMm(fCov);
         fCovACTS = CovToACTS(fObsPar, fCov);
         fCovILC = CovToILC(fCov);
@@ -117 +120 @@
         //if (pt > maxPt) std::cout << "Warning ObsTrk::GenToObsPar: pt " << pt << " is above grid range of " << maxPt << std::endl;
         Double_t minAn = fGC->GetMinAng();
-        //if (angd < minAn) std::cout << "Warning ObsTrk::GenToObsPar: angle " << angd 
+        //if (angd < minAn) std::cout << "Warning ObsTrk::GenToObsPar: angle " << angd
         //      << " is below grid range of " << minAn << std::endl;
         Double_t maxAn = fGC->GetMaxAng();
@@ -131 +134 @@
         Double_t ZinNeg = fG->GetZminNeg();
         Bool_t inside = TrkUtil::IsInside(fGenX, Rin, ZinNeg, ZinPos); // Check if in inner box
+        SolTrack* trk = new SolTrack(fGenX, fGenP, fG);
+        Double_t Xfirst, Yfirst, Zfirst;
+        Int_t iLay = trk->FirstHit(Xfirst, Yfirst, Zfirst);
+        fXfirst = TVector3(Xfirst, Yfirst, Zfirst);
+  //std::cout<<"obs trk: "<<Xfirst<<","<<Yfirst<<","<<Zfirst<<std::endl;
+
         if (inside)
         {
@@ -144 +153 @@
                 //std::cout<<"ObsTrk:: outside: x= "<<fGenX(0)<<", y= "<<fGenX(1)
                 //                         <<", z= "<<fGenX(2)<<std::endl;
-                SolTrack* trk = new SolTrack(fGenX, fGenP, fG);
                 Bool_t Res = kTRUE; Bool_t MS = kTRUE;
                 trk->CovCalc(Res, MS);                                  // Calculate covariance matrix
-                Cov = trk->Cov();                                       // Track covariance
-                delete trk;
-        }
+                Cov = trk->Cov();
+        }                                       // Track covariance
+        delete trk;
         //
         fCov = Cov;