Update Beam pipe in ITS2 (#68)

-Update ITS2 LUT maker
- Format ITS3 LUT maker

Author: njacazio

src/lutWrite.its2.cc

@@ -5,29 +5,39 @@
 
 #include "lutWrite.cc"
 
-void fatInit_its2(float field = 0.5, float rmin = 100.) {
+void fatInit_its2(float field = 0.5, float rmin = 100.)
+{
   fat.SetBField(field);
   fat.SetdNdEtaCent(400.);
 
-  fat.AddLayer((char *)"bpipe", 2.0, 0.0022); // beam pipe
-  fat.AddLayer((char *)"vertex", 0, 0); // dummy vertex for matrix calculation
-
-  // new ideal Pixel properties?
-  Double_t x0IB = 0.0035; // X/X0 of the inner barrel (first three layers)
-  Double_t x0OB = 0.008;  // X/X0 of the outer barrel
-  Double_t resRPhi = 0.0006;
-  Double_t resZ = 0.0006;
-  Double_t eff = 0.98;
-  Double_t xrhoIB = 1.1646e-02; // Surface density for 50 mum thick Si
-  Double_t xrhoOB = 1.1646e-01; // Surface density for 500 mum thick Si
-
-  fat.AddLayer((char *)"ddd1", 2.3, x0IB, xrhoIB, resRPhi, resZ, eff);
-  fat.AddLayer((char *)"ddd2", 3.1, x0IB, xrhoIB, resRPhi, resZ, eff);
-  fat.AddLayer((char *)"ddd3", 3.9, x0IB, xrhoIB, resRPhi, resZ, eff);
-  fat.AddLayer((char *)"ddd4", 19.4, x0OB, xrhoOB, resRPhi, resZ, eff);
-  fat.AddLayer((char *)"ddd5", 24.7, x0OB, xrhoOB, resRPhi, resZ, eff);
-  fat.AddLayer((char *)"ddd6", 35.3, x0OB, xrhoOB, resRPhi, resZ, eff);
-  fat.AddLayer((char *)"ddd7", 40.5, x0OB, xrhoOB, resRPhi, resZ, eff);
+  const Double_t x0BP = 0.00224;     // 800 mum Be
+  const Double_t xrhoBP = 1.4784e-1; // 800 mum Be
+
+  fat.AddLayer((char*)"vertex", 0, 0);              // dummy vertex for matrix calculation
+  fat.AddLayer((char*)"bpipe", 1.98, x0BP, xrhoBP); // beam pipe
+
+  // X/X0 of the inner barrel, values taken from the TDR of ITS upgrade
+  const Double_t x0IB = 0.0035; // X/X0 of the inner barrel (first three layers)
+  // X/X0 of the outer barrel, values taken from the TDR of ITS upgrade
+  const Double_t x0OB = 0.008; // X/X0 of the outer barrel
+  // Resolution in Rphi values taken from A. Kalweit (table presented at the
+  // Physics Forum on 24th Feb. 2021) the value is in the middle of 15 and 30
+  // micron pitch
+  const Double_t resRPhi = 0.0006;
+  // Resolution in Z, values taken from A. Kalweit (table presented at the
+  // Physics Forum on 24th Feb. 2021) the value is in the middle of 15 and 30
+  // micron pitch
+  const Double_t resZ = 0.0006;
+  const Double_t eff = 0.98;            // Efficiency (lower limit)
+  const Double_t xrhoIBOB = 1.1646e-01; // Surface density for 500 mum thick Si
+
+  fat.AddLayer((char*)"il0", 2.3, x0IB, xrhoIBOB, resRPhi, resZ, eff);
+  fat.AddLayer((char*)"il1", 3.1, x0IB, xrhoIBOB, resRPhi, resZ, eff);
+  fat.AddLayer((char*)"il2", 3.9, x0IB, xrhoIBOB, resRPhi, resZ, eff);
+  fat.AddLayer((char*)"ml3", 19.4, x0OB, xrhoIBOB, resRPhi, resZ, eff);
+  fat.AddLayer((char*)"ml4", 24.7, x0OB, xrhoIBOB, resRPhi, resZ, eff);
+  fat.AddLayer((char*)"ol5", 35.3, x0OB, xrhoIBOB, resRPhi, resZ, eff);
+  fat.AddLayer((char*)"ol6", 40.5, x0OB, xrhoIBOB, resRPhi, resZ, eff);
 
   fat.AddTPC(0.1, 0.1); // TPC
   fat.SetAtLeastHits(4);
@@ -39,8 +49,9 @@ void fatInit_its2(float field = 0.5, float rmin = 100.) {
   fat.PrintLayout();
 }
 
-void lutWrite_its2(const char *filename = "lutCovm.dat", int pdg = 211,
-                   float field = 0.2, float rmin = 20.) {
+void lutWrite_its2(const char* filename = "lutCovm.dat", int pdg = 211,
+                   float field = 0.2, float rmin = 20.)
+{
 
   // init FAT
   fatInit_its2(field, rmin);

src/lutWrite.its3.cc

@@ -10,16 +10,17 @@ const bool add_foam = true;
 // Puts foam spacers mid-way betwen layers
 const bool foam_middle = false;
 
-void fatInit_its3(float field = 0.5, float rmin = 100.) {
+void fatInit_its3(float field = 0.5, float rmin = 100.)
+{
   fat.SetBField(field);
   fat.SetdNdEtaCent(400.);
 
   const Double_t x0BP = 0.0014;     // 500 mum Be
   const Double_t xrhoBP = 9.24e-02; // 500 mum Be
 
   // dummy vertex for matrix calculation
-  fat.AddLayer((char *)"vertex", 0.0, 0, 0);
-  fat.AddLayer((char *)"bpipe", 1.625, x0BP, xrhoBP); // 500 mum Be beam pipe
+  fat.AddLayer((char*)"vertex", 0.0, 0, 0);
+  fat.AddLayer((char*)"bpipe", 1.625, x0BP, xrhoBP); // 500 mum Be beam pipe
 
   // X/X0 of the inner barrel first three layers), values taken from the LOI of
   // the ITS3
@@ -41,26 +42,26 @@ void fatInit_its3(float field = 0.5, float rmin = 100.) {
   const Double_t x0Foam = 0.0008;   // X0 ~710cm for 0.6cm thick foam
   float foam_radius = 9.370 * x0IB; // width of a chip
 
-  fat.AddLayer((char *)"ddd1", 1.8, x0IB, xrhoIB, resRPhi, resZ, eff);
+  fat.AddLayer((char*)"ddd1", 1.8, x0IB, xrhoIB, resRPhi, resZ, eff);
   if (foam_middle)
     foam_radius = (2.4 - 1.8) / 2;
   if (add_foam)
-    fat.AddLayer((char *)"foam1", 1.8 + foam_radius, x0Foam); // Foam spacer
-  fat.AddLayer((char *)"ddd2", 2.4, x0IB, xrhoIB, resRPhi, resZ, eff);
+    fat.AddLayer((char*)"foam1", 1.8 + foam_radius, x0Foam); // Foam spacer
+  fat.AddLayer((char*)"ddd2", 2.4, x0IB, xrhoIB, resRPhi, resZ, eff);
   if (foam_middle)
     foam_radius = (3.0 - 2.4) / 2;
   if (add_foam)
-    fat.AddLayer((char *)"foam2", 2.4 + foam_radius, x0Foam); // Foam spacer
-  fat.AddLayer((char *)"ddd3", 3.0, x0IB, xrhoIB, resRPhi, resZ, eff);
+    fat.AddLayer((char*)"foam2", 2.4 + foam_radius, x0Foam); // Foam spacer
+  fat.AddLayer((char*)"ddd3", 3.0, x0IB, xrhoIB, resRPhi, resZ, eff);
   if (foam_middle)
     foam_radius = (19.4 - 3.0) / 2;
   if (add_foam)
-    fat.AddLayer((char *)"foam3", 3.0 + foam_radius, x0Foam); // Foam spacer
+    fat.AddLayer((char*)"foam3", 3.0 + foam_radius, x0Foam); // Foam spacer
   // Structural cylinder?
-  fat.AddLayer((char *)"ddd4", 19.4, x0OB, xrhoOB, resRPhi, resZ, eff);
-  fat.AddLayer((char *)"ddd5", 24.7, x0OB, xrhoOB, resRPhi, resZ, eff);
-  fat.AddLayer((char *)"ddd6", 35.3, x0OB, xrhoOB, resRPhi, resZ, eff);
-  fat.AddLayer((char *)"ddd7", 40.5, x0OB, xrhoOB, resRPhi, resZ, eff);
+  fat.AddLayer((char*)"ddd4", 19.4, x0OB, xrhoOB, resRPhi, resZ, eff);
+  fat.AddLayer((char*)"ddd5", 24.7, x0OB, xrhoOB, resRPhi, resZ, eff);
+  fat.AddLayer((char*)"ddd6", 35.3, x0OB, xrhoOB, resRPhi, resZ, eff);
+  fat.AddLayer((char*)"ddd7", 40.5, x0OB, xrhoOB, resRPhi, resZ, eff);
 
   fat.AddTPC(0.1, 0.1); // TPC
   fat.SetAtLeastHits(4);
@@ -72,8 +73,9 @@ void fatInit_its3(float field = 0.5, float rmin = 100.) {
   fat.PrintLayout();
 }
 
-void lutWrite_its3(const char *filename = "lutCovm.dat", int pdg = 211,
-                   float field = 0.2, float rmin = 20.) {
+void lutWrite_its3(const char* filename = "lutCovm.dat", int pdg = 211,
+                   float field = 0.2, float rmin = 20.)
+{
 
   // init FAT
   fatInit_its3(field, rmin);