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

restore relevant detectors to old version #1003

Closed
wants to merge 2 commits into from
Closed

restore relevant detectors to old version #1003

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
a401336
restore relevant detectors to old version
sarahgaiser Jul 27, 2023
12b90e5
update lcdd files
sarahgaiser Jul 27, 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
70 changes: 35 additions & 35 deletions detector-data/detectors/HPS_PhysicsRun2019_Pass2/HPS_PhysicsRun2019_Pass2.lcdd
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions detector-data/detectors/HPS_PhysicsRun2019_Pass2/compact.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,12 +213,12 @@
<unitvec name="Y" x="7.6453e-05" y="1.0000e+00" z="-3.0945e-05" />
<unitvec name="Z" x="3.0082e-02" y="2.8631e-05" z="9.9955e-01" />
</SurveyVolume>
<SurveyVolume name="support_top_L46" desc="T46 ball basis in box fiducial frame:">
<!-- <SurveyVolume name="support_top_L46" desc="T46 ball basis in box fiducial frame:">
<origin x="-6.3106" y="8.462" z="773.7906" />
<unitvec name="X" x="9.9954e-01" y="7.3687e-05" z="-3.0209e-02" />
<unitvec name="Y" x="-7.2695e-05" y="1.0000e+00" z="3.3946e-05" />
<unitvec name="Z" x="3.0209e-02" y="-3.1734e-05" z="9.9954e-01" />
</SurveyVolume>
</SurveyVolume> -->

<!-- Originally the x of the bottom was 0.0 +1.0, but that seems like a hack -->

Expand Down Expand Up @@ -806,29 +806,29 @@
<millepede_constant name="22362" value="0.0" /> <!-- rw -->

<!-- L3 Top/Bottom translations and angles -->
<millepede_constant name="11163" value="0.0 + 0.018801 + 0.000277 + -0.001333 + -0.000319" /> <!-- u -> global Y -->
<millepede_constant name="11163" value="0.0 + 0.018801 + 0.000277 + -0.001333 + -0.000319 + -0.7" /> <!-- u -> global Y -->
<millepede_constant name="11263" value="0.0" /> <!-- v -> X+svtAngle -->
<millepede_constant name="11363" value="0.0" /> <!-- w -> Z+svtAngle -->
<millepede_constant name="12163" value="0.0" /> <!-- ru -->
<millepede_constant name="12263" value="0.0" /> <!-- rv -->
<millepede_constant name="12363" value="0.0" /> <!-- rw -->

<millepede_constant name="21163" value="0.0 + 0.002791" /> <!-- u -->
<millepede_constant name="21163" value="0.0 + 0.002791 + -0.7" /> <!-- u -->
<millepede_constant name="21263" value="0.0" /> <!-- v -->
<millepede_constant name="21363" value="0.0" /> <!-- w -->
<millepede_constant name="22163" value="0.0" /> <!-- ru -->
<millepede_constant name="22263" value="0.0" /> <!-- rv -->
<millepede_constant name="22363" value="0.0" /> <!-- rw -->

<!-- L4 Top/Bottom translations and angles -->
<millepede_constant name="11164" value="0.0 + 0.022586 + -0.004495 + -0.004089 + -0.000772" /> <!-- u -> global Y -->
<millepede_constant name="11164" value="0.0 + 0.022586 + -0.004495 + -0.004089 + -0.000772 + -0.7" /> <!-- u -> global Y -->
<millepede_constant name="11264" value="0.0" /> <!-- v -> X+svtAngle -->
<millepede_constant name="11364" value="0.0" /> <!-- w -> Z+svtAngle -->
<millepede_constant name="12164" value="0.0" /> <!-- ru -->
<millepede_constant name="12264" value="0.0" /> <!-- rv -->
<millepede_constant name="12364" value="0.0" /> <!-- rw -->

