Author: [log in to unmask]
Date: Mon Nov 17 16:30:56 2014
New Revision: 1561
Log:
Make the conditions loaders instance variables. Make log level of loaders settable.
Modified:
java/trunk/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java
java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalDetectorSetup.java
java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtDetectorSetup.java
java/trunk/conditions/src/main/java/org/hps/conditions/svt/TestRunSvtDetectorSetup.java
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java Mon Nov 17 16:30:56 2014
@@ -56,7 +56,7 @@
* @author Jeremy McCormick <[log in to unmask]>
*/
@SuppressWarnings("rawtypes")
-public final class DatabaseConditionsManager extends ConditionsManagerImplementation {
+public class DatabaseConditionsManager extends ConditionsManagerImplementation {
static String connectionProperty = "org.hps.conditions.connection.file";
protected String detectorName;
@@ -77,6 +77,9 @@
protected String ecalName = "Ecal";
protected String svtName = "Tracker";
protected boolean isFrozen = false;
+ protected EcalDetectorSetup ecalLoader = new EcalDetectorSetup();
+ protected TestRunSvtDetectorSetup testRunSvtloader = new TestRunSvtDetectorSetup();
+ protected SvtDetectorSetup svtLoader = new SvtDetectorSetup();
/**
* Default connection parameters which will use the SLAC database by default,
@@ -522,6 +525,10 @@
logger.config("setting log level to " + level);
logger.setLevel(level);
logger.getHandlers()[0].setLevel(level);
+
+ this.ecalLoader.setLogLevel(level);
+ this.svtLoader.setLogLevel(level);
+ this.testRunSvtloader.setLogLevel(level);
}
/**
@@ -564,26 +571,31 @@
public boolean isFrozen() {
return this.isFrozen;
}
+
+ public void setEcalName(String ecalName) {
+ this.ecalName = ecalName;
+ }
+
+ public void setSvtName(String svtName) {
+ this.svtName = svtName;
+ }
private void setupEcal() {
logger.config("setting up ECAL conditions on detector");
EcalConditions conditions = getCachedConditions(EcalConditions.class, ECAL_CONDITIONS).getCachedData();
- EcalDetectorSetup loader = new EcalDetectorSetup();
- loader.load(this.getDetectorObject().getSubdetector(ecalName), conditions);
+ ecalLoader.load(this.getDetectorObject().getSubdetector(ecalName), conditions);
logger.fine("done setting up ECAL conditions on detector");
}
private void setupSvt(int runNumber) {
if (isTestRun(runNumber)) {
logger.config("loading Test Run SVT detector conditions");
- TestRunSvtConditions svtConditions = getCachedConditions(TestRunSvtConditions.class, SVT_CONDITIONS).getCachedData();
- TestRunSvtDetectorSetup loader = new TestRunSvtDetectorSetup();
- loader.load(getDetectorObject().getSubdetector(svtName), svtConditions);
+ TestRunSvtConditions svtConditions = getCachedConditions(TestRunSvtConditions.class, SVT_CONDITIONS).getCachedData();
+ testRunSvtloader.load(getDetectorObject().getSubdetector(svtName), svtConditions);
} else {
logger.config("loading default SVT detector conditions");
SvtConditions svtConditions = getCachedConditions(SvtConditions.class, SVT_CONDITIONS).getCachedData();
- SvtDetectorSetup loader = new SvtDetectorSetup();
- loader.load(getDetectorObject().getSubdetector(svtName), svtConditions);
+ svtLoader.load(getDetectorObject().getSubdetector(svtName), svtConditions);
}
logger.config("done loading SVT detector conditions");
}
@@ -593,7 +605,7 @@
* Check if connected to the database.
* @return true if connected
*/
- private boolean isConnected() {
+ public boolean isConnected() {
return isConnected;
}
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalDetectorSetup.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalDetectorSetup.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalDetectorSetup.java Mon Nov 17 16:30:56 2014
@@ -1,12 +1,15 @@
package org.hps.conditions.ecal;
import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
import org.hps.conditions.ecal.EcalChannel.GeometryId;
import org.lcsim.detector.converter.compact.EcalCrystal;
import org.lcsim.detector.identifier.IIdentifierHelper;
import org.lcsim.geometry.Subdetector;
+import org.lcsim.util.log.LogUtil;
/**
* Puts {@link EcalConditions} data onto <code>EcalCrystal</code> objects on the
@@ -15,6 +18,13 @@
*/
public final class EcalDetectorSetup {
+ static Logger logger = LogUtil.create(EcalDetectorSetup.class);
+
+ public void setLogLevel(Level level) {
+ logger.setLevel(level);
+ logger.getHandlers()[0].setLevel(level);
+ }
+
/**
* Load ECal conditions data onto a full detector object.
* @param detector The detector object.
@@ -22,7 +32,7 @@
*/
public void load(Subdetector subdetector, EcalConditions conditions) {
- System.out.println("EcalDetectorSetup.load");
+ logger.info("loading ECAL conditions onto subdetector " + subdetector.getName());
// Find EcalCrystal objects.
List<EcalCrystal> crystals = subdetector.getDetectorElement().findDescendants(EcalCrystal.class);
@@ -35,20 +45,14 @@
// Get the full channel map created by the conditions system.
EcalChannelCollection channelMap = conditions.getChannelCollection();
- System.out.println("got " + channelMap.getObjects().size() + " channels");
// Build the map of geometry IDs.
- System.out.println("building geometry map...");
+ logger.info("building ECAL geometry channel map");
channelMap.buildGeometryMap(helper, system);
- System.out.println("geometry map has " + channelMap.geometryMap.size() + " entries");
-
+ logger.info("built ECAL geometry channel with " + channelMap.geometryMap.size() + " entries");
// Loop over crystals.
for (EcalCrystal crystal : crystals) {
-
- // System.out.println(crystal.getName() + " @ " + crystal.getX() +
- // ", " +
- // crystal.getY());
// Reset in case of existing conditions data.
crystal.resetConditions();
@@ -91,5 +95,7 @@
// Set time shift.
crystal.setTimeShift(constants.getTimeShift().getTimeShift());
}
+
+ logger.info("done loading ECAL conditions onto subdetector");
}
}
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtDetectorSetup.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtDetectorSetup.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtDetectorSetup.java Mon Nov 17 16:30:56 2014
@@ -2,6 +2,8 @@
import java.util.Collection;
import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import org.hps.conditions.svt.SvtChannel.SvtChannelCollection;
import org.hps.conditions.svt.SvtDaqMapping.SvtDaqMappingCollection;
@@ -9,6 +11,7 @@
import org.hps.util.Pair;
import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.geometry.compact.Subdetector;
+import org.lcsim.util.log.LogUtil;
/**
* This class puts {@link SvtConditions} data onto <code>HpsSiSensor</code>
@@ -19,6 +22,13 @@
*/
public final class SvtDetectorSetup {
+ private static Logger logger = LogUtil.create(SvtDetectorSetup.class);
+
+ public void setLogLevel(Level level) {
+ logger.setLevel(level);
+ logger.getHandlers()[0].setLevel(level);
+ }
+
/**
* Load conditions data onto a detector object.
*
@@ -27,9 +37,13 @@
*/
public void load(Subdetector subdetector, SvtConditions conditions) {
+ logger.info("loading SVT conditions onto subdetector " + subdetector.getName());
+
// Find sensor objects.
List<HpsSiSensor> sensors = subdetector.getDetectorElement().findDescendants(HpsSiSensor.class);
+ logger.info("setting up " + sensors.size() + " SVT sensors");
SvtChannelCollection channelMap = conditions.getChannelMap();
+ logger.info("channel map has " + conditions.getChannelMap().getObjects().size() + " entries");
SvtDaqMappingCollection daqMap = conditions.getDaqMap();
SvtT0ShiftCollection t0Shifts = conditions.getT0Shifts();
@@ -101,5 +115,7 @@
SvtT0Shift sensorT0Shift = t0Shifts.getT0Shift(daqPair);
sensor.setT0Shift(sensorT0Shift.getT0Shift());
}
+
+ logger.info("loaded default SVT conditions onto subdetector");
}
}
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/svt/TestRunSvtDetectorSetup.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/TestRunSvtDetectorSetup.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/TestRunSvtDetectorSetup.java Mon Nov 17 16:30:56 2014
@@ -2,6 +2,8 @@
import java.util.Collection;
import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import org.hps.conditions.svt.TestRunSvtChannel.TestRunSvtChannelCollection;
import org.hps.conditions.svt.TestRunSvtDaqMapping.TestRunSvtDaqMappingCollection;
@@ -10,6 +12,7 @@
import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.detector.tracker.silicon.HpsTestRunSiSensor;
import org.lcsim.geometry.compact.Subdetector;
+import org.lcsim.util.log.LogUtil;
/**
* This class puts {@link TestRunSvtConditions} data onto
@@ -19,6 +22,13 @@
*/
public class TestRunSvtDetectorSetup {
+ private static Logger logger = LogUtil.create(TestRunSvtDetectorSetup.class);
+
+ public void setLogLevel(Level level) {
+ logger.setLevel(level);
+ logger.getHandlers()[0].setLevel(level);
+ }
+
/**
* Load conditions data onto a detector object.
*
@@ -27,9 +37,14 @@
*/
public void load(Subdetector subdetector, TestRunSvtConditions conditions) {
+
+ logger.info("loading Test Run SVT conditions onto subdetector " + subdetector.getName());
+
// Find sensor objects.
List<HpsSiSensor> sensors = subdetector.getDetectorElement().findDescendants(HpsSiSensor.class);
+ logger.info("setting up " + sensors.size() + " SVT sensors");
TestRunSvtChannelCollection channelMap = conditions.getChannelMap();
+ logger.info("channel map has " + channelMap.getObjects().size() + " entries");
TestRunSvtDaqMappingCollection daqMap = conditions.getDaqMap();
TestRunSvtT0ShiftCollection t0Shifts = conditions.getT0Shifts();
@@ -101,5 +116,7 @@
TestRunSvtT0Shift sensorT0Shift = t0Shifts.getT0Shift(daqPair);
sensor.setT0Shift(sensorT0Shift.getT0Shift());
}
+
+ logger.info("done loading Test Run SVT conditions onto subdetector");
}
}
