From dead63f7d702021278c3bfe27499c23a50e1496a Mon Sep 17 00:00:00 2001
From: klendathu2k <56083924+klendathu2k@users.noreply.github.com>
Date: Tue, 7 Nov 2023 12:22:54 -0500
Subject: [PATCH] [Geometry/y2024] First cut (and first production cut) of the
 y2024 geometry model (#622)

Ident to y2023... STAR has reached a point of stability in its
evolution...
---
 StRoot/StChain/GeometryDbAliases.h    |  3 ++
 StarDb/AgMLGeometry/Geometry.y2024.C  |  7 +++
 StarDb/AgMLGeometry/Geometry.y2024a.C |  7 +++
 StarVMC/Geometry/StarGeo.xml          | 72 +++++++++++++++++++++------
 StarVMC/xgeometry/xgeometry.age       |  3 ++
 5 files changed, 76 insertions(+), 16 deletions(-)
 create mode 100644 StarDb/AgMLGeometry/Geometry.y2024.C
 create mode 100644 StarDb/AgMLGeometry/Geometry.y2024a.C

diff --git a/StRoot/StChain/GeometryDbAliases.h b/StRoot/StChain/GeometryDbAliases.h
index af3be9fac1e..fd7c5bd7dc7 100644
--- a/StRoot/StChain/GeometryDbAliases.h
+++ b/StRoot/StChain/GeometryDbAliases.h
@@ -162,6 +162,9 @@ static const DbAlias_t fDbAlias[] = {// geometry  Comment            old
  { "y2023",       20230410,     0, "y2023",    "y2023 first cut geometry, AgML,xgeometry"},    
  { "y2023a",      20230410,     1, "y2023a",    "y2023a production geometry, AgML,xgeometry"},    
 
+ { "y2023",       20231210,     0, "y2024",    "y2024 first cut geometry, AgML,xgeometry"},    
+ { "y2023a",      20231210,     1, "y2024a",    "y2024a production geometry, AgML,xgeometry"},    
+
   {"dev2021",     21201210,     1, "dev2021",  "-deprecated- geometry for 2021+ forward program,AgML,xgeometry"},
   {"dev2022",     21211210,     1, "dev2022",  "development geometry for 2022+ forward program,AgML,xgeometry"},
 
diff --git a/StarDb/AgMLGeometry/Geometry.y2024.C b/StarDb/AgMLGeometry/Geometry.y2024.C
new file mode 100644
index 00000000000..f55678cbabf
--- /dev/null
+++ b/StarDb/AgMLGeometry/Geometry.y2024.C
@@ -0,0 +1,7 @@
+#include "CreateGeometry.h"
+TDataSet *CreateTable() 
+{
+  // Return the requested geometry
+  return CreateGeometry("y2024");
+}
+
diff --git a/StarDb/AgMLGeometry/Geometry.y2024a.C b/StarDb/AgMLGeometry/Geometry.y2024a.C
new file mode 100644
index 00000000000..f2f2ab9c970
--- /dev/null
+++ b/StarDb/AgMLGeometry/Geometry.y2024a.C
@@ -0,0 +1,7 @@
+#include "CreateGeometry.h"
+TDataSet *CreateTable() 
+{
+  // Return the requested geometry
+  return CreateGeometry("y2024a");
+}
+
diff --git a/StarVMC/Geometry/StarGeo.xml b/StarVMC/Geometry/StarGeo.xml
index 1c751dc2ae1..0b8c4da276a 100644
--- a/StarVMC/Geometry/StarGeo.xml
+++ b/StarVMC/Geometry/StarGeo.xml
@@ -1,20 +1,7 @@
 <Document file="StarVMC/Geometry/GeometryTags.xml">
   <StarGeometry default="y2016" >
-    <!-- 
-      This one can stay the same
-	 F forward
-	 S silicon
-	 T tracking
-	 M module
-
-      sTGC geometry needs to be updated
-         S small
-	 T thin
-	 G gap
-	 C chamber
-    -->
- 
-   <Geometry tag="dev2021" comment="DEPRECATED.  USE dev2022.  (development tag for the forward star upgrade)">
+
+  <Geometry tag="dev2021" comment="DEPRECATED.  USE dev2022.  (development tag for the forward star upgrade)">
     <Construct sys="cave" config="CAVE06"  />
     <Construct sys="upst" config="UPSTon"  />
     <Construct sys="shld" config="SHLDon"  />
@@ -42,7 +29,7 @@
     <Construct sys="pres" config="PRESof" simu="2" /> 
   </Geometry>
 
- <Geometry tag="dev2022" comment="development tag for the 2022 forward star upgrade">
+  <Geometry tag="dev2022" comment="development tag for the 2022 forward star upgrade">
     <Construct sys="cave" config="CAVE06"  />
     <Construct sys="upst" config="UPSTon"  />
     <Construct sys="shld" config="SHLDon"  />
@@ -70,6 +57,59 @@
     <Construct sys="pres" config="PRESof" simu="2" /> 
   </Geometry>
 
+  <Geometry tag="y2024" comment="STAR initial cut tag y2024">
+    <Construct sys="cave" config="CAVE06"  />
+    <Construct sys="upst" config="UPSTon"  />
+    <Construct sys="shld" config="SHLDon"  />
+    <Construct sys="zcal" config="ZCALon"  />
+    <Construct sys="scon" config="SCON14"  />
+    <Construct sys="pipe" config="PIPE12ft" />
+    <Construct sys="targ" config="TARGv1"  /> 
+    <Construct sys="tpce" config="TPCEv6"  />
+    <Construct sys="btof" config="BTOFv8"  />
+    <Construct sys="vpdd" config="VPDD08"  />
+    <Construct sys="calb" config="CALB02"  />
+    <Construct sys="ecal" config="ECALv6"  />
+    <Construct sys="bbcm" config="BBCMin"  />
+    <Construct sys="epdm" config="EPDMv1"  />
+    <Construct sys="magp" config="MAGPon"  />
+    <Construct sys="mutd" config="MUTD16"  />
+    <Construct sys="wcal" config="WCALv1" simu="1" />
+    <Construct sys="hcal" config="HCALv1" simu="1" />
+    <Construct sys="plat" config="PLATon" simu="2" />
+    <Construct sys="pres" config="PRESof" simu="2" /> 
+    <Construct sys="fstm" config="FSTMv1" />
+    <Construct sys="stgm" config="STGCv1" />
+    <Construct sys="etof" config="ETOFv14f"  />
+  </Geometry>
+
+  <Geometry tag="y2024a" comment="STAR initial production tag y2024">
+    <Construct sys="cave" config="CAVE06"  />
+    <Construct sys="upst" config="UPSTon"  />
+    <Construct sys="shld" config="SHLDon"  />
+    <Construct sys="zcal" config="ZCALon"  />
+    <Construct sys="scon" config="SCON14"  />
+    <Construct sys="pipe" config="PIPE12ft" />
+    <Construct sys="targ" config="TARGv1"  /> 
+    <Construct sys="tpce" config="TPCEv6"  />
+    <Construct sys="btof" config="BTOFv8"  />
+    <Construct sys="vpdd" config="VPDD08"  />
+    <Construct sys="calb" config="CALB02"  />
+    <Construct sys="ecal" config="ECALv6"  />
+    <Construct sys="bbcm" config="BBCMin"  />
+    <Construct sys="epdm" config="EPDMv1"  />
+    <Construct sys="magp" config="MAGPon"  />
+    <Construct sys="mutd" config="MUTD16"  />
+    <Construct sys="wcal" config="WCALv1" simu="1" />
+    <Construct sys="hcal" config="HCALv1" simu="1" />
+    <Construct sys="plat" config="PLATon" simu="2" />
+    <Construct sys="pres" config="PRESof" simu="2" /> 
+    <Construct sys="fstm" config="FSTMv1" />
+    <Construct sys="stgm" config="STGCv1" />
+    <Construct sys="etof" config="ETOFv14f"  />
+  </Geometry>
+
+
   <Geometry tag="y2023" comment="STAR initial cut tag y2023">
     <Construct sys="cave" config="CAVE06"  />
     <Construct sys="upst" config="UPSTon"  />
diff --git a/StarVMC/xgeometry/xgeometry.age b/StarVMC/xgeometry/xgeometry.age
index 4382d82d123..a275c12c4b3 100644
--- a/StarVMC/xgeometry/xgeometry.age
+++ b/StarVMC/xgeometry/xgeometry.age
@@ -2542,6 +2542,9 @@ If LL>0
   case y2023 { y2023: y2023 first cut geometry; Geom =        'y2023     '; call geom_y2023;} 
   case y2023a { y2023a: y2023a production tag; Geom =         'y2023a    '; call geom_y2023a;} 
 
+  case y2023 { y2024: y2024 first cut geometry; Geom =        'y2024     '; call geom_y2024;} 
+  case y2023a { y2024a: y2024a production tag; Geom =         'y2024a    '; call geom_y2024a;} 
+
   case dev2021 { dev2021:  First cut forward upgrades; Geom =        'dev2021   '; call geom_dev2021;} 
   case dev2022 { dev2022:  First cut forward upgrades; Geom =        'dev2022   '; call geom_dev2022;} 
   case dev2022m { dev2022m:  First cut forward upgrades; Geom =        'dev2022m   '; call geom_dev2022m;}