From cae61b361bb31c0c4890d25cf5bf4de08c6ea790 Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Wed, 21 Jul 2021 15:08:55 -0500
Subject: [PATCH] modified: compact/display.xml modified:
compact/sphere_test.xml modified: src/sphere_test.cpp
---
compact/display.xml | 2 +-
compact/sphere_test.xml | 8 ++++----
src/sphere_test.cpp | 13 ++-----------
3 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/compact/display.xml b/compact/display.xml
index bd358cc3..edc77cfd 100644
--- a/compact/display.xml
+++ b/compact/display.xml
@@ -69,7 +69,7 @@
<comment>
Deprecated colors.
</comment>
- <vis name="GreenVis" alpha="1.0" r= "0.0" g="1.0" b="0.0" showDaughters="true" visible="true"/>
+ <vis name="GreenVis" alpha="1.0" r= "0.0" g="1.0" b="0.0" showDaughters="false" visible="true"/>
<vis name="RedVis" alpha="0.2" r= "1.0" g="0.0" b="0.0" showDaughters="true" visible="true"/>
<vis name="RPVis" alpha="0.99" r= "1.0" g="0.0" b="0.0" showDaughters="true" visible="true"/>
<vis name="RPLayerVis" alpha="0.99" r= "0.0" g="0.7" b="0.3" showDaughters="true" visible="true" lineStyle="solid" drawingStyle="solid" />
diff --git a/compact/sphere_test.xml b/compact/sphere_test.xml
index f93f5bfc..732607b8 100644
--- a/compact/sphere_test.xml
+++ b/compact/sphere_test.xml
@@ -15,7 +15,7 @@
<detectors>
<detector
- id="1000"
+ id="2"
name="sphere_test"
type="athena_sphere_test"
readout="sphere_test_hits"
@@ -38,8 +38,8 @@
thetamax="120*deg"
phimin="-45*deg"
phimax="45*deg"
- yrot="110*deg"
- material="AcrylicOptical"
+ yrot="0*deg"
+ material="PyrexGlass"
vis="GreenVis"
/>
<sensor
@@ -49,7 +49,7 @@
halflengthx="1.5*m"
halflengthy="1.5*m"
halflengthz="0.1*m"
- material="AcrylicOptical"
+ material="PyrexGlass"
vis="BlueVis"
/>
</detector>
diff --git a/src/sphere_test.cpp b/src/sphere_test.cpp
index b01699d6..5c96c803 100644
--- a/src/sphere_test.cpp
+++ b/src/sphere_test.cpp
@@ -58,26 +58,17 @@ static Ref_t create_detector(Detector& desc, xml::Handle_t handle, SensitiveDete
double ly = detElem.child(_Unicode(sensor)).attr<double>(_Unicode(halflengthy));
double lz = detElem.child(_Unicode(sensor)).attr<double>(_Unicode(halflengthz));
- Sphere mirror_solid( radius-thickness, radius, thetamin, thetamax, phimin, phimax );
+ Sphere mirror_solid( radius-thickness, radius);//, thetamin, thetamax, phimin, phimax );
IntersectionSolid mirror_solid2(mirror_solid, Box(lx,ly,lz), Position(0,0,radius-thickness));
-
- // volume
Volume sphereVol("mirror_v",mirror_solid2,sphereMat);
-
- // placement
+ sphereVol.setVisAttributes(sphereV);
auto spherePV = envVol.placeVolume(sphereVol, Transform3D(RotationY(yrot)));
DetElement sphereDE(det, "mirror_de", 0);
sphereDE.setPlacement(spherePV);
-
-
Box sensor_solid(lx,ly,lz);
- // volume
Volume boxVol("sensor_v",sensor_solid,boxMat);
boxVol.setVisAttributes(boxVis);
- boxVol.setSensitiveDetector(sens);
-
- // placement
auto boxPV = envVol.placeVolume(boxVol);
boxPV.addPhysVolID("sensor", 0);
DetElement boxDE(det, "sensor_de", 0);
--
GitLab