9 modified files
GeomConverter/src/org/lcsim/detector
diff -u -r1.27 -r1.28
--- DetectorElement.java 22 May 2007 23:22:32 -0000 1.27
+++ DetectorElement.java 23 May 2007 00:09:15 -0000 1.28
@@ -13,7 +13,7 @@
* Implementation of {@link IDetectorElement}.
*
* @author Jeremy McCormick
- * @version $Id: DetectorElement.java,v 1.27 2007/05/22 23:22:32 jeremy Exp $
+ * @version $Id: DetectorElement.java,v 1.28 2007/05/23 00:09:15 jeremy Exp $
*/
public class DetectorElement
extends Named
@@ -86,7 +86,7 @@
/**
* Create a DE with complete arguments, including
- * a parent DE, String of path, and an id.
+ * a parent DE, string of path, and an id.
*
* @param name
* @param parent
@@ -98,8 +98,8 @@
String support,
IIdentifier id)
{
- super(name);
- setup(parent,support,id);
+ super(name);
+ setup(parent,support,id);
register();
}
GeomConverter/src/org/lcsim/detector
diff -u -r1.5 -r1.6
--- DetectorElementContainer.java 16 May 2007 23:27:38 -0000 1.5
+++ DetectorElementContainer.java 23 May 2007 00:09:15 -0000 1.6
@@ -12,9 +12,7 @@
public class DetectorElementContainer
extends ArrayList<IDetectorElement>
implements IDetectorElementContainer
-{
- Map<IIdentifier,IDetectorElement> cache = new HashMap<IIdentifier,IDetectorElement>();
-
+{
public IDetectorElement get(String name)
{
IDetectorElement search=null;
@@ -28,12 +26,7 @@
}
return search;
}
-
- public IDetectorElement findDetectorElement(IIdentifier id)
- {
- return cache.get(id);
- }
-
+
public boolean contains(String name)
{
return get(name) != null;
@@ -51,17 +44,7 @@
throw new IllegalArgumentException("There is already a DetectorElement called <"+de.getName()+"> in this container!");
}
- super.add(de);
-
- if ( de.getIdentifier() != null )
- {
- if ( cache.get( de.getIdentifier() ) != null )
- {
- throw new IllegalArgumentException("The identifier <" + de.getIdentifier().toString() + "> on DetectorElement <" + de.getName() + "> already exists.");
- }
- cache.put( de.getIdentifier(), de );
- }
-
+ super.add(de);
return true;
}
}
\ No newline at end of file
GeomConverter/src/org/lcsim/detector
diff -u -r1.3 -r1.4
--- DetectorElementStore.java 2 May 2007 02:06:31 -0000 1.3
+++ DetectorElementStore.java 23 May 2007 00:09:15 -0000 1.4
@@ -1,11 +1,18 @@
package org.lcsim.detector;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.lcsim.detector.identifier.IIdentifier;
+
public class DetectorElementStore
-extends ObjectStore<IDetectorElement>
+extends DetectorElementContainer
implements IDetectorElementStore
{
private static DetectorElementStore store = null;
+ Map<Long,IDetectorElement> cache = new HashMap<Long,IDetectorElement>();
+
public static IDetectorElementStore getInstance()
{
if ( store == null )
@@ -14,4 +21,24 @@
}
return store;
}
-}
+
+ public IDetectorElement findDetectorElement(IIdentifier id)
+ {
+ return cache.get(id.getValue());
+ }
+
+ public boolean add(IDetectorElement de)
+ {
+ if ( de.getIdentifier() != null )
+ {
+ if ( cache.get( de.getIdentifier() ) != null )
+ {
+ throw new IllegalArgumentException("The identifier <" + de.getIdentifier().toString() + "> on DetectorElement <" + de.getName() + "> already exists.");
+ }
+ cache.put(de.getIdentifier().getValue(), de);
+ }
+ super.add(de);
+ return true;
+ }
+
+}
\ No newline at end of file
GeomConverter/src/org/lcsim/detector
diff -u -r1.3 -r1.4
--- DetectorStore.java 10 May 2007 07:55:15 -0000 1.3
+++ DetectorStore.java 23 May 2007 00:09:15 -0000 1.4
@@ -1,11 +1,11 @@
package org.lcsim.detector;
+import org.lcsim.detector.identifier.IIdentifierDictionaryManager;
+import org.lcsim.detector.identifier.IdentifierDictionaryManager;
import org.lcsim.detector.material.IMaterialStore;
import org.lcsim.detector.material.MaterialStore;
import org.lcsim.detector.solids.ISolidStore;
import org.lcsim.detector.solids.SolidStore;
-import org.lcsim.detector.identifier.IdentifierDictionaryManager;
-import org.lcsim.detector.identifier.IIdentifierDictionaryManager;
public class DetectorStore
implements IDetectorStore
@@ -56,6 +56,11 @@
return IdentifierDictionaryManager.getInstance();
}
+ public IParametersStore getParameterStore()
+ {
+ return ParametersStore.getInstance();
+ }
+
public void clear()
{
getDetectorElementStore().clear();
GeomConverter/src/org/lcsim/detector
diff -u -r1.6 -r1.7
--- IDetectorElementContainer.java 16 May 2007 23:27:38 -0000 1.6
+++ IDetectorElementContainer.java 23 May 2007 00:09:15 -0000 1.7
@@ -17,7 +17,7 @@
* @see java.util.ArrayList
*
* @author Jeremy McCormick
- * @version $Id: IDetectorElementContainer.java,v 1.6 2007/05/16 23:27:38 jeremy Exp $
+ * @version $Id: IDetectorElementContainer.java,v 1.7 2007/05/23 00:09:15 jeremy Exp $
*/
public interface IDetectorElementContainer
extends List<IDetectorElement>
@@ -39,12 +39,4 @@
* matching name; False if it does not.
*/
public boolean contains(String name);
-
-
- /**
- * Find an {@link IDetectorElement} by its id.
- * @param id The <code>Identifier</code>.
- * @return A matching <code>IDetectorElement</code> for the id.
- */
- public IDetectorElement findDetectorElement( IIdentifier id );
}
GeomConverter/src/org/lcsim/detector
diff -u -r1.3 -r1.4
--- IDetectorElementStore.java 2 May 2007 02:06:31 -0000 1.3
+++ IDetectorElementStore.java 23 May 2007 00:09:15 -0000 1.4
@@ -1,15 +1,19 @@
package org.lcsim.detector;
+import org.lcsim.detector.identifier.IIdentifier;
+
/**
* The {@link IDetectorElementStore} is a registry of
- * all DetectorElements in the current geometry.
+ * all {@link IDetectorElement}s in the current detector.
*
* @see IDetectorElement
* @see IObjectStore
*
* @author jeremym
- * @version $Id: IDetectorElementStore.java,v 1.3 2007/05/02 02:06:31 jeremy Exp $
+ * @version $Id: IDetectorElementStore.java,v 1.4 2007/05/23 00:09:15 jeremy Exp $
*/
public interface IDetectorElementStore
-extends IObjectStore<IDetectorElement>
-{}
\ No newline at end of file
+extends IDetectorElementContainer
+{
+ public IDetectorElement findDetectorElement(IIdentifier id);
+}
\ No newline at end of file
GeomConverter/src/org/lcsim/detector
diff -u -r1.4 -r1.5
--- IDetectorStore.java 10 May 2007 07:55:15 -0000 1.4
+++ IDetectorStore.java 23 May 2007 00:09:15 -0000 1.5
@@ -11,5 +11,6 @@
public ISolidStore getSolidStore();
public IMaterialStore getMaterialStore();
public IDetectorElementStore getDetectorElementStore();
+ public IParameters getParameterStore();
public void clear();
}
GeomConverter/src/org/lcsim/detector/converter/compact
diff -u -r1.17 -r1.18
--- SiTrackerBarrelConverter.java 18 May 2007 23:46:41 -0000 1.17
+++ SiTrackerBarrelConverter.java 23 May 2007 00:09:16 -0000 1.18
@@ -484,7 +484,7 @@
for ( IPhysicalVolume pv : modulePhysVol.getLogicalVolume().getDaughters())
{
if ( pv.isSensitive() )
- {
+ {
// Create the identifier for this sensor.
ExpandedIdentifier expId = new ExpandedIdentifier();
@@ -522,8 +522,8 @@
//System.out.println(pv.getName() + " is sens");
//System.out.println("path : " + modulePath.toString() + "/" + pv.getName());
String sensorPath = modulePath.toString() + "/" + pv.getName();
- String sensorName = subdet.getName() + "_module" + moduleId + "_sensor" + sensorId;
- SiSensor sensor = new SiSensor(sensorId, sensorName, module, sensorPath);
+ String sensorName = subdet.getName() + "_layer" + layer.getGeometry().getPhysicalVolume().getCopyNumber() + "_module" + moduleId + "_sensor" + sensorId;
+ SiSensor sensor = new SiSensor(sensorId, sensorName, module, sensorPath, id);
sensor.setIdentifier( id );
sensor.setElectrodes(ChargeCarrier.HOLE,new SiStrips(3679,0.025,1));
GeomConverter/src/org/lcsim/detector/tracker/silicon
diff -u -r1.7 -r1.8
--- SiSensor.java 18 May 2007 23:45:11 -0000 1.7
+++ SiSensor.java 23 May 2007 00:09:16 -0000 1.8
@@ -88,10 +88,11 @@
int sensorid,
String name,
IDetectorElement parent,
- String support
+ String support,
+ IIdentifier id
)
{
- super(name,parent,support);
+ super(name,parent,support,id);
setSensorID(sensorid);
setBulk(new DopedSilicon());
this.setOrientation(SiSensor._ORIENTATION_DEFAULT);
CVSspam 0.2.8