forked from cms-sw/cmssw
-
Notifications
You must be signed in to change notification settings - Fork 7
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.
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
Ctpps diamond geometry 2021 #44
Open
Vetchu
wants to merge
10
commits into
CMSSW_11_0_X
Choose a base branch
from
ctpps_diamond_geometry_2021
base: CMSSW_11_0_X
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
cafca1f
add new geometry
Vetchu 4935ae8
Add New Geometry XML
Vetchu 1fbb636
Add new geometry python file
Vetchu 5eb0fb3
Generify RECO Diamond ID
Vetchu 59e93ee
Remove commented values, update layout
Vetchu 60795cf
Added comments for diamond detector dist
Vetchu 43a021f
Cleanup
Vetchu 99f65b4
Correct mistake with naming
Vetchu 56202d7
Merge branch 'ctpps_diamond_reco_2021' into ctpps_diamond_geometry_2021
Vetchu 34a426e
Code format
Vetchu File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
49 changes: 49 additions & 0 deletions
49
Geometry/VeryForwardData/data/CTPPS_2021/RP_Dist_Beam_Cent.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../DDLSchema/DDLSchema.xsd"> | ||
| <!-- Generated by makeOfflineGeometry on 07 Jun 2016 12:43:13 | ||
| time: 1464650000 | ||
| offset file: /afs/cern.ch/exp/totem/scratch/data/RP/tools/measurement_offsets/zero_offsets | ||
| sensor type: RESOLVER | ||
| --> | ||
| <ConstantsSection label="RP_Dist_Beam_Cent.xml"> | ||
| <!-- sector 45, 210m station --> | ||
| <Constant name="RP_147_Left_Det_Dist_0" value=" +9.129*mm"/> <!-- RESOLVER: +9.129, offset: +0.000 --> | ||
| <Constant name="RP_147_Left_Det_Dist_1" value=" +8.885*mm"/> <!-- RESOLVER: +8.885, offset: +0.000 --> | ||
| <Constant name="RP_147_Left_Det_Dist_2" value=" +6.480*mm"/> <!-- RESOLVER: +6.480, offset: +0.000 --> | ||
| <Constant name="RP_147_Left_Det_Dist_3" value=" +6.181*mm"/> <!-- RESOLVER: +6.181, offset: +0.000 --> | ||
| <Constant name="RP_147_Left_Det_Dist_4" value=" +7.000*mm"/> | ||
| <Constant name="RP_147_Left_Det_Dist_5" value=" +7.000*mm"/> | ||
|
|
||
| <!-- sector 45, 220m station --> | ||
| <Constant name="RP_220_Left_Det_Dist_0" value="+43.391*mm"/> <!-- RESOLVER: +43.391, offset: +0.000 --> | ||
| <Constant name="RP_220_Left_Det_Dist_1" value="+42.712*mm"/> <!-- RESOLVER: +42.712, offset: +0.000 --> | ||
| <!--<Constant name="RP_220_Left_Det_Dist_2" value="+41.915*mm"/> RESOLVER: +41.915, offset: +0.000 --> | ||
| <Constant name="RP_220_Left_Det_Dist_2" value="+3.0*mm"/> <!-- RESOLVER: +41.915, offset: +0.000 --> | ||
| <Constant name="RP_220_Left_Det_Dist_3" value="+43.162*mm"/> <!-- RESOLVER: +43.162, offset: +0.000 --> | ||
| <Constant name="RP_220_Left_Det_Dist_4" value=" +7.000*mm"/> | ||
| <Constant name="RP_220_Left_Det_Dist_5" value=" +7.000*mm"/> | ||
|
|
||
| <!-- sector 56, 210m station --> | ||
| <Constant name="RP_147_Right_Det_Dist_0" value=" +9.052*mm"/> <!-- RESOLVER: +9.052, offset: +0.000 --> | ||
| <Constant name="RP_147_Right_Det_Dist_1" value=" +8.017*mm"/> <!-- RESOLVER: +8.017, offset: +0.000 --> | ||
| <Constant name="RP_147_Right_Det_Dist_2" value=" +6.605*mm"/> <!-- RESOLVER: +6.605, offset: +0.000 --> | ||
| <Constant name="RP_147_Right_Det_Dist_3" value=" +5.319*mm"/> <!-- RESOLVER: +5.319, offset: +0.000 --> | ||
| <Constant name="RP_147_Right_Det_Dist_4" value=" +7.000*mm"/> | ||
| <Constant name="RP_147_Right_Det_Dist_5" value=" +7.000*mm"/> | ||
|
|
||
| <!-- sector 56, 220m station --> | ||
| <Constant name="RP_220_Right_Det_Dist_0" value="+42.318*mm"/> <!-- RESOLVER: +42.318, offset: +0.000 --> | ||
| <Constant name="RP_220_Right_Det_Dist_1" value="+42.266*mm"/> <!-- RESOLVER: +42.266, offset: +0.000 --> | ||
| <!--<Constant name="RP_220_Right_Det_Dist_2" value="+44.364*mm"/> RESOLVER: +44.364, offset: +0.000 --> | ||
| <Constant name="RP_220_Right_Det_Dist_2" value="+3.0*mm"/> <!-- RESOLVER: +44.364, offset: +0.000 --> | ||
| <Constant name="RP_220_Right_Det_Dist_3" value="+43.396*mm"/> <!-- RESOLVER: +43.396, offset: +0.000 --> | ||
| <Constant name="RP_220_Right_Det_Dist_4" value=" +7.000*mm"/> | ||
| <Constant name="RP_220_Right_Det_Dist_5" value=" +7.000*mm"/> | ||
|
|
||
| <!-- sector 45, diamond station --> | ||
| <Constant name="CTPPS_45_Det_Dist" value="3.0*mm"/> | ||
|
|
||
| <!-- sector 56, diamond station --> | ||
jan-kaspar marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| <Constant name="CTPPS_56_Det_Dist" value="3.0*mm"/> | ||
| </ConstantsSection> | ||
| </DDDefinition> | ||
86 changes: 86 additions & 0 deletions
86
Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Detector_Assembly.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| <DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../DetectorDescription/Schema/DDLSchema.xsd"> | ||
|
|
||
| <ConstantsSection label="CTPPS_Diamond_Detector_Assembly.xml" eval="true"> | ||
| <Constant name="Shift_dx" value="[CTPPS_Diamond_Parameters:Plane_dx]/2-([CTPPS_Timing_Horizontal_Pot:plane_length]+[CTPPS_Timing_Horizontal_Pot:bottom_wall_thickness])/2-[CTPPS_Timing_Horizontal_Pot:cut_depth]"/> | ||
| <Constant name="box_dz" value="([CTPPS_Diamond_Parameters:Metalized_thick]*2+[CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:PCB_thick])*4+[CTPPS_Diamond_Parameters:Plane_gap]*3"/> | ||
| </ConstantsSection> | ||
|
|
||
| <SolidSection label="CTPPS_Diamond_Detector_Assembly.xml"> | ||
| <!-- Detector Main Box and Planes --> | ||
| <Box name="Main_Box_main" dx="[CTPPS_Diamond_Parameters:PCB_dx]/2-[CTPPS_Diamond_Parameters:PCB_extend_dx]+[CTPPS_Timing_Horizontal_Pot:cut_depth]" dy="[CTPPS_Diamond_Parameters:PCB_dy]/2" dz="[box_dz]/2"/> | ||
| <Trd1 name="Main_Box_extra" dz="[CTPPS_Diamond_Parameters:PCB_extend_dx]/2" dy1="[CTPPS_Diamond_Parameters:PCB_extend_dy1]/2" dy2="[CTPPS_Diamond_Parameters:PCB_extend_dy2]/2" dx1="[box_dz]/2" dx2="[box_dz]/2"/> | ||
| <UnionSolid name="CTPPS_Diamond_Main_Box"> | ||
| <rSolid name="Main_Box_main"/> | ||
| <rSolid name="Main_Box_extra"/> | ||
| <rRotation name="rotations:90YX"/> | ||
| <Translation x="-[CTPPS_Diamond_Parameters:PCB_dx]/2-[CTPPS_Diamond_Parameters:PCB_extend_dx]/2" y="0*mm" z="0*mm"/> | ||
| </UnionSolid> | ||
| <Box name="PCB_main" dx="[CTPPS_Diamond_Parameters:PCB_dx]/2" dy="[CTPPS_Diamond_Parameters:PCB_dy]/2" dz="[CTPPS_Diamond_Parameters:PCB_thick]/2"/> | ||
| <Trd1 name="PCB_extra" dz="[CTPPS_Diamond_Parameters:PCB_extend_dx]/2" dy1="[CTPPS_Diamond_Parameters:PCB_extend_dy1]/2" dy2="[CTPPS_Diamond_Parameters:PCB_extend_dy2]/2" dx1="[CTPPS_Diamond_Parameters:PCB_thick]/2" dx2="[CTPPS_Diamond_Parameters:PCB_thick]/2"/> | ||
| <UnionSolid name="PCB"> | ||
| <rSolid name="PCB_main"/> | ||
| <rSolid name="PCB_extra"/> | ||
| <rRotation name="rotations:90YX"/> | ||
| <Translation x="-[CTPPS_Diamond_Parameters:PCB_dx]/2-[CTPPS_Diamond_Parameters:PCB_extend_dx]/2" y="0*mm" z="0*mm"/> | ||
| </UnionSolid> | ||
| </SolidSection> | ||
|
|
||
| <LogicalPartSection label="CTPPS_Diamond_Detector_Assembly.xml"> | ||
| <!-- ****** Detector Box and Downstream Plane ****** --> | ||
| <LogicalPart name="CTPPS_Diamond_Main_Box" category="envelope"> | ||
| <rSolid name="CTPPS_Diamond_Main_Box"/> | ||
| <rMaterial name="materials:Vacuum"/> | ||
| </LogicalPart> | ||
| <LogicalPart name="PCB" category="support"> | ||
| <rSolid name="PCB"/> | ||
| <rMaterial name="RP_Materials:PCB"/> <!--should be equivalent to actual RO4350B--> | ||
| </LogicalPart> | ||
| </LogicalPartSection> | ||
|
|
||
| <PosPartSection label="CTPPS_Diamond_Detector_Assembly.xml"> | ||
| <PosPart copyNumber="1"> | ||
| <rParent name="CTPPS_Timing_Horizontal_Pot:Primary_Vacuum"/> | ||
| <rChild name="CTPPS_Diamond_Main_Box"/> | ||
| <rRotation name="CTPPS_Diamond_Transformations:planes_box_rotation"/> | ||
| <Translation x="0*cm" y="0*cm" z="-[CTPPS_Timing_Horizontal_Pot:bottom_wall_thickness]/2+[CTPPS_Diamond_Parameters:PCB_extend_dx]"/> | ||
| </PosPart> | ||
| <PosPart copyNumber="122"> | ||
| <rParent name="RP_Box_122:RP_box_primary_vacuum"/> | ||
| <rChild name="CTPPS_Diamond_Main_Box"/> | ||
| <rRotation name="RP_Transformations:RP_90_z_rot"/> | ||
| <Translation x="0*cm" y="[RP_Box:RP_Box_Bottom_Wall_Thickness]" z="-[CTPPS_Timing_Horizontal_Pot:bottom_wall_thickness]/2+[CTPPS_Diamond_Parameters:PCB_extend_dx]"/> | ||
| </PosPart> | ||
| <PosPart copyNumber="22"> | ||
| <rParent name="RP_Box_022:RP_box_primary_vacuum"/> | ||
| <rChild name="CTPPS_Diamond_Main_Box"/> | ||
| <rRotation name="RP_Transformations:RP_90_z_rot"/> | ||
| <!-- <rRotation name="CTPPS_Diamond_Transformations:planes_box_rotation"/>--> | ||
| <Translation x="0*cm" y="[RP_Box:RP_Box_Bottom_Wall_Thickness]" z="-[CTPPS_Timing_Horizontal_Pot:bottom_wall_thickness]/2+[CTPPS_Diamond_Parameters:PCB_extend_dx]"/> | ||
| </PosPart> | ||
|
|
||
|
|
||
| <PosPart copyNumber="1"> | ||
| <rParent name="CTPPS_Diamond_Main_Box"/> | ||
| <rChild name="CTPPS_Diamond_Plane1_new:CTPPS_Diamond_Plane"/> | ||
| <Translation y="0*cm" x="[Shift_dx]" z="-([CTPPS_Diamond_Parameters:Plane_dz]+[CTPPS_Diamond_Parameters:Plane_gap])*3/2"/> | ||
| </PosPart> | ||
| <PosPart copyNumber="2"> | ||
| <rParent name="CTPPS_Diamond_Main_Box"/> | ||
| <rChild name="CTPPS_Diamond_Plane2_new:CTPPS_Diamond_Plane"/> | ||
| <Translation y="0*cm" x="[Shift_dx]" z="-([CTPPS_Diamond_Parameters:Plane_dz]+[CTPPS_Diamond_Parameters:Plane_gap])/2"/> | ||
| </PosPart> | ||
| <PosPart copyNumber="3"> | ||
| <rParent name="CTPPS_Diamond_Main_Box"/> | ||
| <rChild name="CTPPS_Diamond_Plane3:CTPPS_Diamond_Plane"/> | ||
| <Translation y="0*cm" x="[Shift_dx]" z="([CTPPS_Diamond_Parameters:Plane_dz]+[CTPPS_Diamond_Parameters:Plane_gap])/2"/> | ||
| <rRotation name="CTPPS_Diamond_Transformations:planes_x_rotation"/> | ||
| </PosPart> | ||
| <PosPart copyNumber="4"> | ||
| <rParent name="CTPPS_Diamond_Main_Box"/> | ||
| <rChild name="CTPPS_Diamond_Plane4:CTPPS_Diamond_Plane"/> | ||
| <Translation y="0*cm" x="[Shift_dx]" z="([CTPPS_Diamond_Parameters:Plane_dz]+[CTPPS_Diamond_Parameters:Plane_gap])*3/2"/> | ||
| </PosPart> | ||
| </PosPartSection> | ||
|
|
||
| </DDDefinition> | ||
|
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this constant used for both "near" and "far" timing RPs? We should have the possibility to set the position of the RPs independently.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
RP_220_Left_Det_Dist_2 is for the new one.
CTPPS_45_Det_Dist is for the old one.
i think i might need to add a comment to make it cleaner as changing name of constant could create a need to modify more files, as it is used inside RP_Box_22 and 122.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, thanks!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added comments to the file, so unless we'd like to mess with the pot files i think this issue is solved.