Changeset 3a105e5 in git for external

Timestamp:

Feb 24, 2022, 4:15:47 PM (3 years ago)

Author:

michele <michele.selvaggi@…>

Branches:

master

Children:

2a2f310

Parents:

56fb0be

Message:

added first hit to track

Location:

external/TrackCovariance

Files:

• ObsTrk.cc (modified) (2 diffs)
• SolTrack.cc (modified) (11 diffs)

external/TrackCovariance/ObsTrk.cc

@@ -120 +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();
@@ -137 +137 @@
         Double_t Xfirst, Yfirst, Zfirst;
         Int_t iLay = trk->FirstHit(Xfirst, Yfirst, Zfirst);
-        TVector3 fXfirst(Xfirst, Yfirst, Zfirst);
+        fXfirst = TVector3(Xfirst, Yfirst, Zfirst);
+  //std::cout<<"obs trk: "<<Xfirst<<","<<Yfirst<<","<<Zfirst<<std::endl;
+
         if (inside)
         {

external/TrackCovariance/SolTrack.cc

@@ -176 +176 @@
 {
         //
-        // Return lists of hits associated to a track including all scattering layers. 
+        // Return lists of hits associated to a track including all scattering layers.
         // Return value is the total number of measurement hits
         // kmh = total number of measurement layers hit for given type
@@ -190 +190 @@
         {
                 Double_t R; Double_t phi; Double_t zz;
-                if (HitLayer(i, R, phi, zz)) 
+                if (HitLayer(i, R, phi, zz))
                 {
                         zhh[kh] = zz;
@@ -207 +207 @@
 {
         //
-        // Return lists of hits associated to a track for all measurement layers. 
+        // Return lists of hits associated to a track for all measurement layers.
         // Return value is the total number of measurement hits
         // kmh = total number of measurement layers hit for given type
@@ -236 +236 @@
 Int_t SolTrack::FirstHit(Double_t &Xfirst, Double_t &Yfirst, Double_t &Zfirst)
 {
-        Int_t iFirst = -1;      
+        Int_t iFirst = -1;
         Int_t iFirstLay = -1;   // Default return with no hits
         Xfirst = 0.;
@@ -249 +249 @@
                 Double_t *dh = new Double_t[Nmh];
                 //
-                Int_t n = HitListXYZ(ih, Xh, Yh, Zh);   
+                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           
+                        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
                 }
@@ -327 +327 @@
         //
         //
-        // Input flags: 
+        // Input flags:
         //                              Res = .TRUE. turn on resolution effects/Use standard resolutions
         //                                        .FALSE. set all resolutions to 0
@@ -410 +410 @@
                         nz = 1.0;
                 }
-                Double_t corr = TMath::Abs(pxi*nx + pyi * ny + pzi * nz) / p(); 
+                Double_t corr = TMath::Abs(pxi*nx + pyi * ny + pzi * nz) / p();
                 Double_t Rlf = fG->lTh(i) / (corr*fG->lX0(i));                                  // Rad. length fraction
                 thms[ii] = 0.0136*TMath::Sqrt(Rlf)*(1.0 + 0.038*TMath::Log(Rlf)) / p();         // MS angle
@@ -438 +438 @@
                 Int_t ityp  = fG->lTyp(i);                      // Layer type Barrel or Z
                 Int_t nmeai = fG->lND(i);                       // # measurements in layer
-                
+
                 if (fG->isMeasure(i))
                 {
@@ -470 +470 @@
                                                 Rm(im, 2) = csa * dRphi(2) - ssa * dRz(2);      // C derivative
                                                 Rm(im, 3) = csa * dRphi(3) - ssa * dRz(3);      // z0 derivative
-                                                Rm(im, 4) = csa * dRphi(4) - ssa * dRz(4);      // cot(theta) derivative        
+                                                Rm(im, 4) = csa * dRphi(4) - ssa * dRz(4);      // cot(theta) derivative
                                         }
                                         if (ityp == 2)          // Z type layer (Measure R-phi at const. Z)
@@ -531 +531 @@
                                                 {
                                                         Double_t strk = 0;
-                                                        if (nmk + 1 == 1) strk = fG->lStU(k);   // Stereo angle upper 
+                                                        if (nmk + 1 == 1) strk = fG->lStU(k);   // Stereo angle upper
                                                         if (nmk + 1 == 2) strk = fG->lStL(k);   // Stereo angle lower
                                                         //if (im == km && Res) Sm(im, km) += sig*sig;   // Detector resolution on diagonal
@@ -542 +542 @@
                                                         //
                                                         // Loop on all layers below for MS contributions
-                                                        for (Int_t jj = 0; jj < kk; jj++)               
+                                                        for (Int_t jj = 0; jj < kk; jj++)
                                                         {
                                                                 Double_t di = dik(ii, jj);