Author: [log in to unmask]
Date: Tue Feb 24 16:43:06 2015
New Revision: 2195
Log:
Remove usage of unnecessary conditions string constants.
Modified:
java/trunk/conditions/src/main/java/org/hps/conditions/database/TableConstants.java
java/trunk/conditions/src/test/java/org/hps/conditions/beam/BeamCurrentTest.java
java/trunk/conditions/src/test/java/org/hps/conditions/ecal/EcalLedTest.java
java/trunk/conditions/src/test/java/org/hps/conditions/svt/SvtConfigurationTest.java
java/trunk/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/DatabaseCheck.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalCalibrationsDriver.java
java/trunk/users/src/main/java/org/hps/users/celentan/LedAnalysis.java
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/database/TableConstants.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/database/TableConstants.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/database/TableConstants.java Tue Feb 24 16:43:06 2015
@@ -17,57 +17,7 @@
private TableConstants() {
}
+ // FIXME: Add getEcalConditions() to manager API in order to replace the usage of this constant.
/** Conditions key for combined ECal conditions. */
- public static final String ECAL_CONDITIONS = "ecal_conditions";
-
- /** Table with ECal channel data. */
- public static final String ECAL_CHANNELS = "ecal_channels";
-
- /** Conditions key for ECal gain data. */
- public static final String ECAL_GAINS = "ecal_gains";
-
- /** Conditions key for ECal bad channel set. */
- public static final String ECAL_BAD_CHANNELS = "ecal_bad_channels";
-
- /** Conditions key for ECal calibration information. */
- public static final String ECAL_CALIBRATIONS = "ecal_calibrations";
-
- /** ECAL time shifts. */
- public static final String ECAL_TIME_SHIFTS = "ecal_time_shifts";
-
- /** ECAL LED setup. */
- public static final String ECAL_LEDS = "ecal_leds";
-
- /** Conditions key for combined SVT conditions. */
- public static final String SVT_CONDITIONS = "svt_conditions";
-
- /** Conditions key for SVT alignment data. */
- public static final String SVT_ALIGNMENTS = "svt_alignments";
-
- /** Conditions key for SVT bad channels. */
- public static final String SVT_BAD_CHANNELS = "svt_bad_channels";
-
- /** Table with SVT channel data. */
- public static final String SVT_CHANNELS = "svt_channels";
-
- /** Table with the SVT DAQ map. */
- public static final String SVT_DAQ_MAP = "svt_daq_map";
-
- /** Conditions key for SVT calibration data. */
- public static final String SVT_CALIBRATIONS = "svt_calibrations";
-
- /** Conditions key for SVT configuration files. */
- public static final String SVT_CONFIGURATIONS = "svt_configurations";
-
- /** Conditions key for SVT pulse parameters. */
- public static final String SVT_PULSE_PARAMETERS = "svt_pulse_parameters";
-
- /** Conditions key for SVT gain data. */
- public static final String SVT_GAINS = "svt_gains";
-
- /** Conditions key for SVT time shifts by sensor. */
- public static final String SVT_TIME_SHIFTS = "svt_time_shifts";
-
- /** Conditions key for integrated beam current. */
- public static final String BEAM_CURRENT = "beam_current";
-}
+ public static final String ECAL_CONDITIONS = "ecal_conditions";
+}
Modified: java/trunk/conditions/src/test/java/org/hps/conditions/beam/BeamCurrentTest.java
=============================================================================
--- java/trunk/conditions/src/test/java/org/hps/conditions/beam/BeamCurrentTest.java (original)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/beam/BeamCurrentTest.java Tue Feb 24 16:43:06 2015
@@ -1,6 +1,4 @@
package org.hps.conditions.beam;
-
-import static org.hps.conditions.database.TableConstants.BEAM_CURRENT;
import java.io.File;
import java.net.URL;
@@ -11,7 +9,6 @@
import org.hps.conditions.beam.BeamCurrent.BeamCurrentCollection;
import org.hps.conditions.database.DatabaseConditionsManager;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.event.EventHeader;
import org.lcsim.util.Driver;
import org.lcsim.util.cache.FileCache;
@@ -78,7 +75,7 @@
public void process(EventHeader event) {
if (currentRun != event.getRunNumber()) {
currentRun = event.getRunNumber();
- BeamCurrentCollection collection = ConditionsManager.defaultInstance().getCachedConditions(BeamCurrentCollection.class, BEAM_CURRENT).getCachedData();
+ BeamCurrentCollection collection = DatabaseConditionsManager.getInstance().getCollection(BeamCurrentCollection.class);
BeamCurrent beamCurrent = collection.iterator().next();
System.out.println("Run " + event.getRunNumber() + " has integrated beam current " + beamCurrent.getIntegratedBeamCurrent() + " nC.");
assertEquals("Wrong beam current for run.", beamCurrentAnswerKey.get(currentRun), beamCurrent.getIntegratedBeamCurrent());
Modified: java/trunk/conditions/src/test/java/org/hps/conditions/ecal/EcalLedTest.java
=============================================================================
--- java/trunk/conditions/src/test/java/org/hps/conditions/ecal/EcalLedTest.java (original)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/ecal/EcalLedTest.java Tue Feb 24 16:43:06 2015
@@ -30,7 +30,7 @@
DatabaseConditionsManager manager = DatabaseConditionsManager.getInstance();
// LED channel information.
- EcalLedCollection leds = manager.getConditionsData(EcalLedCollection.class, TableConstants.ECAL_LEDS);
+ EcalLedCollection leds = manager.getCollection(EcalLedCollection.class);
for (EcalLed led : leds) {
System.out.println(led);
}
Modified: java/trunk/conditions/src/test/java/org/hps/conditions/svt/SvtConfigurationTest.java
=============================================================================
--- java/trunk/conditions/src/test/java/org/hps/conditions/svt/SvtConfigurationTest.java (original)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/svt/SvtConfigurationTest.java Tue Feb 24 16:43:06 2015
@@ -5,7 +5,6 @@
import junit.framework.TestCase;
import org.hps.conditions.database.DatabaseConditionsManager;
-import org.hps.conditions.database.TableConstants;
import org.hps.conditions.svt.SvtConfiguration.SvtConfigurationCollection;
import org.jdom.Document;
import org.jdom.JDOMException;
@@ -16,7 +15,7 @@
public void testSvtConfiguration() {
DatabaseConditionsManager manager = DatabaseConditionsManager.getInstance();
- SvtConfigurationCollection collection = manager.getCachedConditions(SvtConfigurationCollection.class, TableConstants.SVT_CONFIGURATIONS).getCachedData();
+ SvtConfigurationCollection collection = manager.getCollection(SvtConfigurationCollection.class);
for (SvtConfiguration config : collection) {
Document doc = null;
Modified: java/trunk/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/DatabaseCheck.java
=============================================================================
--- java/trunk/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/DatabaseCheck.java (original)
+++ java/trunk/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/DatabaseCheck.java Tue Feb 24 16:43:06 2015
@@ -48,7 +48,7 @@
// Get the list of EcalChannel objects.
EcalChannelCollection channels = ecalConditions.getChannelCollection();
- EcalLedCollection leds = conditionsManager.getConditionsData(EcalLedCollection.class, TableConstants.ECAL_LEDS);
+ EcalLedCollection leds = conditionsManager.getCollection(EcalLedCollection.class);
// Map the LED objects to their channels.
Map<Integer, EcalLed> ledMap = new HashMap<Integer, EcalLed>();
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalCalibrationsDriver.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalCalibrationsDriver.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalCalibrationsDriver.java Tue Feb 24 16:43:06 2015
@@ -59,6 +59,7 @@
Set<Integer> runs = new HashSet<Integer>();
static DecimalFormat decimalFormat = new DecimalFormat("#.####");
String inputHitsCollectionName = "EcalReadoutHits";
+ static String ECAL_CALIBRATIONS = "ecal_calibrations";
/**
* Set the RawTrackerHit collection of hits to be used for the calibration.
@@ -189,7 +190,7 @@
}
EcalCalibrationCollection calibrations = new EcalCalibrationCollection();
- TableMetaData tableMetaData = conditionsManager.findTableMetaData(TableConstants.ECAL_CALIBRATIONS);
+ TableMetaData tableMetaData = conditionsManager.findTableMetaData(ECAL_CALIBRATIONS);
calibrations.setTableMetaData(tableMetaData);
// Loop over all ECAL channels.
@@ -286,7 +287,7 @@
* @param calibrations The collection of calibration objects.
*/
private void loadCalibrations(EcalCalibrationCollection calibrations) {
- int collectionId = conditionsManager.getNextCollectionID(TableConstants.ECAL_CALIBRATIONS);
+ int collectionId = conditionsManager.getNextCollectionID(ECAL_CALIBRATIONS);
try {
calibrations.setCollectionId(collectionId);
calibrations.insert();
@@ -294,8 +295,8 @@
calibrations.getCollectionId(),
runStart,
runEnd,
- TableConstants.ECAL_CALIBRATIONS,
- TableConstants.ECAL_CALIBRATIONS,
+ ECAL_CALIBRATIONS,
+ ECAL_CALIBRATIONS,
"Generated by EcalCalibrationsDriver.",
"eng_run");
conditionsRecord.insert();
Modified: java/trunk/users/src/main/java/org/hps/users/celentan/LedAnalysis.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/celentan/LedAnalysis.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/celentan/LedAnalysis.java Tue Feb 24 16:43:06 2015
@@ -1,39 +1,25 @@
package org.hps.users.celentan;
+import hep.aida.ICloud1D;
+import hep.aida.IHistogram1D;
+
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
-import java.util.HashMap;
import java.util.Map;
+import org.hps.conditions.database.DatabaseConditionsManager;
+import org.hps.conditions.ecal.EcalChannel;
+import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
+import org.hps.conditions.ecal.EcalLed;
+import org.hps.conditions.ecal.EcalLed.EcalLedCollection;
+import org.hps.monitoring.ecal.plots.EcalMonitoringUtilities;
+import org.lcsim.event.CalorimeterHit;
+import org.lcsim.event.EventHeader;
+import org.lcsim.geometry.Detector;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
-import org.lcsim.geometry.Detector;
-import org.lcsim.event.EventHeader;
-import org.lcsim.event.RawCalorimeterHit;
-import org.lcsim.event.CalorimeterHit;
-import org.lcsim.event.base.BaseRawCalorimeterHit;
-
-import hep.aida.IHistogram1D;
-import hep.aida.IHistogram2D;
-import hep.aida.IPlotter;
-import hep.aida.IPlotterStyle;
-import hep.aida.IPlotterFactory;
-import hep.aida.IHistogramFactory;
-import hep.aida.ICloud1D;
-import hep.aida.ICloud2D;
-
-
-import org.hps.recon.ecal.ECalUtils;
-import org.hps.monitoring.ecal.plots.EcalMonitoringUtilities;
-import org.hps.conditions.database.DatabaseConditionsManager;
-import org.hps.conditions.database.TableConstants;
-import org.hps.conditions.ecal.EcalChannel;
-import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
-import org.hps.conditions.ecal.EcalConditions;
-import org.hps.conditions.ecal.EcalLed;
-import org.hps.conditions.ecal.EcalLed.EcalLedCollection;
-import org.lcsim.conditions.ConditionsManager.ConditionsNotFoundException;
public class LedAnalysis extends Driver{
@@ -84,8 +70,8 @@
LedTopMap = new HashMap< Integer , Integer >(); //key: ecal channel ID. Value:
LedBotMap = new HashMap< Integer , Integer >();
- ChannelCollection = conditionsManager.getCachedConditions(EcalChannel.EcalChannelCollection.class, "ecal_channels").getCachedData();
- LedCollection = conditionsManager.getConditionsData(EcalLedCollection.class, TableConstants.ECAL_LEDS);
+ ChannelCollection = conditionsManager.getCollection(EcalChannelCollection.class);
+ LedCollection = conditionsManager.getCollection(EcalLedCollection.class);
for (EcalChannel channel : ChannelCollection){
chid = channel.getChannelId();
