Author: [log in to unmask]
Date: Fri Mar 6 14:56:07 2015
New Revision: 2304
Log:
Remove the use of the deprecated class SvtSensorSetup.
Modified:
java/trunk/record-util/src/main/java/org/hps/job/JobManager.java
java/trunk/tracking/src/main/java/org/hps/svt/alignment/BuildCompact.java
Modified: java/trunk/record-util/src/main/java/org/hps/job/JobManager.java
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/job/JobManager.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/job/JobManager.java Fri Mar 6 14:56:07 2015
@@ -5,6 +5,7 @@
import org.lcsim.job.JobControlManager;
import org.lcsim.util.Driver;
+// TODO: Who wrote this class?
public class JobManager extends JobControlManager {
// Override the basic LCSim conditions system with the HPS conditions manager.
@@ -25,9 +26,6 @@
*/
@Override
public boolean run() {
-
- // Inject the SvtSensorSetup Driver required for most recon jobs.
- addSvtSetupDriver();
// Setup the conditions if there is a ConditionsDriver present.
setupConditions();
@@ -58,33 +56,4 @@
conditionsDriver.initialize();
}
}
-
- static String driverClassName = "org.hps.recon.tracking.SvtSensorSetup";
- private void addSvtSetupDriver() {
- Class<?> driverClass = null;
- try {
- driverClass = Class.forName(driverClassName);
- } catch (ClassNotFoundException e) {
- throw new RuntimeException("SvtSensorSetup class is not accessible.", e);
- }
-
- boolean hasSetupDriver = false;
- for (Driver driver : this.getDriverAdapter().getDriver().drivers()) {
- if (driver.getClass().getCanonicalName().equals(driverClassName)) {
- hasSetupDriver = true;
- break;
- }
- }
-
- if (!hasSetupDriver) {
- Driver setupDriver;
- try {
- setupDriver = (Driver) driverClass.newInstance();
- } catch (InstantiationException | IllegalAccessException e) {
- throw new RuntimeException("Error creating new SvtSensorSetup Driver.", e);
- }
- this.getDriverAdapter().getDriver().drivers().add(0, setupDriver);
- logStream.println("added SvtSensorSetup to beginning of Driver list");
- }
- }
}
Modified: java/trunk/tracking/src/main/java/org/hps/svt/alignment/BuildCompact.java
=============================================================================
--- java/trunk/tracking/src/main/java/org/hps/svt/alignment/BuildCompact.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/svt/alignment/BuildCompact.java Fri Mar 6 14:56:07 2015
@@ -1,16 +1,4 @@
package org.hps.svt.alignment;
-
-/**
- * Class building a new compact.xml detector based on MillepedeII input
- * corrections.
- *
- * @author Per Ola Hansson Adrian <[log in to unmask]>
- * @date January 15, 2014
- */
-
-import hep.physics.vec.BasicHep3Vector;
-import hep.physics.vec.Hep3Vector;
-import hep.physics.vec.VecOp;
import java.io.BufferedReader;
import java.io.File;
@@ -25,6 +13,10 @@
import java.util.Map;
import java.util.Map.Entry;
+import hep.physics.vec.BasicHep3Vector;
+import hep.physics.vec.Hep3Vector;
+import hep.physics.vec.VecOp;
+
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.HelpFormatter;
@@ -32,13 +24,13 @@
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.PosixParser;
-import org.hps.recon.tracking.CoordinateTransformations;
-import org.hps.recon.tracking.SvtSensorSetup;
+
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.JDOMException;
import org.jdom.input.SAXBuilder;
import org.jdom.output.XMLOutputter;
+
import org.lcsim.conditions.ConditionsManager;
import org.lcsim.conditions.ConditionsManager.ConditionsNotFoundException;
import org.lcsim.detector.IDetectorElement;
@@ -51,7 +43,15 @@
import org.lcsim.geometry.compact.converter.MilleParameter;
import org.lcsim.util.xml.ElementFactory.ElementCreationException;
-
+import org.hps.recon.tracking.CoordinateTransformations;
+
+/**
+ * Class building a new compact.xml detector based on MillepedeII input
+ * corrections.
+ *
+ * @author Per Ola Hansson Adrian <[log in to unmask]>
+ * @date January 15, 2014
+ */
public class BuildCompact {
private static int runNumber = -1; //1351;
@@ -220,11 +220,6 @@
// set conditions in order to be able to determine which sensors are where in the geometry
setConditions(detectorName,runNumber);
-
-
- // setup sensors
- SvtSensorSetup sensorSetup = new SvtSensorSetup();
- sensorSetup.detectorChanged(det);
// Loop over all millepede input files and match parameters with detectors
@@ -364,15 +359,10 @@
//System.out.printf("%d sensors\n",sensors.size());
for (SiSensor module: sensors) {
// Create DAQ Maps
- /* ===> if (!SvtUtils.getInstance().isSetup()) {
- SvtUtils.getInstance().setup(det);
- } ===> */
- //===> boolean isTop = SvtUtils.getInstance().isTopLayer(module);
boolean isTop = ((HpsSiSensor) module).isTopLayer();
int h = par.getHalf();
if ((isTop && h == 1) || (!isTop && h == 2)) {
int layer = ((HpsSiSensor) module).getLayerNumber();
- //===> int layer = SvtUtils.getInstance().getLayerNumber(module);
if (layer == par.getSensor()) {
//found match
return module;
|