Author: [log in to unmask]
Date: Tue May 24 12:14:50 2016
New Revision: 4373
Log:
[HPSJAVA-409] Merge ECal geom dev branch into trunk.
Added:
java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalCrystalPosition.java
- copied unchanged from r4372, java/branches/HPSJAVA-409/conditions/src/main/java/org/hps/conditions/ecal/EcalCrystalPosition.java
java/trunk/detector-model/src/main/java/org/hps/detector/DetectorConverter.java
- copied unchanged from r4372, java/branches/HPSJAVA-409/detector-model/src/main/java/org/hps/detector/DetectorConverter.java
java/trunk/detector-model/src/main/java/org/hps/detector/ecal/CrystalTaitBryanAngleCalculator.java
- copied unchanged from r4372, java/branches/HPSJAVA-409/detector-model/src/main/java/org/hps/detector/ecal/CrystalTaitBryanAngleCalculator.java
java/trunk/detector-model/src/main/java/org/hps/detector/ecal/GVector.java
- copied unchanged from r4372, java/branches/HPSJAVA-409/detector-model/src/main/java/org/hps/detector/ecal/GVector.java
java/trunk/detector-model/src/main/java/org/hps/detector/ecal/Geant4Position.java
- copied unchanged from r4372, java/branches/HPSJAVA-409/detector-model/src/main/java/org/hps/detector/ecal/Geant4Position.java
java/trunk/detector-model/src/main/java/org/hps/detector/ecal/StatFunUtils.java
- copied unchanged from r4372, java/branches/HPSJAVA-409/detector-model/src/main/java/org/hps/detector/ecal/StatFunUtils.java
java/trunk/detector-model/src/main/java/org/hps/detector/ecal/Transformations.java
- copied unchanged from r4372, java/branches/HPSJAVA-409/detector-model/src/main/java/org/hps/detector/ecal/Transformations.java
java/trunk/detector-model/src/main/java/org/lcsim/detector/converter/compact/HPSEcal4Converter.java
- copied unchanged from r4372, java/branches/HPSJAVA-409/detector-model/src/main/java/org/lcsim/detector/converter/compact/HPSEcal4Converter.java
java/trunk/detector-model/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSEcal4.java
- copied unchanged from r4372, java/branches/HPSJAVA-409/detector-model/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSEcal4.java
java/trunk/detector-model/src/main/java/org/lcsim/geometry/subdetector/HPSEcal4.java
- copied unchanged from r4372, java/branches/HPSJAVA-409/detector-model/src/main/java/org/lcsim/geometry/subdetector/HPSEcal4.java
java/trunk/detector-model/src/test/java/org/hps/detector/ecal/EcalCrystalPositionTest.java
- copied unchanged from r4372, java/branches/HPSJAVA-409/detector-model/src/test/java/org/hps/detector/ecal/EcalCrystalPositionTest.java
java/trunk/detector-model/src/test/java/org/lcsim/detector/converter/compact/HPSEcal4ConverterTest.java
- copied unchanged from r4372, java/branches/HPSJAVA-409/detector-model/src/test/java/org/lcsim/detector/converter/compact/HPSEcal4ConverterTest.java
java/trunk/detector-model/src/test/java/org/lcsim/geometry/compact/converter/lcdd/HPSEcal4LCDDTest.java
- copied unchanged from r4372, java/branches/HPSJAVA-409/detector-model/src/test/java/org/lcsim/geometry/compact/converter/lcdd/HPSEcal4LCDDTest.java
java/trunk/detector-model/src/test/resources/org/lcsim/geometry/subdetector/HPSEcal4Test.xml
- copied unchanged from r4372, java/branches/HPSJAVA-409/detector-model/src/test/resources/org/lcsim/geometry/subdetector/HPSEcal4Test.xml
Modified:
java/trunk/conditions/ (props changed)
java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalChannel.java
java/trunk/detector-model/pom.xml
java/trunk/detector-model/src/main/java/org/hps/detector/ecal/CrystalRange.java
java/trunk/detector-model/src/main/java/org/hps/detector/ecal/EcalCrystal.java
java/trunk/detector-model/src/main/java/org/hps/detector/ecal/HPSEcalDetectorElement.java
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalChannel.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalChannel.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalChannel.java Tue May 24 12:14:50 2016
@@ -3,6 +3,7 @@
import java.util.Comparator;
import java.util.HashMap;
import java.util.Map;
+import java.util.logging.Logger;
import org.hps.conditions.api.AbstractIdentifier;
import org.hps.conditions.api.BaseConditionsObject;
@@ -29,6 +30,8 @@
@Table(names = {"ecal_channels", "test_run_ecal_channels"})
@Converter(converter = EcalChannel.EcalChannelConverter.class)
public final class EcalChannel extends BaseConditionsObject {
+
+ private static Logger LOGGER = Logger.getLogger(EcalChannel.class.getPackage().getName());
/**
* The <code>ChannelId</code> is a unique number identifying the channel within its conditions collection. The
@@ -298,9 +301,10 @@
throw new IllegalStateException("The ECal subdetector's detector element is not setup.");
}
} else {
+ LOGGER.warning("ECal subdetector is not accessible so geometry map was not initialized.");
// Bad detector or conditions system not initialized properly.
- throw new IllegalStateException("The ECal subdetector object is null.");
- }
+ //throw new IllegalStateException("The ECal subdetector object is null.");
+ }
return collection;
}
Modified: java/trunk/detector-model/pom.xml
=============================================================================
--- java/trunk/detector-model/pom.xml (original)
+++ java/trunk/detector-model/pom.xml Tue May 24 12:14:50 2016
@@ -46,6 +46,7 @@
<excludes>
<exclude>org/hps/detector/svt/TestRunSvtDetectorSetupTest.java</exclude>
<exclude>org/hps/detector/SvtAlignmentTest.java</exclude>
+ <exclude>org/hps/detector/ecal/EcalCrystalPositionTest.java</exclude>
</excludes>
</configuration>
</plugin>
Modified: java/trunk/detector-model/src/main/java/org/hps/detector/ecal/CrystalRange.java
=============================================================================
--- java/trunk/detector-model/src/main/java/org/hps/detector/ecal/CrystalRange.java (original)
+++ java/trunk/detector-model/src/main/java/org/hps/detector/ecal/CrystalRange.java Tue May 24 12:14:50 2016
@@ -2,6 +2,11 @@
import org.jdom.Element;
+/**
+ * Simplistic representation of a range of ECal XY crystal indices.
+ *
+ * @author Jeremy McCormick
+ */
public class CrystalRange {
int xIndexMax;
Modified: java/trunk/detector-model/src/main/java/org/hps/detector/ecal/EcalCrystal.java
=============================================================================
--- java/trunk/detector-model/src/main/java/org/hps/detector/ecal/EcalCrystal.java (original)
+++ java/trunk/detector-model/src/main/java/org/hps/detector/ecal/EcalCrystal.java Tue May 24 12:14:50 2016
@@ -12,9 +12,10 @@
/**
* This class implements the geometry API for ECal crystals in the HPS experiment.
- * @author Jeremy McCormick <[log in to unmask]>
+ *
+ * @author Jeremy McCormick
*/
-public class EcalCrystal extends DetectorElement {
+public final class EcalCrystal extends DetectorElement {
private Hep3Vector positionFront;
Modified: java/trunk/detector-model/src/main/java/org/hps/detector/ecal/HPSEcalDetectorElement.java
=============================================================================
--- java/trunk/detector-model/src/main/java/org/hps/detector/ecal/HPSEcalDetectorElement.java (original)
+++ java/trunk/detector-model/src/main/java/org/hps/detector/ecal/HPSEcalDetectorElement.java Tue May 24 12:14:50 2016
@@ -16,7 +16,6 @@
import org.lcsim.detector.identifier.IIdentifierHelper;
/**
- * <p>
* This is an implementation of a basic geometry API for the HPS ECAL.
* <p>
* The neighboring API and conventions are based on the page 7 diagram from the
