Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Geometry/y2024] First cut (and first production cut) of the y2024 geometry model #622

Merged
merged 2 commits into from
Nov 7, 2023
Merged

[Geometry/y2024] First cut (and first production cut) of the y2024 geometry model #622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6cb780
[Geometry/y2024] First cut (and first production cut) of the y2024 ge…
klendathu2k Nov 2, 2023
b0966f7
Merge branch 'main' into geometry-y2024
klendathu2k Nov 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions StRoot/StChain/GeometryDbAliases.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this was a typo.... Should be y2024 and y2024a, yes?


{"dev2021", 21201210, 1, "dev2021", "-deprecated- geometry for 2021+ forward program,AgML,xgeometry"},
{"dev2022", 21211210, 1, "dev2022", "development geometry for 2022+ forward program,AgML,xgeometry"},

Expand Down
7 changes: 7 additions & 0 deletions StarDb/AgMLGeometry/Geometry.y2024.C
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#include "CreateGeometry.h"
TDataSet *CreateTable()
{
// Return the requested geometry
return CreateGeometry("y2024");
}

7 changes: 7 additions & 0 deletions StarDb/AgMLGeometry/Geometry.y2024a.C
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#include "CreateGeometry.h"
TDataSet *CreateTable()
{
// Return the requested geometry
return CreateGeometry("y2024a");
}

72 changes: 56 additions & 16 deletions StarVMC/Geometry/StarGeo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" />
Expand Down Expand Up @@ -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" />
Expand Down Expand Up @@ -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" />
Expand Down
3 changes: 3 additions & 0 deletions StarVMC/xgeometry/xgeometry.age
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;}
Expand Down