GeomConverter/src/org/lcsim/detector/converter/compact

diff -u -r1.26 -r1.27
--- DetectorConverter.java	21 Sep 2007 00:45:11 -0000	1.26
+++ DetectorConverter.java	15 Oct 2007 20:37:32 -0000	1.27
@@ -8,7 +8,6 @@

 import org.jdom.Element;
 import org.jdom.JDOMException;
 import org.lcsim.detector.DetectorElement;

-import org.lcsim.detector.DetectorIdHelper;

 import org.lcsim.detector.IDetectorElement;
 import org.lcsim.detector.ILogicalVolume;
 import org.lcsim.detector.IPhysicalVolume;

@@ -16,7 +15,6 @@

 import org.lcsim.detector.ParametersStore;
 import org.lcsim.detector.PhysicalVolume;
 import org.lcsim.detector.PhysicalVolumeNavigatorStore;

-import org.lcsim.detector.DetectorIdHelper.SystemMap;

 import org.lcsim.detector.converter.lcdd.MaterialElementConverter;
 import org.lcsim.detector.converter.lcdd.MaterialMixtureConverter;
 import org.lcsim.detector.converter.lcdd.MaterialsConverter;

@@ -31,7 +29,6 @@

 import org.lcsim.detector.identifier.IdentifierField;
 import org.lcsim.detector.identifier.IdentifierHelper;
 import org.lcsim.detector.identifier.IIdentifierDictionary.DuplicateFieldException;

-import org.lcsim.detector.identifier.IIdentifierDictionary.FieldNotFoundException;

 import org.lcsim.detector.identifier.IIdentifierDictionary.InvalidIndexException;
 import org.lcsim.detector.material.IMaterial;
 import org.lcsim.detector.material.MaterialStore;

@@ -41,7 +38,6 @@

 import org.lcsim.geometry.Readout;
 import org.lcsim.geometry.compact.Constant;
 import org.lcsim.geometry.compact.Subdetector;

-import org.lcsim.geometry.subdetector.PolyconeSupport;

 import org.lcsim.geometry.util.IDDescriptor;
 
 public class DetectorConverter implements IDetectorConverter 

@@ -114,6 +110,7 @@

 		addSubdetectorConverter( new DiskTrackerConverter() );
 		addSubdetectorConverter( new SiTrackerBarrelConverter() );
 		addSubdetectorConverter( new PolyconeSupportConverter() );

+		addSubdetectorConverter( new SiTrackerEndcapConverter() );

 		//addSubdetectorConverter( new PolyhedraBarrelCalorimeterConverter() );
 	}
 

@@ -172,8 +169,6 @@

 		// Loop over all Subdetectors in the Detector.
 		for ( Subdetector subdet : detector.getSubdetectors().values())
 		{		

-			//System.out.println("converting subdet " + subdet.getName());
-

 			// Lookup a registered converter for this Subdetector class.
 			ISubdetectorConverter cnv = getSubdetectorConverter(subdet.getClass());
 

@@ -318,7 +313,7 @@

 			}			
 		}
 	}

-

+   

 	/**
 	 * Creates an {@link IIdentifierDictionary} from an existing 
 	 * {@link org.lcsim.geometry.compact.Subdetector}'s 

@@ -424,7 +419,7 @@

 
 		return pvWorld;
 	}	

-

+            

 	// Put here instead of org.lcsim.detector.DetectorIdHelper 
 	// to avoid a dependence on Detector.
 	/*