slic/examples
diff -u -r1.2 -r1.3
--- limits.lcdd 25 Mar 2005 02:43:30 -0000 1.2
+++ limits.lcdd 9 Jul 2005 01:00:32 -0000 1.3
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Time-stamp: <2005-02-03 13:37:57 jeremym> -->
-<lcdd xmlns:lcdd="http://www.lcsim.org/schemas/lcdd/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+<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">
<!-- header containing meta data about this geometry -->
@@ -33,28 +33,25 @@
</sensitive_detectors>
<limits>
- <limit name="TestLimit"
- step_length_max="1.0"
- track_length_max="10.0"
- time_max="0.0"
- ekin_min="0.0"
- range_min="0.0"
- eunit="MeV"
- lunit="mm"
- tunit="ns"
- />
+ <limitset name="TestLimitSet">
+ <limit name="step_length_max" particles="*" value="1.0" unit="mm"/>
+ <limit name="track_length_max" particles="p, pi+, pi-, p0" value="100.0" unit="cm"/>
+ <limit name="time_max" particles="*" value="100" unit="ns"/>
+ <limit name="ekin_min" particles="*" value="1.0" unit="MeV"/>
+ <limit name="range_min" particles="e+,e-,gamma" value="1.0" unit="cm"/>
+ </limitset>
</limits>
- <regions>
+ <regions>
</regions>
<display>
<vis name="DefaultVis"
- visible="true"
- show_daughters="true"
- line_style="unbroken"
- drawing_style="wireframe">
+ visible="true"
+ show_daughters="true"
+ line_style="unbroken"
+ drawing_style="wireframe">
<color R="1.0"
G="1.0"
B="1.0"
@@ -63,10 +60,10 @@
</vis>
<vis name="WorldVis"
- visible="false"
- show_daughters="true"
- line_style="unbroken"
- drawing_style="wireframe">
+ visible="false"
+ show_daughters="true"
+ line_style="unbroken"
+ drawing_style="wireframe">
<color R="1.0"
G="1.0"
B="1.0"
@@ -81,7 +78,7 @@
<define>
<!-- standard global constants -->
- <constant name="TWOPI" value="2. * pi"/>
+ <constant name="TWOPI" value="2. * pi"/>
<rotation name="identity_rot" x="0.0" y="0.0" z="0.0" unit="degree" />
<position name="identity_pos" x="0.0" y="0.0" z="0.0" unit="cm" />
@@ -120,11 +117,11 @@
<solids>
<!-- world -->
- <box lunit="mm"
+ <box lunit="mm"
aunit="degree"
name="world_box"
- x="world_x"
- y="world_y"
+ x="world_x"
+ y="world_y"
z="world_z" />
</solids>
@@ -134,7 +131,7 @@
<volume name="world">
<materialref ref="Air"/>
<solidref ref="world_box"/>
- <limitref ref="TestLimit" />
+ <limitsetref ref="TestLimitSet" />
<visref ref="WorldVis" />
</volume>
</structure>
slic/examples/trk
diff -u -r1.3 -r1.4
--- trackers.lcdd 5 Jul 2005 20:38:52 -0000 1.3
+++ trackers.lcdd 9 Jul 2005 01:00:32 -0000 1.4
@@ -96,10 +96,12 @@
</sensitive_detectors>
<limits>
- <limit name="TrkLimit"
- step_length_max="0.01" />
- <limit name="TPCLimit"
- step_length_max="0.01" />
+ <limitset name="TrkLimit">
+ <limit name="step_length_max" particles="e+,e-,gamma" value="0.01" unit="mm" />
+ </limitset>
+ <limitset name="TPCLimit">
+ <limit name="step_length_max" particles="e+,e-,gamma" value="0.01" unit="mm"/>
+ </limitset>
</limits>
<regions>
@@ -1415,35 +1417,35 @@
<materialref ref="Air"/>
<solidref ref="tpc_barr_lay0_tube"/>
<sdref ref="TPCBarrSD"/>
- <limitref ref="TPCLimit"/>
+ <limitsetref ref="TPCLimit"/>
</volume>
<volume name="tpc_barr_lay1">
<materialref ref="Air"/>
<solidref ref="tpc_barr_lay1_tube"/>
<sdref ref="TPCBarrSD"/>
- <limitref ref="TPCLimit"/>
+ <limitsetref ref="TPCLimit"/>
</volume>
<volume name="tpc_barr_lay2">
<materialref ref="Air"/>
<solidref ref="tpc_barr_lay2_tube"/>
<sdref ref="TPCBarrSD"/>
- <limitref ref="TPCLimit"/>
+ <limitsetref ref="TPCLimit"/>
</volume>
<volume name="tpc_barr_lay3">
<materialref ref="Air"/>
<solidref ref="tpc_barr_lay3_tube"/>
<sdref ref="TPCBarrSD"/>
- <limitref ref="TPCLimit"/>
+ <limitsetref ref="TPCLimit"/>
</volume>
<volume name="tpc_barr_lay4">
<materialref ref="Air"/>
<solidref ref="tpc_barr_lay4_tube"/>
<sdref ref="TPCBarrSD"/>
- <limitref ref="TPCLimit"/>
+ <limitsetref ref="TPCLimit"/>
</volume>
<volume name="tpc_barr_envelope">