Changeset 56fb0be in git for external/TrackCovariance/ObsTrk.cc

Timestamp:

Feb 23, 2022, 4:24:07 PM (3 years ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

3a105e5

Parents:

dd263e4 (diff), 00b14d5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michele Selvaggi <michele.selvaggi@…> (02/23/22 16:24:07)

git-committer:

GitHub <noreply@…> (02/23/22 16:24:07)

Message:

Merge pull request #105 from fbedesch/master

Add method to get first track hit in ObsTrk

File:

• external/TrackCovariance/ObsTrk.cc (modified) (4 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);
@@ -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);
+        TVector3 fXfirst(Xfirst, Yfirst, Zfirst);
         if (inside)
         {
@@ -144 +151 @@
                 //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;