<millepede_constant name="21164" value="0.0 + 0.003839" /> <!-- u -->
<millepede_constant name="21164" value="0.0 + 0.003839 + -0.7" /> <!-- u -->
<millepede_constant name="21264" value="0.0" /> <!-- v -->
<millepede_constant name="21364" value="0.0" /> <!-- w -->
<millepede_constant name="22164" value="0.0" /> <!-- ru -->
Expand Down
10,070 changes: 10,070 additions & 0 deletions detector-data/detectors/HPS_PhysicsRun2019_Pass2_fixed/HPS_PhysicsRun2019_Pass2_fixed.lcdd
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions detector-data/detectors/HPS_PhysicsRun2019_Pass2_fixed/SamplingFractions/Ecal.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
samplingFraction: 1.0
1 change: 1 addition & 0 deletions ...ctor-data/detectors/HPS_PhysicsRun2019_Pass2_fixed/SamplingFractions/Hodoscope.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
samplingFraction: 1.0
1,082 changes: 1,082 additions & 0 deletions detector-data/detectors/HPS_PhysicsRun2019_Pass2_fixed/compact.xml
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions detector-data/detectors/HPS_PhysicsRun2019_Pass2_fixed/detector.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
name: HPS_PhysicsRun2019_Pass2_fixed
18 changes: 9 additions & 9 deletions detector-data/detectors/HPS_Run2021Pass0_v1/HPS_Run2021Pass0_v1.lcdd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<lcdd xmlns:lcdd="http://www.lcsim.org/schemas/lcdd/1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcdd/1.0/lcdd.xsd">
<header>
<detector name="HPS_Run2021Pass0_v1" />
<generator name="lcsim" version="1.0" file="/sdf/group/hps/users/sgaiser/src/hps-java/detector-data/detectors/HPS_Run2021Pass0_v1/compact.xml" checksum="38842783" />
<generator name="lcsim" version="1.0" file="/sdf/group/hps/users/sgaiser/src/hps-java/detector-data/detectors/HPS_Run2021Pass0_v1/compact.xml" checksum="1210858853" />
<author name="NONE" />
<comment>HPS detector for 2021 run with fieldmap, Tracker at nominal opening angle, no SVT survey, this detector uses the corrected fieldmap scaled for 3.74 GeV beam. Includes L0 and Hodoscope. ECAL with survey alignment for HPSEcal3 (global y/z translations). This detector has the full hierarchical alignment structure</comment>
</header>
Expand Down Expand Up @@ -274,7 +274,7 @@
<rotation name="module_L2t_halfmodule_stereo_sensor_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
<position name="module_L2t_halfmodule_stereo_sensor_active_position" x="0.0" y="0.0" z="0.0" unit="mm" />
<rotation name="module_L2t_halfmodule_stereo_sensor_active_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
<position name="module_L3b_halfmodule_axial_position" x="-44.86653535485047" y="137.05267003736043" z="-25.672413778892928" unit="mm" />
<position name="module_L3b_halfmodule_axial_position" x="-44.86653535485047" y="137.053647237043" z="-24.972414460978417" unit="mm" />
<rotation name="module_L3b_halfmodule_axial_rotation" x="-1.5694003267948962" y="-0.030540399450088122" z="1.5707963267948963" unit="radian" />
<position name="module_L3b_halfmodule_axial_sensor_position" x="-3.414999999999999" y="30.0" z="-0.50725" unit="mm" />
<rotation name="module_L3b_halfmodule_axial_sensor_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
Expand All @@ -286,7 +286,7 @@
<rotation name="module_L3b_halfmodule_axial_cf_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
<position name="module_L3b_halfmodule_axial_hybrid_position" x="-3.414999999999999" y="-55.0" z="0.12649999999999995" unit="mm" />
<rotation name="module_L3b_halfmodule_axial_hybrid_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
<position name="module_L3b_halfmodule_stereo_position" x="-45.31762685506874" y="145.4286365754165" z="-21.854831478310007" unit="mm" />
<position name="module_L3b_halfmodule_stereo_position" x="-45.31762685506874" y="145.42961377509909" z="-21.154832160395497" unit="mm" />
<rotation name="module_L3b_halfmodule_stereo_rotation" x="1.5721923267948963" y="0.03054039945008801" z="1.6707963267948964" unit="radian" />
<position name="module_L3b_halfmodule_stereo_sensor_position" x="-3.414999999999999" y="30.0" z="-0.50725" unit="mm" />
<rotation name="module_L3b_halfmodule_stereo_sensor_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
Expand All @@ -298,7 +298,7 @@
<rotation name="module_L3b_halfmodule_stereo_cf_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
<position name="module_L3b_halfmodule_stereo_hybrid_position" x="-3.414999999999999" y="-55.0" z="0.12649999999999995" unit="mm" />
<rotation name="module_L3b_halfmodule_stereo_hybrid_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
<position name="module_L3t_halfmodule_axial_position" x="-45.61670040744279" y="161.22559183511078" z="25.61125900534158" unit="mm" />
<position name="module_L3t_halfmodule_axial_position" x="-45.61670040744279" y="161.2253174351178" z="24.911259059123978" unit="mm" />
<rotation name="module_L3t_halfmodule_axial_rotation" x="1.5711883267948965" y="0.03043330642417559" z="1.5707963267948966" unit="radian" />
<position name="module_L3t_halfmodule_axial_sensor_position" x="-3.414999999999999" y="30.0" z="-0.50725" unit="mm" />
<rotation name="module_L3t_halfmodule_axial_sensor_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
Expand All @@ -310,7 +310,7 @@
<rotation name="module_L3t_halfmodule_axial_cf_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
<position name="module_L3t_halfmodule_axial_hybrid_position" x="-3.414999999999999" y="-55.0" z="0.12649999999999995" unit="mm" />
<rotation name="module_L3t_halfmodule_axial_hybrid_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
<position name="module_L3t_halfmodule_stereo_position" x="-45.54676173869666" y="152.84185549481725" z="21.829706065586" unit="mm" />
<position name="module_L3t_halfmodule_stereo_position" x="-45.54676173869666" y="152.84158109482428" z="21.129706119368397" unit="mm" />
<rotation name="module_L3t_halfmodule_stereo_rotation" x="-1.5704043267948962" y="-0.030433306424175535" z="1.6707963267948964" unit="radian" />
<position name="module_L3t_halfmodule_stereo_sensor_position" x="-3.414999999999999" y="30.0" z="-0.50725" unit="mm" />
<rotation name="module_L3t_halfmodule_stereo_sensor_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
Expand All @@ -322,7 +322,7 @@
<rotation name="module_L3t_halfmodule_stereo_cf_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
<position name="module_L3t_halfmodule_stereo_hybrid_position" x="-3.414999999999999" y="-55.0" z="0.12649999999999995" unit="mm" />
<rotation name="module_L3t_halfmodule_stereo_hybrid_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
<position name="module_L4b_halfmodule_axial_position" x="-41.81297014635422" y="37.09720378439058" z="-27.105817390045754" unit="mm" />
<position name="module_L4b_halfmodule_axial_position" x="-41.81297014635422" y="37.09818098407319" z="-26.405818072131243" unit="mm" />
<rotation name="module_L4b_halfmodule_axial_rotation" x="-1.5694003267948962" y="-0.030540399450088122" z="1.5707963267948963" unit="radian" />
<position name="module_L4b_halfmodule_axial_sensor_position" x="-3.414999999999999" y="30.0" z="-0.50725" unit="mm" />
<rotation name="module_L4b_halfmodule_axial_sensor_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
Expand All @@ -334,7 +334,7 @@
<rotation name="module_L4b_halfmodule_axial_cf_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
<position name="module_L4b_halfmodule_axial_hybrid_position" x="-3.414999999999999" y="-55.0" z="0.12649999999999995" unit="mm" />
<rotation name="module_L4b_halfmodule_axial_hybrid_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
<position name="module_L4b_halfmodule_stereo_position" x="-42.266005594434105" y="45.47317236141525" z="-23.244233373289834" unit="mm" />
<position name="module_L4b_halfmodule_stereo_position" x="-42.266005594434105" y="45.47414956109785" z="-22.544234055375323" unit="mm" />
<rotation name="module_L4b_halfmodule_stereo_rotation" x="1.5721923267948963" y="0.03054039945008801" z="1.6707963267948964" unit="radian" />
<position name="module_L4b_halfmodule_stereo_sensor_position" x="-3.414999999999999" y="30.0" z="-0.50725" unit="mm" />
<rotation name="module_L4b_halfmodule_stereo_sensor_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
Expand All @@ -346,7 +346,7 @@
<rotation name="module_L4b_halfmodule_stereo_cf_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
<position name="module_L4b_halfmodule_stereo_hybrid_position" x="-3.414999999999999" y="-55.0" z="0.12649999999999995" unit="mm" />
<rotation name="module_L4b_halfmodule_stereo_hybrid_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
<position name="module_L4t_halfmodule_axial_position" x="-42.57383952504715" y="61.27246976169503" z="27.090527741846074" unit="mm" />
<position name="module_L4t_halfmodule_axial_position" x="-42.57383952504715" y="61.27219536170206" z="26.390527795628472" unit="mm" />
<rotation name="module_L4t_halfmodule_axial_rotation" x="1.5711883267948965" y="0.03043330642417559" z="1.5707963267948966" unit="radian" />
<position name="module_L4t_halfmodule_axial_sensor_position" x="-3.414999999999999" y="30.0" z="-0.50725" unit="mm" />
<rotation name="module_L4t_halfmodule_axial_sensor_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
Expand All @@ -358,7 +358,7 @@
<rotation name="module_L4t_halfmodule_axial_cf_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
<position name="module_L4t_halfmodule_axial_hybrid_position" x="-3.414999999999999" y="-55.0" z="0.12649999999999995" unit="mm" />
<rotation name="module_L4t_halfmodule_axial_hybrid_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
<position name="module_L4t_halfmodule_stereo_position" x="-42.51021339381717" y="52.88854680495761" z="23.323143912837278" unit="mm" />
<position name="module_L4t_halfmodule_stereo_position" x="-42.51021339381717" y="52.888272404964646" z="22.623143966619676" unit="mm" />
<rotation name="module_L4t_halfmodule_stereo_rotation" x="-1.5704043267948962" y="-0.030433306424175535" z="1.6707963267948964" unit="radian" />
<position name="module_L4t_halfmodule_stereo_sensor_position" x="-3.414999999999999" y="30.0" z="-0.50725" unit="mm" />
<rotation name="module_L4t_halfmodule_stereo_sensor_rotation" x="0.0" y="-0.0" z="0.0" unit="radian" />
Expand Down
8 changes: 4 additions & 4 deletions detector-data/detectors/HPS_Run2021Pass0_v1/compact.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,29 +534,29 @@
<millepede_constant name="22362" value="0.0" /> <!-- rw -->

