Skip to content

Commit abf4250

Browse files
akioogawaakioogawa
authored
Merge branch 'main' into fEcal_update
2 parents a3102cf + 1db97b7 commit abf4250

File tree

13 files changed

+36
-40
lines changed

13 files changed

+36
-40
lines changed

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ repos:
66
- id: end-of-file-fixer
77
- id: trailing-whitespace
88
- repo: https://github.com/pre-commit/mirrors-clang-format
9-
rev: v21.1.2
9+
rev: v21.1.5
1010
hooks:
1111
- id: clang-format
1212
- repo: https://github.com/Lucas-C/pre-commit-hooks

‎compact/colors.xml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,11 @@
1616
<vis name="AnlBlue" alpha="1" r="0/256" g="96/256" b="156/256"/>
1717
<vis name="AnlTeal" alpha="1" r="0/256" g="161/256" b="156/256"/>
1818
<vis name="AnlGray" alpha="1" r="102/256" g="102/256" b="102/256"/>
19-
<vis name="AnlLight_Gray" alpha="1" r="209/256" g="209/256" b="209/256"/>
20-
<vis name="AnlLightGray" ref="AnlLight_Gray" />
19+
<vis name="AnlLightGray" alpha="1" r="209/256" g="209/256" b="209/256"/>
2120
<!-- off-white (or white) don't work! -->
2221
<!--vis name="AnlOff_White" alpha="1" r="242/256" g="242/256" b="242/256"/-->
2322
<vis name="AnlDarkRed" alpha="1" r="161/256" g="45/256" b="45/256"/>
2423
<vis name="AnlDarkGreen" alpha="1" r="0" g="110/256" b="50/256"/>
2524
<vis name="AnlDarkBlue" alpha="1" r="45/256" g="45/256" b="110/256"/>
26-
<vis name="AnlDelta_Red" ref="AnlDarkRed"/>
27-
<vis name="AnlDelta_Green" ref="AnlDarkGreen"/>
28-
<vis name="AnlDelta_Blue" ref="AnlDarkBlue"/>
2925

3026
</display>

‎compact/display.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
<vis name="SVTSensorVis" ref="AnlGold" visible="true" showDaughters="true" />
2727
<vis name="SVTReadoutVis" ref="AnlDarkGreen" visible="true" showDaughters="true" />
28-
<vis name="SVTSupportVis" ref="AnlLight_Gray" visible="true" showDaughters="false" />
28+
<vis name="SVTSupportVis" ref="AnlLightGray" visible="true" showDaughters="false" />
2929
<vis name="VertexLayerVis" ref="SVTSensorVis" visible="true" showDaughters="true" />
3030

3131
<vis name="TOFVis" ref="AnlTeal" visible="true" showDaughters="true"/>
@@ -122,8 +122,8 @@
122122
Solenoid
123123
</comment>
124124
<vis name="SolenoidCoilVis" ref="AnlLightGray" showDaughters="true" visible="true" lineStyle="solid" drawingStyle="solid" />
125-
<vis name="SolenoidCryostatVis" ref="AnlGray" showDaughters="true" visible="true" lineStyle="solid" drawingStyle="solid" />
126-
<vis name="SolenoidYokeVis" ref="AnlLight_Gray" showDaughters="false" visible="true" lineStyle="solid" drawingStyle="solid" />
125+
<vis name="SolenoidCryostatVis" ref="AnlGray" showDaughters="true" visible="true" lineStyle="solid" drawingStyle="solid" />
126+
<vis name="SolenoidYokeVis" ref="AnlLightGray" showDaughters="false" visible="true" lineStyle="solid" drawingStyle="solid" />
127127

128128

129129
<comment>
@@ -162,7 +162,7 @@
162162
</comment>
163163
<vis name="BackwardsBox" alpha="0.3" ref="AnlGray" showDaughters="true" visible="true"/>
164164
<vis name="BackwardsAir" alpha="0.7" ref="AnlBlue" showDaughters="true" visible="true"/>
165-
<vis name="BackwardsVac" alpha="0.1" ref="AnlLight_Gray" showDaughters="true" visible="true"/>
165+
<vis name="BackwardsVac" alpha="0.1" ref="AnlLightGray" showDaughters="true" visible="true"/>
166166

