Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
athena
Manage
Activity
Members
Labels
Plan
Issues
38
Issue boards
Milestones
Wiki
Code
Merge requests
34
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
EIC
detectors
athena
Commits
63168a37
Commit
63168a37
authored
3 years ago
by
Whitney Armstrong
Browse files
Options
Downloads
Patches
Plain Diff
Fixed last remaining overlap and check
modified: .gitlab-ci.yml modified: compact/solenoid.xml
parent
9c121719
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
.gitlab-ci.yml
+1
-1
1 addition, 1 deletion
.gitlab-ci.yml
compact/solenoid.xml
+2
-1
2 additions, 1 deletion
compact/solenoid.xml
with
3 additions
and
2 deletions
.gitlab-ci.yml
+
1
−
1
View file @
63168a37
...
...
@@ -117,7 +117,7 @@ overlap_check:
script
:
-
checkOverlaps -c reference_detector.xml | tee doc/overlap_check.out
-
echo "$(cat doc/overlap_check.out | grep ovlp | wc -l) overlaps..."
-
if [[ "$(cat doc/overlap_check.out | grep ovlp | wc -l)" -gt "
1
" ]] ; then echo "Overlaps exist!" &&
false
; fi
-
if [[ "$(cat doc/overlap_check.out | grep ovlp | wc -l)" -gt "
0
" ]] ; then echo "Overlaps exist!" &&
false
; fi
detector:config_testing
:
stage
:
test
...
...
This diff is collapsed.
Click to expand it.
compact/solenoid.xml
+
2
−
1
View file @
63168a37
...
...
@@ -102,6 +102,8 @@
-->
</detector>
<!--
<detector
id="SolenoidYoke_ID"
name="SolenoidYokeEndcaps"
...
...
@@ -118,7 +120,6 @@
<slice material="Steel235" thickness="SolenoidYokeEndcap_thickness/2.0" vis="SolenoidYokeVis" />
</layer>
</detector>
<!--
<detector name="SolenoidYoke" type="SiEIC_Yoke" vis="SolenoidYokeVis">
<material name="Steel235"/>
<dimensions inner_radius="SolenoidYokeInnerRadius" thickness="SolenoidYokeThickness" rmin="CaloInnerRadius + 10 * mm" angle="SolenoidYokeChamferAngle" inner_z="SolenoidYokeInnerZ"/>
...
...
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