Commit in java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal on MAIN
EcalEdepToTriggerConverterDriver.java+1-21015 -> 1016
EcalRawConverter.java-11015 -> 1016
EcalRawConverterDriver.java+4-21015 -> 1016
EcalReadoutToTriggerConverterDriver.java+4-51015 -> 1016
EcalTriggerFilterDriver.java+4-51015 -> 1016
HPSCalorimeterHit.java-11015 -> 1016
+13-16
6 modified files
Fix bizaare usage of EcalConditionsUtil in Drivers.
java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal
EcalEdepToTriggerConverterDriver.java 1015 -> 1016
--- java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/EcalEdepToTriggerConverterDriver.java	2014-09-12 03:53:58 UTC (rev 1015)
+++ java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/EcalEdepToTriggerConverterDriver.java	2014-09-12 04:10:09 UTC (rev 1016)
@@ -11,7 +11,6 @@

 import org.hps.conditions.ecal.EcalChannel.GeometryId;
 import org.hps.conditions.ecal.EcalChannelConstants;
 import org.hps.conditions.ecal.EcalConditions;

-import org.hps.conditions.ecal.EcalConditionsUtil;

 import org.lcsim.conditions.ConditionsManager;
 import org.lcsim.detector.identifier.IIdentifier;
 import org.lcsim.detector.identifier.IIdentifierHelper;

@@ -30,7 +29,7 @@

  */
 public class EcalEdepToTriggerConverterDriver extends Driver {
 	

-	Detector detector = null;

+    Detector detector = null;

     static EcalConditions ecalConditions = null;
     static IIdentifierHelper helper = null;
     static EcalChannelCollection channels = null;
java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal
EcalRawConverter.java 1015 -> 1016
--- java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverter.java	2014-09-12 03:53:58 UTC (rev 1015)
+++ java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverter.java	2014-09-12 04:10:09 UTC (rev 1016)
@@ -7,7 +7,6 @@

 import org.hps.conditions.ecal.EcalChannel.GeometryId;
 import org.hps.conditions.ecal.EcalChannelConstants;
 import org.hps.conditions.ecal.EcalConditions;

-import org.hps.conditions.ecal.EcalConditionsUtil;

 import org.lcsim.conditions.ConditionsManager;
 import org.lcsim.detector.identifier.IIdentifier;
 import org.lcsim.detector.identifier.IIdentifierHelper;
java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal
EcalRawConverterDriver.java 1015 -> 1016
--- java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverterDriver.java	2014-09-12 03:53:58 UTC (rev 1015)
+++ java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverterDriver.java	2014-09-12 04:10:09 UTC (rev 1016)
@@ -36,6 +36,8 @@

     static EcalConditions ecalConditions = null;
     static IIdentifierHelper helper = null;
     static EcalChannelCollection channels = null; 

+
+    EcalConditionsUtil util = new EcalConditionsUtil();

     
     Detector detector = null;
     

@@ -286,7 +288,7 @@

      */
     private int getCrate(long cellID) {
         

-        EcalConditionsUtil util = new EcalConditionsUtil();

+        //EcalConditionsUtil util = new EcalConditionsUtil();

 
         // Find the ECAL channel and return the crate number.
         return util.getCrate(helper, cellID);

@@ -298,7 +300,7 @@

      * @return Slot number (int)
      */
     private int getSlot(long cellID) {

-        EcalConditionsUtil util = new EcalConditionsUtil();

+        //EcalConditionsUtil util = new EcalConditionsUtil();

 
         // Find the ECAL channel and return the crate number.
         return util.getSlot(helper, cellID);
java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal
EcalReadoutToTriggerConverterDriver.java 1015 -> 1016
--- java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/EcalReadoutToTriggerConverterDriver.java	2014-09-12 03:53:58 UTC (rev 1015)
+++ java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/EcalReadoutToTriggerConverterDriver.java	2014-09-12 04:10:09 UTC (rev 1016)
@@ -34,6 +34,8 @@

     static IIdentifierHelper helper = null;
     static EcalChannelCollection channels = null;
 	Detector detector = null;

+
+    EcalConditionsUtil util;

 	
     String rawCollectionName = "EcalReadoutHits";
     String ecalReadoutName = "EcalHits";

@@ -106,6 +108,8 @@

         
         // ID helper.
         helper = detector.getSubdetector("Ecal").getDetectorElement().getIdentifierHelper();

+
+        util = new EcalConditionsUtil(); 

         
         System.out.println("You are now using the database conditions for EcalReadoutToTriggerConverterDriver.");
     }

@@ -255,9 +259,6 @@

      * @return Crate number (int)
      */
     private int getCrate(long cellID) {

-        
-        EcalConditionsUtil util = new EcalConditionsUtil();
-

         // Find the ECAL channel and return the crate number.
         return util.getCrate(helper, cellID);
     }

@@ -268,8 +269,6 @@

      * @return Slot number (int)
      */
     private int getSlot(long cellID) {

-        EcalConditionsUtil util = new EcalConditionsUtil();
-

         // Find the ECAL channel and return the crate number.
         return util.getSlot(helper, cellID);         
     }
java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal
EcalTriggerFilterDriver.java 1015 -> 1016
--- java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/EcalTriggerFilterDriver.java	2014-09-12 03:53:58 UTC (rev 1015)
+++ java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/EcalTriggerFilterDriver.java	2014-09-12 04:10:09 UTC (rev 1016)
@@ -35,6 +35,7 @@

     static EcalChannelCollection channels = null;
     int systemId;
     Detector detector = null;

+    EcalConditionsUtil util;

     
     private String ecalReadoutName = "EcalHits";
     private String inputCollection = "EcalReadoutHits";

@@ -87,6 +88,8 @@

         helper = detector.getSubdetector("Ecal").getDetectorElement().getIdentifierHelper();
 
         systemId = detector.getSubdetector("Ecal").getSystemID();

+
+        util = new EcalConditionsUtil();

         
         System.out.println("You are now using the database conditions for EcalTriggerFilterDriver.");
     }

@@ -159,9 +162,6 @@

      * @return Crate number (int)
      */
     private int getCrate(long cellID) {

-        
-        EcalConditionsUtil util = new EcalConditionsUtil();
-

         // Find the ECAL channel and return the crate number.
         return util.getCrate(helper, cellID);
     }

@@ -172,8 +172,7 @@

      * @return Slot number (int)
      */
     private int getSlot(long cellID) {

-        EcalConditionsUtil util = new EcalConditionsUtil();
-

+        //EcalConditionsUtil util = new EcalConditionsUtil();

         // Find the ECAL channel and return the crate number.
         return util.getSlot(helper, cellID);         
     }
java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal
HPSCalorimeterHit.java 1015 -> 1016
--- java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/HPSCalorimeterHit.java	2014-09-12 03:53:58 UTC (rev 1015)
+++ java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/HPSCalorimeterHit.java	2014-09-12 04:10:09 UTC (rev 1016)
@@ -10,7 +10,6 @@

 import org.hps.conditions.ecal.EcalChannel.GeometryId;
 import org.hps.conditions.ecal.EcalChannelConstants;
 import org.hps.conditions.ecal.EcalConditions;

-import org.hps.conditions.ecal.EcalConditionsUtil;

 import org.lcsim.conditions.ConditionsManager;
 import org.lcsim.detector.identifier.IIdentifier;
 import org.lcsim.detector.identifier.IIdentifierHelper;
SVNspam 0.1