LCDetectors/detectors/mcdrcal01
diff -u -r1.5 -r1.6
--- compact.xml 8 May 2013 16:16:53 -0000 1.5
+++ compact.xml 18 Jun 2013 19:01:17 -0000 1.6
@@ -7,9 +7,9 @@
<info name="mcdrcal01"
title="Muon Collider Higgs factory Detector v00"
author="Hans Wenzel"
- url="http://confluence.slac.stanford.edu/display/ilc/mcdrcald00"
+ url="http://confluence.slac.stanford.edu/display/ilc/mcdrcald01"
status="development"
- version="$Id: compact.xml,v 1.5 2013/05/08 16:16:53 wenzel Exp $">
+ version="$Id: compact.xml,v 1.6 2013/06/18 19:01:17 wenzel Exp $">
<comment>The compact format for the Muon Collider Higgs factory Detector with dual read out</comment>
</info>
@@ -25,31 +25,575 @@
<constant name="world_z" value="world_side" />
<!-- tracking region -->
- <constant name="tracking_region_radius" value="130.5*cm"/>
+ <constant name="tracking_region_radius" value="125.0*cm"/>
<constant name="tracking_region_zmax" value="200.0*cm"/>
+ <!--
+ refraction index calculated using sellmeier coefficients from
+ Rémi Chipaux,
+ Numerical formulae for the refractive index of lead tungstate
+ CMS TN / 95-184. December 1995.
+ -->
+ <matrix name="Rindex" coldim="2" values="0.00000145864 2.20849
+ 0.00000146036 2.20857
+ 0.00000146208 2.20865
+ 0.0000014638 2.20874
+ 0.00000146553 2.20882
+ 0.00000146727 2.2089
+ 0.00000146901 2.20899
+ 0.00000147075 2.20907
+ 0.0000014725 2.20916
+ 0.00000147425 2.20924
+ 0.000001476 2.20933
+ 0.00000147776 2.20941
+ 0.00000147952 2.2095
+ 0.00000148129 2.20958
+ 0.00000148306 2.20967
+ 0.00000148484 2.20976
+ 0.00000148662 2.20984
+ 0.00000148841 2.20993
+ 0.00000149019 2.21002
+ 0.00000149199 2.21011
+ 0.00000149379 2.2102
+ 0.00000149559 2.21028
+ 0.00000149739 2.21037
+ 0.0000014992 2.21046
+ 0.00000150102 2.21055
+ 0.00000150284 2.21064
+ 0.00000150466 2.21073
+ 0.00000150649 2.21083
+ 0.00000150832 2.21092
+ 0.00000151016 2.21101
+ 0.000001512 2.2111
+ 0.00000151385 2.21119
+ 0.0000015157 2.21129
+ 0.00000151755 2.21138
+ 0.00000151941 2.21148
+ 0.00000152128 2.21157
+ 0.00000152315 2.21166
+ 0.00000152502 2.21176
+ 0.0000015269 2.21186
+ 0.00000152878 2.21195
+ 0.00000153067 2.21205
+ 0.00000153256 2.21214
+ 0.00000153446 2.21224
+ 0.00000153636 2.21234
+ 0.00000153827 2.21244
+ 0.00000154018 2.21254
+ 0.00000154209 2.21264
+ 0.00000154401 2.21273
+ 0.00000154594 2.21283
+ 0.00000154787 2.21293
+ 0.0000015498 2.21303
+ 0.00000155174 2.21314
+ 0.00000155369 2.21324
+ 0.00000155564 2.21334
+ 0.00000155759 2.21344
+ 0.00000155955 2.21354
+ 0.00000156151 2.21365
+ 0.00000156348 2.21375
+ 0.00000156546 2.21386
+ 0.00000156744 2.21396
+ 0.00000156942 2.21407
+ 0.00000157141 2.21417
+ 0.0000015734 2.21428
+ 0.0000015754 2.21438
+ 0.00000157741 2.21449
+ 0.00000157942 2.2146
+ 0.00000158143 2.21471
+ 0.00000158345 2.21482
+ 0.00000158548 2.21492
+ 0.00000158751 2.21503
+ 0.00000158954 2.21514
+ 0.00000159158 2.21525
+ 0.00000159363 2.21536
+ 0.00000159568 2.21548
+ 0.00000159773 2.21559
+ 0.0000015998 2.2157
+ 0.00000160186 2.21581
+ 0.00000160394 2.21593
+ 0.00000160601 2.21604
+ 0.0000016081 2.21616
+ 0.00000161018 2.21627
+ 0.00000161228 2.21639
+ 0.00000161438 2.2165
+ 0.00000161648 2.21662
+ 0.00000161859 2.21674
+ 0.00000162071 2.21685
+ 0.00000162283 2.21697
+ 0.00000162496 2.21709
+ 0.00000162709 2.21721
+ 0.00000162923 2.21733
+ 0.00000163137 2.21745
+ 0.00000163352 2.21757
+ 0.00000163568 2.21769
+ 0.00000163784 2.21782
+ 0.00000164 2.21794
+ 0.00000164217 2.21806
+ 0.00000164435 2.21819
+ 0.00000164654 2.21831
+ 0.00000164873 2.21844
+ 0.00000165092 2.21856
+ 0.00000165312 2.21869
+ 0.00000165533 2.21881
+ 0.00000165754 2.21894
+ 0.00000165976 2.21907
+ 0.00000166199 2.2192
+ 0.00000166422 2.21933
+ 0.00000166645 2.21946
+ 0.0000016687 2.21959
+ 0.00000167095 2.21972
+ 0.0000016732 2.21985
+ 0.00000167546 2.21998
+ 0.00000167773 2.22012
+ 0.00000168 2.22025
+ 0.00000168228 2.22038
+ 0.00000168457 2.22052
+ 0.00000168686 2.22066
+ 0.00000168916 2.22079
+ 0.00000169146 2.22093
+ 0.00000169377 2.22107
+ 0.00000169609 2.2212
+ 0.00000169841 2.22134
+ 0.00000170074 2.22148
+ 0.00000170308 2.22162
+ 0.00000170542 2.22177
+ 0.00000170777 2.22191
+ 0.00000171013 2.22205
+ 0.00000171249 2.22219
+ 0.00000171486 2.22234
+ 0.00000171723 2.22248
+ 0.00000171961 2.22263
+ 0.000001722 2.22277
+ 0.0000017244 2.22292
+ 0.0000017268 2.22307
+ 0.00000172921 2.22322
+ 0.00000173162 2.22336
+ 0.00000173404 2.22351
+ 0.00000173647 2.22367
+ 0.00000173891 2.22382
+ 0.00000174135 2.22397
+ 0.0000017438 2.22412
+ 0.00000174626 2.22428
+ 0.00000174872 2.22443
+ 0.00000175119 2.22459
+ 0.00000175367 2.22474
+ 0.00000175615 2.2249
+ 0.00000175864 2.22506
+ 0.00000176114 2.22521
+ 0.00000176364 2.22537
+ 0.00000176616 2.22553
+ 0.00000176868 2.2257
+ 0.0000017712 2.22586
+ 0.00000177374 2.22602
+ 0.00000177628 2.22618
+ 0.00000177883 2.22635
+ 0.00000178138 2.22651
+ 0.00000178395 2.22668
+ 0.00000178652 2.22685
+ 0.00000178909 2.22701
+ 0.00000179168 2.22718
+ 0.00000179427 2.22735
+ 0.00000179687 2.22752
+ 0.00000179948 2.22769
+ 0.0000018021 2.22787
+ 0.00000180472 2.22804
+ 0.00000180735 2.22821
+ 0.00000180999 2.22839
+ 0.00000181263 2.22857
+ 0.00000181529 2.22874
+ 0.00000181795 2.22892
+ 0.00000182062 2.2291
+ 0.0000018233 2.22928
+ 0.00000182598 2.22946
+ 0.00000182868 2.22964
+ 0.00000183138 2.22983
+ 0.00000183409 2.23001
+ 0.0000018368 2.2302
+ 0.00000183953 2.23038
+ 0.00000184226 2.23057
+ 0.000001845 2.23076
+ 0.00000184775 2.23095
+ 0.00000185051 2.23114
+ 0.00000185328 2.23133
+ 0.00000185605 2.23152
+ 0.00000185883 2.23171
+ 0.00000186162 2.23191
+ 0.00000186442 2.2321
+ 0.00000186723 2.2323
+ 0.00000187005 2.2325
+ 0.00000187287 2.2327
+ 0.00000187571 2.2329
+ 0.00000187855 2.2331
+ 0.0000018814 2.2333
+ 0.00000188426 2.2335
+ 0.00000188713 2.23371
+ 0.00000189 2.23391
+ 0.00000189289 2.23412
+ 0.00000189578 2.23433
+ 0.00000189869 2.23454
+ 0.0000019016 2.23475
+ 0.00000190452 2.23496
+ 0.00000190745 2.23517
+ 0.00000191039 2.23539
+ 0.00000191334 2.2356
+ 0.00000191629 2.23582
+ 0.00000191926 2.23604
+ 0.00000192224 2.23626
+ 0.00000192522 2.23648
+ 0.00000192821 2.2367
+ 0.00000193122 2.23692
+ 0.00000193423 2.23715
+ 0.00000193725 2.23737
+ 0.00000194028 2.2376
+ 0.00000194333 2.23783
+ 0.00000194638 2.23806
+ 0.00000194944 2.23829
+ 0.00000195251 2.23852
+ 0.00000195559 2.23876
+ 0.00000195868 2.23899
+ 0.00000196178 2.23923
+ 0.00000196488 2.23947
+ 0.000001968 2.23971
+ 0.00000197113 2.23995
+ 0.00000197427 2.24019
+ 0.00000197742 2.24044
+ 0.00000198058 2.24068
+ 0.00000198375 2.24093
+ 0.00000198693 2.24118
+ 0.00000199012 2.24143
+ 0.00000199331 2.24168
+ 0.00000199652 2.24194
+ 0.00000199975 2.24219
+ 0.00000200298 2.24245
+ 0.00000200622 2.24271
+ 0.00000200947 2.24297
+ 0.00000201273 2.24323
+ 0.000002016 2.24349
+ 0.00000201929 2.24376
+ 0.00000202258 2.24402
+ 0.00000202589 2.24429
+ 0.0000020292 2.24456
+ 0.00000203253 2.24483
+ 0.00000203587 2.24511
+ 0.00000203921 2.24538
+ 0.00000204257 2.24566
+ 0.00000204594 2.24594
+ 0.00000204933 2.24622
+ 0.00000205272 2.2465
+ 0.00000205612 2.24679
+ 0.00000205954 2.24707
+ 0.00000206296 2.24736
+ 0.0000020664 2.24765
+ 0.00000206985 2.24794
+ 0.00000207331 2.24824
+ 0.00000207679 2.24853
+ 0.00000208027 2.24883
+ 0.00000208377 2.24913
+ 0.00000208728 2.24943
+ 0.0000020908 2.24973
+ 0.00000209433 2.25004
+ 0.00000209787 2.25035
+ 0.00000210143 2.25066
+ 0.00000210499 2.25097
+ 0.00000210857 2.25128
+ 0.00000211217 2.2516
+ 0.00000211577 2.25192
+ 0.00000211939 2.25224
+ 0.00000212302 2.25256
+ 0.00000212666 2.25289
+ 0.00000213031 2.25321
+ 0.00000213398 2.25354
+ 0.00000213766 2.25388
+ 0.00000214135 2.25421
+ 0.00000214506 2.25455
+ 0.00000214877 2.25489
+ 0.0000021525 2.25523
+ 0.00000215625 2.25557
+ 0.00000216 2.25592
+ 0.00000216377 2.25627
+ 0.00000216756 2.25662
+ 0.00000217135 2.25697
+ 0.00000217516 2.25733
+ 0.00000217898 2.25768
+ 0.00000218282 2.25805
+ 0.00000218667 2.25841
+ 0.00000219053 2.25878
+ 0.00000219441 2.25914
+ 0.0000021983 2.25952
+ 0.00000220221 2.25989
+ 0.00000220612 2.26027
+ 0.00000221006 2.26065
+ 0.000002214 2.26103
+ 0.00000221796 2.26142
+ 0.00000222194 2.26181
+ 0.00000222593 2.2622
+ 0.00000222993 2.26259
+ 0.00000223395 2.26299
+ 0.00000223798 2.26339
+ 0.00000224203 2.26379
+ 0.00000224609 2.2642
+ 0.00000225017 2.26461
+ 0.00000225426 2.26502
+ 0.00000225836 2.26544
+ 0.00000226249 2.26585
+ 0.00000226662 2.26628
+ 0.00000227077 2.2667
+ 0.00000227494 2.26713
+ 0.00000227912 2.26756
+ 0.00000228332 2.268
+ 0.00000228753 2.26844
+ 0.00000229176 2.26888
+ 0.000002296 2.26932
+ 0.00000230026 2.26977
+ 0.00000230454 2.27023
+ 0.00000230883 2.27068
+ 0.00000231314 2.27114
+ 0.00000231746 2.2716
+ 0.0000023218 2.27207
+ 0.00000232616 2.27254
+ 0.00000233053 2.27302
+ 0.00000233492 2.2735
+ 0.00000233932 2.27398
+ 0.00000234375 2.27446
+ 0.00000234819 2.27496
+ 0.00000235264 2.27545
+ 0.00000235711 2.27595
+ 0.0000023616 2.27645
+ 0.00000236611 2.27696
+ 0.00000237063 2.27747
+ 0.00000237518 2.27798
+ 0.00000237973 2.2785
+ 0.00000238431 2.27903
+ 0.00000238891 2.27955
+ 0.00000239352 2.28009
+ 0.00000239815 2.28062
+ 0.00000240279 2.28117
+ 0.00000240746 2.28171
+ 0.00000241214 2.28226
+ 0.00000241685 2.28282
+ 0.00000242157 2.28338
+ 0.00000242631 2.28395
+ 0.00000243106 2.28452
+ 0.00000243584 2.28509
+ 0.00000244063 2.28567
+ 0.00000244545 2.28626
+ 0.00000245028 2.28685
+ 0.00000245513 2.28745
+ 0.00000246 2.28805
+ 0.00000246489 2.28865
+ 0.0000024698 2.28927
+ 0.00000247473 2.28988
+ 0.00000247968 2.29051
+ 0.00000248465 2.29114
+ 0.00000248964 2.29177
+ 0.00000249465 2.29241
+ 0.00000249968 2.29306
+ 0.00000250473 2.29371
+ 0.0000025098 2.29437
+ 0.00000251489 2.29503
+ 0.00000252 2.2957
+ 0.00000252514 2.29638
+ 0.00000253029 2.29707
+ 0.00000253546 2.29776
+ 0.00000254066 2.29845
+ 0.00000254588 2.29915
+ 0.00000255112 2.29986
+ 0.00000255638 2.30058
+ 0.00000256166 2.3013
+ 0.00000256696 2.30204
+ 0.00000257229 2.30277
+ 0.00000257763 2.30352
+ 0.000002583 2.30427
+ 0.0000025884 2.30503
+ 0.00000259381 2.3058
+ 0.00000259925 2.30657
+ 0.00000260471 2.30735
+ 0.00000261019 2.30814
+ 0.0000026157 2.30894
+ 0.00000262123 2.30975
+ 0.00000262678 2.31056
+ 0.00000263236 2.31139
+ 0.00000263796 2.31222
+ 0.00000264359 2.31306
+ 0.00000264923 2.31391
+ 0.00000265491 2.31476
+ 0.0000026606 2.31563
+ 0.00000266633 2.3165
+ 0.00000267207 2.31739
+ 0.00000267784 2.31828
+ 0.00000268364 2.31919
+ 0.00000268946 2.3201
+ 0.00000269531 2.32102
+ 0.00000270118 2.32196
+ 0.00000270708 2.3229
+ 0.000002713 2.32385
+ 0.00000271895 2.32482
+ 0.00000272493 2.32579
+ 0.00000273093 2.32677
+ 0.00000273696 2.32777
+ 0.00000274301 2.32878
+ 0.0000027491 2.3298
+ 0.0000027552 2.33083
+ 0.00000276134 2.33187
+ 0.0000027675 2.33292
+ 0.0000027737 2.33399
+ 0.00000277991 2.33506
+ 0.00000278616 2.33615
+ 0.00000279244 2.33726
+ 0.00000279874 2.33837
+ 0.00000280507 2.3395
+ 0.00000281143 2.34064
+ 0.00000281782 2.3418
+ 0.00000282424 2.34297
+ 0.00000283069 2.34415
+ 0.00000283717 2.34535
+ 0.00000284367 2.34656
+ 0.00000285021 2.34779
+ 0.00000285678 2.34903
+ 0.00000286338 2.35029
+ 0.00000287 2.35156
+ 0.00000287666 2.35285
+ 0.00000288335 2.35415
+ 0.00000289007 2.35547
+ 0.00000289683 2.35681
+ 0.00000290361 2.35817
+ 0.00000291043 2.35954
+ 0.00000291728 2.36093
+ 0.00000292416 2.36234
+ 0.00000293107 2.36376
+ 0.00000293801 2.36521
+ 0.00000294499 2.36667
+ 0.000002952 2.36816
+ 0.00000295905 2.36966
+ 0.00000296613 2.37119
+ 0.00000297324 2.37273
+ 0.00000298039 2.3743
+ 0.00000298757 2.37588
+ 0.00000299479 2.37749
+ 0.00000300204 2.37912
+ 0.00000300933 2.38078
+ 0.00000301665 2.38245
+ 0.000003024 2.38415
+ 0.0000030314 2.38588
+ 0.00000303883 2.38763
+ 0.00000304629 2.3894
+ 0.0000030538 2.3912
+ 0.00000306134 2.39303
+ 0.00000306892 2.39489
+ 0.00000307653 2.39677
+ 0.00000308418 2.39868
+ 0.00000309188 2.40061
+ 0.0000030996 2.40258
+ 0.00000310737 2.40458
+ 0.00000311518 2.40661
+ 0.00000312303 2.40867
+ 0.00000313091 2.41076
+ 0.00000313884 2.41288
+ 0.00000314681 2.41504
+ 0.00000315481 2.41723
+ 0.00000316286 2.41946
+ 0.00000317095 2.42172
+ 0.00000317908 2.42402
+ 0.00000318725 2.42636
+ 0.00000319547 2.42874
+ 0.00000320373 2.43115
+ 0.00000321203 2.43361
+ 0.00000322037 2.43611
+ 0.00000322875 2.43865
+ 0.00000323719 2.44123
+ 0.00000324566 2.44386
+ 0.00000325418 2.44653
+ 0.00000326274 2.44926
+ 0.00000327135 2.45203
+ 0.00000328001 2.45485
+ 0.00000328871 2.45772
+ 0.00000329745 2.46064
+ 0.00000330625 2.46362
+ 0.00000331509 2.46665
+ 0.00000332397 2.46974
+ 0.00000333291 2.47289
+ 0.00000334189 2.47609
+ 0.00000335092 2.47936
+ 0.00000336001 2.4827
+ 0.00000336914 2.48609
+ 0.00000337832 2.48956
+ 0.00000338755 2.49309
+ 0.00000339683 2.4967
+ 0.00000340616 2.50038
+ 0.00000341554 2.50413
+ 0.00000342498 2.50796
+ 0.00000343447 2.51187
+ 0.00000344401 2.51587
+ 0.0000034536 2.51995
+ 0.00000346325 2.52412
+ 0.00000347295 2.52838
+ 0.0000034827 2.53273
+ 0.00000349251 2.53718
+ 0.00000350238 2.54173
+ 0.0000035123 2.54639
+ 0.00000352228 2.55115
+ 0.00000353231 2.55603
+ 0.00000354241 2.56102
+ 0.00000355256 2.56612
+ 0.00000356276 2.57135
+ 0.00000357303 2.57671
+ 0.00000358336 2.58221
+ 0.00000359374 2.58784
+ 0.00000360419 2.59361
+ 0.0000036147 2.59953
+ 0.00000362527 2.6056
+ 0.0000036359 2.61184
+ 0.00000364659 2.61824
+ 0.00000365735 2.62481
+ 0.00000366817 2.63157
+ 0.00000367906 2.63851
+ 0.00000369001 2.64564
+ 0.00000370102 2.65299
+ 0.0000037121 2.66054
+ 0.00000372325 2.66832
+ 0.00000373446 2.67633
+ 0.00000374575 2.68458
+ 0.0000037571 2.69308
+ 0.00000376852 2.70185
+ 0.00000378001 2.7109
+ 0.00000379157 2.72025
+ 0.0000038032 2.7299
+ 0.0000038149 2.73987
+ 0.00000382667 2.75017
+ 0.00000383852 2.76084
+ 0.00000385044 2.77188
+ 0.00000386244 2.78331
+ 0.00000387451 2.79516"/>
</define>
<materials>
- <material name="BGO">
- <D value="7.13" unit="g/cm3"/>
- <composite n="4" ref="Bi"/>
- <composite n="3" ref="Ge"/>
- <composite n="12" ref="O"/>
- </material>
- <material name="TungstenDens25">
- <D value="18.2" unit="g/cm3"/>
- <fraction n="0.950" ref="W"/>
- <fraction n="0.044" ref="Ni"/>
- <fraction n="0.006" ref="Fe"/>
- </material>
- <material name="BoratedPolyethylene5">
- <D value="0.93" unit="g/cm3"/>
- <fraction n="0.612" ref="C"/>
- <fraction n="0.222" ref="O"/>
- <fraction n="0.116" ref="H"/>
- <fraction n="0.050" ref="B"/>
- </material>
+ <material name="PbWO4">
+ <property name="RINDEX" ref="Rindex"/>
+ <D value="8.28" unit="g/cm3"/>
+ <composite n="1" ref="Pb"/>
+ <composite n="1" ref="W"/>
+ <composite n="4" ref="O"/>
+ </material>
+ <material name="BGO">
+ <D value="7.13" unit="g/cm3"/>
+ <composite n="4" ref="Bi"/>
+ <composite n="3" ref="Ge"/>
+ <composite n="12" ref="O"/>
+ </material>
+ <material name="TungstenDens25">
+ <D value="18.2" unit="g/cm3"/>
+ <fraction n="0.950" ref="W"/>
+ <fraction n="0.044" ref="Ni"/>
+ <fraction n="0.006" ref="Fe"/>
+ </material>
+ <material name="BoratedPolyethylene5">
+ <D value="0.93" unit="g/cm3"/>
+ <fraction n="0.612" ref="C"/>
+ <fraction n="0.222" ref="O"/>
+ <fraction n="0.116" ref="H"/>
+ <fraction n="0.050" ref="B"/>
+ </material>
</materials>
<limits>
@@ -141,39 +685,39 @@
</detector>
- <detector id="5" name="EcalBarrel" type="EcalBarrel" readout="EcalBarrelHits" calorimeterType="EM_BARREL">
+ <detector id="5" name="EcalBarrel" type="EcalBarrel" readout="EcalBarrelHits" calorimeterType="EM_BARREL" optical="true">
<comment>EM Calorimeter Barrel</comment>
- <dimensions numsides="12" rmin="136.0*cm" z="220.1*2*cm" />
+ <dimensions numsides="12" rmin="131.0*cm" z="220.1*2*cm" />
<staves />
<layer repeat="10">
- <slice material = "BGO" thickness = "2.0*cm" sensitive="yes" />
+ <slice material = "PbWO4" thickness = "2.0*cm" sensitive="yes" />
</layer>
</detector>
- <detector id="6" name="EcalEndcap" type="PolyhedraEndcapCalorimeter3" readout="EcalEndcapHits" reflect="true" calorimeterType="EM_ENDCAP">
+ <detector id="6" name="EcalEndcap" type="PolyhedraEndcapCalorimeter3" readout="EcalEndcapHits" reflect="true" calorimeterType="EM_ENDCAP" optical="true">
<comment>EM Calorimeter Endcaps</comment>
- <dimensions numsides="12" zmin="200.1*cm" rmin="38.0*cm" rmax="135.9*cm" angle="6.*deg" />
+ <dimensions numsides="12" zmin="200.1*cm" rmin="38.0*cm" rmax="130.9*cm" angle="6.*deg" />
<layer repeat="10">
- <slice material="BGO" thickness="2.0*cm" sensitive="yes" />
+ <slice material="PbWO4" thickness="2.0*cm" sensitive="yes" />
</layer>
</detector>
- <detector id="7" name="HcalBarrel" type="PolyhedraBarrelCalorimeter2" readout="HcalBarrelHits" calorimeterType="HAD_BARREL" gap="0.*cm" material="BGO">
+ <detector id="7" name="HcalBarrel" type="PolyhedraBarrelCalorimeter2" readout="HcalBarrelHits" calorimeterType="HAD_BARREL" gap="0.*cm" material="PbWO4" optical="true" >
<comment>Hadron Calorimeter Barrel</comment>
- <dimensions numsides="12" rmin="157*cm" z="370.2*cm * 2"/>
+ <dimensions numsides="12" rmin="152*cm" z="370.2*cm * 2"/>
<staves />
<layer repeat="30">
- <slice material="BGO" thickness="5.0*cm" sensitive="yes" />
+ <slice material="PbWO4" thickness="5.0*cm" sensitive="yes" />
</layer>
</detector>
- <detector id="8" name="HcalEndcap" type="PolyhedraEndcapCalorimeter3" readout="HcalEndcapHits" reflect="true" calorimeterType="HAD_ENDCAP">
+ <detector id="8" name="HcalEndcap" type="PolyhedraEndcapCalorimeter3" readout="HcalEndcapHits" reflect="true" calorimeterType="HAD_ENDCAP" optical="true">
<comment>Hadron Calorimeter Endcaps</comment>
- <dimensions numsides="12" zmin="220.2*cm" rmin="39.0*cm" rmax="156.5*cm" angle="6.*deg" />
+ <dimensions numsides="12" zmin="220.2*cm" rmin="39.0*cm" rmax="151.5*cm" angle="6.*deg" />
<layer repeat="30">
- <slice material="BGO" thickness="5.0*cm" sensitive="yes" />
+ <slice material="PbWO4" thickness="5.0*cm" sensitive="yes" />
</layer>
</detector>
<detector id="9" name="MuonBarrel" type="PolyhedraBarrelCalorimeter2" readout="MuonBarrelHits" calorimeterType="MUON_BARREL" gap="0.*cm" material="Steel235">
<comment>Muon Calorimeter Barrel</comment>
- <dimensions numsides="12" rmin="308.*cm" z="370.2*cm * 2"/>
+ <dimensions numsides="12" rmin="300.*cm" z="370.2*cm * 2"/>
<staves />
<layer repeat="22" >
<slice material="Iron" thickness="10.0*cm" sensitive="yes"/>
@@ -181,12 +725,12 @@
</detector>
<detector id="10" name="MuonEndcap" type="PolyhedraEndcapCalorimeter3" readout="MuonEndcapHits" reflect="true" calorimeterType="MUON_ENDCAP">
<comment>Muon Calorimeter Endcaps</comment>
- <dimensions numsides="12" zmin="370.3*cm" rmin="53.*cm" rmax="526.*cm" angle="6.*deg" />
+ <dimensions numsides="12" zmin="370.3*cm" rmin="53.*cm" rmax="538.*cm" angle="6.*deg" />
<layer repeat="22">
<slice material="Iron" thickness="10.0*cm" sensitive="yes"/>
</layer>
</detector>
-
+<!--
<comment>Masks</comment>
<detector name="ForwardM1" type="PolyconeSupport" insideTrackingVolume="true">
<material name="Tungsten"/>
@@ -236,7 +780,7 @@
<zplane rmin="45.0*cm" rmax="50.2*cm" z="-350.0*cm"/>
<zplane rmin="31.414*cm" rmax="36.614*cm" z="-200.1*cm"/>
</detector>
-
+-->
</detectors>
<!-- Sensitive Detector readout segmentation -->
@@ -286,6 +830,6 @@
inner_field="5.0"
outer_field="-0.6"
zmax="1000*cm"
- outer_radius="307.5*cm"/>
+ outer_radius="300*cm"/>
</fields>
</lccdd>