Author: [log in to unmask]
Date: Mon Dec 15 22:48:50 2014
New Revision: 1751
Log:
Add method to get the full list of ConditionsRecords. Make the logger accessible via a public method for related classes that should use it.
Modified:
java/trunk/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.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 Dec 15 22:48:50 2014
@@ -72,7 +72,6 @@
// The default Engineering Run detector.
private static final String DEFAULT_ENG_RUN_DETECTOR = "HPS-Proposal2014-v8-6pt6";
-
protected static Logger logger = LogUtil.create(DatabaseConditionsManager.class);
protected String detectorName;
@@ -335,7 +334,8 @@
try {
setupEcal();
} catch (Exception e) {
- logger.log(Level.SEVERE, "Error loading ECAL conditions onto detector.", e);
+ e.printStackTrace();
+ logger.log(Level.WARNING, "Error loading ECAL conditions onto detector.", e);
}
// Load conditions onto the SVT subdetector object.
@@ -343,7 +343,7 @@
setupSvt(runNumber);
} catch (Exception e) {
e.printStackTrace();
- logger.log(Level.SEVERE, "Error loading SVT conditions onto detector.", e);
+ logger.log(Level.WARNING, "Error loading SVT conditions onto detector.", e);
}
this.isInitialized = true;
@@ -586,6 +586,15 @@
}
}
return foundConditionsRecords;
+ }
+
+ public ConditionsRecordCollection getConditionsRecords() {
+ ConditionsRecordCollection conditionsRecords = new ConditionsRecordCollection();
+ for (TableMetaData tableMetaData : this.getTableMetaDataList()) {
+ ConditionsRecordCollection foundConditionsRecords = findConditionsRecords(tableMetaData.getKey());
+ conditionsRecords.addAll(foundConditionsRecords);
+ }
+ return conditionsRecords;
}
public void freeze() {
@@ -718,6 +727,10 @@
public void addTableMetaData(TableMetaData tableMetaData) {
this.tableMetaData.add(tableMetaData);
}
+
+ public Logger getLogger() {
+ return logger;
+ }
/**
* Configure this class from an <code>InputStream</code> which should point to an XML document.
|