167167
<comment>
168168
PID visualization

‎compact/display_detailed.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@
9797
<comment>
9898
Solenoid
9999
</comment>
100-
<vis name="SolenoidCoilVis" ref="AnlLight_Gray" showDaughters="true" visible="true" lineStyle="solid" drawingStyle="solid" />
101-
<vis name="SolenoidCryostatVis" ref="AnlGray" showDaughters="true" visible="true" lineStyle="solid" drawingStyle="solid" />
102-
<vis name="SolenoidYokeVis" ref="AnlLight_Gray" showDaughters="false" visible="true" lineStyle="solid" drawingStyle="solid" />
100+
<vis name="SolenoidCoilVis" ref="AnlLightGray" showDaughters="true" visible="true" lineStyle="solid" drawingStyle="solid" />
101+
<vis name="SolenoidCryostatVis" ref="AnlGray" showDaughters="true" visible="true" lineStyle="solid" drawingStyle="solid" />
102+
<vis name="SolenoidYokeVis" ref="AnlLightGray" showDaughters="false" visible="true" lineStyle="solid" drawingStyle="solid" />
103103

104104

105105
<comment>
@@ -145,7 +145,7 @@
145145
</comment>
146146
<vis name="GreenVis" ref="AnlGreen" showDaughters="true" visible="true"/>
147147
<vis name="RedVis" ref="AnlRed" showDaughters="true" visible="true"/>
148-
<vis name="RPVis" ref="AnlDelta_Red" showDaughters="true" visible="true"/>
148+
<vis name="RPVis" ref="AnlDarkRed" showDaughters="true" visible="true"/>
149149
<vis name="RPLayerVis" ref="AnlTeal" showDaughters="true" visible="true" lineStyle="solid" drawingStyle="solid" />
150150
<vis name="BlueVis" ref="AnlBlue" showDaughters="true" visible="true"/>
151151
<vis name="OrangeVis" ref="AnlOrange" showDaughters="true" visible="true"/>

‎compact/display_geoviewer.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@
9797
<comment>
9898
Solenoid
9999
</comment>
100-
<vis name="SolenoidCoilVis" ref="AnlLight_Gray" showDaughters="true" visible="true" lineStyle="solid" drawingStyle="solid" />
101-
<vis name="SolenoidCryostatVis" ref="AnlGray" showDaughters="true" visible="true" lineStyle="solid" drawingStyle="solid" />
102-
<vis name="SolenoidYokeVis" ref="AnlLight_Gray" showDaughters="false" visible="true" lineStyle="solid" drawingStyle="solid" />
100+
<vis name="SolenoidCoilVis" ref="AnlLightGray" showDaughters="true" visible="true" lineStyle="solid" drawingStyle="solid" />
101+
<vis name="SolenoidCryostatVis" ref="AnlGray" showDaughters="true" visible="true" lineStyle="solid" drawingStyle="solid" />
102+
<vis name="SolenoidYokeVis" ref="AnlLightGray" showDaughters="false" visible="true" lineStyle="solid" drawingStyle="solid" />
103103

104104

105105
<comment>
@@ -145,7 +145,7 @@
145145
</comment>
146146
<vis name="GreenVis" ref="AnlGreen" showDaughters="true" visible="true"/>
147147
<vis name="RedVis" ref="AnlRed" showDaughters="true" visible="true"/>
148-
<vis name="RPVis" ref="AnlDelta_Red" showDaughters="true" visible="true"/>
148+
<vis name="RPVis" ref="AnlDarkRed" showDaughters="true" visible="true"/>
149149
<vis name="RPLayerVis" ref="AnlTeal" showDaughters="true" visible="true" lineStyle="solid" drawingStyle="solid" />
150150
<vis name="BlueVis" ref="AnlBlue" showDaughters="true" visible="true"/>
151151
<vis name="OrangeVis" ref="AnlOrange" showDaughters="true" visible="true"/>

