Author: [log in to unmask]
Date: Tue May 5 15:32:16 2015
New Revision: 2908
Log:
Use reader class to access SVT alignment constants from database. HPSJAVA-499
Modified:
java/branches/HPSJAVA-499/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTrackerBuilder.java
java/branches/HPSJAVA-499/detector-model/src/main/java/org/lcsim/geometry/compact/converter/SvtAlignmentConstantsReader.java
Modified: java/branches/HPSJAVA-499/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTrackerBuilder.java
=============================================================================
--- java/branches/HPSJAVA-499/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTrackerBuilder.java (original)
+++ java/branches/HPSJAVA-499/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTrackerBuilder.java Tue May 5 15:32:16 2015
@@ -31,8 +31,9 @@
public HPSTrackerBuilder(boolean debug, Element node) {
this.debug = debug;
this.node = node;
- initAlignmentParameters();
- }
+ this.milleparameters = SvtAlignmentConstantsReader.readMilleParameters();
+ //initAlignmentParameters();
+ }
/**
* Extract alignment constants from xml description
Modified: java/branches/HPSJAVA-499/detector-model/src/main/java/org/lcsim/geometry/compact/converter/SvtAlignmentConstantsReader.java
=============================================================================
--- java/branches/HPSJAVA-499/detector-model/src/main/java/org/lcsim/geometry/compact/converter/SvtAlignmentConstantsReader.java (original)
+++ java/branches/HPSJAVA-499/detector-model/src/main/java/org/lcsim/geometry/compact/converter/SvtAlignmentConstantsReader.java Tue May 5 15:32:16 2015
@@ -15,8 +15,11 @@
* @author <a href="mailto:[log in to unmask]">Jeremy McCormick</a>
*/
public class SvtAlignmentConstantsReader {
+
+ private SvtAlignmentConstantsReader() {
+ }
- public List<MilleParameter> readMilleParameters() {
+ public static List<MilleParameter> readMilleParameters() {
if (!ConditionsManager.isSetup()) {
throw new RuntimeException("Conditions system is not initialized.");
|