Author: [log in to unmask]
Date: Mon Jan 12 16:31:15 2015
New Revision: 3491
Log:
Minor change to how the DetectorElement gets set to avoid errors.
Modified:
projects/lcsim/trunk/event-model/src/main/java/org/lcsim/event/base/BaseHit.java
Modified: projects/lcsim/trunk/event-model/src/main/java/org/lcsim/event/base/BaseHit.java
=============================================================================
--- projects/lcsim/trunk/event-model/src/main/java/org/lcsim/event/base/BaseHit.java (original)
+++ projects/lcsim/trunk/event-model/src/main/java/org/lcsim/event/base/BaseHit.java Mon Jan 12 16:31:15 2015
@@ -205,11 +205,12 @@
* @return The DetectorElement at position.
*/
private IDetectorElement findDetectorElement(Hep3Vector position) {
- IDetectorElement mommy;
+ IDetectorElement mommy = null;
if (this.metaData != null) {
// Use subdetector's volume as top.
mommy = this.getIDDecoder().getSubdetector().getDetectorElement();
- } else {
+ }
+ if (mommy == null) {
// Use the world volume.
mommy = ((DetectorElement) DetectorElementStore.getInstance().get(0)).getTop().findDetectorElement(getPositionVec());
}
@@ -222,11 +223,12 @@
* @return The DetectorElement matching the identifier.
*/
private IDetectorElement findDetectorElement(IIdentifier id) {
- IDetectorElement mommy;
+ IDetectorElement mommy = null;
if (this.metaData != null) {
// Use subdetector's volume as top.
mommy = this.getIDDecoder().getSubdetector().getDetectorElement();
- } else {
+ }
+ if (mommy == null) {
// Use the world volume.
mommy = ((DetectorElement) DetectorElementStore.getInstance().get(0)).getTop();
}
########################################################################
Use REPLY-ALL to reply to list
To unsubscribe from the LCDET-SVN list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCDET-SVN&A=1
|
