--- java/branches/hps_java_trunk_HPSJAVA-255/evio/src/main/java/org/hps/evio/ECalEvioReader.java	2014-09-30 21:25:30 UTC (rev 1117)
+++ java/branches/hps_java_trunk_HPSJAVA-255/evio/src/main/java/org/hps/evio/ECalEvioReader.java	2014-09-30 22:09:13 UTC (rev 1118)
@@ -34,7 +34,7 @@

 public class ECalEvioReader extends EvioReader {
     // Names of subdetectors.
 

-    private int bankTag = EventConstants.ECAL_PULSE_INTEGRAL_BANK_TAG;

+    private int bankTag = 0;

     private Class hitClass = BaseRawCalorimeterHit.class;
 
     // FIXME: Hard-coded detector names.

--- java/branches/hps_java_trunk_HPSJAVA-255/evio/src/main/java/org/hps/evio/ECalHitWriter.java	2014-09-30 21:25:30 UTC (rev 1117)
+++ java/branches/hps_java_trunk_HPSJAVA-255/evio/src/main/java/org/hps/evio/ECalHitWriter.java	2014-09-30 22:09:13 UTC (rev 1118)
@@ -176,7 +176,6 @@

 
     private long getCellID(Object hit) {
         if (RawCalorimeterHit.class.isInstance(hit)) {

-            System.out.println("hit.getCellID() " + ((RawCalorimeterHit) hit).getCellID());

             return ((RawCalorimeterHit) hit).getCellID();
         } else if (RawTrackerHit.class.isInstance(hit)) {
             return ((RawTrackerHit) hit).getCellID();

@@ -243,7 +242,7 @@

             }
         }
         // New bank for this slot.

-        EvioBank cdataBank = new EvioBank(EventConstants.ECAL_PULSE_BANK_TAG, DataType.COMPOSITE, 0);

+        EvioBank cdataBank = new EvioBank(EventConstants.ECAL_PULSE_INTEGRAL_BANK_TAG, DataType.COMPOSITE, 0);

         List<CompositeData> cdataList = new ArrayList<CompositeData>();
 
         // Add CompositeData to bank.

--- java/branches/hps_java_trunk_HPSJAVA-255/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToEvio.java	2014-09-30 21:25:30 UTC (rev 1117)
+++ java/branches/hps_java_trunk_HPSJAVA-255/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToEvio.java	2014-09-30 22:09:13 UTC (rev 1118)
@@ -46,7 +46,7 @@

     
     @Override
     public void detectorChanged(Detector detector) {    	

-    	//ecalWriter.setDetector(detector);

+    	ecalWriter.setDetector(detector);

         if(detector == null) System.out.println("detectorChanged, Detector == null");
         else System.out.println("detectorChanged, Detector != null");
     }

@@ -82,17 +82,17 @@

         }
 
         writePrestartEvent();

-        this.detector = DatabaseConditionsManager.getInstance().getDetectorObject();

+//        this.detector = DatabaseConditionsManager.getInstance().getDetectorObject();

 
         writers = new ArrayList<HitWriter>();
 
         ecalWriter = new ECalHitWriter();

-        if(detector == null) System.out.println("Detector == null");
-        else System.out.println("Detector != null");

+//        if(detector == null) System.out.println("Detector == null");
+//        else System.out.println("Detector != null");

         //ecalWriter.setDetector(detector);
         ecalWriter.setMode(ecalMode);
         ecalWriter.setHitCollectionName(rawCalorimeterHitCollectionName);

-        ecalWriter.setDetector(detector);

+//        ecalWriter.setDetector(detector);

         writers.add(ecalWriter);
 
         svtWriter = new SVTHitWriter();

--- java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutToEvio.lcsim	2014-09-30 21:25:30 UTC (rev 1117)
+++ java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutToEvio.lcsim	2014-09-30 22:09:13 UTC (rev 1118)
@@ -7,7 +7,9 @@

        xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
     <execute>
         <driver name="EventMarkerDriver"/>

-        

+
+        <driver name="ConditionsDriver"/>   
+

         <driver name="CalibrationDriver"/>   
         <driver name="EcalReadout"/>
         <driver name="EcalConverter"/>

@@ -28,8 +30,11 @@

         <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
             <eventInterval>1000</eventInterval>
         </driver> 

+        <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
+            <loadSvtConditions>false</loadSvtConditions>
+        </driver>

         <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">

-<!--            <runNumber>1351</runNumber>    -->

+                        <runNumber>1351</runNumber>    

         </driver>
         <driver name="TestRunReconToEvio" type="org.hps.evio.TestRunTriggeredReconToEvio">
             <evioOutputFile>${outputFile}.evio</evioOutputFile>

@@ -41,8 +46,8 @@

             <ecalCollectionName>EcalHits</ecalCollectionName>
             <ecalRawCollectionName>EcalRawHits</ecalRawCollectionName>
             <addNoise>true</addNoise>

-<!--            <fixedGain>0.15</fixedGain>-->
-<!--            <debug>true</debug>-->

+            <!--            <fixedGain>0.15</fixedGain>-->
+            <!--            <debug>true</debug>-->

         </driver>
 
         <driver name="EcalConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">

@@ -51,7 +56,7 @@

             <!--<gain>0.15</gain>-->
             <applyBadCrystalMap>false</applyBadCrystalMap>
             <use2014Gain>true</use2014Gain>

-<!--            <debug>true</debug>-->

+            <!--            <debug>true</debug>-->

         </driver>	
 
         <driver name="EcalClusterer" type="org.hps.recon.ecal.GTPEcalClusterer">

@@ -69,7 +74,7 @@

         <driver name="SimpleSVTReadout" type="org.hps.readout.svt.SimpleSvtReadout">
         </driver>
 

-<!--        <driver name="AidaSaveDriver"

+        <!--        <driver name="AidaSaveDriver"

                         type="org.lcsim.job.AidaSaveDriver">
             <outputFileName>${outputFile}_triggerPlots</outputFileName>
         </driver>-->