Skip to content

Commit dead63f

Browse files
klendathu2kklendathu2k
authoredNov 7, 2023
[Geometry/y2024] First cut (and first production cut) of the y2024 geometry model (star-bnl#622)
Ident to y2023... STAR has reached a point of stability in its evolution...
1 parent 43def14 commit dead63f

File tree

5 files changed

+76
-16
lines changed

5 files changed

+76
-16
lines changed
 

‎StRoot/StChain/GeometryDbAliases.h

+3
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,9 @@ static const DbAlias_t fDbAlias[] = {// geometry Comment old
162162
{ "y2023", 20230410, 0, "y2023", "y2023 first cut geometry, AgML,xgeometry"},
163163
{ "y2023a", 20230410, 1, "y2023a", "y2023a production geometry, AgML,xgeometry"},
164164

165+
{ "y2023", 20231210, 0, "y2024", "y2024 first cut geometry, AgML,xgeometry"},
166+
{ "y2023a", 20231210, 1, "y2024a", "y2024a production geometry, AgML,xgeometry"},
167+
165168
{"dev2021", 21201210, 1, "dev2021", "-deprecated- geometry for 2021+ forward program,AgML,xgeometry"},
166169
{"dev2022", 21211210, 1, "dev2022", "development geometry for 2022+ forward program,AgML,xgeometry"},
167170

‎StarDb/AgMLGeometry/Geometry.y2024.C

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#include "CreateGeometry.h"
2+
TDataSet *CreateTable()
3+
{
4+
// Return the requested geometry
5+
return CreateGeometry("y2024");
6+
}
7+

‎StarDb/AgMLGeometry/Geometry.y2024a.C

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#include "CreateGeometry.h"
2+
TDataSet *CreateTable()
3+
{
4+
// Return the requested geometry
5+
return CreateGeometry("y2024a");
6+
}
7+

‎StarVMC/Geometry/StarGeo.xml

+56-16
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,7 @@
11
<Document file="StarVMC/Geometry/GeometryTags.xml">
22
<StarGeometry default="y2016" >
3-
<!--
4-
This one can stay the same
5-
F forward
6-
S silicon
7-
T tracking
8-
M module
9-
10-
sTGC geometry needs to be updated
11-
S small
12-
T thin
13-
G gap
14-
C chamber
15-
-->
16-
17-
<Geometry tag="dev2021" comment="DEPRECATED. USE dev2022. (development tag for the forward star upgrade)">
3+
4+
<Geometry tag="dev2021" comment="DEPRECATED. USE dev2022. (development tag for the forward star upgrade)">
185
<Construct sys="cave" config="CAVE06" />
196
<Construct sys="upst" config="UPSTon" />
207
<Construct sys="shld" config="SHLDon" />
@@ -42,7 +29,7 @@
4229
<Construct sys="pres" config="PRESof" simu="2" />
4330
</Geometry>
4431

45-
<Geometry tag="dev2022" comment="development tag for the 2022 forward star upgrade">
32+
<Geometry tag="dev2022" comment="development tag for the 2022 forward star upgrade">
4633
<Construct sys="cave" config="CAVE06" />
4734
<Construct sys="upst" config="UPSTon" />
4835
<Construct sys="shld" config="SHLDon" />
@@ -70,6 +57,59 @@
7057
<Construct sys="pres" config="PRESof" simu="2" />
7158
</Geometry>
7259

60+
<Geometry tag="y2024" comment="STAR initial cut tag y2024">
61+
<Construct sys="cave" config="CAVE06" />
62+
<Construct sys="upst" config="UPSTon" />
63+
<Construct sys="shld" config="SHLDon" />
64+
<Construct sys="zcal" config="ZCALon" />
65+
<Construct sys="scon" config="SCON14" />
66+
<Construct sys="pipe" config="PIPE12ft" />
67+
<Construct sys="targ" config="TARGv1" />
68+
<Construct sys="tpce" config="TPCEv6" />
69+
<Construct sys="btof" config="BTOFv8" />
70+
<Construct sys="vpdd" config="VPDD08" />
71+
<Construct sys="calb" config="CALB02" />
72+
<Construct sys="ecal" config="ECALv6" />
73+
<Construct sys="bbcm" config="BBCMin" />
74+
<Construct sys="epdm" config="EPDMv1" />
75+
<Construct sys="magp" config="MAGPon" />
76+
<Construct sys="mutd" config="MUTD16" />
77+
<Construct sys="wcal" config="WCALv1" simu="1" />
78+
<Construct sys="hcal" config="HCALv1" simu="1" />
79+
<Construct sys="plat" config="PLATon" simu="2" />
80+
<Construct sys="pres" config="PRESof" simu="2" />
81+
<Construct sys="fstm" config="FSTMv1" />
82+
<Construct sys="stgm" config="STGCv1" />
83+
<Construct sys="etof" config="ETOFv14f" />
84+
</Geometry>
85+
86+
<Geometry tag="y2024a" comment="STAR initial production tag y2024">
87+
<Construct sys="cave" config="CAVE06" />
88+
<Construct sys="upst" config="UPSTon" />
89+
<Construct sys="shld" config="SHLDon" />
90+
<Construct sys="zcal" config="ZCALon" />
91+
<Construct sys="scon" config="SCON14" />
92+
<Construct sys="pipe" config="PIPE12ft" />
93+
<Construct sys="targ" config="TARGv1" />
94+
<Construct sys="tpce" config="TPCEv6" />
95+
<Construct sys="btof" config="BTOFv8" />
96+
<Construct sys="vpdd" config="VPDD08" />
97+
<Construct sys="calb" config="CALB02" />
98+
<Construct sys="ecal" config="ECALv6" />
99+
<Construct sys="bbcm" config="BBCMin" />
100+
<Construct sys="epdm" config="EPDMv1" />
101+
<Construct sys="magp" config="MAGPon" />
102+
<Construct sys="mutd" config="MUTD16" />
103+
<Construct sys="wcal" config="WCALv1" simu="1" />
104+
<Construct sys="hcal" config="HCALv1" simu="1" />
105+
<Construct sys="plat" config="PLATon" simu="2" />
106+
<Construct sys="pres" config="PRESof" simu="2" />
107+
<Construct sys="fstm" config="FSTMv1" />
108+
<Construct sys="stgm" config="STGCv1" />
109+
<Construct sys="etof" config="ETOFv14f" />
110+
</Geometry>
111+
112+
73113
<Geometry tag="y2023" comment="STAR initial cut tag y2023">
74114
<Construct sys="cave" config="CAVE06" />
75115
<Construct sys="upst" config="UPSTon" />

‎StarVMC/xgeometry/xgeometry.age

+3
Original file line numberDiff line numberDiff line change
@@ -2542,6 +2542,9 @@ If LL>0
25422542
case y2023 { y2023: y2023 first cut geometry; Geom = 'y2023 '; call geom_y2023;}
25432543
case y2023a { y2023a: y2023a production tag; Geom = 'y2023a '; call geom_y2023a;}
25442544

2545+
case y2023 { y2024: y2024 first cut geometry; Geom = 'y2024 '; call geom_y2024;}
2546+
case y2023a { y2024a: y2024a production tag; Geom = 'y2024a '; call geom_y2024a;}
2547+
25452548
case dev2021 { dev2021: First cut forward upgrades; Geom = 'dev2021 '; call geom_dev2021;}
25462549
case dev2022 { dev2022: First cut forward upgrades; Geom = 'dev2022 '; call geom_dev2022;}
25472550
case dev2022m { dev2022m: First cut forward upgrades; Geom = 'dev2022m '; call geom_dev2022m;}

0 commit comments

Comments
 (0)
Please sign in to comment.