diff -u -r1.3 -r1.4
--- ECalEvioWriter.java	10 Apr 2012 01:00:13 -0000	1.3
+++ ECalEvioWriter.java	2 May 2012 00:39:40 -0000	1.4
@@ -18,7 +18,7 @@

 import org.lcsim.event.EventHeader.LCMetaData;
 import org.lcsim.event.RawCalorimeterHit;
 import org.lcsim.geometry.IDDecoder;

-import org.lcsim.hps.recon.ecal.HPSEcalDaqIDConverter;

+import org.lcsim.hps.recon.ecal.HPSEcalConditions;

 
 import static org.lcsim.hps.evio.EventConstants.ECAL_BANK_NUMBER;
 import static org.lcsim.hps.evio.EventConstants.ECAL_BOTTOM_BANK_TAG;

@@ -29,386 +29,383 @@

 /**
  *
  * @author Sho Uemura <[log in to unmask]>

- * @version $Id: ECalEvioWriter.java,v 1.3 2012/04/10 01:00:13 meeg Exp $

+ * @version $Id: ECalEvioWriter.java,v 1.4 2012/05/02 00:39:40 meeg Exp $

  */
 public class ECalEvioWriter implements EvioWriter {
 

-	private String hitCollectionName = "EcalReadoutHits";
-	private String ecalName = "Ecal";
-	private HPSEcalDaqIDConverter ecalIDConverter = null;
-	private int mode = EventConstants.ECAL_PULSE_INTEGRAL_MODE;
-
-	public ECalEvioWriter() {
-	}
-
-	public void setEcalName(String ecalName) {
-		this.ecalName = ecalName;
-		ecalIDConverter = null;
-	}
-
-	public void setHitCollectionName(String hitCollectionName) {
-		this.hitCollectionName = hitCollectionName;
-	}
-
-	public void setMode(int mode) {
-		this.mode = mode;
-		if (mode != EventConstants.ECAL_WINDOW_MODE && mode != EventConstants.ECAL_PULSE_MODE && mode != EventConstants.ECAL_PULSE_INTEGRAL_MODE) {
-			throw new IllegalArgumentException("invalid mode " + mode);
-		}
-	}
-
-	public boolean hasData(EventHeader event) {
-		switch (mode) {
-			case EventConstants.ECAL_WINDOW_MODE:
-				return event.hasCollection(RawTrackerHit.class, hitCollectionName);
-			case EventConstants.ECAL_PULSE_MODE:
-				return event.hasCollection(RawTrackerHit.class, hitCollectionName);
-			case EventConstants.ECAL_PULSE_INTEGRAL_MODE:
-				return event.hasCollection(RawCalorimeterHit.class, hitCollectionName);
-			default:
-				return false;
-		}
-	}
-
-	public void writeData(EventHeader event, EventBuilder builder) {
-		if (ecalIDConverter == null) {
-			ecalIDConverter = new HPSEcalDaqIDConverter();
-			ecalIDConverter.fillDaqCellMap(event.getDetector().getSubdetector(ecalName));
-		}
-		LCMetaData meta;
-		List<RawCalorimeterHit> rawCalorimeterHits;
-		List<RawTrackerHit> rawTrackerHits;
-		switch (mode) {
-			case EventConstants.ECAL_WINDOW_MODE:
-				rawTrackerHits = event.get(RawTrackerHit.class, hitCollectionName);
-				meta = event.getMetaData(rawTrackerHits);
-				writeWindowHits(meta, rawTrackerHits, builder);
-				break;
-			case EventConstants.ECAL_PULSE_MODE:
-				rawTrackerHits = event.get(RawTrackerHit.class, hitCollectionName);
-				meta = event.getMetaData(rawTrackerHits);
-				writePulseHits(meta, rawTrackerHits, builder);
-				break;
-			case EventConstants.ECAL_PULSE_INTEGRAL_MODE:
-				rawCalorimeterHits = event.get(RawCalorimeterHit.class, hitCollectionName);
-				meta = event.getMetaData(rawCalorimeterHits);
-				writeIntegralHits(meta, rawCalorimeterHits, builder);
-				break;
-			default:
-				break;
-		}
-	}
-
-	private void writeIntegralHits(LCMetaData meta, List<RawCalorimeterHit> rawCalorimeterHits, EventBuilder builder) {
-		System.out.println("Writing " + rawCalorimeterHits.size() + " ECal hits in integral format");
-
-		// Make two lists containing the hits from top and bottom sections, which go into separate EVIO data banks.
-		List<RawCalorimeterHit> topHits = new ArrayList<RawCalorimeterHit>();
-		List<RawCalorimeterHit> bottomHits = new ArrayList<RawCalorimeterHit>();
-		for (RawCalorimeterHit hit : rawCalorimeterHits) {
-			Long daqID = ecalIDConverter.physicalToDaqID(hit.getCellID());
-			int crate = HPSEcalDaqIDConverter.getCrate(daqID);
-			if (crate == ECAL_BOTTOM_BANK_TAG) {
-				bottomHits.add(hit);
-			} else {
-				topHits.add(hit);
-			}
-		}
-
-		// Write the two collections for top and bottom hits to separate EVIO banks.
-		writeIntegralHitCollection(topHits, meta, ECAL_TOP_BANK_TAG, builder);
-		writeIntegralHitCollection(bottomHits, meta, ECAL_BOTTOM_BANK_TAG, builder);
-	}
-
-	private void writeIntegralHitCollection(List<RawCalorimeterHit> hits, LCMetaData meta, int bankTag, EventBuilder builder) {
-		// Get the ID decoder.
-		IDDecoder dec = meta.getIDDecoder();
-
-		// Make a hit map; allow for multiple hits in a crystal.
-		Map<Long, List<RawCalorimeterHit>> hitMap = new HashMap<Long, List<RawCalorimeterHit>>();
-		for (RawCalorimeterHit hit : hits) {
-			if (hitMap.get(hit.getCellID()) == null) {
-				hitMap.put(hit.getCellID(), new ArrayList<RawCalorimeterHit>());
-			}
-			List<RawCalorimeterHit> channelHits = hitMap.get(hit.getCellID());
-			channelHits.add(hit);
-		}
-
-		// Make map of slot number to hit IDs.
-		Map<Integer, List<Long>> slotMap = new HashMap<Integer, List<Long>>();
-		for (Long id : hitMap.keySet()) {
-			dec.setID(id);

+    private String hitCollectionName = "EcalReadoutHits";
+    private String ecalName = "Ecal";
+    private int mode = EventConstants.ECAL_PULSE_INTEGRAL_MODE;
+
+    public ECalEvioWriter() {
+    }
+
+    public void setEcalName(String ecalName) {
+        this.ecalName = ecalName;
+    }
+
+    public void setHitCollectionName(String hitCollectionName) {
+        this.hitCollectionName = hitCollectionName;
+    }
+
+    public void setMode(int mode) {
+        this.mode = mode;
+        if (mode != EventConstants.ECAL_WINDOW_MODE && mode != EventConstants.ECAL_PULSE_MODE && mode != EventConstants.ECAL_PULSE_INTEGRAL_MODE) {
+            throw new IllegalArgumentException("invalid mode " + mode);
+        }
+    }
+
+    public boolean hasData(EventHeader event) {
+        switch (mode) {
+            case EventConstants.ECAL_WINDOW_MODE:
+                return event.hasCollection(RawTrackerHit.class, hitCollectionName);
+            case EventConstants.ECAL_PULSE_MODE:
+                return event.hasCollection(RawTrackerHit.class, hitCollectionName);
+            case EventConstants.ECAL_PULSE_INTEGRAL_MODE:
+                return event.hasCollection(RawCalorimeterHit.class, hitCollectionName);
+            default:
+                return false;
+        }
+    }
+
+    public void writeData(EventHeader event, EventBuilder builder) {
+        if (!HPSEcalConditions.mapLoaded()) {
+            HPSEcalConditions.fillDaqCellMap(event.getDetector().getSubdetector(ecalName));
+        }
+        LCMetaData meta;
+        List<RawCalorimeterHit> rawCalorimeterHits;
+        List<RawTrackerHit> rawTrackerHits;
+        switch (mode) {
+            case EventConstants.ECAL_WINDOW_MODE:
+                rawTrackerHits = event.get(RawTrackerHit.class, hitCollectionName);
+                meta = event.getMetaData(rawTrackerHits);
+                writeWindowHits(meta, rawTrackerHits, builder);
+                break;
+            case EventConstants.ECAL_PULSE_MODE:
+                rawTrackerHits = event.get(RawTrackerHit.class, hitCollectionName);
+                meta = event.getMetaData(rawTrackerHits);
+                writePulseHits(meta, rawTrackerHits, builder);
+                break;
+            case EventConstants.ECAL_PULSE_INTEGRAL_MODE:
+                rawCalorimeterHits = event.get(RawCalorimeterHit.class, hitCollectionName);
+                meta = event.getMetaData(rawCalorimeterHits);
+                writeIntegralHits(meta, rawCalorimeterHits, builder);
+                break;
+            default:
+                break;
+        }
+    }
+
+    private void writeIntegralHits(LCMetaData meta, List<RawCalorimeterHit> rawCalorimeterHits, EventBuilder builder) {
+        System.out.println("Writing " + rawCalorimeterHits.size() + " ECal hits in integral format");
+
+        // Make two lists containing the hits from top and bottom sections, which go into separate EVIO data banks.
+        List<RawCalorimeterHit> topHits = new ArrayList<RawCalorimeterHit>();
+        List<RawCalorimeterHit> bottomHits = new ArrayList<RawCalorimeterHit>();
+        for (RawCalorimeterHit hit : rawCalorimeterHits) {
+            Long daqID = HPSEcalConditions.physicalToDaqID(hit.getCellID());
+            int crate = HPSEcalConditions.getCrate(daqID);
+            if (crate == ECAL_BOTTOM_BANK_TAG) {
+                bottomHits.add(hit);
+            } else {
+                topHits.add(hit);
+            }
+        }
+
+        // Write the two collections for top and bottom hits to separate EVIO banks.
+        writeIntegralHitCollection(topHits, meta, ECAL_TOP_BANK_TAG, builder);
+        writeIntegralHitCollection(bottomHits, meta, ECAL_BOTTOM_BANK_TAG, builder);
+    }
+
+    private void writeIntegralHitCollection(List<RawCalorimeterHit> hits, LCMetaData meta, int bankTag, EventBuilder builder) {
+        // Get the ID decoder.
+        IDDecoder dec = meta.getIDDecoder();
+
+        // Make a hit map; allow for multiple hits in a crystal.
+        Map<Long, List<RawCalorimeterHit>> hitMap = new HashMap<Long, List<RawCalorimeterHit>>();
+        for (RawCalorimeterHit hit : hits) {
+            if (hitMap.get(hit.getCellID()) == null) {
+                hitMap.put(hit.getCellID(), new ArrayList<RawCalorimeterHit>());
+            }
+            List<RawCalorimeterHit> channelHits = hitMap.get(hit.getCellID());
+            channelHits.add(hit);
+        }
+
+        // Make map of slot number to hit IDs.
+        Map<Integer, List<Long>> slotMap = new HashMap<Integer, List<Long>>();
+        for (Long id : hitMap.keySet()) {
+            dec.setID(id);

 //			System.out.println(dec.getIDDescription());
 //			System.out.printf("ix = %d, iy = %d\n", dec.getValue("ix"), dec.getValue("iy"));

-			Long daqID = ecalIDConverter.physicalToDaqID(id);

+            Long daqID = HPSEcalConditions.physicalToDaqID(id);

 //			System.out.printf("physicalID %d, daqID %d\n", id, daqID);

-			int slot = HPSEcalDaqIDConverter.getSlot(daqID);
-			if (slotMap.get(slot) == null) {
-				slotMap.put(slot, new ArrayList<Long>());
-			}
-			List<Long> slots = slotMap.get(slot);
-			slots.add(id);
-		}
-
-		// Make a new bank for this crate.
-		EvioBank crateBank = new EvioBank(bankTag, DataType.BANK, ECAL_BANK_NUMBER);
-
-		// Loop over the slots in the map.
-		for (int slot : slotMap.keySet()) {
-
-			// New bank for this slot.
-			EvioBank slotBank = new EvioBank(ECAL_PULSE_INTEGRAL_BANK_TAG, DataType.COMPOSITE, slot);
-
-			// Create composite data for this slot and its channels.
-			CompositeData.Data data = new CompositeData.Data();
-			data.addUchar((byte) slot); // slot #
-			data.addUint(0); // trigger #
-			data.addUlong(0); // timestamp    		
-			List<Long> hitIDs = slotMap.get(slot);
-			int nhits = hitIDs.size();
-			data.addN(nhits); // number of channels
-			for (Long id : hitIDs) {
-				dec.setID(id);
-				int channel = HPSEcalDaqIDConverter.getChannel(ecalIDConverter.physicalToDaqID(id));
-				data.addUchar((byte) channel); // channel #
-				List<RawCalorimeterHit> channelHits = hitMap.get(id);
-				data.addN(channelHits.size()); // number of pulses
-				for (RawCalorimeterHit hit : channelHits) {
-					data.addUshort((short) hit.getTimeStamp()); // pulse time
-					data.addUint((int) hit.getAmplitude()); // pulse integral
-				}
-			}
-
-			// Add CompositeData to bank.
-			CompositeData cdata = null;
-			try {
-				cdata = new CompositeData(ECAL_PULSE_INTEGRAL_FORMAT, 1, data, ECAL_PULSE_INTEGRAL_BANK_TAG, slot);
-				slotBank.appendCompositeData(cdata);
-			} catch (EvioException e) {
-				throw new RuntimeException(e);
-			}
-
-			// Add slot bank to crate bank.
-			slotBank.setAllHeaderLengths();
-			try {
-				builder.addChild(crateBank, slotBank);
-			} catch (EvioException e) {
-				throw new RuntimeException(e);
-			}
-		}
-		try {
-			crateBank.setAllHeaderLengths();
-			builder.addChild(builder.getEvent(), crateBank);
-		} catch (EvioException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	private void writePulseHits(LCMetaData meta, List<RawTrackerHit> rawCalorimeterHits, EventBuilder builder) {
-		System.out.println("Writing " + rawCalorimeterHits.size() + " ECal hits in pulse format");
-
-		// Make two lists containing the hits from top and bottom sections, which go into separate EVIO data banks.
-		List<RawTrackerHit> topHits = new ArrayList<RawTrackerHit>();
-		List<RawTrackerHit> bottomHits = new ArrayList<RawTrackerHit>();
-		for (RawTrackerHit hit : rawCalorimeterHits) {
-			Long daqID = ecalIDConverter.physicalToDaqID(hit.getCellID());
-			int crate = HPSEcalDaqIDConverter.getCrate(daqID);
-			if (crate == ECAL_BOTTOM_BANK_TAG) {
-				bottomHits.add(hit);
-			} else {
-				topHits.add(hit);
-			}
-		}
-
-		// Write the two collections for top and bottom hits to separate EVIO banks.
-		writePulseHitCollection(topHits, meta, ECAL_TOP_BANK_TAG, builder);
-		writePulseHitCollection(bottomHits, meta, ECAL_BOTTOM_BANK_TAG, builder);
-	}
-
-	private void writePulseHitCollection(List<RawTrackerHit> hits, LCMetaData meta, int bankTag, EventBuilder builder) {
-		// Get the ID decoder.
-		IDDecoder dec = meta.getIDDecoder();
-
-		// Make a hit map; allow for multiple hits in a crystal.
-		Map<Long, List<RawTrackerHit>> hitMap = new HashMap<Long, List<RawTrackerHit>>();
-		for (RawTrackerHit hit : hits) {
-			if (hitMap.get(hit.getCellID()) == null) {
-				hitMap.put(hit.getCellID(), new ArrayList<RawTrackerHit>());
-			}
-			List<RawTrackerHit> channelHits = hitMap.get(hit.getCellID());
-			channelHits.add(hit);
-		}
-
-		// Make map of slot number to hit IDs.
-		Map<Integer, List<Long>> slotMap = new HashMap<Integer, List<Long>>();
-		for (Long id : hitMap.keySet()) {
-			dec.setID(id);

+            int slot = HPSEcalConditions.getSlot(daqID);
+            if (slotMap.get(slot) == null) {
+                slotMap.put(slot, new ArrayList<Long>());
+            }
+            List<Long> slots = slotMap.get(slot);
+            slots.add(id);
+        }
+
+        // Make a new bank for this crate.
+        EvioBank crateBank = new EvioBank(bankTag, DataType.BANK, ECAL_BANK_NUMBER);
+
+        // Loop over the slots in the map.
+        for (int slot : slotMap.keySet()) {
+
+            // New bank for this slot.
+            EvioBank slotBank = new EvioBank(ECAL_PULSE_INTEGRAL_BANK_TAG, DataType.COMPOSITE, slot);
+
+            // Create composite data for this slot and its channels.
+            CompositeData.Data data = new CompositeData.Data();
+            data.addUchar((byte) slot); // slot #
+            data.addUint(0); // trigger #
+            data.addUlong(0); // timestamp    		
+            List<Long> hitIDs = slotMap.get(slot);
+            int nhits = hitIDs.size();
+            data.addN(nhits); // number of channels
+            for (Long id : hitIDs) {
+                dec.setID(id);
+                int channel = HPSEcalConditions.getChannel(HPSEcalConditions.physicalToDaqID(id));
+                data.addUchar((byte) channel); // channel #
+                List<RawCalorimeterHit> channelHits = hitMap.get(id);
+                data.addN(channelHits.size()); // number of pulses
+                for (RawCalorimeterHit hit : channelHits) {
+                    data.addUshort((short) hit.getTimeStamp()); // pulse time
+                    data.addUint((int) hit.getAmplitude()); // pulse integral
+                }
+            }
+
+            // Add CompositeData to bank.
+            CompositeData cdata = null;
+            try {
+                cdata = new CompositeData(ECAL_PULSE_INTEGRAL_FORMAT, 1, data, ECAL_PULSE_INTEGRAL_BANK_TAG, slot);
+                slotBank.appendCompositeData(cdata);
+            } catch (EvioException e) {
+                throw new RuntimeException(e);
+            }
+
+            // Add slot bank to crate bank.
+            slotBank.setAllHeaderLengths();
+            try {
+                builder.addChild(crateBank, slotBank);
+            } catch (EvioException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        try {
+            crateBank.setAllHeaderLengths();
+            builder.addChild(builder.getEvent(), crateBank);
+        } catch (EvioException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void writePulseHits(LCMetaData meta, List<RawTrackerHit> rawCalorimeterHits, EventBuilder builder) {
+        System.out.println("Writing " + rawCalorimeterHits.size() + " ECal hits in pulse format");
+
+        // Make two lists containing the hits from top and bottom sections, which go into separate EVIO data banks.
+        List<RawTrackerHit> topHits = new ArrayList<RawTrackerHit>();
+        List<RawTrackerHit> bottomHits = new ArrayList<RawTrackerHit>();
+        for (RawTrackerHit hit : rawCalorimeterHits) {
+            Long daqID = HPSEcalConditions.physicalToDaqID(hit.getCellID());
+            int crate = HPSEcalConditions.getCrate(daqID);
+            if (crate == ECAL_BOTTOM_BANK_TAG) {
+                bottomHits.add(hit);
+            } else {
+                topHits.add(hit);
+            }
+        }
+
+        // Write the two collections for top and bottom hits to separate EVIO banks.
+        writePulseHitCollection(topHits, meta, ECAL_TOP_BANK_TAG, builder);
+        writePulseHitCollection(bottomHits, meta, ECAL_BOTTOM_BANK_TAG, builder);
+    }
+
+    private void writePulseHitCollection(List<RawTrackerHit> hits, LCMetaData meta, int bankTag, EventBuilder builder) {
+        // Get the ID decoder.
+        IDDecoder dec = meta.getIDDecoder();
+
+        // Make a hit map; allow for multiple hits in a crystal.
+        Map<Long, List<RawTrackerHit>> hitMap = new HashMap<Long, List<RawTrackerHit>>();
+        for (RawTrackerHit hit : hits) {
+            if (hitMap.get(hit.getCellID()) == null) {
+                hitMap.put(hit.getCellID(), new ArrayList<RawTrackerHit>());
+            }
+            List<RawTrackerHit> channelHits = hitMap.get(hit.getCellID());
+            channelHits.add(hit);
+        }
+
+        // Make map of slot number to hit IDs.
+        Map<Integer, List<Long>> slotMap = new HashMap<Integer, List<Long>>();
+        for (Long id : hitMap.keySet()) {
+            dec.setID(id);

 //			System.out.println(dec.getIDDescription());
 //			System.out.printf("ix = %d, iy = %d\n", dec.getValue("ix"), dec.getValue("iy"));

-			Long daqID = ecalIDConverter.physicalToDaqID(id);

+            Long daqID = HPSEcalConditions.physicalToDaqID(id);

 //			System.out.printf("physicalID %d, daqID %d\n", id, daqID);

-			int slot = HPSEcalDaqIDConverter.getSlot(daqID);
-			if (slotMap.get(slot) == null) {
-				slotMap.put(slot, new ArrayList<Long>());
-			}
-			List<Long> slots = slotMap.get(slot);
-			slots.add(id);
-		}
-
-		// Make a new bank for this crate.
-		EvioBank crateBank = new EvioBank(bankTag, DataType.BANK, ECAL_BANK_NUMBER);
-
-		// Loop over the slots in the map.
-		for (int slot : slotMap.keySet()) {
-
-			// New bank for this slot.
-			EvioBank slotBank = new EvioBank(EventConstants.ECAL_PULSE_BANK_TAG, DataType.COMPOSITE, slot);
-
-			// Create composite data for this slot and its channels.
-			CompositeData.Data data = new CompositeData.Data();
-			data.addUchar((byte) slot); // slot #
-			data.addUint(0); // trigger #
-			data.addUlong(0); // timestamp    		
-			List<Long> hitIDs = slotMap.get(slot);
-			int nhits = hitIDs.size();
-			data.addN(nhits); // number of channels
-			for (Long id : hitIDs) {
-				dec.setID(id);
-				int channel = HPSEcalDaqIDConverter.getChannel(ecalIDConverter.physicalToDaqID(id));
-				data.addUchar((byte) channel); // channel #
-				List<RawTrackerHit> channelHits = hitMap.get(id);
-				data.addN(channelHits.size()); // number of pulses
-				for (RawTrackerHit hit : channelHits) {
-					data.addUchar((byte) channelHits.indexOf(hit)); // pulse number
-					data.addN(hit.getADCValues().length); // number of samples
-					for (short val : hit.getADCValues()) {
-						data.addUshort(val); // sample
-					}
-				}
-			}
-
-			// Add CompositeData to bank.
-			CompositeData cdata = null;
-			try {
-				cdata = new CompositeData(EventConstants.ECAL_PULSE_FORMAT, 1, data, EventConstants.ECAL_PULSE_BANK_TAG, slot);
-				slotBank.appendCompositeData(cdata);
-			} catch (EvioException e) {
-				throw new RuntimeException(e);
-			}
-
-			// Add slot bank to crate bank.
-			slotBank.setAllHeaderLengths();
-			try {
-				builder.addChild(crateBank, slotBank);
-			} catch (EvioException e) {
-				throw new RuntimeException(e);
-			}
-		}
-		try {
-			crateBank.setAllHeaderLengths();
-			builder.addChild(builder.getEvent(), crateBank);
-		} catch (EvioException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	private void writeWindowHits(LCMetaData meta, List<RawTrackerHit> rawCalorimeterHits, EventBuilder builder) {
-		System.out.println("Writing " + rawCalorimeterHits.size() + " ECal hits in window format");
-
-		// Make two lists containing the hits from top and bottom sections, which go into separate EVIO data banks.
-		List<RawTrackerHit> topHits = new ArrayList<RawTrackerHit>();
-		List<RawTrackerHit> bottomHits = new ArrayList<RawTrackerHit>();
-		for (RawTrackerHit hit : rawCalorimeterHits) {
-			Long daqID = ecalIDConverter.physicalToDaqID(hit.getCellID());
-			int crate = HPSEcalDaqIDConverter.getCrate(daqID);
-			if (crate == ECAL_BOTTOM_BANK_TAG) {
-				bottomHits.add(hit);
-			} else {
-				topHits.add(hit);
-			}
-		}
-
-		// Write the two collections for top and bottom hits to separate EVIO banks.
-		writeWindowHitCollection(topHits, meta, ECAL_TOP_BANK_TAG, builder);
-		writeWindowHitCollection(bottomHits, meta, ECAL_BOTTOM_BANK_TAG, builder);
-	}
-
-	private void writeWindowHitCollection(List<RawTrackerHit> hits, LCMetaData meta, int bankTag, EventBuilder builder) {
-		// Get the ID decoder.
-		IDDecoder dec = meta.getIDDecoder();
-
-		// Make a hit map; allow for multiple hits in a crystal.
-		Map<Long, RawTrackerHit> hitMap = new HashMap<Long, RawTrackerHit>();
-		for (RawTrackerHit hit : hits) {
-			hitMap.put(hit.getCellID(), hit);
-		}
-
-		// Make map of slot number to hit IDs.
-		Map<Integer, List<Long>> slotMap = new HashMap<Integer, List<Long>>();
-		for (Long id : hitMap.keySet()) {
-			dec.setID(id);

+            int slot = HPSEcalConditions.getSlot(daqID);
+            if (slotMap.get(slot) == null) {
+                slotMap.put(slot, new ArrayList<Long>());
+            }
+            List<Long> slots = slotMap.get(slot);
+            slots.add(id);
+        }
+
+        // Make a new bank for this crate.
+        EvioBank crateBank = new EvioBank(bankTag, DataType.BANK, ECAL_BANK_NUMBER);
+
+        // Loop over the slots in the map.
+        for (int slot : slotMap.keySet()) {
+
+            // New bank for this slot.
+            EvioBank slotBank = new EvioBank(EventConstants.ECAL_PULSE_BANK_TAG, DataType.COMPOSITE, slot);
+
+            // Create composite data for this slot and its channels.
+            CompositeData.Data data = new CompositeData.Data();
+            data.addUchar((byte) slot); // slot #
+            data.addUint(0); // trigger #
+            data.addUlong(0); // timestamp    		
+            List<Long> hitIDs = slotMap.get(slot);
+            int nhits = hitIDs.size();
+            data.addN(nhits); // number of channels
+            for (Long id : hitIDs) {
+                dec.setID(id);
+                int channel = HPSEcalConditions.getChannel(HPSEcalConditions.physicalToDaqID(id));
+                data.addUchar((byte) channel); // channel #
+                List<RawTrackerHit> channelHits = hitMap.get(id);
+                data.addN(channelHits.size()); // number of pulses
+                for (RawTrackerHit hit : channelHits) {
+                    data.addUchar((byte) channelHits.indexOf(hit)); // pulse number
+                    data.addN(hit.getADCValues().length); // number of samples
+                    for (short val : hit.getADCValues()) {
+                        data.addUshort(val); // sample
+                    }
+                }
+            }
+
+            // Add CompositeData to bank.
+            CompositeData cdata = null;
+            try {
+                cdata = new CompositeData(EventConstants.ECAL_PULSE_FORMAT, 1, data, EventConstants.ECAL_PULSE_BANK_TAG, slot);
+                slotBank.appendCompositeData(cdata);
+            } catch (EvioException e) {
+                throw new RuntimeException(e);
+            }
+
+            // Add slot bank to crate bank.
+            slotBank.setAllHeaderLengths();
+            try {
+                builder.addChild(crateBank, slotBank);
+            } catch (EvioException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        try {
+            crateBank.setAllHeaderLengths();
+            builder.addChild(builder.getEvent(), crateBank);
+        } catch (EvioException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void writeWindowHits(LCMetaData meta, List<RawTrackerHit> rawCalorimeterHits, EventBuilder builder) {
+        System.out.println("Writing " + rawCalorimeterHits.size() + " ECal hits in window format");
+
+        // Make two lists containing the hits from top and bottom sections, which go into separate EVIO data banks.
+        List<RawTrackerHit> topHits = new ArrayList<RawTrackerHit>();
+        List<RawTrackerHit> bottomHits = new ArrayList<RawTrackerHit>();
+        for (RawTrackerHit hit : rawCalorimeterHits) {
+            Long daqID = HPSEcalConditions.physicalToDaqID(hit.getCellID());
+            int crate = HPSEcalConditions.getCrate(daqID);
+            if (crate == ECAL_BOTTOM_BANK_TAG) {
+                bottomHits.add(hit);
+            } else {
+                topHits.add(hit);
+            }
+        }
+
+        // Write the two collections for top and bottom hits to separate EVIO banks.
+        writeWindowHitCollection(topHits, meta, ECAL_TOP_BANK_TAG, builder);
+        writeWindowHitCollection(bottomHits, meta, ECAL_BOTTOM_BANK_TAG, builder);
+    }
+
+    private void writeWindowHitCollection(List<RawTrackerHit> hits, LCMetaData meta, int bankTag, EventBuilder builder) {
+        // Get the ID decoder.
+        IDDecoder dec = meta.getIDDecoder();
+
+        // Make a hit map; allow for multiple hits in a crystal.
+        Map<Long, RawTrackerHit> hitMap = new HashMap<Long, RawTrackerHit>();
+        for (RawTrackerHit hit : hits) {
+            hitMap.put(hit.getCellID(), hit);
+        }
+
+        // Make map of slot number to hit IDs.
+        Map<Integer, List<Long>> slotMap = new HashMap<Integer, List<Long>>();
+        for (Long id : hitMap.keySet()) {
+            dec.setID(id);

 //			System.out.println(dec.getIDDescription());
 //			System.out.printf("ix = %d, iy = %d\n", dec.getValue("ix"), dec.getValue("iy"));

-			Long daqID = ecalIDConverter.physicalToDaqID(id);

+            Long daqID = HPSEcalConditions.physicalToDaqID(id);

 //			System.out.printf("physicalID %d, daqID %d\n", id, daqID);

-			int slot = HPSEcalDaqIDConverter.getSlot(daqID);
-			if (slotMap.get(slot) == null) {
-				slotMap.put(slot, new ArrayList<Long>());
-			}
-			List<Long> slots = slotMap.get(slot);
-			slots.add(id);
-		}
-
-		// Make a new bank for this crate.
-		EvioBank crateBank = new EvioBank(bankTag, DataType.BANK, ECAL_BANK_NUMBER);
-
-		// Loop over the slots in the map.
-		for (int slot : slotMap.keySet()) {
-
-			// New bank for this slot.
-			EvioBank slotBank = new EvioBank(EventConstants.ECAL_WINDOW_BANK_TAG, DataType.COMPOSITE, slot);
-
-			// Create composite data for this slot and its channels.
-			CompositeData.Data data = new CompositeData.Data();
-			data.addUchar((byte) slot); // slot #
-			data.addUint(0); // trigger #
-			data.addUlong(0); // timestamp    		
-			List<Long> hitIDs = slotMap.get(slot);
-			int nhits = hitIDs.size();
-			data.addN(nhits); // number of channels
-			for (Long id : hitIDs) {
-				dec.setID(id);
-				int channel = HPSEcalDaqIDConverter.getChannel(ecalIDConverter.physicalToDaqID(id));
-				data.addUchar((byte) channel); // channel #
-				RawTrackerHit hit = hitMap.get(id);
-				data.addN(hit.getADCValues().length); // number of samples
-				for (short val : hit.getADCValues()) {
-					data.addUshort(val); // sample
-				}
-			}
-
-			// Add CompositeData to bank.
-			CompositeData cdata = null;
-			try {
-				cdata = new CompositeData(EventConstants.ECAL_WINDOW_FORMAT, 1, data, EventConstants.ECAL_WINDOW_BANK_TAG, slot);
-				slotBank.appendCompositeData(cdata);
-			} catch (EvioException e) {
-				throw new RuntimeException(e);
-			}
-
-			// Add slot bank to crate bank.
-			slotBank.setAllHeaderLengths();
-			try {
-				builder.addChild(crateBank, slotBank);
-			} catch (EvioException e) {
-				throw new RuntimeException(e);
-			}
-		}
-		try {
-			crateBank.setAllHeaderLengths();
-			builder.addChild(builder.getEvent(), crateBank);
-		} catch (EvioException e) {
-			throw new RuntimeException(e);
-		}
-	}

+            int slot = HPSEcalConditions.getSlot(daqID);
+            if (slotMap.get(slot) == null) {
+                slotMap.put(slot, new ArrayList<Long>());
+            }
+            List<Long> slots = slotMap.get(slot);
+            slots.add(id);
+        }
+
+        // Make a new bank for this crate.
+        EvioBank crateBank = new EvioBank(bankTag, DataType.BANK, ECAL_BANK_NUMBER);
+
+        // Loop over the slots in the map.
+        for (int slot : slotMap.keySet()) {
+
+            // New bank for this slot.
+            EvioBank slotBank = new EvioBank(EventConstants.ECAL_WINDOW_BANK_TAG, DataType.COMPOSITE, slot);
+
+            // Create composite data for this slot and its channels.
+            CompositeData.Data data = new CompositeData.Data();
+            data.addUchar((byte) slot); // slot #
+            data.addUint(0); // trigger #
+            data.addUlong(0); // timestamp    		
+            List<Long> hitIDs = slotMap.get(slot);
+            int nhits = hitIDs.size();
+            data.addN(nhits); // number of channels
+            for (Long id : hitIDs) {
+                dec.setID(id);
+                int channel = HPSEcalConditions.getChannel(HPSEcalConditions.physicalToDaqID(id));
+                data.addUchar((byte) channel); // channel #
+                RawTrackerHit hit = hitMap.get(id);
+                data.addN(hit.getADCValues().length); // number of samples
+                for (short val : hit.getADCValues()) {
+                    data.addUshort(val); // sample
+                }
+            }
+
+            // Add CompositeData to bank.
+            CompositeData cdata = null;
+            try {
+                cdata = new CompositeData(EventConstants.ECAL_WINDOW_FORMAT, 1, data, EventConstants.ECAL_WINDOW_BANK_TAG, slot);
+                slotBank.appendCompositeData(cdata);
+            } catch (EvioException e) {
+                throw new RuntimeException(e);
+            }
+
+            // Add slot bank to crate bank.
+            slotBank.setAllHeaderLengths();
+            try {
+                builder.addChild(crateBank, slotBank);
+            } catch (EvioException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        try {
+            crateBank.setAllHeaderLengths();
+            builder.addChild(builder.getEvent(), crateBank);
+        } catch (EvioException e) {
+            throw new RuntimeException(e);
+        }
+    }

 }

diff -u -r1.7 -r1.8
--- ECalEvioReader.java	29 Apr 2012 23:05:26 -0000	1.7
+++ ECalEvioReader.java	2 May 2012 00:39:40 -0000	1.8
@@ -12,18 +12,17 @@

 import org.lcsim.event.RawTrackerHit;
 import org.lcsim.event.base.BaseRawCalorimeterHit;
 import org.lcsim.event.base.BaseRawTrackerHit;

-import org.lcsim.hps.recon.ecal.HPSEcalDaqIDConverter;

+import org.lcsim.hps.recon.ecal.HPSEcalConditions;

 
 /**
  *
  * @author Sho Uemura <[log in to unmask]>

- * @version $Id: ECalEvioReader.java,v 1.7 2012/04/29 23:05:26 meeg Exp $

+ * @version $Id: ECalEvioReader.java,v 1.8 2012/05/02 00:39:40 meeg Exp $

  */
 public class ECalEvioReader extends EvioReader {
     // Names of subdetectors.
 
     private String ecalName = "Ecal";

-    private HPSEcalDaqIDConverter ecalIDConverter = null;

     private int bankTag = EventConstants.ECAL_PULSE_INTEGRAL_BANK_TAG;
     private Class hitClass = RawCalorimeterHit.class;
 

@@ -33,15 +32,13 @@

 
     public void setEcalName(String ecalName) {
         this.ecalName = ecalName;

-        ecalIDConverter = null;

     }
 
     @Override
     public boolean makeHits(EvioEvent event, EventHeader lcsimEvent) {
         boolean foundHits = false;

-        if (ecalIDConverter == null) {
-            ecalIDConverter = new HPSEcalDaqIDConverter();
-            ecalIDConverter.fillDaqCellMap(lcsimEvent.getDetector().getSubdetector(ecalName));

+        if (!HPSEcalConditions.mapLoaded()) {
+            HPSEcalConditions.fillDaqCellMap(lcsimEvent.getDetector().getSubdetector(ecalName));

         }
         List<Object> hits = new ArrayList<Object>();
         hitClass = Object.class;

@@ -56,31 +53,33 @@

                     }
                     for (BaseStructure slotBank : bank.getChildren()) {
                         CompositeData cdata = null;

-                        try {
-                            cdata = slotBank.getCompositeData();
-                        } catch (EvioException e) {
-                            throw new RuntimeException(e);
-                        }
-                        if (slotBank.getHeader().getTag() != bankTag) {
-                            bankTag = slotBank.getHeader().getTag();
-                            System.out.printf("ECal format tag: 0x%x\n", bankTag);
-                        }
-                        switch (slotBank.getHeader().getTag()) {
-                            case EventConstants.ECAL_WINDOW_BANK_TAG:
-                                hits.addAll(makeWindowHits(cdata, crateBankTag));
-                                hitClass = RawTrackerHit.class;
-                                break;
-                            case EventConstants.ECAL_PULSE_BANK_TAG:
-                                hits.addAll(makePulseHits(cdata, crateBankTag));
-                                hitClass = RawTrackerHit.class;
-                                break;
-                            case EventConstants.ECAL_PULSE_INTEGRAL_BANK_TAG:
-                                hits.addAll(makeIntegralHits(cdata, crateBankTag));
-                                hitClass = RawCalorimeterHit.class;
-                                break;
-                            default:
-                                throw new RuntimeException("Unsupported ECal format - bank tag " + slotBank.getHeader().getTag());

+                        while (true) {
+                            try {
+                                cdata = slotBank.getCompositeData();
+                            } catch (EvioException e) {
+                                throw new RuntimeException(e);
+                            }
+                            if (slotBank.getHeader().getTag() != bankTag) {
+                                bankTag = slotBank.getHeader().getTag();
+                                System.out.printf("ECal format tag: 0x%x\n", bankTag);
+                            }
+                            switch (slotBank.getHeader().getTag()) {
+                                case EventConstants.ECAL_WINDOW_BANK_TAG:
+                                    hits.addAll(makeWindowHits(cdata, crateBankTag));
+                                    hitClass = RawTrackerHit.class;
+                                    break;
+                                case EventConstants.ECAL_PULSE_BANK_TAG:
+                                    hits.addAll(makePulseHits(cdata, crateBankTag));
+                                    hitClass = RawTrackerHit.class;
+                                    break;
+                                case EventConstants.ECAL_PULSE_INTEGRAL_BANK_TAG:
+                                    hits.addAll(makeIntegralHits(cdata, crateBankTag));
+                                    hitClass = RawCalorimeterHit.class;
+                                    break;
+                                default:
+                                    throw new RuntimeException("Unsupported ECal format - bank tag " + slotBank.getHeader().getTag());

+                            }

                         }
                     }
                 }

@@ -118,8 +117,8 @@

             if (debug) {
                 System.out.println("  channel=" + channel + "; nSamples=" + nSamples);
             }

-            long daqID = HPSEcalDaqIDConverter.getDaqID(crate, slot, channel);
-            Long id = ecalIDConverter.daqToPhysicalID(daqID);

+            long daqID = HPSEcalConditions.getDaqID(crate, slot, channel);
+            Long id = HPSEcalConditions.daqToPhysicalID(daqID);

 
             short[] adcValues = new short[nSamples];
             for (int i = 0; i < nSamples; i++) {

@@ -160,8 +159,8 @@

             if (debug) {
                 System.out.println("  channel=" + channel + "; npulses=" + npulses);
             }

-            long daqID = HPSEcalDaqIDConverter.getDaqID(crate, slot, channel);
-            Long id = ecalIDConverter.daqToPhysicalID(daqID);

+            long daqID = HPSEcalConditions.getDaqID(crate, slot, channel);
+            Long id = HPSEcalConditions.daqToPhysicalID(daqID);

 
             for (int k = 0; k < npulses; k++) {
                 short pulseNum = cdata.getByte();

@@ -206,8 +205,8 @@

             if (debug) {
                 System.out.println("  channel=" + channel + "; npulses=" + npulses);
             }

-            long daqID = HPSEcalDaqIDConverter.getDaqID(crate, slot, channel);
-            Long id = ecalIDConverter.daqToPhysicalID(daqID);

+            long daqID = HPSEcalConditions.getDaqID(crate, slot, channel);
+            Long id = HPSEcalConditions.daqToPhysicalID(daqID);

 
             for (int k = 0; k < npulses; k++) {
                 short pulseTime = cdata.getShort();