Author: [log in to unmask]
Date: Tue Feb 24 17:19:41 2015
New Revision: 2197
Log:
Use manager convenience method to get ECAL conditions.
Removed:
java/trunk/conditions/src/main/java/org/hps/conditions/database/TableConstants.java
Modified:
java/trunk/analysis/src/main/java/org/hps/analysis/ecal/cosmic/CosmicClusterPlotsDriver.java
java/trunk/analysis/src/main/java/org/hps/analysis/ecal/cosmic/CrystalEnergyPlotsDriver.java
java/trunk/analysis/src/main/java/org/hps/analysis/ecal/cosmic/DualThresholdSignalFitDriver.java
java/trunk/analysis/src/main/java/org/hps/analysis/ecal/cosmic/RawModeADCHistogramDriver.java
java/trunk/analysis/src/main/java/org/hps/analysis/ecal/cosmic/RawModeADCProfileDriver.java
java/trunk/analysis/src/main/java/org/hps/analysis/ecal/cosmic/RawModeHitSelectionDriver.java
java/trunk/analysis/src/main/java/org/hps/analysis/ecal/cosmic/RawModeSignalFitDriver.java
java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalConditionsUtil.java
java/trunk/conditions/src/test/java/org/hps/conditions/ecal/EcalLedTest.java
java/trunk/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/util/DatabaseCheck.java
java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/FADCEcalReadoutDriver.java
java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/triggerbank/TriggerConfig.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/ECalRunningPedestalDriver.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalCalibrationsDriver.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalEdepToTriggerConverterDriver.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalPedestalCalculator.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverter.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverterDriver.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalReadoutToTriggerConverterDriver.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalTriggerFilterDriver.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/FADCConverterDriver.java
java/trunk/evio/src/main/java/org/hps/evio/ECalEvioReader.java
java/trunk/evio/src/main/java/org/hps/evio/ECalHitWriter.java
java/trunk/monitoring-util/src/main/java/org/hps/monitoring/subsys/ecal/EcalPedestalMonitor.java
java/trunk/users/src/main/java/org/hps/users/baltzell/ECalRunningPedestalDriver.java
java/trunk/users/src/main/java/org/hps/users/baltzell/EcalPedestalPlots.java
java/trunk/users/src/main/java/org/hps/users/baltzell/EcalRawConverterDriver_RunPed.java
java/trunk/users/src/main/java/org/hps/users/baltzell/EcalRawConverter_RunPed.java
java/trunk/users/src/main/java/org/hps/users/jeremym/EcalADCPlotsDriver.java
java/trunk/users/src/main/java/org/hps/users/jeremym/EcalADCProfilePlotsDriver.java
java/trunk/users/src/main/java/org/hps/users/jeremym/EcalADCSumPlotsDriver.java
java/trunk/users/src/main/java/org/hps/users/jeremym/EcalADCThresholdPlotsDriver.java
java/trunk/users/src/main/java/org/hps/users/jeremym/EcalCosmicClusterPlotsDriver.java
java/trunk/users/src/main/java/org/hps/users/jeremym/EcalCosmicHitFitDriver.java
java/trunk/users/src/main/java/org/hps/users/jeremym/EcalCosmicHitSelectionDriver.java
java/trunk/users/src/main/java/org/hps/users/jeremym/EcalEnergyPlotsDriver.java
java/trunk/users/src/main/java/org/hps/users/jeremym/EcalRawModeMipAnalysisDriver.java
java/trunk/users/src/main/java/org/hps/users/luca/CalibClusterAnalyzerEngRun.java
java/trunk/users/src/main/java/org/hps/users/luca/CalibClusterAnalyzerEngRunHist.java
java/trunk/users/src/main/java/org/hps/users/luca/Pass2CalibAnalyzer.java
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/ecal/cosmic/CosmicClusterPlotsDriver.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/ecal/cosmic/CosmicClusterPlotsDriver.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/ecal/cosmic/CosmicClusterPlotsDriver.java Tue Feb 24 17:19:41 2015
@@ -12,7 +12,6 @@
import hep.aida.IPlotterStyle;
import hep.aida.IProfile1D;
import hep.aida.ref.fitter.FitResult;
-import hep.aida.ref.function.AbstractIFunction;
import java.io.File;
import java.io.FileNotFoundException;
@@ -23,11 +22,10 @@
import java.util.Map;
import java.util.Map.Entry;
-import org.hps.conditions.database.TableConstants;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannel;
import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
import org.hps.conditions.ecal.EcalConditions;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
@@ -119,7 +117,7 @@
}
public void detectorChanged(Detector detector) {
- conditions = ConditionsManager.defaultInstance().getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
+ conditions = DatabaseConditionsManager.getInstance().getEcalConditions();
channels = conditions.getChannelCollection();
for (EcalChannel channel : conditions.getChannelCollection()) {
IProfile1D profile = aida.profile1D(inputClusterCollectionName + "/ADC Values : Channel " + String.format("%03d", channel.getChannelId()), 100, -0.5, 99.5);
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/ecal/cosmic/CrystalEnergyPlotsDriver.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/ecal/cosmic/CrystalEnergyPlotsDriver.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/ecal/cosmic/CrystalEnergyPlotsDriver.java Tue Feb 24 17:19:41 2015
@@ -11,11 +11,10 @@
import java.util.List;
import java.util.Set;
-import org.hps.conditions.database.TableConstants;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannel;
import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
import org.hps.conditions.ecal.EcalConditions;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.geometry.Detector;
@@ -39,7 +38,7 @@
public void detectorChanged(Detector detector) {
- conditions = ConditionsManager.defaultInstance().getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
+ conditions = DatabaseConditionsManager.getInstance().getEcalConditions();
channels = conditions.getChannelCollection();
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/ecal/cosmic/DualThresholdSignalFitDriver.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/ecal/cosmic/DualThresholdSignalFitDriver.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/ecal/cosmic/DualThresholdSignalFitDriver.java Tue Feb 24 17:19:41 2015
@@ -15,12 +15,11 @@
import java.util.List;
import java.util.Map;
-import org.hps.conditions.database.TableConstants;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannel;
import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
import org.hps.conditions.ecal.EcalChannelConstants;
import org.hps.conditions.ecal.EcalConditions;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.geometry.Detector;
@@ -151,7 +150,7 @@
*/
public void detectorChanged(Detector detector) {
ecal = (HPSEcal3)detector.getSubdetector(ecalName);
- conditions = ConditionsManager.defaultInstance().getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
+ conditions = DatabaseConditionsManager.getInstance().getEcalConditions();
channels = conditions.getChannelCollection();
for (EcalChannel channel : conditions.getChannelCollection()) {
signalNormHistograms.put(channel, aida.histogram1D(inputHitsCollectionName + "/Signal Norm : Channel " + String.format("%03d", channel.getChannelId()), 500, 0, 500.));
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/ecal/cosmic/RawModeADCHistogramDriver.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/ecal/cosmic/RawModeADCHistogramDriver.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/ecal/cosmic/RawModeADCHistogramDriver.java Tue Feb 24 17:19:41 2015
@@ -11,11 +11,10 @@
import java.util.List;
import java.util.Set;
-import org.hps.conditions.database.TableConstants;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannel;
import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
import org.hps.conditions.ecal.EcalConditions;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.geometry.Detector;
@@ -39,7 +38,7 @@
public void detectorChanged(Detector detector) {
- conditions = ConditionsManager.defaultInstance().getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
+ conditions = DatabaseConditionsManager.getInstance().getEcalConditions();
channels = conditions.getChannelCollection();
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/ecal/cosmic/RawModeADCProfileDriver.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/ecal/cosmic/RawModeADCProfileDriver.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/ecal/cosmic/RawModeADCProfileDriver.java Tue Feb 24 17:19:41 2015
@@ -7,11 +7,10 @@
import java.util.List;
import java.util.Map;
-import org.hps.conditions.database.TableConstants;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannel;
import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
import org.hps.conditions.ecal.EcalConditions;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.geometry.Detector;
@@ -36,7 +35,7 @@
}
public void detectorChanged(Detector detector) {
- conditions = ConditionsManager.defaultInstance().getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
+ conditions = DatabaseConditionsManager.getInstance().getEcalConditions();
channels = conditions.getChannelCollection();
for (EcalChannel channel : conditions.getChannelCollection()) {
// Create ADC profile histogram, assuming ADC sample values of 0 to 99, with profile range -0.5 to 99.5, so bins are centered.
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/ecal/cosmic/RawModeHitSelectionDriver.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/ecal/cosmic/RawModeHitSelectionDriver.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/ecal/cosmic/RawModeHitSelectionDriver.java Tue Feb 24 17:19:41 2015
@@ -5,12 +5,11 @@
import java.util.ArrayList;
import java.util.List;
-import org.hps.conditions.database.TableConstants;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannel;
import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
import org.hps.conditions.ecal.EcalChannelConstants;
import org.hps.conditions.ecal.EcalConditions;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.geometry.Detector;
@@ -83,7 +82,7 @@
*/
public void detectorChanged(Detector detector) {
ecal = (HPSEcal3)detector.getSubdetector(ecalName);
- conditions = ConditionsManager.defaultInstance().getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
+ conditions = DatabaseConditionsManager.getInstance().getEcalConditions();
channels = conditions.getChannelCollection();
}
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/ecal/cosmic/RawModeSignalFitDriver.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/ecal/cosmic/RawModeSignalFitDriver.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/ecal/cosmic/RawModeSignalFitDriver.java Tue Feb 24 17:19:41 2015
@@ -15,12 +15,11 @@
import java.util.List;
import java.util.Map;
-import org.hps.conditions.database.TableConstants;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannel;
import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
import org.hps.conditions.ecal.EcalChannelConstants;
import org.hps.conditions.ecal.EcalConditions;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.geometry.Detector;
@@ -137,7 +136,7 @@
*/
public void detectorChanged(Detector detector) {
ecal = (HPSEcal3)detector.getSubdetector(ecalName);
- conditions = ConditionsManager.defaultInstance().getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
+ conditions = DatabaseConditionsManager.getInstance().getEcalConditions();
channels = conditions.getChannelCollection();
for (EcalChannel channel : conditions.getChannelCollection()) {
signalNormHistograms.put(channel, aida.histogram1D(inputHitsCollectionName + "/Signal Norm : Channel " + String.format("%03d", channel.getChannelId()), 500, 0, 500.));
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalConditionsUtil.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalConditionsUtil.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ecal/EcalConditionsUtil.java Tue Feb 24 17:19:41 2015
@@ -1,7 +1,6 @@
package org.hps.conditions.ecal;
import org.hps.conditions.database.DatabaseConditionsManager;
-import org.hps.conditions.database.TableConstants;
import org.hps.conditions.ecal.EcalChannel.GeometryId;
import org.lcsim.detector.identifier.IIdentifier;
import org.lcsim.detector.identifier.IIdentifierHelper;
@@ -30,7 +29,7 @@
* conditions manager instance.
*/
public EcalConditionsUtil() {
- conditions = DatabaseConditionsManager.getInstance().getConditionsData(EcalConditions.class, TableConstants.ECAL_CONDITIONS);
+ conditions = DatabaseConditionsManager.getInstance().getEcalConditions();
}
/**
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 17:19:41 2015
@@ -3,7 +3,6 @@
import junit.framework.TestCase;
import org.hps.conditions.database.DatabaseConditionsManager;
-import org.hps.conditions.database.TableConstants;
//import org.hps.conditions.config.DevReadOnlyConfiguration;
import org.hps.conditions.ecal.EcalLed.EcalLedCollection;
import org.hps.conditions.ecal.EcalLedCalibration.EcalLedCalibrationCollection;
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 17:19:41 2015
@@ -9,13 +9,11 @@
import java.util.Set;
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.hps.conditions.ecal.EcalConditions;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.conditions.ConditionsManager.ConditionsNotFoundException;
public class DatabaseCheck {
@@ -44,7 +42,7 @@
conditionsManager.setDetector(detectorName, runNumber);
// Get ECAL conditions.
- EcalConditions ecalConditions = ConditionsManager.defaultInstance().getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
+ EcalConditions ecalConditions = DatabaseConditionsManager.getInstance().getEcalConditions();
// Get the list of EcalChannel objects.
EcalChannelCollection channels = ecalConditions.getChannelCollection();
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/FADCEcalReadoutDriver.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/FADCEcalReadoutDriver.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/FADCEcalReadoutDriver.java Tue Feb 24 17:19:41 2015
@@ -16,11 +16,11 @@
import java.util.PriorityQueue;
import java.util.Set;
-import org.hps.conditions.database.TableConstants;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannelConstants;
import org.hps.conditions.ecal.EcalConditions;
-import org.lcsim.conditions.ConditionsManager;
import org.hps.recon.ecal.ECalUtils;
+import org.hps.util.RandomGaussian;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawCalorimeterHit;
@@ -30,7 +30,6 @@
import org.lcsim.geometry.Detector;
import org.lcsim.geometry.Subdetector;
import org.lcsim.geometry.subdetector.HPSEcal3;
-import org.hps.util.RandomGaussian;
import org.lcsim.lcio.LCIOConstants;
/**
@@ -476,8 +475,7 @@
ecal = detector.getSubdetector(ecalName);
// ECAL combined conditions object.
- ecalConditions = ConditionsManager.defaultInstance()
- .getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
+ ecalConditions = DatabaseConditionsManager.getInstance().getEcalConditions();
resetFADCBuffers();
}
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/triggerbank/TriggerConfig.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/triggerbank/TriggerConfig.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/triggerbank/TriggerConfig.java Tue Feb 24 17:19:41 2015
@@ -6,10 +6,9 @@
import java.util.List;
import java.util.Map;
-import org.hps.conditions.database.TableConstants;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannel;
import org.hps.conditions.ecal.EcalConditions;
-import org.lcsim.conditions.ConditionsManager;
public class TriggerConfig {
@@ -103,10 +102,7 @@
private List<EcalChannel> channels=new ArrayList<EcalChannel>();
public TriggerConfig() {
- ecalConditions = ConditionsManager
- .defaultInstance()
- .getCachedConditions(EcalConditions.class,
- TableConstants.ECAL_CONDITIONS).getCachedData();
+ ecalConditions = DatabaseConditionsManager.getInstance().getEcalConditions();
for (int ii = 0; ii < 442; ii++) {
channels.add(findChannel(ii+1));
}
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/ECalRunningPedestalDriver.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/ECalRunningPedestalDriver.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/ECalRunningPedestalDriver.java Tue Feb 24 17:19:41 2015
@@ -5,11 +5,9 @@
import java.util.List;
import java.util.Map;
-import org.hps.conditions.database.TableConstants;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannel;
import org.hps.conditions.ecal.EcalConditions;
-import org.hps.recon.ecal.HitExtraData;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.event.EventHeader;
import org.lcsim.event.GenericObject;
import org.lcsim.event.LCRelation;
@@ -80,10 +78,7 @@
@Override
public void detectorChanged(Detector detector) {
- ecalConditions = ConditionsManager
- .defaultInstance()
- .getCachedConditions(EcalConditions.class,
- TableConstants.ECAL_CONDITIONS).getCachedData();
+ ecalConditions = DatabaseConditionsManager.getInstance().getEcalConditions();
for (int ii = 0; ii < nChannels; ii++) {
EcalChannel chan = findChannel(ii + 1);
runningPedestals.put(chan,getStaticPedestal(chan));
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 17:19:41 2015
@@ -22,7 +22,6 @@
import org.hps.conditions.api.ConditionsRecord;
import org.hps.conditions.api.FieldValueMap;
import org.hps.conditions.database.DatabaseConditionsManager;
-import org.hps.conditions.database.TableConstants;
import org.hps.conditions.database.TableMetaData;
import org.hps.conditions.ecal.EcalCalibration;
import org.hps.conditions.ecal.EcalCalibration.EcalCalibrationCollection;
@@ -137,7 +136,7 @@
@Override
public void detectorChanged(Detector detector) {
conditionsManager = DatabaseConditionsManager.getInstance();
- ecalConditions = conditionsManager.getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
+ ecalConditions = DatabaseConditionsManager.getInstance().getEcalConditions();
// Create a histogram for every ECAL channel.
for (EcalChannel channel : ecalConditions.getChannelCollection()) {
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalEdepToTriggerConverterDriver.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalEdepToTriggerConverterDriver.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalEdepToTriggerConverterDriver.java Tue Feb 24 17:19:41 2015
@@ -3,17 +3,15 @@
import java.util.ArrayList;
import java.util.List;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannelConstants;
import org.hps.conditions.ecal.EcalConditions;
import org.hps.util.RandomGaussian;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
-import org.lcsim.event.base.BaseCalorimeterHit;
import org.lcsim.geometry.Detector;
import org.lcsim.util.Driver;
//import org.hps.conditions.deprecated.EcalConditions;
-import org.hps.conditions.database.TableConstants;
/**
@@ -89,8 +87,7 @@
public void detectorChanged(Detector detector) {
// ECAL combined conditions object.
- ecalConditions = ConditionsManager.defaultInstance()
- .getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
+ ecalConditions = DatabaseConditionsManager.getInstance().getEcalConditions();
System.out.println("You are now using the database conditions for EcalEdepToTriggerConverterDriver.");
}
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalPedestalCalculator.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalPedestalCalculator.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalPedestalCalculator.java Tue Feb 24 17:19:41 2015
@@ -5,10 +5,9 @@
import java.io.FileWriter;
import java.io.IOException;
-import org.hps.conditions.database.TableConstants;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannel;
import org.hps.conditions.ecal.EcalConditions;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.event.EventHeader;
import org.lcsim.event.GenericObject;
import org.lcsim.event.LCRelation;
@@ -78,9 +77,7 @@
if (nDetectorChanges++ > 1) {
throw new RuntimeException("No Detector Change Allowed.");
}
- ecalConditions = ConditionsManager.defaultInstance()
- .getCachedConditions(EcalConditions.class,TableConstants.ECAL_CONDITIONS)
- .getCachedData();
+ ecalConditions = DatabaseConditionsManager.getInstance().getEcalConditions();
aida.tree().cd("/");
for (EcalChannel cc : ecalConditions.getChannelCollection()) {
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverter.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverter.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverter.java Tue Feb 24 17:19:41 2015
@@ -2,11 +2,10 @@
import java.util.Map;
-import org.hps.conditions.database.TableConstants;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannel;
import org.hps.conditions.ecal.EcalChannelConstants;
import org.hps.conditions.ecal.EcalConditions;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.event.GenericObject;
@@ -181,8 +180,7 @@
*/
public void setDetector(Detector detector) {
// ECAL combined conditions object.
- ecalConditions = ConditionsManager.defaultInstance()
- .getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
+ ecalConditions = DatabaseConditionsManager.getInstance().getEcalConditions();
}
/**
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverterDriver.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverterDriver.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverterDriver.java Tue Feb 24 17:19:41 2015
@@ -2,10 +2,10 @@
import java.util.ArrayList;
import java.util.List;
-import org.hps.conditions.database.TableConstants;
+
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannelConstants;
import org.hps.conditions.ecal.EcalConditions;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.event.GenericObject;
@@ -117,8 +117,7 @@
converter.setDetector(detector);
// ECAL combined conditions object.
- ecalConditions = ConditionsManager.defaultInstance()
- .getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
+ ecalConditions = DatabaseConditionsManager.getInstance().getEcalConditions();
}
/**
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalReadoutToTriggerConverterDriver.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalReadoutToTriggerConverterDriver.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalReadoutToTriggerConverterDriver.java Tue Feb 24 17:19:41 2015
@@ -3,10 +3,9 @@
import java.util.ArrayList;
import java.util.List;
-import org.hps.conditions.database.TableConstants;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannelConstants;
import org.hps.conditions.ecal.EcalConditions;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.event.base.BaseRawCalorimeterHit;
@@ -84,8 +83,7 @@
public void detectorChanged(Detector detector) {
// ECAL combined conditions object.
- ecalConditions = ConditionsManager.defaultInstance()
- .getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
+ ecalConditions = DatabaseConditionsManager.getInstance().getEcalConditions();
System.out.println("You are now using the database conditions for EcalReadoutToTriggerConverterDriver.");
}
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalTriggerFilterDriver.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalTriggerFilterDriver.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalTriggerFilterDriver.java Tue Feb 24 17:19:41 2015
@@ -5,10 +5,9 @@
import java.util.Queue;
import java.util.concurrent.ArrayBlockingQueue;
-import org.hps.conditions.database.TableConstants;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannel.GeometryId;
import org.hps.conditions.ecal.EcalConditions;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.detector.identifier.IIdentifierHelper;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
@@ -72,8 +71,7 @@
systemId = detector.getSubdetector("Ecal").getSystemID();
// ECAL combined conditions object.
- ecalConditions = ConditionsManager.defaultInstance()
- .getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
+ ecalConditions = DatabaseConditionsManager.getInstance().getEcalConditions();
System.out.println("You are now using the database conditions for EcalTriggerFilterDriver.");
}
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/FADCConverterDriver.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/FADCConverterDriver.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/FADCConverterDriver.java Tue Feb 24 17:19:41 2015
@@ -3,10 +3,9 @@
import java.util.ArrayList;
import java.util.List;
-import org.hps.conditions.database.TableConstants;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannelConstants;
import org.hps.conditions.ecal.EcalConditions;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.event.base.BaseRawCalorimeterHit;
@@ -64,8 +63,7 @@
@Override
public void detectorChanged(Detector detector) {
// ECAL combined conditions object.
- ecalConditions = ConditionsManager.defaultInstance()
- .getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
+ ecalConditions = DatabaseConditionsManager.getInstance().getEcalConditions();
System.out.println("You are now using the database conditions for FADCConverterDriver");
}
Modified: java/trunk/evio/src/main/java/org/hps/evio/ECalEvioReader.java
=============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/ECalEvioReader.java (original)
+++ java/trunk/evio/src/main/java/org/hps/evio/ECalEvioReader.java Tue Feb 24 17:19:41 2015
@@ -7,21 +7,20 @@
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
+
import org.hps.conditions.database.DatabaseConditionsManager;
-import org.hps.conditions.database.TableConstants;
import org.hps.conditions.ecal.EcalChannel;
import org.hps.conditions.ecal.EcalChannel.DaqId;
import org.hps.conditions.ecal.EcalChannel.GeometryId;
import org.hps.conditions.ecal.EcalConditions;
import org.hps.recon.ecal.FADCGenericHit;
+import org.hps.recon.ecal.HitExtraData;
import org.hps.recon.ecal.HitExtraData.Mode7Data;
-import org.hps.recon.ecal.HitExtraData;
import org.jlab.coda.jevio.BaseStructure;
import org.jlab.coda.jevio.BaseStructureHeader;
import org.jlab.coda.jevio.CompositeData;
import org.jlab.coda.jevio.EvioEvent;
import org.jlab.coda.jevio.EvioException;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.detector.identifier.IIdentifierHelper;
import org.lcsim.detector.identifier.Identifier;
import org.lcsim.event.EventHeader;
@@ -77,9 +76,6 @@
hitCollectionName = "EcalReadoutHits";
logger.setLevel(Level.FINE);
- //System.out.println("You are now using the database conditions for ECalEvioReader.java");
- // ID helper.
-// helper = detector.getSubdetector("Ecal").getDetectorElement().getIdentifierHelper();
}
public void setTopBankTag(int topBankTag) {
@@ -418,8 +414,7 @@
subDetector = DatabaseConditionsManager.getInstance().getDetectorObject().getSubdetector(subdetectorName);
// ECAL combined conditions object.
- ecalConditions = ConditionsManager.defaultInstance()
- .getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
+ ecalConditions = DatabaseConditionsManager.getInstance().getEcalConditions();
helper = subDetector.getDetectorElement().getIdentifierHelper();
}
Modified: java/trunk/evio/src/main/java/org/hps/evio/ECalHitWriter.java
=============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/ECalHitWriter.java (original)
+++ java/trunk/evio/src/main/java/org/hps/evio/ECalHitWriter.java Tue Feb 24 17:19:41 2015
@@ -1,11 +1,17 @@
package org.hps.evio;
+
+import static org.hps.evio.EventConstants.ECAL_BANK_NUMBER;
+import static org.hps.evio.EventConstants.ECAL_BOTTOM_BANK_TAG;
+import static org.hps.evio.EventConstants.ECAL_PULSE_INTEGRAL_BANK_TAG;
+import static org.hps.evio.EventConstants.ECAL_PULSE_INTEGRAL_FORMAT;
+import static org.hps.evio.EventConstants.ECAL_TOP_BANK_TAG;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.hps.conditions.database.TableConstants;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalConditions;
import org.jlab.coda.jevio.BaseStructure;
import org.jlab.coda.jevio.CompositeData;
@@ -13,7 +19,6 @@
import org.jlab.coda.jevio.EventBuilder;
import org.jlab.coda.jevio.EvioBank;
import org.jlab.coda.jevio.EvioException;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawCalorimeterHit;
import org.lcsim.event.RawTrackerHit;
@@ -22,8 +27,6 @@
import org.lcsim.geometry.Subdetector;
import org.lcsim.lcio.LCIOConstants;
-import static org.hps.evio.EventConstants.*;
-
/**
*
* @author Sho Uemura <[log in to unmask]>
@@ -55,8 +58,7 @@
subDetector = detector.getSubdetector(subdetectorName);
// ECAL combined conditions object.
- ecalConditions = ConditionsManager.defaultInstance()
- .getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
+ ecalConditions = DatabaseConditionsManager.getInstance().getEcalConditions();
System.out.println("You are now using the database conditions for ECalHitWriter.java");
}
Modified: java/trunk/monitoring-util/src/main/java/org/hps/monitoring/subsys/ecal/EcalPedestalMonitor.java
=============================================================================
--- java/trunk/monitoring-util/src/main/java/org/hps/monitoring/subsys/ecal/EcalPedestalMonitor.java (original)
+++ java/trunk/monitoring-util/src/main/java/org/hps/monitoring/subsys/ecal/EcalPedestalMonitor.java Tue Feb 24 17:19:41 2015
@@ -4,7 +4,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.hps.conditions.database.TableConstants;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannel;
import org.hps.conditions.ecal.EcalConditions;
import org.hps.monitoring.plotting.MonitoringPlotFactory;
@@ -12,12 +12,10 @@
import org.jfree.chart.JFreeChart;
import org.jfree.data.time.Millisecond;
import org.jfree.data.time.TimeSeries;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.event.EventHeader;
import org.lcsim.geometry.Detector;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
-import hep.aida.IPlotterFactory;
/*
* Reads output of org.hps.recon.ecal.RunningPedestalDriver and makes strip charts.
* Baltzell
@@ -51,9 +49,7 @@
@Override
public void detectorChanged(Detector detector) {
- ecalConditions = ConditionsManager.defaultInstance()
- .getCachedConditions(EcalConditions.class,TableConstants.ECAL_CONDITIONS)
- .getCachedData();
+ ecalConditions = DatabaseConditionsManager.getInstance().getEcalConditions();
/*
for (EcalChannel cc : ecalConditions.getChannelCollection()) {
final int crate = cc.getCrate();
Modified: java/trunk/users/src/main/java/org/hps/users/baltzell/ECalRunningPedestalDriver.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/baltzell/ECalRunningPedestalDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/baltzell/ECalRunningPedestalDriver.java Tue Feb 24 17:19:41 2015
@@ -5,11 +5,10 @@
import java.util.List;
import java.util.Map;
-import org.hps.conditions.database.TableConstants;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannel;
import org.hps.conditions.ecal.EcalConditions;
import org.hps.recon.ecal.HitExtraData;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.event.EventHeader;
import org.lcsim.event.GenericObject;
import org.lcsim.event.LCRelation;
@@ -67,9 +66,7 @@
@Override
public void detectorChanged(Detector detector) {
- ecalConditions = ConditionsManager.defaultInstance()
- .getCachedConditions(EcalConditions.class,TableConstants.ECAL_CONDITIONS)
- .getCachedData();
+ ecalConditions = DatabaseConditionsManager.getInstance().getEcalConditions();
for (int ii = 0; ii < nChannels; ii++) {
EcalChannel chan = findChannel(ii + 1);
runningPedestals.put(chan,getStaticPedestal(chan));
Modified: java/trunk/users/src/main/java/org/hps/users/baltzell/EcalPedestalPlots.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/baltzell/EcalPedestalPlots.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/baltzell/EcalPedestalPlots.java Tue Feb 24 17:19:41 2015
@@ -7,10 +7,9 @@
import java.util.List;
import java.util.Map;
-import org.hps.conditions.database.TableConstants;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannel;
import org.hps.conditions.ecal.EcalConditions;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawCalorimeterHit;
import org.lcsim.geometry.Detector;
@@ -40,9 +39,7 @@
}
protected void detectorChanged(Detector detector) {
- ecalConditions = ConditionsManager.defaultInstance()
- .getCachedConditions(EcalConditions.class,TableConstants.ECAL_CONDITIONS)
- .getCachedData();
+ ecalConditions = DatabaseConditionsManager.getInstance().getEcalConditions();
for (int ii = 0; ii < NX / 2; ii++) {
LT.add(aida.cloud2D("EcalPedestalPlots:LT",1000));
LB.add(aida.cloud2D("EcalPedestalPlots:LB",1000));
Modified: java/trunk/users/src/main/java/org/hps/users/baltzell/EcalRawConverterDriver_RunPed.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/baltzell/EcalRawConverterDriver_RunPed.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/baltzell/EcalRawConverterDriver_RunPed.java Tue Feb 24 17:19:41 2015
@@ -2,10 +2,10 @@
import java.util.ArrayList;
import java.util.List;
-import org.hps.conditions.database.TableConstants;
+
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannelConstants;
import org.hps.conditions.ecal.EcalConditions;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.event.GenericObject;
@@ -113,8 +113,7 @@
converter.setDetector(detector);
// ECAL combined conditions object.
- ecalConditions = ConditionsManager.defaultInstance()
- .getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
+ ecalConditions = DatabaseConditionsManager.getInstance().getEcalConditions();
}
/**
Modified: java/trunk/users/src/main/java/org/hps/users/baltzell/EcalRawConverter_RunPed.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/baltzell/EcalRawConverter_RunPed.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/baltzell/EcalRawConverter_RunPed.java Tue Feb 24 17:19:41 2015
@@ -1,15 +1,13 @@
package org.hps.users.baltzell;
-import java.util.List;
import java.util.Map;
-import org.hps.conditions.database.TableConstants;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannel;
import org.hps.conditions.ecal.EcalChannelConstants;
import org.hps.conditions.ecal.EcalConditions;
import org.hps.recon.ecal.CalorimeterHitUtilities;
import org.hps.recon.ecal.ECalUtils;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.event.GenericObject;
@@ -171,8 +169,7 @@
*/
public void setDetector(Detector detector) {
// ECAL combined conditions object.
- ecalConditions = ConditionsManager.defaultInstance()
- .getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
+ ecalConditions = DatabaseConditionsManager.getInstance().getEcalConditions();
}
/**
Modified: java/trunk/users/src/main/java/org/hps/users/jeremym/EcalADCPlotsDriver.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/jeremym/EcalADCPlotsDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/jeremym/EcalADCPlotsDriver.java Tue Feb 24 17:19:41 2015
@@ -11,11 +11,10 @@
import java.util.List;
import java.util.Set;
-import org.hps.conditions.database.TableConstants;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannel;
import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
import org.hps.conditions.ecal.EcalConditions;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.geometry.Detector;
@@ -39,7 +38,7 @@
public void detectorChanged(Detector detector) {
- conditions = ConditionsManager.defaultInstance().getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
+ conditions = DatabaseConditionsManager.getInstance().getEcalConditions();
channels = conditions.getChannelCollection();
Modified: java/trunk/users/src/main/java/org/hps/users/jeremym/EcalADCProfilePlotsDriver.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/jeremym/EcalADCProfilePlotsDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/jeremym/EcalADCProfilePlotsDriver.java Tue Feb 24 17:19:41 2015
@@ -1,24 +1,16 @@
package org.hps.users.jeremym;
import hep.aida.IAnalysisFactory;
-import hep.aida.IFitFactory;
-import hep.aida.IFitResult;
-import hep.aida.IFitter;
-import hep.aida.IFunction;
-import hep.aida.IFunctionFactory;
import hep.aida.IProfile1D;
-import hep.aida.ref.fitter.FitResult;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
-import org.hps.conditions.database.TableConstants;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannel;
import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
import org.hps.conditions.ecal.EcalConditions;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.geometry.Detector;
@@ -42,7 +34,7 @@
}
public void detectorChanged(Detector detector) {
- conditions = ConditionsManager.defaultInstance().getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
+ conditions = DatabaseConditionsManager.getInstance().getEcalConditions();
channels = conditions.getChannelCollection();
for (EcalChannel channel : conditions.getChannelCollection()) {
adcProfiles.put(channel, aida.profile1D(inputHitsCollectionName + "/ : ADC Values : " + String.format("%03d", channel.getChannelId()), 100, 0, 100));
Modified: java/trunk/users/src/main/java/org/hps/users/jeremym/EcalADCSumPlotsDriver.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/jeremym/EcalADCSumPlotsDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/jeremym/EcalADCSumPlotsDriver.java Tue Feb 24 17:19:41 2015
@@ -11,12 +11,11 @@
import java.util.List;
import java.util.Set;
-import org.hps.conditions.database.TableConstants;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannel;
import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
import org.hps.conditions.ecal.EcalConditions;
import org.hps.recon.ecal.EcalRawConverter;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.geometry.Detector;
@@ -41,7 +40,7 @@
public void detectorChanged(Detector detector) {
- conditions = ConditionsManager.defaultInstance().getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
+ conditions = DatabaseConditionsManager.getInstance().getEcalConditions();
ecalRawConverter = new EcalRawConverter();
ecalRawConverter.setDetector(null);
Modified: java/trunk/users/src/main/java/org/hps/users/jeremym/EcalADCThresholdPlotsDriver.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/jeremym/EcalADCThresholdPlotsDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/jeremym/EcalADCThresholdPlotsDriver.java Tue Feb 24 17:19:41 2015
@@ -8,11 +8,10 @@
import java.util.HashSet;
import java.util.List;
-import org.hps.conditions.database.TableConstants;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannel;
import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
import org.hps.conditions.ecal.EcalConditions;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.geometry.Detector;
@@ -37,7 +36,7 @@
@Override
public void detectorChanged(Detector detector) {
- conditions = ConditionsManager.defaultInstance().getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
+ conditions = DatabaseConditionsManager.getInstance().getEcalConditions();
channels = conditions.getChannelCollection();
}
Modified: java/trunk/users/src/main/java/org/hps/users/jeremym/EcalCosmicClusterPlotsDriver.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/jeremym/EcalCosmicClusterPlotsDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/jeremym/EcalCosmicClusterPlotsDriver.java Tue Feb 24 17:19:41 2015
@@ -22,11 +22,10 @@
import java.util.Map;
import java.util.Map.Entry;
-import org.hps.conditions.database.TableConstants;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannel;
import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
import org.hps.conditions.ecal.EcalConditions;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
@@ -87,7 +86,7 @@
}
public void detectorChanged(Detector detector) {
- conditions = ConditionsManager.defaultInstance().getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
+ conditions = DatabaseConditionsManager.getInstance().getEcalConditions();
channels = conditions.getChannelCollection();
for (EcalChannel channel : conditions.getChannelCollection()) {
IProfile1D profile = aida.profile1D(inputClusterCollectionName + "/ADC Values : Channel " + String.format("%03d", channel.getChannelId()), 100, 0, 100);
Modified: java/trunk/users/src/main/java/org/hps/users/jeremym/EcalCosmicHitFitDriver.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/jeremym/EcalCosmicHitFitDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/jeremym/EcalCosmicHitFitDriver.java Tue Feb 24 17:19:41 2015
@@ -8,19 +8,17 @@
import hep.aida.IFunction;
import hep.aida.IFunctionFactory;
import hep.aida.IHistogram1D;
-import hep.aida.ref.fitter.FitResult;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.hps.conditions.database.TableConstants;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannel;
import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
import org.hps.conditions.ecal.EcalChannelConstants;
import org.hps.conditions.ecal.EcalConditions;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.geometry.Detector;
@@ -125,7 +123,7 @@
*/
public void detectorChanged(Detector detector) {
ecal = (HPSEcal3)detector.getSubdetector(ecalName);
- conditions = ConditionsManager.defaultInstance().getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
+ conditions = DatabaseConditionsManager.getInstance().getEcalConditions();
channels = conditions.getChannelCollection();
for (EcalChannel channel : conditions.getChannelCollection()) {
signalNormHistograms.put(channel, aida.histogram1D(inputHitsCollectionName + "/Signal Norm : Channel " + String.format("%03d", channel.getChannelId()), 500, 0, 500.));
Modified: java/trunk/users/src/main/java/org/hps/users/jeremym/EcalCosmicHitSelectionDriver.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/jeremym/EcalCosmicHitSelectionDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/jeremym/EcalCosmicHitSelectionDriver.java Tue Feb 24 17:19:41 2015
@@ -5,12 +5,11 @@
import java.util.ArrayList;
import java.util.List;
-import org.hps.conditions.database.TableConstants;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannel;
import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
import org.hps.conditions.ecal.EcalChannelConstants;
import org.hps.conditions.ecal.EcalConditions;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.geometry.Detector;
@@ -71,7 +70,7 @@
public void detectorChanged(Detector detector) {
ecal = (HPSEcal3)detector.getSubdetector(ecalName);
- conditions = ConditionsManager.defaultInstance().getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
+ conditions = DatabaseConditionsManager.getInstance().getEcalConditions();
channels = conditions.getChannelCollection();
}
Modified: java/trunk/users/src/main/java/org/hps/users/jeremym/EcalEnergyPlotsDriver.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/jeremym/EcalEnergyPlotsDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/jeremym/EcalEnergyPlotsDriver.java Tue Feb 24 17:19:41 2015
@@ -11,11 +11,10 @@
import java.util.List;
import java.util.Set;
-import org.hps.conditions.database.TableConstants;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannel;
import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
import org.hps.conditions.ecal.EcalConditions;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.geometry.Detector;
@@ -38,7 +37,7 @@
public void detectorChanged(Detector detector) {
- conditions = ConditionsManager.defaultInstance().getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
+ conditions = DatabaseConditionsManager.getInstance().getEcalConditions();
channels = conditions.getChannelCollection();
Modified: java/trunk/users/src/main/java/org/hps/users/jeremym/EcalRawModeMipAnalysisDriver.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/jeremym/EcalRawModeMipAnalysisDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/jeremym/EcalRawModeMipAnalysisDriver.java Tue Feb 24 17:19:41 2015
@@ -8,12 +8,11 @@
import java.util.Map.Entry;
import java.util.Set;
-import org.hps.conditions.database.TableConstants;
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannel;
import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
import org.hps.conditions.ecal.EcalChannelConstants;
import org.hps.conditions.ecal.EcalConditions;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.detector.converter.compact.EcalCrystal;
import org.lcsim.event.EventHeader;
import org.lcsim.event.EventHeader.LCMetaData;
@@ -43,7 +42,7 @@
int minNeighbors = 1;
public void detectorChanged(Detector detector) {
- conditions = ConditionsManager.defaultInstance().getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
+ conditions = DatabaseConditionsManager.getInstance().getEcalConditions();
channels = conditions.getChannelCollection();
ecal = (HPSEcal3)detector.getSubdetector(ecalName);
if (ecal == null) {
Modified: java/trunk/users/src/main/java/org/hps/users/luca/CalibClusterAnalyzerEngRun.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/luca/CalibClusterAnalyzerEngRun.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/luca/CalibClusterAnalyzerEngRun.java Tue Feb 24 17:19:41 2015
@@ -7,35 +7,22 @@
package org.hps.users.luca;
-import org.lcsim.util.Driver;
-import hep.aida.IHistogram1D;
-import java.io.File;
-import java.io.FileNotFoundException;
import java.io.FileWriter;
import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.HashMap;
import java.util.List;
-import java.util.Scanner;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.hps.conditions.database.TableConstants;
+
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannel;
import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
import org.hps.conditions.ecal.EcalChannelConstants;
import org.hps.conditions.ecal.EcalConditions;
-import org.hps.readout.ecal.FADCEcalReadoutDriver;
-import org.hps.readout.ecal.RingBuffer;
import org.hps.recon.ecal.cluster.ClusterUtilities;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
import org.lcsim.geometry.Detector;
import org.lcsim.geometry.Subdetector;
-import org.lcsim.geometry.subdetector.HPSEcal3;
+import org.lcsim.util.Driver;
/**
@@ -84,10 +71,8 @@
/* // ECAL combined conditions object.
ecalConditions = ConditionsManager.defaultInstance()
.getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();*/
-
-
-
- ecalConditions = ConditionsManager.defaultInstance().getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
+
+ ecalConditions = DatabaseConditionsManager.getInstance().getEcalConditions();
channels = ecalConditions.getChannelCollection();
}
@Override
Modified: java/trunk/users/src/main/java/org/hps/users/luca/CalibClusterAnalyzerEngRunHist.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/luca/CalibClusterAnalyzerEngRunHist.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/luca/CalibClusterAnalyzerEngRunHist.java Tue Feb 24 17:19:41 2015
@@ -7,36 +7,18 @@
package org.hps.users.luca;
-import org.lcsim.util.Driver;
import hep.aida.IHistogram1D;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
+
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Scanner;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.hps.conditions.database.TableConstants;
-import org.hps.conditions.ecal.EcalChannel;
+
import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
-import org.hps.conditions.ecal.EcalChannelConstants;
import org.hps.conditions.ecal.EcalConditions;
-import org.hps.readout.ecal.FADCEcalReadoutDriver;
-import org.hps.readout.ecal.RingBuffer;
-import org.hps.recon.ecal.cluster.ClusterUtilities;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
-import org.lcsim.geometry.Detector;
import org.lcsim.geometry.Subdetector;
-import org.lcsim.geometry.subdetector.HPSEcal3;
+import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
Modified: java/trunk/users/src/main/java/org/hps/users/luca/Pass2CalibAnalyzer.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/luca/Pass2CalibAnalyzer.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/luca/Pass2CalibAnalyzer.java Tue Feb 24 17:19:41 2015
@@ -7,36 +7,23 @@
package org.hps.users.luca;
-import org.lcsim.util.Driver;
import hep.aida.IHistogram1D;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
+
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Scanner;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.hps.conditions.database.TableConstants;
+
+import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannel;
import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
import org.hps.conditions.ecal.EcalChannelConstants;
import org.hps.conditions.ecal.EcalConditions;
-import org.hps.readout.ecal.FADCEcalReadoutDriver;
-import org.hps.readout.ecal.RingBuffer;
import org.hps.recon.ecal.cluster.ClusterUtilities;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
import org.lcsim.geometry.Detector;
import org.lcsim.geometry.Subdetector;
-import org.lcsim.geometry.subdetector.HPSEcal3;
+import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
@@ -79,11 +66,9 @@
/* // ECAL combined conditions object.
ecalConditions = ConditionsManager.defaultInstance()
- .getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();*/
-
-
-
- ecalConditions = ConditionsManager.defaultInstance().getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
+ .getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();*/
+
+ ecalConditions = DatabaseConditionsManager.getInstance().getEcalConditions();
channels = ecalConditions.getChannelCollection();
}
@Override
