Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
athena
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Fernando Torales Acosta
athena
Commits
ab400a96
Commit
ab400a96
authored
3 years ago
by
Whitney Armstrong
Browse files
Options
Downloads
Patches
Plain Diff
Fixed overlaps
- Added some fudging numbers for ecal endcap z positions. Should fix this in the future..
parent
e3022508
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
compact/definitions.xml
+4
-4
4 additions, 4 deletions
compact/definitions.xml
reference_detector.xml
+0
-1
0 additions, 1 deletion
reference_detector.xml
with
4 additions
and
5 deletions
compact/definitions.xml
+
4
−
4
View file @
ab400a96
...
...
@@ -373,7 +373,7 @@
<constant
name=
"SolenoidYokeEndcapN_zmin"
value=
"Solenoid_length/2.0 - Solenoid_offset+ExtraHcalEndcapN_length"
/>
<constant
name=
"EcalBarrel_rmin"
value=
"SiliconTrackerOuterRadius + BarrelPIDThickness + 5.0 * mm"
/>
<constant
name=
"HcalBarrel_rmax"
value=
"Solenoid_rmin -
4
0.0 *
m
m "
/>
<constant
name=
"HcalBarrel_rmax"
value=
"Solenoid_rmin -
1
0.0 *
c
m "
/>
<constant
name=
"Barrel_TotalCalThickness"
value=
"HcalBarrel_rmax - EcalBarrel_rmin"
/>
<constant
name=
"CalBarrelDivider"
value=
"0.5"
/>
<comment>
Ecal and Hcal have the same thickness
</comment>
...
...
@@ -389,8 +389,8 @@
<constant
name=
"BarrelLength"
value=
"SiliconTrackerOuterBarrelLength + ForwardPIDLength + BackwardPIDLength"
/>
<constant
name=
"Barrel_offset"
value=
"(EcalEndcapP_zmin-EcalEndcapN_zmin)/2.0"
/>
<constant
name=
"EndcapPTotalCal_length"
value=
"(SolenoidYokeEndcapP_zmin - 0.0 * mm) - (EcalEndcapP_zmin + 0.0 * mm)"
/>
<constant
name=
"EndcapNTotalCal_length"
value=
"(SolenoidYokeEndcapN_zmin - 0.0 * mm) - (EcalEndcapN_zmin + 0.0 * mm)"
/>
<constant
name=
"EndcapPTotalCal_length"
value=
"(SolenoidYokeEndcapP_zmin - 0.0 * mm) - (EcalEndcapP_zmin +
2
0.0 * mm)"
/>
<constant
name=
"EndcapNTotalCal_length"
value=
"(SolenoidYokeEndcapN_zmin - 0.0 * mm) - (EcalEndcapN_zmin +
2
0.0 * mm)"
/>
<constant
name=
"EndcapP_CalDivide"
value=
"0.5"
/>
<comment>
0.5 means Ecal and Hcal have the same thickness
</comment>
<constant
name=
"EndcapN_CalDivide"
value=
"0.5"
/>
<comment>
0.5 means Ecal and Hcal have the same thickness
</comment>
...
...
@@ -593,7 +593,7 @@
ce_GEM Parameters
------------------
</comment>
<constant
name=
"ce_GEM_rmin"
value=
"
7
.0 * cm"
/>
<comment>
temporary number. Need beampipe radius
</comment>
<constant
name=
"ce_GEM_rmin"
value=
"
10
.0 * cm"
/>
<comment>
temporary number. Need beampipe radius
</comment>
<!--<constant name="ce_GEM_rmin" value="0.0 * cm"/>-->
<constant
name=
"ce_GEM_rmax"
value=
"HcalEndcapN_rmin + 8.0 * cm"
/>
<comment>
temporary number to avoid overlaps
</comment>
<!--<constant name="ce_GEM_rmax" value="45.0 * cm + 50.0 * cm"/>-->
...
...
This diff is collapsed.
Click to expand it.
reference_detector.xml
+
0
−
1
View file @
ab400a96
...
...
@@ -122,7 +122,6 @@
<include
ref=
"compact/ce_GEM.xml"
/>
<include
ref=
"compact/ffi_ZDC.xml"
/>
<include
ref=
"compact/ci_GEM.xml"
/>
<include
ref=
"compact/hcal.xml"
/>
<!--
<include ref="compact/ci_HCAL.xml"/>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment