--- java/branches/hps_java_trunk_HPSJAVA-251/ecal-readout-sim/src/main/java/org/hps/readout/ecal/FADCEcalReadoutDriver.java	2014-09-12 02:32:40 UTC (rev 1011)
+++ java/branches/hps_java_trunk_HPSJAVA-251/ecal-readout-sim/src/main/java/org/hps/readout/ecal/FADCEcalReadoutDriver.java	2014-09-12 03:11:00 UTC (rev 1012)
@@ -241,7 +241,7 @@

 
             FADCPipeline pipeline = pipelineMap.get(cellID);
             pipeline.step();

-           

+            

             // Get the channel data.
             EcalChannelConstants channelData = findChannel(cellID);
 

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

         }
         while (outputQueue.peek() != null && outputQueue.peek().getTimeStamp() / 64 <= readoutCounter - delay0) {
             if (outputQueue.peek().getTimeStamp() / 64 < readoutCounter - delay0) {

-                System.out.println("Stale hit in output queue");

+                System.out.println(this.getName() + ": Stale hit in output queue");

                 outputQueue.poll();
             } else {
                 buffer.add(outputQueue.poll());

@@ -515,7 +515,8 @@

 
     private double pulseAmplitude(double time, long cellID) {
     	

-    	EcalChannelConstants channelData = findChannel(cellID);

+        // Get the channel data.
+        EcalChannelConstants channelData = findChannel(cellID);

     	
         if (use2014Gain) {
             //if fixedGain is set, multiply the default gain by this factor

@@ -625,7 +626,11 @@

         }
     }
     

-    // Convert physical ID to gain value.

+    /** 
+     * Convert physical ID to gain value.
+     * @param cellID (long)
+     * @return channel constants (EcalChannelConstants)
+     */

     private EcalChannelConstants findChannel(long cellID) {
         // Make an ID object from raw hit ID.
         IIdentifier id = new Identifier(cellID);

@@ -637,13 +642,9 @@

         
         // Create an ID to search for in channel collection.
         GeometryId geometryId = new GeometryId(helper, new int[] { system, x, y });

-        
-        // Find the ECAL channel.
-//        return channels.findChannel(geometryId);

                 
         // Get the channel data.

-        return ecalConditions.getChannelConstants(channels.findChannel(geometryId));

+        return ecalConditions.getChannelConstants(channels.findChannel(geometryId));    

     }

-    

 }
 

--- java/branches/hps_java_trunk_HPSJAVA-251/ecal-readout-sim/src/main/java/org/hps/readout/ecal/FADCTriggerDriver.java	2014-09-12 02:32:40 UTC (rev 1011)
+++ java/branches/hps_java_trunk_HPSJAVA-251/ecal-readout-sim/src/main/java/org/hps/readout/ecal/FADCTriggerDriver.java	2014-09-12 03:11:00 UTC (rev 1012)
@@ -134,16 +134,6 @@

     }
 
     /**

-     * Set X coordinate used as the origin for cluster coplanarity and distance
-     * calculations. Defaults to the ECal midplane. Units of mm.
-     *
-     * @param originX
-     */
-    public void setOriginX(double originX) {
-        this.originX = originX;
-    }
-
-    /**

      * Used for plot ranges and cuts that scale with energy. 1.1, 2.2 and 6.6
      * are associated with default cuts. Units of GeV.
      *

@@ -154,15 +144,6 @@

     }
 
     /**

-     * Use default cuts based on beam energy.
-     *
-     * @param useDefaultCuts
-     */
-    public void setUseDefaultCuts(boolean useDefaultCuts) {
-        this.useDefaultCuts = useDefaultCuts;
-    }
-
-    /**

      * Minimum hit count for a cluster.
      *
      * @param minHitCount

@@ -243,6 +224,25 @@

         }
     }
 

+    /**
+     * Set X coordinate used as the origin for cluster coplanarity and distance
+     * calculations. Defaults to the ECal midplane.
+     *
+     * @param originX
+     */
+    public void setOriginX(double originX) {
+        this.originX = originX;
+    }
+
+    /**
+     * Use default cuts based on beam energy.
+     *
+     * @param useDefaultCuts
+     */
+    public void setUseDefaultCuts(boolean useDefaultCuts) {
+        this.useDefaultCuts = useDefaultCuts;
+    }
+

     @Override
     public void detectorChanged(Detector detector) {
         if (beamEnergy < 0) {

@@ -675,4 +675,4 @@

     protected double getClusterDistance(HPSEcalCluster cluster) {
         return Math.hypot(cluster.getSeedHit().getPosition()[0] - originX, cluster.getSeedHit().getPosition()[1]);
     }

-}

\ No newline at end of file

+}

--- java/branches/hps_java_trunk_HPSJAVA-251/ecal-readout-sim/src/main/java/org/hps/readout/ecal/SimpleEcalReadoutDriver.java	2014-09-12 02:32:40 UTC (rev 1011)
+++ java/branches/hps_java_trunk_HPSJAVA-251/ecal-readout-sim/src/main/java/org/hps/readout/ecal/SimpleEcalReadoutDriver.java	2014-09-12 03:11:00 UTC (rev 1012)
@@ -6,6 +6,7 @@

 
 import org.hps.recon.ecal.HPSCalorimeterHit;
 import org.lcsim.event.CalorimeterHit;

+import org.lcsim.geometry.Detector;

 
 /**
  * Performs readout of ECal hits.

@@ -17,12 +18,21 @@

 public class SimpleEcalReadoutDriver extends EcalReadoutDriver<HPSCalorimeterHit> {
     //buffer for deposited energy
     Map<Long, Double> eDepMap = null;

+    
+    Detector detector = null;
+    
+    HPSCalorimeterHit h = null;

 
 	public SimpleEcalReadoutDriver() {
 		hitClass = HPSCalorimeterHit.class;
 	}
 
     @Override

+    public void detectorChanged(Detector detector) {
+    	this.detector = detector;
+    }
+	
+    @Override

     protected void readHits(List<HPSCalorimeterHit> hits) {
         for (Long cellID : eDepMap.keySet()) {
 //            int ix = dec.getValue("ix");

@@ -32,7 +42,9 @@

 //            if (iy == 1 && ix*side >= -10 && ix*side <= -2)
 //                continue;
             if (eDepMap.get(cellID) > threshold)

-                hits.add(new HPSCalorimeterHit(eDepMap.get(cellID), readoutTime(), cellID, hitType));

+            	h = new HPSCalorimeterHit(eDepMap.get(cellID), readoutTime(), cellID, hitType); 
+                h.setDetector(detector);
+                hits.add(h);

         }
         //reset hit integration
         eDepMap = new HashMap<Long, Double>();

--- java/branches/hps_java_trunk_HPSJAVA-251/ecal-readout-sim/src/main/java/org/hps/readout/ecal/TimeEvolutionEcalReadoutDriver.java	2014-09-12 02:32:40 UTC (rev 1011)
+++ java/branches/hps_java_trunk_HPSJAVA-251/ecal-readout-sim/src/main/java/org/hps/readout/ecal/TimeEvolutionEcalReadoutDriver.java	2014-09-12 03:11:00 UTC (rev 1012)
@@ -6,6 +6,7 @@

 
 import org.hps.recon.ecal.HPSCalorimeterHit;
 import org.lcsim.event.CalorimeterHit;

+import org.lcsim.geometry.Detector;

 
 /**
  * Performs readout of ECal hits.

@@ -16,12 +17,19 @@

  */
 public class TimeEvolutionEcalReadoutDriver extends EcalReadoutDriver<HPSCalorimeterHit> {
 

+	Detector detector = null;
+	

     //buffer for deposited energy
     Map<Long, RingBuffer> eDepMap = null;
     //length of ring buffer (in readout cycles)
     int bufferLength = 20;
     //shaper time constant in ns; negative values generate square pulses of the given width
     double t0 = 18.0;

+    
+    @Override
+    public void detectorChanged(Detector detector) {
+    	this.detector = detector;
+    }

 
     public TimeEvolutionEcalReadoutDriver() {
 		hitClass = HPSCalorimeterHit.class;

@@ -45,7 +53,9 @@

 //                int iy = dec.getValue("iy");
 //                if (iy == 1 && ix == -2)
 //                    System.out.printf("Time %f, output signal %f\n", ClockSingleton.getTime(), eDepBuffer.currentValue());

-                hits.add(new HPSCalorimeterHit(eDepBuffer.currentValue(), readoutTime(), cellID, hitType));

+            	HPSCalorimeterHit h = new HPSCalorimeterHit(eDepBuffer.currentValue(), readoutTime(), cellID, hitType);
+            	h.setDetector(detector);
+            	hits.add(h);

             }
             eDepBuffer.step();
         }

--- java/branches/hps_java_trunk_HPSJAVA-251/evio/src/main/java/org/hps/evio/TestRunReconToEvio.java	2014-09-12 02:32:40 UTC (rev 1011)
+++ java/branches/hps_java_trunk_HPSJAVA-251/evio/src/main/java/org/hps/evio/TestRunReconToEvio.java	2014-09-12 03:11:00 UTC (rev 1012)
@@ -2,12 +2,16 @@

 
 import java.io.IOException;
 

