9 modified files
GeomConverter
diff -u -r1.31 -r1.32
--- project.xml 5 Dec 2007 01:57:59 -0000 1.31
+++ project.xml 6 Dec 2007 23:25:18 -0000 1.32
@@ -116,8 +116,6 @@
<unitTestSourceDirectory>test</unitTestSourceDirectory>
<unitTest>
<excludes>
- <!-- Test is temporarily broken. Needs fix from TKN. -->
- <exclude>org/lcsim/detector/converter/compact/SiTrackerEndcapConverterTest.java</exclude>
</excludes>
<resources>
<resource>
GeomConverter/src/org/lcsim/detector/converter/compact
diff -u -r1.2 -r1.3
--- AbstractSubdetectorConverter.java 6 Dec 2007 22:27:11 -0000 1.2
+++ AbstractSubdetectorConverter.java 6 Dec 2007 23:25:19 -0000 1.3
@@ -27,7 +27,7 @@
* some utilities and default method implementations for Subdetector conversion.
*
* @author Jeremy McCormick
- * @version $Id: AbstractSubdetectorConverter.java,v 1.2 2007/12/06 22:27:11 jeremy Exp $
+ * @version $Id: AbstractSubdetectorConverter.java,v 1.3 2007/12/06 23:25:19 jeremy Exp $
*/
public abstract class AbstractSubdetectorConverter implements ISubdetectorConverter
@@ -39,11 +39,9 @@
public IDetectorElement makeSubdetectorDetectorElement(Detector detector, Subdetector subdetector)
{
- return null;
- // FIXME: put this in
- //IDetectorElement subdetectorDE = new DetectorElement(subdetector.getName(), detector.getDetectorElement());
- //subdetector.setDetectorElement(subdetectorDE);
- //return subdetectorDE;
+ IDetectorElement subdetectorDE = new DetectorElement(subdetector.getName(), detector.getDetectorElement());
+ subdetector.setDetectorElement(subdetectorDE);
+ return subdetectorDE;
}
/**
@@ -62,13 +60,10 @@
* @return An IIdentifierHelper for this Subdetector.
*/
public IIdentifierHelper makeIdentifierHelper(Subdetector subdetector, SystemMap systemMap)
- {
- System.out.println("AbstractSubdetector.makeIdentifierHelper - " + subdetector.getName());
-
+ {
// Do not create helper if there is no Readout.
if (subdetector.getReadout() == null)
{
- System.out.println(subdetector.getName() + " has not readout so no helper was made!");
return null;
}
@@ -99,9 +94,7 @@
{
throw new RuntimeException(x);
}
-
- System.out.println("made helper -> " + helper.getIdentifierDictionary().getName());
-
+
return helper;
}
@@ -143,17 +136,13 @@
}
public void makeIdentifiers(Subdetector subdet)
- {
- System.out.println("makeIdentifiers");
-
+ {
if (subdet.getDetectorElement() == null)
return;
if (subdet.getDetectorElement().getIdentifierHelper() == null)
return;
-
- System.out.println("ok");
-
+
IIdentifierHelper idhelper = subdet.getDetectorElement().getIdentifierHelper();
IIdentifierDictionary iddict = idhelper.getIdentifierDictionary();
@@ -217,9 +206,7 @@
try {
IIdentifier endcapSubId = idhelper.pack(expid);
-
- System.out.println("endcap id - " + endcap.getName() + "-" + expid);
-
+
endcap.setIdentifier(endcapSubId);
}
catch (InvalidIndexException x)
GeomConverter/src/org/lcsim/detector/converter/compact
diff -u -r1.9 -r1.10
--- CylindricalBarrelCalorimeterConverter.java 6 Dec 2007 01:26:33 -0000 1.9
+++ CylindricalBarrelCalorimeterConverter.java 6 Dec 2007 23:25:19 -0000 1.10
@@ -63,7 +63,8 @@
IPhysicalVolumePath path = nav.getPath( cal.getName() );
// Create the Subdetector's DetectorElement.
- cal.setDetectorElement( new DeSubdetector(detector, cal, path) );
+ //cal.setDetectorElement( new DeSubdetector(detector, cal, path) );
+ ((DetectorElement)cal.getDetectorElement()).setSupport(path);
// Build the layers.
buildLayers(cal, envelope);
GeomConverter/src/org/lcsim/detector/converter/compact
diff -u -r1.11 -r1.12
--- CylindricalEndcapCalorimeterConverter.java 6 Dec 2007 01:26:33 -0000 1.11
+++ CylindricalEndcapCalorimeterConverter.java 6 Dec 2007 23:25:19 -0000 1.12
@@ -28,7 +28,7 @@
{
CylindricalEndcapCalorimeter cal = (CylindricalEndcapCalorimeter)subdet;
- subdet.setDetectorElement( new DeSubdetector( detector, subdet ) );
+ //subdet.setDetectorElement( new DeSubdetector( detector, subdet ) );
IPhysicalVolume world = detector.getWorldVolume();
GeomConverter/src/org/lcsim/detector/converter/compact
diff -u -r1.35 -r1.36
--- DetectorConverter.java 6 Dec 2007 22:27:12 -0000 1.35
+++ DetectorConverter.java 6 Dec 2007 23:25:19 -0000 1.36
@@ -149,16 +149,7 @@
DetectorElement subdetectorDE = (DetectorElement)cnv.makeSubdetectorDetectorElement(detector, subdetector);
// Make the IdentifierHelper for this Subdetector.
- IIdentifierHelper helper = cnv.makeIdentifierHelper(subdetector, sysMap);
-
- if (helper != null)
- {
- System.out.println(subdetector.getName() + " - helper is null!");
- }
- else
- {
- System.out.println(subdetector.getName() + " - " + helper.getIdentifierDictionary().getName());
- }
+ IIdentifierHelper helper = cnv.makeIdentifierHelper(subdetector, sysMap);
// Convert the parameters.
try {
GeomConverter/src/org/lcsim/detector/converter/compact
diff -u -r1.17 -r1.18
--- DiskTrackerConverter.java 6 Dec 2007 01:26:33 -0000 1.17
+++ DiskTrackerConverter.java 6 Dec 2007 23:25:19 -0000 1.18
@@ -64,9 +64,6 @@
catch (NullPointerException x)
{}
- if (decoder != null)
- subdet.setDetectorElement( new DeSubdetector( detector, subdet ) );
-
Layering layering = tracker.getLayering();
String name = tracker.getName();
@@ -74,13 +71,11 @@
DetectorElement endcapNeg = null;
if (decoder != null)
{
- endcapPos = new DiskTrackerDE(name + "_positive");
- endcapPos.setParent(tracker.getDetectorElement());
+ endcapPos = new DetectorElement(name + "_positive", tracker.getDetectorElement());
if ( tracker.getReflect() )
{
- endcapNeg = new DiskTrackerDE(name + "_negative");
- endcapNeg.setParent(tracker.getDetectorElement());
+ endcapNeg = new DetectorElement(name + "_negative", tracker.getDetectorElement());
}
}
@@ -194,12 +189,12 @@
{
throw new RuntimeException(x);
}
- DiskTrackerSensorLayer northEndcapLayer =
- new DiskTrackerSensorLayer(
- name + "_positive_sensor" + sensorNum,
- endcapPos,
- path,
- id);
+
+ new DetectorElement(
+ name + "_positive_sensor" + sensorNum,
+ endcapPos,
+ path,
+ id);
if ( tracker.getReflect() )
{
@@ -212,13 +207,13 @@
catch (InvalidIndexException x)
{
throw new RuntimeException(x);
- }
- DiskTrackerSensorLayer southEndcapLayer =
- new DiskTrackerSensorLayer(
- name + "_negative_sensor" + sensorNum,
- endcapNeg,
- path,
- id);
+ }
+
+ new DetectorElement(
+ name + "_negative_sensor" + sensorNum,
+ endcapNeg,
+ path,
+ id);
}
++sensorNum;
@@ -281,24 +276,4 @@
{
return DiskTracker.class;
}
-
- class DiskTrackerSensorLayer
- extends DetectorElement
- {
- DiskTrackerSensorLayer
- (String name, IDetectorElement parent, String path, IIdentifier id)
- {
- super(name,parent,path,id);
- }
- }
-
- class DiskTrackerDE
- extends DetectorElement
- {
- DiskTrackerDE
- (String name)
- {
- super(name);
- }
- }
}
GeomConverter/src/org/lcsim/detector/converter/compact
diff -u -r1.13 -r1.14
--- MultiLayerTrackerConverter.java 6 Dec 2007 01:26:33 -0000 1.13
+++ MultiLayerTrackerConverter.java 6 Dec 2007 23:25:19 -0000 1.14
@@ -46,7 +46,7 @@
MultiLayerTracker tracker = (MultiLayerTracker)subdet;
- tracker.setDetectorElement( new DeSubdetector( detector, subdet ) );
+ //tracker.setDetectorElement( new DeSubdetector( detector, subdet ) );
Layering layering = tracker.getLayering();
GeomConverter/src/org/lcsim/detector/converter/compact
diff -u -r1.27 -r1.28
--- SiTrackerBarrelConverter.java 6 Dec 2007 01:26:34 -0000 1.27
+++ SiTrackerBarrelConverter.java 6 Dec 2007 23:25:19 -0000 1.28
@@ -23,9 +23,11 @@
import org.lcsim.detector.RotationPassiveXYZ;
import org.lcsim.detector.Transform3D;
import org.lcsim.detector.Translation3D;
+import org.lcsim.detector.DetectorIdentifierHelper.SystemMap;
import org.lcsim.detector.identifier.ExpandedIdentifier;
import org.lcsim.detector.identifier.IIdentifier;
import org.lcsim.detector.identifier.IIdentifierDictionary;
+import org.lcsim.detector.identifier.IIdentifierHelper;
import org.lcsim.detector.identifier.IdentifierDictionaryManager;
import org.lcsim.detector.identifier.IdentifierUtil;
import org.lcsim.detector.identifier.IIdentifierDictionary.FieldNotFoundException;
@@ -43,6 +45,7 @@
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.detector.tracker.silicon.SiSensorElectrodes;
import org.lcsim.detector.tracker.silicon.SiStrips;
+import org.lcsim.detector.tracker.silicon.SiTrackerIdentifierHelper;
import org.lcsim.detector.tracker.silicon.SiTrackerLayer;
import org.lcsim.detector.tracker.silicon.SiTrackerModule;
import org.lcsim.geometry.compact.Detector;
@@ -53,10 +56,31 @@
extends AbstractSubdetectorConverter
implements ISubdetectorConverter
{
- public void convert( Subdetector subdet, Detector detector)
+ /*
+ public IDetectorElement makeSubdetectorDetectorElement(Detector detector, Subdetector subdetector)
{
- subdet.setDetectorElement( new DeSiTrackerBarrel( subdet.getName(), detector.getDetectorElement()));
-
+ subdetector.setDetectorElement( new DeSiTrackerBarrel(subdetector.getName(), detector.getDetectorElement()));
+ return subdetector.getDetectorElement();
+ }
+ */
+
+ public IIdentifierHelper makeIdentifierHelper(Subdetector subdetector, SystemMap systemMap)
+ {
+ try {
+ return new SiTrackerIdentifierHelper(makeIdentifierDictionary(subdetector), systemMap);
+ }
+ catch (FieldNotFoundException x)
+ {
+ throw new RuntimeException(x);
+ }
+ catch (InvalidIndexException x)
+ {
+ throw new RuntimeException(x);
+ }
+ }
+
+ public void convert( Subdetector subdet, Detector detector)
+ {
Map<String, ILogicalVolume> modules = buildModules(subdet);
try
GeomConverter/src/org/lcsim/detector/converter/compact
diff -u -r1.17 -r1.18
--- SiTrackerEndcapConverter.java 6 Dec 2007 22:27:12 -0000 1.17
+++ SiTrackerEndcapConverter.java 6 Dec 2007 23:25:19 -0000 1.18
@@ -58,19 +58,21 @@
* Converter for SiTrackerEndcap.
*
* @author Jeremy McCormick, Tim Nelson
- * @version $Id: SiTrackerEndcapConverter.java,v 1.17 2007/12/06 22:27:12 jeremy Exp $
+ * @version $Id: SiTrackerEndcapConverter.java,v 1.18 2007/12/06 23:25:19 jeremy Exp $
*/
public class SiTrackerEndcapConverter
extends AbstractSubdetectorConverter
implements ISubdetectorConverter
{
+ /*
public IDetectorElement makeSubdetectorDetectorElement(Detector detector, Subdetector subdetector)
{
IDetectorElement endcapDE = new DetectorElement(subdetector.getName(), detector.getDetectorElement());
subdetector.setDetectorElement(endcapDE);
return endcapDE;
}
+ */
private ModuleParameters moduleParameters = null;
CVSspam 0.2.8