<!-- L3 Top/Bottom translations and angles -->
<millepede_constant name="11163" value="0.0 + 0.000678 - -0.059459 - 0.012216 - 0.006668 - 0.002504" /> <!-- u -> global Y -->
<millepede_constant name="11163" value="0.0 + 0.000678 - -0.059459 - 0.012216 - 0.006668 - 0.002504 + -0.7" /> <!-- u -> global Y -->
<millepede_constant name="11263" value="0.0" /> <!-- v -> X+svtAngle -->
<millepede_constant name="11363" value="0.0" /> <!-- w -> Z+svtAngle -->
<millepede_constant name="12163" value="0.0" /> <!-- ru -->
<millepede_constant name="12263" value="0.0" /> <!-- rv -->
<millepede_constant name="12363" value="0.0" /> <!-- rw -->

<millepede_constant name="21163" value="0.0 + -0.046884 + -0.010228 - 0.075913 - 0.001767 - 0.023862" /> <!-- u -->
<millepede_constant name="21163" value="0.0 + -0.046884 + -0.010228 - 0.075913 - 0.001767 - 0.023862 + -0.7" /> <!-- u -->
<millepede_constant name="21263" value="0.0" /> <!-- v -->
<millepede_constant name="21363" value="0.0" /> <!-- w -->
<millepede_constant name="22163" value="0.0" /> <!-- ru -->
<millepede_constant name="22263" value="0.0" /> <!-- rv -->
<millepede_constant name="22363" value="0.0" /> <!-- rw -->

