Update a3 geo in fasttracker

Author: jesgum

ALICE3/Core/FastTracker.cxx

@@ -144,24 +144,37 @@ void FastTracker::AddSiliconALICE3v2(std::vector<float> pixelResolution)
   AddLayer("B10", 80., 250, x0OT, xrhoOT, resRPhiOT, resZOT, eff, 1);
 }
 
-void FastTracker::AddSiliconALICE3(std::vector<float> pixelResolution)
+void FastTracker::AddSiliconALICE3(float VDX0Scale, std::vector<float> pixelResolution)
 {
-  float x0IT = 0.001;        // 0.1%
-  float x0OT = 0.01;         // 1.0%
-  float xrhoIB = 2.3292e-02; // 100 mum Si
-  float xrhoOT = 2.3292e-01; // 1000 mum Si
-  float eff = 1.00;
-
-  float resRPhiIT = pixelResolution[0];
-  float resZIT = pixelResolution[1];
+  float x0Pipe0 = 0.001592;   // 200 um AlBe
+  float x0VDL0 = 0.00076;     // 30 um Si + 50 um glue + carbon foam 0.03%
+  float x0VDL1 = 0.00096;     // 30 um Si + 50 um glue + carbon foam 0.05%
+  float x0VDL2 = 0.00167;     // 30 um Si + 50 um glue + carbon foam 0.05% + 0.07% Be case 
+  float x0Coldplate = 0.02f;  // (1.5 mm Al2O3 2%) 
+  float x0Pipe1 = 0.0023f;    // 800 um Be
+  float x0OT = 0.01;          // 1.0%
+
+  float resRPhiVD = pixelResolution[0];
+  float resZVD = pixelResolution[1];
   float resRPhiOT = pixelResolution[2];
   float resZOT = pixelResolution[3];
 
-  AddLayer("bpipe0", 0.48, 250, 0.00042, 2.772e-02, 0.0f, 0.0f, 0.0f, 0); // 150 mum Be
-  AddLayer("B00", 0.5, 250, x0IT, xrhoIB, resRPhiIT, resZIT, eff, 1);
-  AddLayer("B01", 1.2, 250, x0IT, xrhoIB, resRPhiIT, resZIT, eff, 1);
-  AddLayer("B02", 2.5, 250, x0IT, xrhoIB, resRPhiIT, resZIT, eff, 1);
-  AddLayer("bpipe1", 3.7, 250, 0.0014, 9.24e-02, 0.0f, 0.0f, 0.0f, 0); // 500 mum Be
+  float xrhoPipe0 = 0;
+  float xrhoVDL0 = 0;
+  float xrhoVDL1 = 0;
+  float xrhoVDL2 = 0;
+  float xrhoColdplate = 0;
+  float xrhoPipe1 = 0;
+  float xrhoOT = 2.3292e-01;
+
+  float eff = 1.00;
+
+  AddLayer("bpipe0", 0.48, 250, x0Pipe0, xrhoPipe0, 0.0f, 0.0f, 0.0f, 0); // 150 mum Be
+  AddLayer("B00", 0.5, 250, x0VDL0 * VDX0Scale, xrhoVDL0, resRPhiVD, resZVD, eff, 1);
+  AddLayer("B01", 1.2, 250, x0VDL1 * VDX0Scale, xrhoVDL1, resRPhiVD, resZVD, eff, 1);
+  AddLayer("B02", 2.5, 250, x0VDL2 * VDX0Scale, xrhoVDL2, resRPhiVD, resZVD, eff, 1);
+  AddLayer("coldplate", 2.6, 250, x0Coldplate, xrhoColdplate, 0.0f, 0.0f, 0.0f, 0); // 500 mum Be
+  AddLayer("bpipe1", 5.7, 250, x0Pipe1, xrhoPipe1, 0.0f, 0.0f, 0.0f, 0); // 500 mum Be
   AddLayer("B03", 7., 250, x0OT, xrhoOT, resRPhiOT, resZOT, eff, 1);
   AddLayer("B04", 9., 250, x0OT, xrhoOT, resRPhiOT, resZOT, eff, 1);
   AddLayer("B05", 12., 250, x0OT, xrhoOT, resRPhiOT, resZOT, eff, 1);

ALICE3/Core/FastTracker.h

@@ -59,7 +59,7 @@ class FastTracker
 
   void AddSiliconALICE3v4(std::vector<float> pixelResolution);
   void AddSiliconALICE3v2(std::vector<float> pixelResolution);
-  void AddSiliconALICE3(std::vector<float> pixelResolution);
+  void AddSiliconALICE3(float VDX0Scale, std::vector<float> pixelResolution);
   void AddTPC(float phiResMean, float zResMean);
 
   void Print();

ALICE3/TableProducer/OTF/onTheFlyTracker.cxx

@@ -138,11 +138,12 @@ struct OnTheFlyTracker {
     Configurable<int> minSiliconHits{"minSiliconHits", 6, "minimum number of silicon hits to accept track"};
     Configurable<int> minSiliconHitsIfTPCUsed{"minSiliconHitsIfTPCUsed", 2, "minimum number of silicon hits to accept track in case TPC info is present"};
     Configurable<int> minTPCClusters{"minTPCClusters", 70, "minimum number of TPC hits necessary to consider minSiliconHitsIfTPCUsed"};
-    Configurable<int> alice3detector{"alice3detector", 0, "0: ALICE 3 v1, 1: ALICE 3 v4"};
+    Configurable<int> alice3detector{"alice3detector", 2, "0: ALICE 3 v1, 1: ALICE 3 v4, 2: ALICE 3 Sep 2025"};
     Configurable<bool> applyZacceptance{"applyZacceptance", false, "apply z limits to detector layers or not"};
     Configurable<bool> applyMSCorrection{"applyMSCorrection", true, "apply ms corrections for secondaries or not"};
     Configurable<bool> applyElossCorrection{"applyElossCorrection", true, "apply eloss corrections for secondaries or not"};
     Configurable<bool> applyEffCorrection{"applyEffCorrection", true, "apply efficiency correction or not"};
+    Configurable<int> scaleVD{"scaleVD", 1, "scale x0 and xrho in VD layers"};
     Configurable<std::vector<float>> pixelRes{"pixelRes", {0.00025, 0.00025, 0.001, 0.001}, "RPhiIT, ZIT, RPhiOT, ZOT"};
   } fastTrackerSettings; // allows for gap between peak and bg in case someone wants to
 
@@ -412,12 +413,22 @@ struct OnTheFlyTracker {
     fastTracker.SetApplyMSCorrection(fastTrackerSettings.applyMSCorrection);
     fastTracker.SetApplyElossCorrection(fastTrackerSettings.applyElossCorrection);
 
-    if (fastTrackerSettings.alice3detector == 0) {
-      fastTracker.AddSiliconALICE3v2(fastTrackerSettings.pixelRes);
-    }
-    if (fastTrackerSettings.alice3detector == 1) {
-      fastTracker.AddSiliconALICE3v4(fastTrackerSettings.pixelRes);
-      fastTracker.AddTPC(0.1, 0.1);
+    switch (fastTrackerSettings.alice3detector) {
+      case 0:
+        fastTracker.AddSiliconALICE3v2(fastTrackerSettings.pixelRes);
+        break;
+
+      case 1:
+        fastTracker.AddSiliconALICE3v4(fastTrackerSettings.pixelRes);
+        fastTracker.AddTPC(0.1, 0.1);
+        break;
+
+      case 2:
+        fastTracker.AddSiliconALICE3(scaleVD, fastTrackerSettings.pixelRes);
+        break;
+
+      default:
+        break;
     }
 
     // print fastTracker settings