Changeset a95da74 in git for external

Timestamp:

Apr 28, 2021, 9:35:32 AM (4 years ago)

Author:

michele <michele.selvaggi@…>

Branches:

master

Children:

d4fb268

Parents:

4739226

Message:

added v0 of Ionisation cluster counting

Location:

external/TrackCovariance

Files:

• TrkUtil.cc (modified) (9 diffs)
• TrkUtil.h (modified) (3 diffs)

external/TrackCovariance/TrkUtil.cc

@@ -233 +233 @@
 }
 //
+
+//
+void TrkUtil::SetBfield(Double_t Bz)
+{
+        fBz = Bz;
+}
+
 // Setup chamber volume
 void TrkUtil::SetDchBoundaries(Double_t Rmin, Double_t Rmax, Double_t Zmin, Double_t Zmax)
@@ -267 +274 @@
                 //      << ", C= " << C << ", z0= " << z0 << ", ct= " << ct << std::endl;
                 //
-                // Track length per unit phase change 
+                // Track length per unit phase change
                 Double_t Scale = sqrt(1.0 + ct*ct) / (2.0*TMath::Abs(C));
                 //
                 // Find intersections with chamber boundaries
                 //
-                Double_t phRin = 0.0;                   // phase of inner cylinder 
+                Double_t phRin = 0.0;                   // phase of inner cylinder
                 Double_t phRin2= 0.0;                   // phase of inner cylinder intersection (2nd branch)
                 Double_t phRhi = 0.0;                   // phase of outer cylinder intersection
@@ -287 +294 @@
                         //std::cout << "Rin intersection: ph = " << ph<<", z= "<<z << std::endl;
 
-                        if (z < fZmax && z > fZmin)     phRin = TMath::Abs(ph); // Intersection inside chamber volume   
+                        if (z < fZmax && z > fZmin)     phRin = TMath::Abs(ph); // Intersection inside chamber volume
                         //
                         // Include second branch of loopers
@@ -301 +308 @@
                         Double_t ph = 2 * asin(C*sqrt((fRmax*fRmax - D*D) / (1.0 + 2.0*C*D)));
                         Double_t z = z0 + ct*ph / (2.0*C);
-                        if (z < fZmax && z > fZmin)     phRhi = TMath::Abs(ph); // Intersection inside chamber volume   
+                        if (z < fZmax && z > fZmin)     phRhi = TMath::Abs(ph); // Intersection inside chamber volume
                 }
                 //  ... with left wall
@@ -309 +316 @@
                         Double_t ph = 2.0*C*Zdir;
                         Double_t Rint = sqrt(D*D + (1.0 + 2.0*C*D)*pow(sin(ph / 2), 2) / (C*C));
-                        if (Rint < fRmax && Rint > fRmin)       phZmn = TMath::Abs(ph); // Intersection inside chamber volume   
+                        if (Rint < fRmax && Rint > fRmin)       phZmn = TMath::Abs(ph); // Intersection inside chamber volume
                 }
                 //  ... with right wall
@@ -317 +324 @@
                         Double_t ph = 2.0*C*Zdir;
                         Double_t Rint = sqrt(D*D + (1.0 + 2.0*C*D)*pow(sin(ph / 2), 2) / (C*C));
-                        if (Rint < fRmax && Rint > fRmin)       phZmx = TMath::Abs(ph); // Intersection inside chamber volume   
+                        if (Rint < fRmax && Rint > fRmin)       phZmx = TMath::Abs(ph); // Intersection inside chamber volume
                 }
                 //
@@ -390 +397 @@
 //
 //
-Double_t TrkUtil::Nclusters(Double_t begam) 
+Double_t TrkUtil::Nclusters(Double_t begam)
 {
         Int_t Opt = fGasSel;
@@ -465 +472 @@
         {
                 case 0: std::copy(ncl_He_Iso, ncl_He_Iso + Npt, ncl);   // He-Isobutane
-                break;                                                  
+                break;
                 case 1: std::copy(ncl_He, ncl_He + Npt, ncl);           // pure He
                 break;
@@ -493 +500 @@
         TVectorD coeff = Xval * y;
         Double_t interp = coeff[0] + coeff[1] * begam + coeff[2] * begam * begam;
-        //std::cout << "val1= (" <<x(0)<<", "<< y(0) << "), val2= (" 
-        //      <<x(1)<<", "<< y(1) << "), val3= (" 
+        //std::cout << "val1= (" <<x(0)<<", "<< y(0) << "), val2= ("
+        //      <<x(1)<<", "<< y(1) << "), val3= ("
         //      <<x(2)<<", "<< y(2)
         //      << "), result= (" <<begam<<", "<< interp<<")" << std::endl;

external/TrackCovariance/TrkUtil.h

@@ -25 +25 @@
         // Service routines
         //
-        void SetBfield(Double_t Bz) { fBz = Bz; }
         TVectorD XPtoPar(TVector3 x, TVector3 p, Double_t Q);
         TVector3 ParToP(TVectorD Par);
@@ -54 +53 @@
                 Double_t c = 2.99792458e8;      // speed of light m/sec
                 //return TMath::C()*1.0e-9;     // Incompatible with root5
-                return c*1.0e-9;                // Reduced speed of light       
+                return c*1.0e-9;                // Reduced speed of light
         }
         //
@@ -71 +70 @@
         // Cluster counting in gas
         //
-        // Define gas volume (units = meters) 
+        void SetBfield(Double_t Bz);
+        // Define gas volume (units = meters)
         void SetDchBoundaries(Double_t Rmin, Double_t Rmax, Double_t Zmin, Double_t Zmax);
         // Gas mixture selection