+import org.hps.conditions.TableConstants;
+import org.hps.conditions.ecal.EcalConditions;

 import org.jlab.coda.jevio.DataType;
 import org.jlab.coda.jevio.EventBuilder;
 import org.jlab.coda.jevio.EventWriter;
 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.geometry.Detector;

 import org.lcsim.util.Driver;
 
 /**

@@ -26,9 +30,17 @@

 	private int eventsWritten = 0;
 	ECalHitWriter ecalWriter = null;
 	SVTHitWriter svtWriter = null;

+	
+	Detector detector = null;

 
 	public TestRunReconToEvio() {
 	}

+	
+    @Override
+    public void detectorChanged(Detector detector) {    	
+    	// set the detector
+        this.detector = detector;
+    }

 
 	public void setEvioOutputFile(String evioOutputFile) {
 		this.evioOutputFile = evioOutputFile;

@@ -49,6 +61,7 @@

 		}
 
 		ecalWriter = new ECalHitWriter();

+		ecalWriter.setDetector(detector);

 		ecalWriter.setHitCollectionName(rawCalorimeterHitCollectionName);
 
 		svtWriter = new SVTHitWriter();

--- java/branches/hps_java_trunk_HPSJAVA-251/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToEvio.java	2014-09-12 02:32:40 UTC (rev 1011)
+++ java/branches/hps_java_trunk_HPSJAVA-251/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToEvio.java	2014-09-12 03:11:00 UTC (rev 1012)
@@ -5,8 +5,9 @@

 import java.util.LinkedList;
 import java.util.List;
 import java.util.Queue;

+import org.hps.conditions.DatabaseConditionsManager;

 import org.hps.conditions.deprecated.CalibrationDriver;

-import org.hps.conditions.deprecated.EcalConditions;

+import org.hps.conditions.ecal.EcalConditions;

 import org.hps.readout.ecal.ReadoutTimestamp;
 import org.hps.readout.ecal.TriggerDriver;
 import org.hps.readout.ecal.TriggerableDriver;

@@ -16,6 +17,7 @@

 import org.jlab.coda.jevio.EvioBank;
 import org.jlab.coda.jevio.EvioException;
 import org.lcsim.event.EventHeader;

+import org.lcsim.geometry.Detector;

 import org.lcsim.util.Driver;
 
 /**

@@ -39,10 +41,19 @@

     TriggerDataWriter triggerWriter = null;
     List<HitWriter> writers = null;
     private int ecalMode = EventConstants.ECAL_PULSE_INTEGRAL_MODE;

+    
+    Detector detector;

 
     public TestRunTriggeredReconToEvio() {
         setTriggerDelay(0);
     }

+    
+    @Override
+    public void detectorChanged(Detector detector) {    	
+    	//ecalWriter.setDetector(detector);
+        if(detector == null) System.out.println("detectorChanged, Detector == null");
+        else System.out.println("detectorChanged, Detector != null");
+    }

 
     public void setEcalMode(int ecalMode) {
         this.ecalMode = ecalMode;

@@ -75,12 +86,17 @@

         }
 
         writePrestartEvent();

+        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");
+        //ecalWriter.setDetector(detector);

         ecalWriter.setMode(ecalMode);
         ecalWriter.setHitCollectionName(rawCalorimeterHitCollectionName);

+        ecalWriter.setDetector(detector);

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

--- java/branches/hps_java_trunk_HPSJAVA-251/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToLcio.java	2014-09-12 02:32:40 UTC (rev 1011)
+++ java/branches/hps_java_trunk_HPSJAVA-251/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToLcio.java	2014-09-12 03:11:00 UTC (rev 1012)
@@ -18,6 +18,7 @@

 import org.lcsim.event.MCParticle;
 import org.lcsim.event.SimCalorimeterHit;
 import org.lcsim.event.SimTrackerHit;

+import org.lcsim.geometry.Detector;

 import org.lcsim.lcio.LCIOWriter;
 import org.lcsim.util.Driver;
 

@@ -60,10 +61,17 @@

     static final String trackerCollectionName = "TrackerHits";
     private String relationCollectionName = "SVTTrueHitRelations";
     String ecalScoringPlaneHitsCollectionName = "TrackerHitsECal";

+    Detector detector = null;

 
     public TestRunTriggeredReconToLcio() {
         setTriggerDelay(0);
     }

+    
+    @Override
+    public void detectorChanged(Detector detector) {    	
+    	// set the detector
+        this.detector = detector;
+    }

 
     public void setEcalMode(int ecalMode) {
         this.ecalMode = ecalMode;

@@ -100,6 +108,7 @@

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

+        ecalWriter.setDetector(detector);

         ecalWriter.setMode(ecalMode);
         ecalWriter.setHitCollectionName(rawCalorimeterHitCollectionName);
         writers.add(ecalWriter);