diff -u -r1.6 -r1.7
--- ECalEvioWriter.java	12 May 2012 23:09:05 -0000	1.6
+++ ECalEvioWriter.java	31 May 2012 00:28:18 -0000	1.7
@@ -25,21 +25,16 @@

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

- * @version $Id: ECalEvioWriter.java,v 1.6 2012/05/12 23:09:05 meeg Exp $

+ * @version $Id: ECalEvioWriter.java,v 1.7 2012/05/31 00:28:18 meeg Exp $

  */
 public class ECalEvioWriter implements EvioWriter {
 
     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;
     }

@@ -67,9 +62,6 @@

 
     @Override
     public void writeData(EventHeader event, EventBuilder builder) {

-        if (!HPSEcalConditions.mapLoaded()) {
-            HPSEcalConditions.subdetectorChanged(event.getDetector().getSubdetector(ecalName));
-        }

         LCMetaData meta;
         List<RawCalorimeterHit> rawCalorimeterHits;
         List<RawTrackerHit> rawTrackerHits;

diff -u -r1.19 -r1.20
--- ECalEvioReader.java	29 May 2012 22:25:10 -0000	1.19
+++ ECalEvioReader.java	31 May 2012 00:28:18 -0000	1.20
@@ -9,13 +9,12 @@

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

-import org.lcsim.geometry.Detector;

 import org.lcsim.hps.recon.ecal.HPSEcalConditions;
 
 /**
  *
  * @author Sho Uemura <[log in to unmask]>

- * @version $Id: ECalEvioReader.java,v 1.19 2012/05/29 22:25:10 meeg Exp $

+ * @version $Id: ECalEvioReader.java,v 1.20 2012/05/31 00:28:18 meeg Exp $

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

@@ -23,7 +22,6 @@

     private String ecalName = "Ecal";
     private int bankTag = EventConstants.ECAL_PULSE_INTEGRAL_BANK_TAG;
     private Class hitClass = BaseRawCalorimeterHit.class;

-    private Detector detector;

 
     public ECalEvioReader() {
         hitCollectionName = "EcalReadoutHits";

@@ -37,8 +35,7 @@

     public boolean makeHits(EvioEvent event, EventHeader lcsimEvent) {
         boolean foundHits = false;
         if (!HPSEcalConditions.mapLoaded()) {

-            detector = lcsimEvent.getDetector();
-            HPSEcalConditions.subdetectorChanged(lcsimEvent.getDetector().getSubdetector(ecalName));

+            HPSEcalConditions.detectorChanged(lcsimEvent.getDetector(), ecalName);

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

@@ -92,7 +89,7 @@

                 }
             }
         }

-        String readoutName = lcsimEvent.getDetector().getSubdetector(ecalName).getReadout().getName();

+        String readoutName = HPSEcalConditions.getSubdetector().getReadout().getName();

         lcsimEvent.put(hitCollectionName, hits, hitClass, 0, readoutName);
 //        for (Object hit : hits) {
 //            System.out.println(((RawTrackerHit) hit).getIDDecoder().getIDDescription().toString());

@@ -134,12 +131,10 @@

                     adcValues[i] = cdata.getShort();
                 }
                 if (id == null) {

-                    if (debug) {
-                        System.out.printf("Crate %d, slot %d, channel %d not found in map\n", crate, slot, channel);
-                    }
-                    continue;

+                    System.out.printf("Crate %d, slot %d, channel %d not found in map\n", crate, slot, channel);
+                } else {
+                    hits.add(new BaseRawTrackerHit(0, id, adcValues, new ArrayList<SimTrackerHit>(), HPSEcalConditions.getSubdetector().getDetectorElement().findDetectorElement(new Identifier(id)).get(0)));

                 }

-                hits.add(new BaseRawTrackerHit(0, id, adcValues, new ArrayList<SimTrackerHit>(), detector.getSubdetector(ecalName).getDetectorElement().findDetectorElement(new Identifier(id)).get(0)));

             }
         }
         return hits;

@@ -172,10 +167,6 @@

                     System.out.println("  channel=" + channel + "; npulses=" + npulses);
                 }
                 Long id = HPSEcalConditions.daqToPhysicalID(crate, slot, channel);

-                if (id == null) {
-                    System.out.printf("Crate %d, slot %d, channel %d not found in map\n", crate, slot, channel);
-                }
-

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

@@ -183,7 +174,11 @@

                     for (int i = 0; i < sampleCount; i++) {
                         adcValues[i] = cdata.getShort();
                     }

-                    hits.add(new BaseRawTrackerHit(pulseNum, id, adcValues, new ArrayList<SimTrackerHit>(), detector.getSubdetector(ecalName).getDetectorElement().findDetectorElement(new Identifier(id)).get(0)));

+                    if (id == null) {
+                        System.out.printf("Crate %d, slot %d, channel %d not found in map\n", crate, slot, channel);
+                    } else {
+                        hits.add(new BaseRawTrackerHit(pulseNum, id, adcValues, new ArrayList<SimTrackerHit>(), HPSEcalConditions.getSubdetector().getDetectorElement().findDetectorElement(new Identifier(id)).get(0)));
+                    }

                 }
             }
         }

@@ -217,9 +212,6 @@

                     System.out.println("  channel=" + channel + "; npulses=" + npulses);
                 }
                 Long id = HPSEcalConditions.daqToPhysicalID(crate, slot, channel);

-                if (id == null) {
-                    System.out.printf("Crate %d, slot %d, channel %d not found in map\n", crate, slot, channel);
-                }

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

@@ -227,7 +219,11 @@

                     if (debug) {
                         System.out.println("    pulseTime=" + pulseTime + "; pulseIntegral=" + pulseIntegral);
                     }

-                    hits.add(new BaseRawCalorimeterHit(id, pulseIntegral, pulseTime));

+                    if (id == null) {
+                        System.out.printf("Crate %d, slot %d, channel %d not found in map\n", crate, slot, channel);
+                    } else {
+                        hits.add(new BaseRawCalorimeterHit(id, pulseIntegral, pulseTime));
+                    }

                 }
             }
         }

diff -u -r1.2 -r1.3
--- HPSCalibrationDriver.java	24 May 2012 17:08:18 -0000	1.2
+++ HPSCalibrationDriver.java	31 May 2012 00:28:19 -0000	1.3
@@ -1,23 +1,17 @@

-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */

 package org.lcsim.hps.monitoring;
 
 import org.lcsim.hps.recon.ecal.HPSEcalConditions;

-import org.lcsim.hps.recon.tracking.HPSSVTDAQMaps;

 import org.lcsim.hps.recon.tracking.HPSSVTSensorSetup;
 import org.lcsim.util.Driver;
 
 /**
  *
  * @author Sho Uemura <[log in to unmask]>

- * @version $Id: HPSCalibrationDriver.java,v 1.2 2012/05/24 17:08:18 omoreno Exp $

+ * @version $Id: HPSCalibrationDriver.java,v 1.3 2012/05/31 00:28:19 meeg Exp $

  */
 public class HPSCalibrationDriver extends Driver {
     public HPSCalibrationDriver() {
         add(new HPSEcalConditions());

- //       add(new HPSSVTDAQMaps());

         add(new HPSSVTSensorSetup());
     }
 }