Geometry y2021b (#714)

star-bnl · Nov 25, 2024 · 5f2e5ac · 5f2e5ac
1 parent a34894e
commit 5f2e5ac
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 0 deletions.
diff --git a/StRoot/StChain/GeometryDbAliases.h b/StRoot/StChain/GeometryDbAliases.h
@@ -155,6 +155,7 @@ static const DbAlias_t fDbAlias[] = {// geometry  Comment            old
 
   {"y2021",       20201215,     0, "y2021",    "y2021 development geometry, AgML,xgeometry"},   
   {"y2021a",      20201215,     1, "y2021a",   "y2021 first production geometry, AgML,xgeometry"},   
+  {"y2021b",      20201215,     2, "y2021b",   "y2021 production geometry (FXT @ 200.7 cm), AgML,xgeometry"},   
 
   {"y2022",       20211015,     0, "y2022",    "y2022 first cut geometry, AgML,xgeometry"},   
   {"y2022a",      20211015,     1, "y2022a",   "y2022 production geometry, AgML,xgeometry"},  

diff --git a/StarVMC/Geometry/StarGeo.xml b/StarVMC/Geometry/StarGeo.xml
@@ -324,6 +324,33 @@
     <Construct sys="etof" config="ETOFv14f"  />
   </Geometry>
 
+    <Geometry tag="y2021b" comment="STAR production tag w/ FCS installation / Fixed target at 207cm / TPC GG deadzone update">
+    <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"  />
+<!-- Temporarily removed so that we do not need to introduce overlapping volumes -->
+    <Construct sys="pipe" config="PIPE12ft"/>
+    <Construct sys="targ" config="TARGv1a"  /> --><!-- fixed target geometry -->
+    <Construct sys="tpce" config="TPCEv61"  />
+    <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="etof" config="ETOFv14f"  -->
+    <Construct sys="wcal" config="WCALv1" simu="1" />
+    <Construct sys="hcal" config="HCALv1" simu="1" />
+    <Construct sys="plat" config="PLATon" simu="2" />
+    <!-- No preshower -->
+    <Construct sys="pres" config="PRESof" />
+    <Construct sys="etof" config="ETOFv14f"  />
+  </Geometry>
+
   <Geometry tag="y2020"  check="false" comment="Y2020 rough cut geometry">
 
     <Construct sys="cave" config="CAVE06"  />

diff --git a/StarVMC/xgeometry/xgeometry.age b/StarVMC/xgeometry/xgeometry.age
@@ -2529,12 +2529,15 @@ If LL>0
 
   case y2019 { y2019: y2019 first cut geometry; Geom =        'y2019     '; call geom_y2019;} 
   case y2019a { y2019: y2019a production release; Geom =        'y2019a    '; call geom_y2019a;} 
+  case y2019b { y2019: y2019a production release; Geom =        'y2019b    '; call geom_y2019b;} 
 
   case y2020 { y2020: y2020 first cut geometry; Geom =        'y2020     '; call geom_y2020;} 
   case y2020a { y2020a: y2020a production; Geom =        'y2020a    '; call geom_y2020a;} 
+  case y2020b { y2020b: y2020a production; Geom =        'y2020b    '; call geom_y2020b;} 
 
   case y2021 { y2021: y2021 first cut geometry; Geom =        'y2021     '; call geom_y2021;} 
   case y2021a { y2021a: y2021 first production geometry; Geom =        'y2021a    '; call geom_y2021a;} 
+  case y2021b { y2021b: y2021 first production geometry; Geom =        'y2021b    '; call geom_y2021b;} 
 
   case y2022 { y2022: y2022 first cut geometry; Geom =        'y2022     '; call geom_y2022;} 
   case y2022a { y2022a: y2022 first production geometry; Geom =        'y2022a    '; call geom_y2022a;}