Changeset 00b14d5 in git for external/TrackCovariance

Timestamp:

Feb 22, 2022, 2:56:43 PM (3 years ago)

Author:

Franco BEDESCHI <bed@…>

Branches:

master

Children:

56fb0be

Parents:

5c03893

Message:

First hit calculation added

Location:

external/TrackCovariance

Files:

• ObsTrk.cc (modified) (2 diffs)
• ObsTrk.h (modified) (2 diffs)
• SolTrack.cc (modified) (1 diff)
• SolTrack.h (modified) (1 diff)

external/TrackCovariance/ObsTrk.cc

@@ -134 +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)
         {
@@ -147 +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;

external/TrackCovariance/ObsTrk.h

@@ -46 +46 @@
         TMatrixDSym fCovILC;                    // Covariance of track parameters in ILC format
                                                                         // (d0, phi0, w, z0, tan(lambda))
+        TVector3 fXfirst;                       // x,y,z of first track hit
         //
         // Service routines
@@ -89 +90 @@
         TMatrixDSym GetCovMm()  { return fCov; }        // in mm
         TMatrixDSym GetCovACTS(){ return fCovACTS; }
-        TMatrixDSym GetCovILC(){ return fCovILC; }
-        //
+        TMatrixDSym GetCovILC() { return fCovILC; }
+        // First hit
+        TVector3 GetFirstHit()  { return fXfirst; }
 };
 

external/TrackCovariance/SolTrack.cc

@@ -232 +232 @@
         //
         return kmh;
+}
+//
+Int_t SolTrack::FirstHit(Double_t &Xfirst, Double_t &Yfirst, Double_t &Zfirst)
+{
+        Int_t iFirst = -1;      
+        Int_t iFirstLay = -1;   // Default return with no hits
+        Xfirst = 0.;
+        Yfirst = 0.;
+        Zfirst = 0.;
+        Int_t Nmh = nmHit();    // # measurement hits
+        if(Nmh > 0){
+                Int_t    *ih = new Int_t   [Nmh];
+                Double_t *Xh = new Double_t[Nmh];
+                Double_t *Yh = new Double_t[Nmh];
+                Double_t *Zh = new Double_t[Nmh];
+                Double_t *dh = new Double_t[Nmh];
+                //
+                Int_t n = HitListXYZ(ih, Xh, Yh, Zh);   
+                //
+                for(Int_t i=0; i<Nmh; i++){
+                        Double_t rr = TMath::Sqrt(Xh[i]*Xh[i]+Yh[i]*Yh[i]);     // Hit radius           
+                        dh[i] = TMath::ASin(C() * TMath::Sqrt((rr * rr - D() * D()) / (1. + 2 * C() * D()))) / C();     // Arc length traveled
+                }
+                //
+                Int_t *hord = new Int_t[Nmh];                   // hit order by increasing arc length
+                TMath::Sort(Nmh, dh, hord, kFALSE);             // Order by increasing arc length
+                iFirst = hord[0];                               // First hit pointer
+                Xfirst = Xh[iFirst];
+                Yfirst = Yh[iFirst];
+                Zfirst = Zh[iFirst];
+                iFirstLay = ih[iFirst];
+                //
+                // Clean
+                delete [] ih;
+                delete [] Xh;
+                delete [] Yh;
+                delete [] Zh;
+                delete [] dh;
+                delete [] hord;
+        }
+//
+        return  iFirstLay;      // Return first hit layer number
 }
 //

external/TrackCovariance/SolTrack.h

@@ -73 +73 @@
         Int_t HitList(Int_t *&ihh, Double_t *&rhh, Double_t *&zhh);
         Int_t HitListXYZ(Int_t *&ihh, Double_t *&Xh, Double_t *&Yh, Double_t *&Zh);
+        Int_t FirstHit(Double_t &Xfirst, Double_t &Yfirst, Double_t &Zfirst);   // First hit position
         //
         // Track graph