5 modified files
GeomConverter/src/org/lcsim/detector/converter/compact
diff -u -r1.5 -r1.6
--- CylindricalBarrelCalorimeterConverter.java 5 Apr 2007 23:24:21 -0000 1.5
+++ CylindricalBarrelCalorimeterConverter.java 18 Apr 2007 00:05:27 -0000 1.6
@@ -1,6 +1,7 @@
package org.lcsim.detector.converter.compact;
import org.lcsim.detector.DetectorElement;
+import org.lcsim.detector.IDetectorElement;
import org.lcsim.detector.ILogicalVolume;
import org.lcsim.detector.IPhysicalVolume;
import org.lcsim.detector.IPhysicalVolumeNavigator;
@@ -157,7 +158,7 @@
// Path to the PhysicalVolume of this sensor.
String sensorPath = "/" + cal.getName() + "/" + layerName + "/" + sliceName;
- new DetectorElement(
+ new CylindricalBarrelCalorimeterSensorLayer(
cal.getName() + "_sensor" + sensorNumber,
cal,
sensorPath);
@@ -175,4 +176,14 @@
{
return CylindricalBarrelCalorimeter.class;
}
+
+ class CylindricalBarrelCalorimeterSensorLayer
+ extends DetectorElement
+ {
+ CylindricalBarrelCalorimeterSensorLayer
+ (String name, IDetectorElement parent, String path)
+ {
+ super(name,parent,path);
+ }
+ }
}
\ No newline at end of file
GeomConverter/src/org/lcsim/detector/converter/compact
diff -u -r1.5 -r1.6
--- CylindricalEndcapCalorimeterConverter.java 5 Apr 2007 23:24:21 -0000 1.5
+++ CylindricalEndcapCalorimeterConverter.java 18 Apr 2007 00:05:27 -0000 1.6
@@ -3,6 +3,7 @@
import hep.physics.vec.BasicHep3Vector;
import org.lcsim.detector.DetectorElement;
+import org.lcsim.detector.IDetectorElement;
import org.lcsim.detector.ILogicalVolume;
import org.lcsim.detector.IPhysicalVolume;
import org.lcsim.detector.LogicalVolume;
@@ -46,7 +47,8 @@
double negz = -cal.getZMin() - width;
// DE for positive endcap.
- DetectorElement endcap = new DetectorElement(cal.getName() + "_positive", detector);
+ DetectorElement endcap =
+ new CylindricalEndcapCalorimeterDE(cal.getName() + "_positive", detector);
endcap.setSupport(cal.getName() + "_positive");
// DE for negative endcap.
@@ -68,7 +70,8 @@
subdet.getSystemID()
);
- reflectedEndcap = new DetectorElement(cal.getName() + "_negative", detector);
+ reflectedEndcap =
+ new CylindricalEndcapCalorimeterDE(cal.getName() + "_negative", detector);
reflectedEndcap.setSupport(cal.getName() + "_negative");
}
@@ -84,7 +87,7 @@
DetectorElement endcap,
DetectorElement reflectedEndcap)
{
- int sensorNum=0;
+ int layerNumber=0;
for (int i=0; i<cal.getLayering().getNumberOfLayers(); i++)
{
@@ -98,8 +101,8 @@
{
// Create the DE for an endcap sensor.
String pathName = "/" + cal.getName() + "_positive" + "/" + layerName + "/" + sliceName;
- new DetectorElement(
- cal.getName() + "_positive_sensor" + sensorNum,
+ new CylindricalEndcapCalorimeterSensorLayer(
+ cal.getName() + "_positive_layer" + layerNumber,
endcap,
pathName);
@@ -107,14 +110,14 @@
if ( reflectedEndcap != null )
{
pathName = "/" + cal.getName() + "_negative" + "/" + layerName + "/" + sliceName;
- new DetectorElement(
- cal.getName() + "_negative_sensor" + sensorNum,
+ new CylindricalEndcapCalorimeterSensorLayer(
+ cal.getName() + "_negative_layer" + layerNumber,
reflectedEndcap,
pathName);
}
// Increment the sensor number.
- ++sensorNum;
+ ++layerNumber;
}
}
}
@@ -216,9 +219,29 @@
zLayer += layer.getThickness();
}
}
-
+
public Class getSubdetectorType()
{
return CylindricalEndcapCalorimeter.class;
}
+
+ class CylindricalEndcapCalorimeterSensorLayer
+ extends DetectorElement
+ {
+ CylindricalEndcapCalorimeterSensorLayer
+ (String name, IDetectorElement parent, String path)
+ {
+ super(name,parent,path);
+ }
+ }
+
+ class CylindricalEndcapCalorimeterDE
+ extends DetectorElement
+ {
+ CylindricalEndcapCalorimeterDE
+ (String name, IDetectorElement parent)
+ {
+ super(name,parent);
+ }
+ }
}
\ No newline at end of file
GeomConverter/src/org/lcsim/detector/converter/compact
diff -u -r1.10 -r1.11
--- DetectorConverter.java 3 Apr 2007 01:45:59 -0000 1.10
+++ DetectorConverter.java 18 Apr 2007 00:05:27 -0000 1.11
@@ -152,8 +152,6 @@
trackingLV,
world,
0);
-
- //new DetectorElement("trackers", detector, "/tracking_region");
}
private IPhysicalVolume buildWorldVolume(Detector detector)
GeomConverter/src/org/lcsim/detector/converter/compact
diff -u -r1.6 -r1.7
--- DiskTrackerConverter.java 5 Apr 2007 23:24:21 -0000 1.6
+++ DiskTrackerConverter.java 18 Apr 2007 00:05:27 -0000 1.7
@@ -3,6 +3,7 @@
import hep.physics.vec.BasicHep3Vector;
import org.lcsim.detector.DetectorElement;
+import org.lcsim.detector.IDetectorElement;
import org.lcsim.detector.ILogicalVolume;
import org.lcsim.detector.LogicalVolume;
import org.lcsim.detector.PhysicalVolume;
@@ -38,13 +39,13 @@
Layering layering = tracker.getLayering();
String name = tracker.getName();
- DetectorElement endcapPos = new DetectorElement(name + "_positive");
+ DetectorElement endcapPos = new DiskTrackerDE(name + "_positive");
endcapPos.setParent(tracker);
DetectorElement endcapNeg=null;
if ( tracker.getReflect() )
{
- endcapNeg = new DetectorElement(name + "_negative");
+ endcapNeg = new DiskTrackerDE(name + "_negative");
endcapNeg.setParent(tracker);
}
@@ -145,7 +146,7 @@
{
String path = "/tracking_region/" + name + "_positive_layer" +i + "/slice" + j;
- new DetectorElement(
+ new DiskTrackerSensorLayer(
name + "_positive_sensor" + sensorNum,
endcapPos,
path);
@@ -153,7 +154,7 @@
if ( tracker.getReflect() )
{
path = "/tracking_region/" + name + "_negative_layer" +i + "/slice" + j;
- new DetectorElement(
+ new DiskTrackerSensorLayer(
name + "_negative_sensor" + sensorNum,
endcapNeg,
path);
@@ -169,4 +170,24 @@
{
return DiskTracker.class;
}
-}
+
+ class DiskTrackerSensorLayer
+ extends DetectorElement
+ {
+ DiskTrackerSensorLayer
+ (String name, IDetectorElement parent, String path)
+ {
+ super(name,parent,path);
+ }
+ }
+
+ class DiskTrackerDE
+ extends DetectorElement
+ {
+ DiskTrackerDE
+ (String name)
+ {
+ super(name);
+ }
+ }
+}
\ No newline at end of file
GeomConverter/src/org/lcsim/detector/converter/compact
diff -u -r1.3 -r1.4
--- MultiLayerTrackerConverter.java 5 Apr 2007 23:24:21 -0000 1.3
+++ MultiLayerTrackerConverter.java 18 Apr 2007 00:05:27 -0000 1.4
@@ -1,6 +1,7 @@
package org.lcsim.detector.converter.compact;
import org.lcsim.detector.DetectorElement;
+import org.lcsim.detector.IDetectorElement;
import org.lcsim.detector.ILogicalVolume;
import org.lcsim.detector.LogicalVolume;
import org.lcsim.detector.PhysicalVolume;
@@ -34,7 +35,7 @@
String name = tracker.getName();
- int sensorNum=0;
+ int layerNumber=0;
for (int i=0; i<tracker.getLayering().getNumberOfLayers(); i++)
{
Layer layer = layering.getLayer(i);
@@ -98,8 +99,8 @@
if ( slice.isSensitive() )
{
String path = "/tracking_region/" + name + "_layer" +i + "/slice" + j;
- new DetectorElement(name + "sensor" + sensorNum, tracker, path);
- ++sensorNum;
+ new MultiLayerTrackerSensorLayer(name + "_layer" + layerNumber, tracker, path);
+ ++layerNumber;
}
sliceInnerR += sliceThickness;
@@ -111,4 +112,14 @@
{
return MultiLayerTracker.class;
}
+
+ public class MultiLayerTrackerSensorLayer
+ extends DetectorElement
+ {
+ MultiLayerTrackerSensorLayer(String name, IDetectorElement parent, String path)
+ {
+ super(name,parent,path);
+ }
+ }
+
}
\ No newline at end of file
CVSspam 0.2.8