‎compact/far_forward/ZDC_1stSilicon.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<dimensions x="ZDC_1stSilicon_x" y="ZDC_1stSilicon_y" z="ZDC_1stSilicon_z"/>
2828
<layer nlayer="1" gapspace="ZDC_Si_Air_thickness">
2929
<slice name="silicon" material="Silicon" thickness="ZDC_pixel_thickness" vis="AnlRed" sensitive="true"/>
30-
<slice name="glue" material="G10" thickness="ZDC_glue_thickness" vis="AnlLight_Gray"/>
30+
<slice name="glue" material="G10" thickness="ZDC_glue_thickness" vis="AnlLightGray"/>
3131
<slice name="pcb" material="ZDC_PET" thickness="ZDC_PCB_thickness" vis="AnlGreen"/>
3232
</layer>
3333

‎compact/far_forward/ZDC_Crystal.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
cellx="ZDC_Crystal_cell_width" celly="ZDC_Crystal_cell_height" thickness="ZDC_Crystal_APD_socket_z"
4343
material="ZDC_Polyethylene" vis="AnlTeal" />
4444
</module>
45-
<support material="CarbonFiber" vis="AnlLight_Gray" sizez="ZDC_Crystal_cell_length" thickness="ZDC_Crystal_frame_thickness"/>
45+
<support material="CarbonFiber" vis="AnlLightGray" sizez="ZDC_Crystal_cell_length" thickness="ZDC_Crystal_frame_thickness"/>
4646

4747
</detector>
4848
</detectors>

‎compact/far_forward/ZDC_Crystal_LYSO.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
cellx="ZDC_Crystal_cell_width" celly="ZDC_Crystal_cell_width" thickness="ZDC_Crystal_APD_socket_z"
5656
material="ZDC_Polyethylene" vis="AnlTeal" />
5757
</module>
58-
<support material="CarbonFiber" vis="AnlLight_Gray" sizez="ZDC_Crystal_cell_length" thickness="ZDC_Crystal_frame_thickness"/>
58+
<support material="CarbonFiber" vis="AnlLightGray" sizez="ZDC_Crystal_cell_length" thickness="ZDC_Crystal_frame_thickness"/>
5959

6060
</detector>
6161
</detectors>

‎compact/far_forward/ZDC_PbScinti.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<dimensions x="ZDC_PbSci_x" y="ZDC_PbSci_y" z="ZDC_PbSci_z"/>
3030
<module nbox="ZDC_PbSci_nbox" gapspace="ZDC_PbSci_box_gap">
3131
<layer nlayer="ZDC_PbSci_nlayers_per_box">
32-
<slice name="lead" material="Lead" thickness="ZDC_Lead_thickness" vis="AnlLight_Gray"/>
32+
<slice name="lead" material="Lead" thickness="ZDC_Lead_thickness" vis="AnlLightGray"/>
3333
<slice name="scinti" material="ZDC_Scintillator" thickness="ZDC_Sci_thickness" vis="AnlGreen" sensitive="true"/>
3434
</layer>
3535
</module>

‎compact/far_forward/ZDC_PbSi.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
<rotation x="ZDC_PbSi_rotateX_angle" y="ZDC_PbSi_rotateY_angle" z="ZDC_PbSi_rotateZ_angle"/>
2929
<dimensions x="ZDC_PbSi_x" y="ZDC_PbSi_y" z="ZDC_PbSi_z"/>
3030
<layer nlayer="ZDC_PbSi_nlayers" gapspace="ZDC_Si_Air_thickness">
31-
<slice name="lead" material="Lead" thickness="ZDC_Lead_thickness" vis="AnlLight_Gray"/>
32-
<slice name="glue" material="G10" thickness="ZDC_glue_thickness" vis="AnlLight_Gray"/>
31+
<slice name="lead" material="Lead" thickness="ZDC_Lead_thickness" vis="AnlLightGray"/>
32+
<slice name="glue" material="G10" thickness="ZDC_glue_thickness" vis="AnlLightGray"/>
3333
<slice name="silicon" material="Silicon" thickness="ZDC_pad_thickness" vis="AnlTeal" sensitive="true"/>
34-
<slice name="glue" material="G10" thickness="ZDC_glue_thickness" vis="AnlLight_Gray"/>
34+
<slice name="glue" material="G10" thickness="ZDC_glue_thickness" vis="AnlLightGray"/>
3535
<slice name="pcb" material="ZDC_PET" thickness="ZDC_PCB_thickness" vis="AnlGreen"/>
3636
</layer>
3737
</detector>

0 commit comments

Comments
 (0)