<!-- L4 Top/Bottom translations and angles -->
<millepede_constant name="11164" value="0.0 + -0.007361 - -0.033468 - -0.017968 - -0.013564 - 0.001690" /> <!-- u -> global Y -->
<millepede_constant name="11164" value="0.0 + -0.007361 - -0.033468 - -0.017968 - -0.013564 - 0.001690 + -0.7" /> <!-- u -> global Y -->
<millepede_constant name="11264" value="0.0" /> <!-- v -> X+svtAngle -->
<millepede_constant name="11364" value="0.0" /> <!-- w -> Z+svtAngle -->
<millepede_constant name="12164" value="0.0" /> <!-- ru -->
<millepede_constant name="12264" value="0.0" /> <!-- rv -->
<millepede_constant name="12364" value="0.0" /> <!-- rw -->

<millepede_constant name="21164" value="0.0 + -0.033974 + -0.006749 - 0.051528 - -0.004088 - 0.021074 - 0.001095" /> <!-- u -->
<millepede_constant name="21164" value="0.0 + -0.033974 + -0.006749 - 0.051528 - -0.004088 - 0.021074 - 0.001095 + -0.7" /> <!-- u -->
<millepede_constant name="21264" value="0.0" /> <!-- v -->
<millepede_constant name="21364" value="0.0" /> <!-- w -->
<millepede_constant name="22164" value="0.0" /> <!-- ru -->
Expand Down
Loading