Author: [log in to unmask]
Date: Mon Nov 17 13:45:32 2014
New Revision: 1549
Log:
Fix imports of classes that were moved. A few other minor changes mostly to print outs.
Modified:
java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/FADCEcalReadoutDriver.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/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
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 Mon Nov 17 13:45:32 2014
@@ -15,7 +15,7 @@
import java.util.PriorityQueue;
import java.util.Set;
-import org.hps.conditions.TableConstants;
+import org.hps.conditions.database.TableConstants;
import org.hps.conditions.ecal.EcalChannelConstants;
import org.hps.conditions.ecal.EcalConditions;
import org.lcsim.conditions.ConditionsManager;
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 Mon Nov 17 13:45:32 2014
@@ -5,7 +5,8 @@
//import org.hps.conditions.deprecated.EcalConditions;
-import org.hps.conditions.TableConstants;
+
+import org.hps.conditions.database.TableConstants;
import org.hps.conditions.ecal.EcalChannelConstants;
import org.hps.conditions.ecal.EcalConditions;
import org.lcsim.conditions.ConditionsManager;
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 Mon Nov 17 13:45:32 2014
@@ -1,6 +1,6 @@
package org.hps.recon.ecal;
-import org.hps.conditions.TableConstants;
+import org.hps.conditions.database.TableConstants;
import org.hps.conditions.ecal.EcalChannelConstants;
import org.hps.conditions.ecal.EcalConditions;
import org.lcsim.conditions.ConditionsManager;
@@ -147,7 +147,7 @@
ecalConditions = ConditionsManager.defaultInstance()
.getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
- System.out.println("You are now using the database conditions for EcalRawConverter.");
+ //System.out.println("You are now using the database conditions for EcalRawConverter.");
}
/**
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 Mon Nov 17 13:45:32 2014
@@ -3,7 +3,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.hps.conditions.TableConstants;
+import org.hps.conditions.database.TableConstants;
import org.hps.conditions.ecal.EcalChannelConstants;
import org.hps.conditions.ecal.EcalConditions;
import org.lcsim.conditions.ConditionsManager;
@@ -100,15 +100,13 @@
@Override
public void detectorChanged(Detector detector) {
-
+
// set the detector for the converter
converter.setDetector(detector);
// ECAL combined conditions object.
ecalConditions = ConditionsManager.defaultInstance()
- .getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
-
- System.out.println("You are now using the database conditions for EcalRawConverterDriver.");
+ .getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
}
/**
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 Mon Nov 17 13:45:32 2014
@@ -3,7 +3,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.hps.conditions.TableConstants;
+import org.hps.conditions.database.TableConstants;
import org.hps.conditions.ecal.EcalChannelConstants;
import org.hps.conditions.ecal.EcalConditions;
import org.lcsim.conditions.ConditionsManager;
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 Mon Nov 17 13:45:32 2014
@@ -4,8 +4,8 @@
import java.util.List;
import java.util.Queue;
import java.util.concurrent.ArrayBlockingQueue;
-import org.hps.conditions.TableConstants;
+import org.hps.conditions.database.TableConstants;
import org.hps.conditions.ecal.EcalChannel.GeometryId;
import org.hps.conditions.ecal.EcalConditions;
import org.lcsim.conditions.ConditionsManager;
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 Mon Nov 17 13:45:32 2014
@@ -3,7 +3,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.hps.conditions.TableConstants;
+import org.hps.conditions.database.TableConstants;
import org.hps.conditions.ecal.EcalChannelConstants;
import org.hps.conditions.ecal.EcalConditions;
import org.lcsim.conditions.ConditionsManager;
