Skip to content

Commit aa78ba4

Browse files
JeremyMcCormickJeremyMcCormick
committed
Change inactive Si collection to match existing convention.
1 parent 26e5948 commit aa78ba4

2 files changed

Lines changed: 41 additions & 41 deletions

File tree

‎detector-data/detectors/HPS-EngRun2015-Nominal-v7-0-fieldmap/HPS-EngRun2015-Nominal-v7-0-fieldmap.lcdd‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<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">
33
<header>
44
<detector name="HPS-EngRun2015-Nominal-v7-0-fieldmap" />
5-
<generator name="lcsim" version="1.0" file="/nfs/slac/g/hps/jeremym/dev/hps-java/detector-data/detectors/HPS-EngRun2015-Nominal-v7-0-fieldmap/compact.xml" checksum="1929563464" />
5+
<generator name="lcsim" version="1.0" file="/nfs/slac/g/hps/jeremym/dev/hps-java/detector-data/detectors/HPS-EngRun2015-Nominal-v7-0-fieldmap/compact.xml" checksum="1814056602" />
66
<author name="NONE" />
77
<comment>Copy of v6-fieldmap detector with inactive Si turned on.</comment>
88
</header>
@@ -25,7 +25,7 @@
2525
<idfield signed="true" label="side" length="2" start="32" />
2626
<idfield signed="false" label="strip" length="12" start="34" />
2727
</idspec>
28-
<idspec name="TrackerHits_InactiveSi" length="46">
28+
<idspec name="TrackerHits_Inactive" length="46">
2929
<idfield signed="false" label="system" length="6" start="0" />
3030
<idfield signed="false" label="barrel" length="3" start="6" />
3131
<idfield signed="false" label="layer" length="4" start="9" />
@@ -54,7 +54,7 @@
5454
<tracker name="Tracker" ecut="0.0" eunit="MeV" verbose="0" hits_collection="TrackerHits">
5555
<idspecref ref="TrackerHits" />
5656
</tracker>
57-
<tracker name="TrackerHits_InactiveSi_det" ecut="0.0" eunit="MeV" verbose="0" hits_collection="TrackerHits_InactiveSi" />
57+
<tracker name="TrackerHits_Inactive_det" ecut="0.0" eunit="MeV" verbose="0" hits_collection="TrackerHits_Inactive" />
5858
<tracker name="ECalScoring" ecut="0.0" eunit="MeV" verbose="0" hits_collection="TrackerHitsECal">
5959
<idspecref ref="TrackerHitsECal" />
6060
<hit_processor type="ScoringTrackerHitProcessor" />
@@ -2303,7 +2303,7 @@
23032303
<rotationref ref="module_L1b_halfmodule_axial_sensor_active_rotation" />
23042304
<physvolid field_name="sensor" value="0" />
23052305
</physvol>
2306-
<sdref ref="TrackerHits_InactiveSi_det" />
2306+
<sdref ref="TrackerHits_Inactive_det" />
23072307
<visref ref="SensorVis" />
23082308
</volume>
23092309
<volume name="module_L1b_halfmodule_axial_lamination_volume">
@@ -2365,7 +2365,7 @@
23652365
<rotationref ref="module_L1b_halfmodule_stereo_sensor_active_rotation" />
23662366
<physvolid field_name="sensor" value="0" />
23672367
</physvol>
2368-
<sdref ref="TrackerHits_InactiveSi_det" />
2368+
<sdref ref="TrackerHits_Inactive_det" />
23692369
<visref ref="SensorVis" />
23702370
</volume>
23712371
<volume name="module_L1b_halfmodule_stereo_lamination_volume">
@@ -2427,7 +2427,7 @@
24272427
<rotationref ref="module_L1t_halfmodule_axial_sensor_active_rotation" />
24282428
<physvolid field_name="sensor" value="0" />
24292429
</physvol>
2430-
<sdref ref="TrackerHits_InactiveSi_det" />
2430+
<sdref ref="TrackerHits_Inactive_det" />
24312431
<visref ref="SensorVis" />
24322432
</volume>
24332433
<volume name="module_L1t_halfmodule_axial_lamination_volume">
@@ -2489,7 +2489,7 @@
24892489
<rotationref ref="module_L1t_halfmodule_stereo_sensor_active_rotation" />
24902490
<physvolid field_name="sensor" value="0" />
24912491
</physvol>
2492-
<sdref ref="TrackerHits_InactiveSi_det" />
2492+
<sdref ref="TrackerHits_Inactive_det" />
24932493
<visref ref="SensorVis" />
24942494
</volume>
24952495
<volume name="module_L1t_halfmodule_stereo_lamination_volume">
@@ -2551,7 +2551,7 @@
25512551
<rotationref ref="module_L2b_halfmodule_axial_sensor_active_rotation" />
25522552
<physvolid field_name="sensor" value="0" />
25532553
</physvol>
2554-
<sdref ref="TrackerHits_InactiveSi_det" />
2554+
<sdref ref="TrackerHits_Inactive_det" />
25552555
<visref ref="SensorVis" />
25562556
</volume>
25572557
<volume name="module_L2b_halfmodule_axial_lamination_volume">
@@ -2613,7 +2613,7 @@
26132613
<rotationref ref="module_L2b_halfmodule_stereo_sensor_active_rotation" />
26142614
<physvolid field_name="sensor" value="0" />
26152615
</physvol>
2616-
<sdref ref="TrackerHits_InactiveSi_det" />
2616+
<sdref ref="TrackerHits_Inactive_det" />
26172617
<visref ref="SensorVis" />
26182618
</volume>
26192619
<volume name="module_L2b_halfmodule_stereo_lamination_volume">
@@ -2675,7 +2675,7 @@
26752675
<rotationref ref="module_L2t_halfmodule_axial_sensor_active_rotation" />
26762676
<physvolid field_name="sensor" value="0" />
26772677
</physvol>
2678-
<sdref ref="TrackerHits_InactiveSi_det" />
2678+
<sdref ref="TrackerHits_Inactive_det" />
26792679
<visref ref="SensorVis" />
26802680
</volume>
26812681
<volume name="module_L2t_halfmodule_axial_lamination_volume">
@@ -2737,7 +2737,7 @@
27372737
<rotationref ref="module_L2t_halfmodule_stereo_sensor_active_rotation" />
27382738
<physvolid field_name="sensor" value="0" />
27392739
</physvol>
2740-
<sdref ref="TrackerHits_InactiveSi_det" />
2740+
<sdref ref="TrackerHits_Inactive_det" />
27412741
<visref ref="SensorVis" />
27422742
</volume>
27432743
<volume name="module_L2t_halfmodule_stereo_lamination_volume">
@@ -2799,7 +2799,7 @@
27992799
<rotationref ref="module_L3b_halfmodule_axial_sensor_active_rotation" />
28002800
<physvolid field_name="sensor" value="0" />
28012801
</physvol>
2802-
<sdref ref="TrackerHits_InactiveSi_det" />
2802+
<sdref ref="TrackerHits_Inactive_det" />
28032803
<visref ref="SensorVis" />
28042804
</volume>
28052805
<volume name="module_L3b_halfmodule_axial_lamination_volume">
@@ -2861,7 +2861,7 @@
28612861
<rotationref ref="module_L3b_halfmodule_stereo_sensor_active_rotation" />
28622862
<physvolid field_name="sensor" value="0" />
28632863
</physvol>
2864-
<sdref ref="TrackerHits_InactiveSi_det" />
2864+
<sdref ref="TrackerHits_Inactive_det" />
28652865
<visref ref="SensorVis" />
28662866
</volume>
28672867
<volume name="module_L3b_halfmodule_stereo_lamination_volume">
@@ -2923,7 +2923,7 @@
29232923
<rotationref ref="module_L3t_halfmodule_axial_sensor_active_rotation" />
29242924
<physvolid field_name="sensor" value="0" />
29252925
</physvol>
2926-
<sdref ref="TrackerHits_InactiveSi_det" />
2926+
<sdref ref="TrackerHits_Inactive_det" />
29272927
<visref ref="SensorVis" />
29282928
</volume>
29292929
<volume name="module_L3t_halfmodule_axial_lamination_volume">
@@ -2985,7 +2985,7 @@
29852985
<rotationref ref="module_L3t_halfmodule_stereo_sensor_active_rotation" />
29862986
<physvolid field_name="sensor" value="0" />
29872987
</physvol>
2988-
<sdref ref="TrackerHits_InactiveSi_det" />
2988+
<sdref ref="TrackerHits_Inactive_det" />
29892989
<visref ref="SensorVis" />
29902990
</volume>
29912991
<volume name="module_L3t_halfmodule_stereo_lamination_volume">
@@ -3047,7 +3047,7 @@
30473047
<rotationref ref="module_L4b_halfmodule_axial_hole_sensor_active_rotation" />
30483048
<physvolid field_name="sensor" value="0" />
30493049
</physvol>
3050-
<sdref ref="TrackerHits_InactiveSi_det" />
3050+
<sdref ref="TrackerHits_Inactive_det" />
30513051
<visref ref="SensorVis" />
30523052
</volume>
30533053
<volume name="module_L4b_halfmodule_axial_hole_lamination_volume">
@@ -3087,7 +3087,7 @@
30873087
<rotationref ref="module_L4b_halfmodule_axial_slot_sensor_active_rotation" />
30883088
<physvolid field_name="sensor" value="0" />
30893089
</physvol>
3090-
<sdref ref="TrackerHits_InactiveSi_det" />
3090+
<sdref ref="TrackerHits_Inactive_det" />
30913091
<visref ref="SensorVis" />
30923092
</volume>
30933093
<volume name="module_L4b_halfmodule_axial_slot_lamination_volume">
@@ -3127,7 +3127,7 @@
31273127
<rotationref ref="module_L4b_halfmodule_stereo_hole_sensor_active_rotation" />
31283128
<physvolid field_name="sensor" value="0" />
31293129
</physvol>
3130-
<sdref ref="TrackerHits_InactiveSi_det" />
3130+
<sdref ref="TrackerHits_Inactive_det" />
31313131
<visref ref="SensorVis" />
31323132
</volume>
31333133
<volume name="module_L4b_halfmodule_stereo_hole_lamination_volume">
@@ -3167,7 +3167,7 @@
31673167
<rotationref ref="module_L4b_halfmodule_stereo_slot_sensor_active_rotation" />
31683168
<physvolid field_name="sensor" value="0" />
31693169
</physvol>
3170-
<sdref ref="TrackerHits_InactiveSi_det" />
3170+
<sdref ref="TrackerHits_Inactive_det" />
31713171
<visref ref="SensorVis" />
31723172
</volume>
31733173
<volume name="module_L4b_halfmodule_stereo_slot_lamination_volume">
@@ -3207,7 +3207,7 @@
32073207
<rotationref ref="module_L4t_halfmodule_axial_hole_sensor_active_rotation" />
32083208
<physvolid field_name="sensor" value="0" />
32093209
</physvol>
3210-
<sdref ref="TrackerHits_InactiveSi_det" />
3210+
<sdref ref="TrackerHits_Inactive_det" />
32113211
<visref ref="SensorVis" />
32123212
</volume>
32133213
<volume name="module_L4t_halfmodule_axial_hole_lamination_volume">
@@ -3247,7 +3247,7 @@
32473247
<rotationref ref="module_L4t_halfmodule_axial_slot_sensor_active_rotation" />
32483248
<physvolid field_name="sensor" value="0" />
32493249
</physvol>
3250-
<sdref ref="TrackerHits_InactiveSi_det" />
3250+
<sdref ref="TrackerHits_Inactive_det" />
32513251
<visref ref="SensorVis" />
32523252
</volume>
32533253
<volume name="module_L4t_halfmodule_axial_slot_lamination_volume">
@@ -3287,7 +3287,7 @@
32873287
<rotationref ref="module_L4t_halfmodule_stereo_hole_sensor_active_rotation" />
32883288
<physvolid field_name="sensor" value="0" />
32893289
</physvol>
3290-
<sdref ref="TrackerHits_InactiveSi_det" />
3290+
<sdref ref="TrackerHits_Inactive_det" />
32913291
<visref ref="SensorVis" />
32923292
</volume>
32933293
<volume name="module_L4t_halfmodule_stereo_hole_lamination_volume">
@@ -3327,7 +3327,7 @@
33273327
<rotationref ref="module_L4t_halfmodule_stereo_slot_sensor_active_rotation" />
33283328
<physvolid field_name="sensor" value="0" />
33293329
</physvol>
3330-
<sdref ref="TrackerHits_InactiveSi_det" />
3330+
<sdref ref="TrackerHits_Inactive_det" />
33313331
<visref ref="SensorVis" />
33323332
</volume>
33333333
<volume name="module_L4t_halfmodule_stereo_slot_lamination_volume">
@@ -3367,7 +3367,7 @@
33673367
<rotationref ref="module_L5b_halfmodule_axial_hole_sensor_active_rotation" />
33683368
<physvolid field_name="sensor" value="0" />
33693369
</physvol>
3370-
<sdref ref="TrackerHits_InactiveSi_det" />
3370+
<sdref ref="TrackerHits_Inactive_det" />
33713371
<visref ref="SensorVis" />
33723372
</volume>
33733373
<volume name="module_L5b_halfmodule_axial_hole_lamination_volume">
@@ -3407,7 +3407,7 @@
34073407
<rotationref ref="module_L5b_halfmodule_axial_slot_sensor_active_rotation" />
34083408
<physvolid field_name="sensor" value="0" />
34093409
</physvol>
3410-
<sdref ref="TrackerHits_InactiveSi_det" />
3410+
<sdref ref="TrackerHits_Inactive_det" />
34113411
<visref ref="SensorVis" />
34123412
</volume>
34133413
<volume name="module_L5b_halfmodule_axial_slot_lamination_volume">
@@ -3447,7 +3447,7 @@
34473447
<rotationref ref="module_L5b_halfmodule_stereo_hole_sensor_active_rotation" />
34483448
<physvolid field_name="sensor" value="0" />
34493449
</physvol>
3450-
<sdref ref="TrackerHits_InactiveSi_det" />
3450+
<sdref ref="TrackerHits_Inactive_det" />
34513451
<visref ref="SensorVis" />
34523452
</volume>
34533453
<volume name="module_L5b_halfmodule_stereo_hole_lamination_volume">
@@ -3487,7 +3487,7 @@
34873487
<rotationref ref="module_L5b_halfmodule_stereo_slot_sensor_active_rotation" />
34883488
<physvolid field_name="sensor" value="0" />
34893489
</physvol>
3490-
<sdref ref="TrackerHits_InactiveSi_det" />
3490+
<sdref ref="TrackerHits_Inactive_det" />
34913491
<visref ref="SensorVis" />
34923492
</volume>
34933493
<volume name="module_L5b_halfmodule_stereo_slot_lamination_volume">
@@ -3527,7 +3527,7 @@
35273527
<rotationref ref="module_L5t_halfmodule_axial_hole_sensor_active_rotation" />
35283528
<physvolid field_name="sensor" value="0" />
35293529
</physvol>
3530-
<sdref ref="TrackerHits_InactiveSi_det" />
3530+
<sdref ref="TrackerHits_Inactive_det" />
35313531
<visref ref="SensorVis" />
35323532
</volume>
35333533
<volume name="module_L5t_halfmodule_axial_hole_lamination_volume">
@@ -3567,7 +3567,7 @@
35673567
<rotationref ref="module_L5t_halfmodule_axial_slot_sensor_active_rotation" />
35683568
<physvolid field_name="sensor" value="0" />
35693569
</physvol>
3570-
<sdref ref="TrackerHits_InactiveSi_det" />
3570+
<sdref ref="TrackerHits_Inactive_det" />
35713571
<visref ref="SensorVis" />
35723572
</volume>
35733573
<volume name="module_L5t_halfmodule_axial_slot_lamination_volume">
@@ -3607,7 +3607,7 @@
36073607
<rotationref ref="module_L5t_halfmodule_stereo_hole_sensor_active_rotation" />
36083608
<physvolid field_name="sensor" value="0" />
36093609
</physvol>
3610-
<sdref ref="TrackerHits_InactiveSi_det" />
3610+
<sdref ref="TrackerHits_Inactive_det" />
36113611
<visref ref="SensorVis" />
36123612
</volume>
36133613
<volume name="module_L5t_halfmodule_stereo_hole_lamination_volume">
@@ -3647,7 +3647,7 @@
36473647
<rotationref ref="module_L5t_halfmodule_stereo_slot_sensor_active_rotation" />
36483648
<physvolid field_name="sensor" value="0" />
36493649
</physvol>
3650-
<sdref ref="TrackerHits_InactiveSi_det" />
3650+
<sdref ref="TrackerHits_Inactive_det" />
36513651
<visref ref="SensorVis" />
36523652
</volume>
36533653
<volume name="module_L5t_halfmodule_stereo_slot_lamination_volume">
@@ -3687,7 +3687,7 @@
36873687
<rotationref ref="module_L6b_halfmodule_axial_hole_sensor_active_rotation" />
36883688
<physvolid field_name="sensor" value="0" />
36893689
</physvol>
3690-
<sdref ref="TrackerHits_InactiveSi_det" />
3690+
<sdref ref="TrackerHits_Inactive_det" />
36913691
<visref ref="SensorVis" />
36923692
</volume>
36933693
<volume name="module_L6b_halfmodule_axial_hole_lamination_volume">
@@ -3727,7 +3727,7 @@
37273727
<rotationref ref="module_L6b_halfmodule_axial_slot_sensor_active_rotation" />
37283728
<physvolid field_name="sensor" value="0" />
37293729
</physvol>
3730-
<sdref ref="TrackerHits_InactiveSi_det" />
3730+
<sdref ref="TrackerHits_Inactive_det" />
37313731
<visref ref="SensorVis" />
37323732
</volume>
37333733
<volume name="module_L6b_halfmodule_axial_slot_lamination_volume">
@@ -3767,7 +3767,7 @@
37673767
<rotationref ref="module_L6b_halfmodule_stereo_hole_sensor_active_rotation" />
37683768
<physvolid field_name="sensor" value="0" />
37693769
</physvol>
3770-
<sdref ref="TrackerHits_InactiveSi_det" />
3770+
<sdref ref="TrackerHits_Inactive_det" />
37713771
<visref ref="SensorVis" />
37723772
</volume>
37733773
<volume name="module_L6b_halfmodule_stereo_hole_lamination_volume">
@@ -3807,7 +3807,7 @@
38073807
<rotationref ref="module_L6b_halfmodule_stereo_slot_sensor_active_rotation" />
38083808
<physvolid field_name="sensor" value="0" />
38093809
</physvol>
3810-
<sdref ref="TrackerHits_InactiveSi_det" />
3810+
<sdref ref="TrackerHits_Inactive_det" />
38113811
<visref ref="SensorVis" />
38123812
</volume>
38133813
<volume name="module_L6b_halfmodule_stereo_slot_lamination_volume">
@@ -3847,7 +3847,7 @@
38473847
<rotationref ref="module_L6t_halfmodule_axial_hole_sensor_active_rotation" />
38483848
<physvolid field_name="sensor" value="0" />
38493849
</physvol>
3850-
<sdref ref="TrackerHits_InactiveSi_det" />
3850+
<sdref ref="TrackerHits_Inactive_det" />
38513851
<visref ref="SensorVis" />
38523852
</volume>
38533853
<volume name="module_L6t_halfmodule_axial_hole_lamination_volume">
@@ -3887,7 +3887,7 @@
38873887
<rotationref ref="module_L6t_halfmodule_axial_slot_sensor_active_rotation" />
38883888
<physvolid field_name="sensor" value="0" />
38893889
</physvol>
3890-
<sdref ref="TrackerHits_InactiveSi_det" />
3890+
<sdref ref="TrackerHits_Inactive_det" />
38913891
<visref ref="SensorVis" />
38923892
</volume>
38933893
<volume name="module_L6t_halfmodule_axial_slot_lamination_volume">
@@ -3927,7 +3927,7 @@
39273927
<rotationref ref="module_L6t_halfmodule_stereo_hole_sensor_active_rotation" />
39283928
<physvolid field_name="sensor" value="0" />
39293929
</physvol>
3930-
<sdref ref="TrackerHits_InactiveSi_det" />
3930+
<sdref ref="TrackerHits_Inactive_det" />
39313931
<visref ref="SensorVis" />
39323932
</volume>
39333933
<volume name="module_L6t_halfmodule_stereo_hole_lamination_volume">
@@ -3967,7 +3967,7 @@
39673967
<rotationref ref="module_L6t_halfmodule_stereo_slot_sensor_active_rotation" />
39683968
<physvolid field_name="sensor" value="0" />
39693969
</physvol>
3970-
<sdref ref="TrackerHits_InactiveSi_det" />
3970+
<sdref ref="TrackerHits_Inactive_det" />
39713971
<visref ref="SensorVis" />
39723972
</volume>
39733973
<volume name="module_L6t_halfmodule_stereo_slot_lamination_volume">

‎detector-data/detectors/HPS-EngRun2015-Nominal-v7-0-fieldmap/compact.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162

163163
<detectors>
164164

165-
<detector id="1" name="Tracker" type="HPSTracker2014v1" readout="TrackerHits" inactiveSiReadout="TrackerHits_InactiveSi">
165+
<detector id="1" name="Tracker" type="HPSTracker2014v1" readout="TrackerHits" inactiveSiReadout="TrackerHits_Inactive">
166166
<SurveyVolumes>
167167

168168
<!-- U-channel in Svt box survey survey -->
@@ -832,7 +832,7 @@
832832
<readout name="TrackerHits">
833833
<id>system:6,barrel:3,layer:4,module:12,sensor:1,side:32:-2,strip:12</id>
834834
</readout>
835-
<readout name="TrackerHits_InactiveSi">
835+
<readout name="TrackerHits_Inactive">
836836
<id>system:6,barrel:3,layer:4,module:12,sensor:1,side:32:-2,strip:12</id>
837837
</readout>
838838
<readout name="TrackerHitsFieldDef">

0 commit comments

Comments
 (0)