From 6898108de1df7196769fbbbf79e0c53d3e97bb40 Mon Sep 17 00:00:00 2001
From: Markus Frank <markus.frank@cern.ch>
Date: Thu, 12 Dec 2013 18:47:03 +0000
Subject: [PATCH] Fix ROOT units
---
examples/CLICSiD/compact/compact.xml | 107 +++++++++---------
.../src/CylindricalBarrelCalorimeter_geo.cpp | 6 +-
.../src/CylindricalEndcapCalorimeter_geo.cpp | 6 +-
examples/CLICSiD/src/DiskTracker_geo.cpp | 2 +-
examples/CLICSiD/src/EcalBarrel_geo.cpp | 2 +-
examples/CLICSiD/src/ForwardDetector_geo.cpp | 8 +-
.../CLICSiD/src/MultiLayerTracker_geo.cpp | 6 +-
examples/CLICSiD/src/PolyconeSupport_geo.cpp | 4 +-
8 files changed, 72 insertions(+), 69 deletions(-)
diff --git a/examples/CLICSiD/compact/compact.xml b/examples/CLICSiD/compact/compact.xml
index 5d3e817ad..8097c3a5e 100644
--- a/examples/CLICSiD/compact/compact.xml
+++ b/examples/CLICSiD/compact/compact.xml
@@ -144,7 +144,7 @@
<constant name="IncomingBP_radius" value="0.25*cm"/>
<constant name="IncomingBP_thickness" value="0.05*cm"/>
- <constant name="OutgoingBP_radius" value="tan(CrossingAngle/2)*BeamCal_zmin"/>
+ <constant name="OutgoingBP_radius" value="tan(CrossingAngle/2/rad)*BeamCal_zmin"/>
<constant name="OutgoingBP_thickness" value="0.1*cm"/>
</define>
@@ -268,6 +268,9 @@
<vis name="RedVis" r="1.0" g="0.0" b="0.0" showDaughters="true" visible="true"/>
<vis name="BlueVis" r="0.0" g="0.0" b="1.0" showDaughters="true" visible="true"/>
</display>
+
+
+
<detectors>
<comment>Trackers</comment>
@@ -605,8 +608,6 @@
<ring r="1206.937*mm" zstart="(1555.647+1.75)*mm" nmodules="84" dz="1.75*mm" module="Module2"/>
</layer>
</detector>
-<!--
-
<detector id="5" name="SiTrackerForward" type="SiTrackerEndcap2" readout="SiTrackerForwardHits">
<comment>Forward Tracker inside Vertex Support Barrel</comment>
@@ -626,17 +627,16 @@
<module_component thickness="0.013*cm" material="Carbon" />
</module>
<layer id="1">
- <ring r="(ForwardTracker_rmax + ForwardTracker_rmin1) / 2" zstart="ForwardTracker_z1" nmodules="(int) ForwardTrackerModules" dz="0.011" module="SiTrackerForwardModule1"/>
+ <ring r="(ForwardTracker_rmax + ForwardTracker_rmin1) / 2" zstart="ForwardTracker_z1" nmodules="(int) ForwardTrackerModules" dz="0.011*mm" module="SiTrackerForwardModule1"/>
</layer>
<layer id="2">
- <ring r="(ForwardTracker_rmax + ForwardTracker_rmin2) / 2" zstart="ForwardTracker_z2" nmodules="(int) ForwardTrackerModules" dz="0.011" module="SiTrackerForwardModule2"/>
+ <ring r="(ForwardTracker_rmax + ForwardTracker_rmin2) / 2" zstart="ForwardTracker_z2" nmodules="(int) ForwardTrackerModules" dz="0.011*mm" module="SiTrackerForwardModule2"/>
</layer>
<layer id="3">
- <ring r="(ForwardTracker_rmax + ForwardTracker_rmin3) / 2" zstart="ForwardTracker_z3" nmodules="(int) ForwardTrackerModules" dz="0.011" module="SiTrackerForwardModule3"/>
+ <ring r="(ForwardTracker_rmax + ForwardTracker_rmin3) / 2" zstart="ForwardTracker_z3" nmodules="(int) ForwardTrackerModules" dz="0.011*mm" module="SiTrackerForwardModule3"/>
</layer>
</detector>
-
<comment>Calorimeters</comment>
<detector id="6" name="EcalBarrel" type="EcalBarrel" readout="EcalBarrelHits" vis="EcalBarrelVis" calorimeterType="EM_BARREL">
<comment>EM Calorimeter Barrel</comment>
@@ -666,7 +666,6 @@
</layer>
</detector>
-
<detector id="7" name="EcalEndcap" type="PolyhedraEndcapCalorimeter2" reflect="true" readout="EcalEndcapHits" vis="EcalEndcapVis" calorimeterType="EM_ENDCAP">
<comment>EM Calorimeter Endcaps</comment>
<dimensions numsides="(int) CaloSides" zmin="EcalEndcap_zmin" rmin="EcalEndcap_rmin" rmax="EcalEndcap_rmax" />
@@ -716,7 +715,6 @@
</layer>
</detector>
-
<detector id="10" name="HcalPlug" type="PolyhedraEndcapCalorimeter2" readout="HcalPlugHits" vis="MuonEndcapVis">
<comment>Hadron Calorimeter Plug</comment>
<dimensions numsides="(int) CaloSides" zmin="SolenoidCoilOuterZ" rmin="MuonEndcap_rmin" rmax="HcalEndcap_rmax" />
@@ -844,7 +842,6 @@
<slice material="Air" thickness="1.0*cm" />
</layer>
</detector>
-
<detector id="13" name="LumiCal" reflect="true" type="CylindricalEndcapCalorimeter" readout="LumiCalHits" vis="LumiCalVis" calorimeterType="LUMI">
<comment>Luminosity Calorimeter</comment>
@@ -865,7 +862,6 @@
</layer>
</detector>
-
<detector name="LumiReadout_Forward" type="PolyconeSupport" vis="LumiCalVis">
<comment>Readout for Luminosity Calorimeter</comment>
<material name="G10"/>
@@ -880,7 +876,7 @@
<zplane rmin="LumiCal_rmax" rmax="LumiCalElectronics_rmax" z="-(LumiCal_zmin+LumiCal_thickness)"/>
</detector>
-
+ -->
<detector id="14" name="BeamCal" reflect="true" type="ForwardDetector" readout="BeamCalHits" vis="LumiCalVis" calorimeterType="BEAM">
<comment>Beam Calorimeter</comment>
<dimensions outer_r="BeamCal_rmax" inner_r="0.0*cm" inner_z="BeamCal_zmin" />
@@ -893,7 +889,7 @@
<slice material="Air" thickness="0.033*cm" />
</layer>
</detector>
-
+
<comment>Dead material and supports</comment>
<comment>Beampipe</comment>
<detector name="Beampipe" type="PolyconeSupport" insideTrackingVolume="true" vis="BeamPipeVis">
@@ -962,31 +958,36 @@
rmax="LumiCal_rmin - BeamPipe_endThickness"
z="ForwardMask_zmin - BeamPipe_endThickness" />
</detector>
+
<detector name="NorthIncomingBeampipe" type="TubeSegment" vis="BeamPipeVis">
<material name="Iron" />
<tubs rmin="IncomingBP_radius - IncomingBP_thickness" rmax="IncomingBP_radius" zhalf="(MuonEndcap_zmax - ForwardMask_zmin)/2.0" />
- <position x="-((ForwardMask_zmin + MuonEndcap_zmax)/2.0*tan(CrossingAngle)/2.0)" y="0" z="(ForwardMask_zmin + MuonEndcap_zmax)/2.0" />
- <rotation x="0.0" y="CrossingAngle/2.0" z="0.0" />
+ <position x="-((ForwardMask_zmin + MuonEndcap_zmax)/2.0*tan(CrossingAngle/rad)/2.0)" y="0" z="(ForwardMask_zmin + MuonEndcap_zmax)/2.0" />
+ <rotation x="0.0" y="CrossingAngle/2.0/rad" z="0.0" />
</detector>
+
+
<detector name="SouthIncomingBeampipe" type="TubeSegment" vis="BeamPipeVis">
<material name="Iron" />
<tubs rmin="IncomingBP_radius - IncomingBP_thickness" rmax="IncomingBP_radius" zhalf="(MuonEndcap_zmax - ForwardMask_zmin)/2.0" />
- <position x="-((ForwardMask_zmin + MuonEndcap_zmax)/2.0*tan(CrossingAngle)/2.0)" y="0" z="- (ForwardMask_zmin + MuonEndcap_zmax)/2.0" />
- <rotation x="0.0" y="- CrossingAngle/2.0" z="0.0" />
+ <position x="-((ForwardMask_zmin + MuonEndcap_zmax)/2.0*tan(CrossingAngle/rad)/2.0)" y="0" z="- (ForwardMask_zmin + MuonEndcap_zmax)/2.0" />
+ <rotation x="0.0" y="-CrossingAngle/2.0/rad" z="0.0" />
</detector>
+
<detector name="NorthOutgoingBeampipe" type="TubeSegment" vis="BeamPipeVis">
<material name="Iron" />
<tubs rmin="OutgoingBP_radius - OutgoingBP_thickness" rmax="OutgoingBP_radius" zhalf="(MuonEndcap_zmax - ForwardMask_zmin)/2.0" />
- <position x="((ForwardMask_zmin + MuonEndcap_zmax)/2.0*tan(CrossingAngle)/2.0)" y="0" z="(ForwardMask_zmin + MuonEndcap_zmax)/2.0" />
- <rotation x="0.0" y="- CrossingAngle/2.0" z="0.0" />
+ <position x="((ForwardMask_zmin + MuonEndcap_zmax)/2.0*tan(CrossingAngle/rad)/2.0)" y="0" z="(ForwardMask_zmin + MuonEndcap_zmax)/2.0" />
+ <rotation x="0.0" y="-CrossingAngle/2.0/rad" z="0.0" />
</detector>
+
<detector name="SouthOutgoingBeampipe" type="TubeSegment" vis="BeamPipeVis">
<material name="Iron" />
<tubs rmin="OutgoingBP_radius - OutgoingBP_thickness" rmax="OutgoingBP_radius" zhalf="(MuonEndcap_zmax - ForwardMask_zmin)/2.0" />
- <position x="((ForwardMask_zmin + MuonEndcap_zmax)/2.0*tan(CrossingAngle)/2.0)" y="0" z="- (ForwardMask_zmin + MuonEndcap_zmax)/2.0" />
- <rotation x="0.0" y="CrossingAngle/2.0" z="0.0" />
+ <position x="((ForwardMask_zmin + MuonEndcap_zmax)/2.0*tan(CrossingAngle/rad)/2.0)" y="0" z="- (ForwardMask_zmin + MuonEndcap_zmax)/2.0" />
+ <rotation x="0.0" y="CrossingAngle/2.0/rad" z="0.0" />
</detector>
--->
+
<!-- Beam pipe liner is not needed, use thicker conical steel pipe instead
<detector name="BeamPipeLiner" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<comment>BeamPipe Liner to shield bremsstrahlung photons</comment>
@@ -999,7 +1000,7 @@
<zplane rmin="(tracking_region_zmax - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax - BeamPipe_thickness - BeamPipeLiner_thickness" rmax="(tracking_region_zmax - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax - BeamPipe_thickness" z="tracking_region_zmax" />
</detector>
-->
-<!--
+
<detector name="BeamPipeVacuum" type="PolyconeSupport" insideTrackingVolume="true" vis="InvisibleNoDaughters">
<comment>Vacuum inside beampipe</comment>
<material name="Vacuum"/>
@@ -1196,6 +1197,7 @@
rmax="(VertexService_zmax - CentralBeamPipe_zmax)*bp_cone_slope + CentralBeamPipe_rmax + VertexServiceThickness"
z="VertexService_zmax"/>
</detector>
+
<comment>Outer Tracker Supports and Readout</comment>
<detector name="TrackerBarrelSupports" type="MultiLayerTracker" reflect="true">
<comment>Barrels</comment>
@@ -1225,6 +1227,7 @@
<slice material="CarbonFiber" thickness="0.05*cm" />
</layer>
</detector>
+
<comment>Dished endcap disks</comment>
<detector name="SiTrackerEndcapSupport1" type="PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
@@ -1242,52 +1245,52 @@
</detector>
<detector name="SiTrackerEndcapSupport3" type="PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
- <zplane rmin="510.448" rmax="510.448" z="(757.218+0.001)*mm" />
- <zplane rmin="504.711" rmax="510.448" z="(757.720+0.001)*mm" />
- <zplane rmin="206.234" rmax="211.970" z="(783.834+0.001)*mm" />
- <zplane rmin="206.234" rmax="206.234" z="(784.336+0.001)*mm" />
+ <zplane rmin="510.448*mm" rmax="510.448*mm" z="(757.218+0.001)*mm" />
+ <zplane rmin="504.711*mm" rmax="510.448*mm" z="(757.720+0.001)*mm" />
+ <zplane rmin="206.234*mm" rmax="211.970*mm" z="(783.834+0.001)*mm" />
+ <zplane rmin="206.234*mm" rmax="206.234*mm" z="(784.336+0.001)*mm" />
</detector>
<detector name="SiTrackerEndcapSupport4" type="PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
- <zplane rmin="763.796" rmax="763.796" z="(1014.437-0.001)*mm" />
- <zplane rmin="758.059" rmax="763.796" z="(1014.939-0.001)*mm" />
- <zplane rmin="206.234" rmax="211.970" z="(1063.219-0.001)*mm" />
- <zplane rmin="206.234" rmax="206.234" z="(1063.721-0.001)*mm" />
+ <zplane rmin="763.796*mm" rmax="763.796*mm" z="(1014.437-0.001)*mm" />
+ <zplane rmin="758.059*mm" rmax="763.796*mm" z="(1014.939-0.001)*mm" />
+ <zplane rmin="206.234*mm" rmax="211.970*mm" z="(1063.219-0.001)*mm" />
+ <zplane rmin="206.234*mm" rmax="206.234*mm" z="(1063.721-0.001)*mm" />
</detector>
<detector name="SiTrackerEndcapSupport5" type="PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="Rohacell31"/>
- <zplane rmin="763.796" rmax="763.796" z="1014.939*mm" />
- <zplane rmin="691.797" rmax="763.796" z="1021.238*mm" />
- <zplane rmin="206.234" rmax="278.187" z="1063.721*mm" />
- <zplane rmin="206.234" rmax="206.234" z="1070.020*mm" />
+ <zplane rmin="763.796*mm" rmax="763.796*mm" z="1014.939*mm" />
+ <zplane rmin="691.797*mm" rmax="763.796*mm" z="1021.238*mm" />
+ <zplane rmin="206.234*mm" rmax="278.187*mm" z="1063.721*mm" />
+ <zplane rmin="206.234*mm" rmax="206.234*mm" z="1070.020*mm" />
</detector>
<detector name="SiTrackerEndcapSupport6" type="PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
- <zplane rmin="763.796" rmax="763.796" z="(1021.238+0.001)*mm" />
- <zplane rmin="758.059" rmax="763.796" z="(1021.740+0.001)*mm" />
- <zplane rmin="206.234" rmax="211.970" z="(1070.020+0.001)*mm" />
- <zplane rmin="206.234" rmax="206.234" z="(1070.522+0.001)*mm" />
+ <zplane rmin="763.796*mm" rmax="763.796*mm" z="(1021.238+0.001)*mm" />
+ <zplane rmin="758.059*mm" rmax="763.796*mm" z="(1021.740+0.001)*mm" />
+ <zplane rmin="206.234*mm" rmax="211.970*mm" z="(1070.020+0.001)*mm" />
+ <zplane rmin="206.234*mm" rmax="206.234*mm" z="(1070.522+0.001)*mm" />
</detector>
<detector name="SiTrackerEndcapSupport7" type="PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
- <zplane rmin="1015.748" rmax="1015.748" z="(1272.885-0.001)*mm" />
- <zplane rmin="1010.011" rmax="1015.748" z="(1273.387-0.001)*mm" />
- <zplane rmin="206.234" rmax="211.970" z="(1343.711-0.001)*mm" />
- <zplane rmin="206.234" rmax="206.234" z="(1344.213-0.001)*mm" />
+ <zplane rmin="1015.748*mm" rmax="1015.748*mm" z="(1272.885-0.001)*mm" />
+ <zplane rmin="1010.011*mm" rmax="1015.748*mm" z="(1273.387-0.001)*mm" />
+ <zplane rmin="206.234*mm" rmax="211.970*mm" z="(1343.711-0.001)*mm" />
+ <zplane rmin="206.234*mm" rmax="206.234*mm" z="(1344.213-0.001)*mm" />
</detector>
<detector name="SiTrackerEndcapSupport8" type="PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="Rohacell31"/>
- <zplane rmin="1015.748" rmax="1015.748" z="1273.387*mm" />
- <zplane rmin="943.753" rmax="1015.748" z="1279.686*mm" />
- <zplane rmin="206.234" rmax="278.187" z="1344.213*mm" />
- <zplane rmin="206.234" rmax="206.234" z="1350.512*mm" />
+ <zplane rmin="1015.748*mm" rmax="1015.748*mm" z="1273.387*mm" />
+ <zplane rmin="943.753*mm" rmax="1015.748*mm" z="1279.686*mm" />
+ <zplane rmin="206.234*mm" rmax="278.187*mm" z="1344.213*mm" />
+ <zplane rmin="206.234*mm" rmax="206.234*mm" z="1350.512*mm" />
</detector>
<detector name="SiTrackerEndcapSupport9" type="PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
- <zplane rmin="1015.748" rmax="1015.748" z="(1279.686+0.001)*mm" />
- <zplane rmin="1010.011" rmax="1015.748" z="(1280.188+0.001)*mm" />
- <zplane rmin="206.234" rmax="211.970" z="(1350.512+0.001)*mm" />
- <zplane rmin="206.234" rmax="206.234" z="(1351.014+0.001)*mm" />
+ <zplane rmin="1015.748*mm" rmax="1015.748*mm" z="(1279.686+0.001)*mm" />
+ <zplane rmin="1010.011*mm" rmax="1015.748*mm" z="(1280.188+0.001)*mm" />
+ <zplane rmin="206.234*mm" rmax="211.970*mm" z="(1350.512+0.001)*mm" />
+ <zplane rmin="206.234*mm" rmax="206.234*mm" z="(1351.014+0.001)*mm" />
</detector>
<detector name="SiTrackerEndcapSupport10" type="PolyconeSupport" insideTrackingVolume="true" vis="SupportVis">
<material name="CarbonFiber"/>
@@ -1522,7 +1525,7 @@
<slice material="Steel235" thickness="SolenoidEndcapCryostatThickness" />
</layer>
</detector>
--->
+
</detectors>
<readouts>
diff --git a/examples/CLICSiD/src/CylindricalBarrelCalorimeter_geo.cpp b/examples/CLICSiD/src/CylindricalBarrelCalorimeter_geo.cpp
index d91c81374..d67b5becf 100644
--- a/examples/CLICSiD/src/CylindricalBarrelCalorimeter_geo.cpp
+++ b/examples/CLICSiD/src/CylindricalBarrelCalorimeter_geo.cpp
@@ -22,7 +22,7 @@ static Ref_t create_detector(LCDD& lcdd, xml_h e, SensitiveDetector sens) {
double rmin = dim.inner_r();
double r = rmin;
int n = 0;
- Tube envelope(rmin,2*rmin,2*z,0.0,2*M_PI);
+ Tube envelope(rmin,2*rmin,2*z);
Volume envelopeVol(det_name+"_envelope",envelope,air);
for(xml_coll_t c(x_det,_U(layer)); c; ++c) {
@@ -30,7 +30,7 @@ static Ref_t create_detector(LCDD& lcdd, xml_h e, SensitiveDetector sens) {
for(int i=0, m=0, repeat=x_layer.repeat(); i<repeat; ++i, m=0) {
string layer_name = det_name + _toString(n,"_layer%d");
double rlayer = r;
- Tube layer_tub(rmin,rlayer,2*z,0,2*M_PI);
+ Tube layer_tub(rmin,rlayer,2*z);
Volume layer_vol(layer_name,layer_tub,air);
for(xml_coll_t l(x_layer,_U(slice)); l; ++l, ++m) {
@@ -58,7 +58,7 @@ static Ref_t create_detector(LCDD& lcdd, xml_h e, SensitiveDetector sens) {
++n;
}
}
- envelope.setDimensions(rmin,r,2*z,0,2*M_PI);
+ envelope.setDimensions(rmin,r,2*z);
// Set region of slice
envelopeVol.setAttributes(lcdd,x_det.regionStr(),x_det.limitsStr(),x_det.visStr());
diff --git a/examples/CLICSiD/src/CylindricalEndcapCalorimeter_geo.cpp b/examples/CLICSiD/src/CylindricalEndcapCalorimeter_geo.cpp
index b190354bd..3aebcc9b7 100644
--- a/examples/CLICSiD/src/CylindricalEndcapCalorimeter_geo.cpp
+++ b/examples/CLICSiD/src/CylindricalEndcapCalorimeter_geo.cpp
@@ -24,7 +24,7 @@ static Ref_t create_detector(LCDD& lcdd, xml_h e, SensitiveDetector sens) {
double rmax = dim.outer_r();
double totWidth = Layering(x_det).totalThickness();
double z = zmin;
- Tube envelope (rmin,rmax,totWidth/2,0,2*M_PI);
+ Tube envelope (rmin,rmax,totWidth/2);
Volume envelopeVol(det_name+"_envelope",envelope,air);
int layer_num = 1;
PlacedVolume pv;
@@ -46,7 +46,7 @@ static Ref_t create_detector(LCDD& lcdd, xml_h e, SensitiveDetector sens) {
string slice_name = layer_name + _toString(m+1,"slice%d");
Material slice_mat = lcdd.material(x_slice.materialStr());
Volume slice_vol (slice_name,Tube(rmin,rmax,w),slice_mat);
-
+
if ( x_slice.isSensitive() ) {
sens.setType("calorimeter");
slice_vol.setSensitiveDetector(sens);
@@ -64,7 +64,7 @@ static Ref_t create_detector(LCDD& lcdd, xml_h e, SensitiveDetector sens) {
++layer_num;
}
}
- envelope.setDimensions(rmin,rmax,totWidth/2,0,2*M_PI);
+ envelope.setDimensions(rmin,rmax,totWidth/2);
// Set attributes of slice
envelopeVol.setAttributes(lcdd,x_det.regionStr(),x_det.limitsStr(),x_det.visStr());
diff --git a/examples/CLICSiD/src/DiskTracker_geo.cpp b/examples/CLICSiD/src/DiskTracker_geo.cpp
index 2eae79c6c..8322369c6 100644
--- a/examples/CLICSiD/src/DiskTracker_geo.cpp
+++ b/examples/CLICSiD/src/DiskTracker_geo.cpp
@@ -35,7 +35,7 @@ static Ref_t create_detector(LCDD& lcdd, xml_h e, SensitiveDetector sens) {
double thickness = xml_comp_t(j).thickness();
layerWidth += thickness;
}
- Tube l_tub(rmin,rmax,layerWidth,2*M_PI);
+ Tube l_tub(rmin,rmax,layerWidth,2*M_PI*tgeo::rad);
Volume l_vol(l_nam,l_tub,air);
l_vol.setVisAttributes(lcdd,x_layer.visStr());
for(xml_coll_t j(x_layer,_U(slice)); j; ++j, ++s_num) {
diff --git a/examples/CLICSiD/src/EcalBarrel_geo.cpp b/examples/CLICSiD/src/EcalBarrel_geo.cpp
index bab40680d..9c4af50b8 100644
--- a/examples/CLICSiD/src/EcalBarrel_geo.cpp
+++ b/examples/CLICSiD/src/EcalBarrel_geo.cpp
@@ -26,7 +26,7 @@ static Ref_t create_detector(LCDD& lcdd, xml_h e, SensitiveDetector sens) {
xml_comp_t x_dim = x_det.dimensions();
int nsides = x_dim.numsides();
double inner_r = x_dim.rmin();
- double dphi = 2*M_PI / nsides;
+ double dphi = (2*M_PI/nsides);
double hphi = dphi/2;
double mod_z = layering.totalThickness();
double outer_r = inner_r + mod_z;
diff --git a/examples/CLICSiD/src/ForwardDetector_geo.cpp b/examples/CLICSiD/src/ForwardDetector_geo.cpp
index dd772b950..8def1c40c 100644
--- a/examples/CLICSiD/src/ForwardDetector_geo.cpp
+++ b/examples/CLICSiD/src/ForwardDetector_geo.cpp
@@ -22,7 +22,7 @@ static Ref_t create_detector(LCDD& lcdd, xml_h e, SensitiveDetector sens) {
int id = x_det.id();
Material air = lcdd.air();
DetElement sdet (det_name,id);
- Layering layering(x_det);
+ Layering layering (x_det);
Volume motherVol = lcdd.pickMotherVolume(sdet);
@@ -31,7 +31,7 @@ static Ref_t create_detector(LCDD& lcdd, xml_h e, SensitiveDetector sens) {
double zinner = dim.inner_z();
double outgoingR = beam.outgoing_r();
double incomingR = beam.incoming_r();
- double xangle = beam.crossing_angle();
+ double xangle = beam.crossing_angle()/tgeo::rad;
double xangleHalf = xangle/2;
double thickness = layering.totalThickness();
double zpos = zinner + thickness/2;
@@ -69,7 +69,7 @@ static Ref_t create_detector(LCDD& lcdd, xml_h e, SensitiveDetector sens) {
// Process each layer element.
double layerPosZ = -thickness / 2;
double layerDisplZ = 0;
-
+
int layerCount = 1;
for(xml_coll_t c(x_det,_U(layer)); c; ++c) {
xml_comp_t x_layer = c;
@@ -88,7 +88,7 @@ static Ref_t create_detector(LCDD& lcdd, xml_h e, SensitiveDetector sens) {
// First layer subtraction solid.
DetElement layer(sdet,layer_nam,sdet.id());
double layerGlobalZ = zinner + layerDisplZ;
- double layerPosX = tan(xangleHalf) * layerGlobalZ;
+ double layerPosX = std::tan(xangleHalf) * layerGlobalZ;
Position layer1SubPos( layerPosX,0,0);
Position layer2SubPos(-layerPosX,0,0);
diff --git a/examples/CLICSiD/src/MultiLayerTracker_geo.cpp b/examples/CLICSiD/src/MultiLayerTracker_geo.cpp
index 54d5a70e1..24fec0dde 100644
--- a/examples/CLICSiD/src/MultiLayerTracker_geo.cpp
+++ b/examples/CLICSiD/src/MultiLayerTracker_geo.cpp
@@ -29,7 +29,7 @@ static Ref_t create_detector(LCDD& lcdd, xml_h e, SensitiveDetector sens) {
double rmin = x_layer.inner_r();
double r = rmin;
DetElement layer(sdet,_toString(n,"layer%d"),x_layer.id());
- Tube l_tub (rmin,2*rmin,z,0.0,2*M_PI);
+ Tube l_tub (rmin,2*rmin,z);
Volume l_vol(l_name,l_tub,air);
int m = 0;
@@ -38,7 +38,7 @@ static Ref_t create_detector(LCDD& lcdd, xml_h e, SensitiveDetector sens) {
Material mat = lcdd.material(x_slice.materialStr());
string s_name= l_name+_toString(m,"_slice%d");
double thickness = x_slice.thickness();
- Tube s_tub(r,r+thickness,z,2*M_PI);
+ Tube s_tub(r,r+thickness,z,2*M_PI*tgeo::rad);
Volume s_vol(s_name, s_tub, mat);
r += thickness;
@@ -52,7 +52,7 @@ static Ref_t create_detector(LCDD& lcdd, xml_h e, SensitiveDetector sens) {
// Slices have no extra id. Take the ID of the layer!
pv.addPhysVolID("slice",m);
}
- l_tub.setDimensions(rmin,r,z,0,2*M_PI);
+ l_tub.setDimensions(rmin,r,z);
//cout << l_name << " " << rmin << " " << r << " " << z << endl;
l_vol.setVisAttributes(lcdd,x_layer.visStr());
diff --git a/examples/CLICSiD/src/PolyconeSupport_geo.cpp b/examples/CLICSiD/src/PolyconeSupport_geo.cpp
index 80c98da4a..f2634f0b7 100644
--- a/examples/CLICSiD/src/PolyconeSupport_geo.cpp
+++ b/examples/CLICSiD/src/PolyconeSupport_geo.cpp
@@ -29,8 +29,8 @@ static Ref_t create_detector(LCDD& lcdd, xml_h e, Ref_t) {
if ( num < 2 ) {
throw runtime_error("PolyCone["+name+"]> Not enough Z planes. minimum is 2!");
}
- Polycone cone (0.,2.*M_PI,rmin,rmax,z);
- Volume volume (name, cone, mat);
+ Polycone cone (0.,2.*M_PI*RAD_2_DEGREE,rmin,rmax,z);
+ Volume volume(name, cone, mat);
volume.setVisAttributes(lcdd, x_det.visStr());
sdet.setPlacement(lcdd.pickMotherVolume(sdet).placeVolume(volume));
return sdet;
--
GitLab