diff -u -r1.2 -r1.3
--- SVTDataToRawTrackerHitDriver.java	10 Apr 2012 23:52:15 -0000	1.2
+++ SVTDataToRawTrackerHitDriver.java	11 Apr 2012 23:57:12 -0000	1.3
@@ -12,74 +12,77 @@

 import org.lcsim.util.lcio.LCIOUtil;
 
 public class SVTDataToRawTrackerHitDriver extends Driver {

-	

+

 	String svtDataCollectionName = "SVTData";
 	String rawTrackerHitOutputCollectionName = "SVTRawTrackerHits";

-	
-	public SVTDataToRawTrackerHitDriver() {}
-	

+
+	public SVTDataToRawTrackerHitDriver() {
+	}
+

 	public void setSvtDataCollectionName(String svtDataCollectionName) {
 		this.svtDataCollectionName = svtDataCollectionName;
 	}

-	

+

 	public void setRawTrackerHitOutputCollectionName(String rawTrackerHitOutputCollectionName) {
 		this.rawTrackerHitOutputCollectionName = rawTrackerHitOutputCollectionName;
 	}

-	

+

 	public void process(EventHeader event) {
 		if (!event.hasCollection(HPSSVTData.class, svtDataCollectionName)) {
 			System.out.println(svtDataCollectionName + " does not exist; skipping event");
 			return;
 		}
 		List<HPSSVTData> svtDataCollection = event.get(HPSSVTData.class, svtDataCollectionName);

-		if (svtDataCollection.size() == 0) {

+		if (svtDataCollection.isEmpty()) {

 			System.out.println(svtDataCollectionName + " is empty; skipping event");
 			return;
 		}

-		

+

 		List<RawTrackerHit> hits = new ArrayList<RawTrackerHit>();
 		for (HPSSVTData svtData : svtDataCollection) {
 			Pair<Integer, Integer> daqPair = new Pair<Integer, Integer>(svtData.getHybridNumber(), svtData.getFPGAAddress());
 			SiSensor sensor = HPSSVTDAQMaps.daqPairToSensor.get(daqPair);

-			
-			// Get the channel 
-			int channelNumber = svtData.getChannelNumber()*svtData.getAPVNumber() + svtData.getChannelNumber();

+
+			// Get the channel  - hardcoded the number of channels per APV, but that should be okay
+			int channelNumber = 128 * svtData.getAPVNumber() + svtData.getChannelNumber();
+			if (channelNumber < 0 || channelNumber > 638) {
+				System.out.printf("unexpected channel %d: APV %d, channel %d\n", channelNumber, svtData.getAPVNumber(), svtData.getChannelNumber());
+			}

 			//int channelNumber = svtData.getChannelNumber()*svtData.getAPVNumber();

-			

+

 			short[] data = new short[6];

-			for(int index = 0; index < 6; index++){
-				data[index] = (short)svtData.getSample(index);

+			for (int index = 0; index < 6; index++) {
+				data[index] = (short) svtData.getSample(index);

 			}

-			

+

 			// No time yet
 			int time = 0;

-			long cell_id = sensor.makeStripId(channelNumber, 1 ).getValue();
-			

+			long cell_id = sensor.makeStripId(channelNumber, 1).getValue();
+

 			RawTrackerHit rawHit = new BaseRawTrackerHit(time, cell_id, data, null, sensor);

-			
-			hits.add(rawHit);			

+
+			hits.add(rawHit);

 		}

-		

+

 		System.out.println(this.getClass().getSimpleName() + " made " + hits.size() + " RawTrackerHits");

-		

+

 		int flag = LCIOUtil.bitSet(0, 31, true); // Turn on 64-bit cell ID.
 		event.put(rawTrackerHitOutputCollectionName, hits, RawTrackerHit.class, flag);

-	}	
-	

+	}

 	/*

-	 private RawTrackerHit makeRawTrackerHit( Integer channelNumber, SiSensor sensor, short[] adcValues)
-    {
-        IReadout ro = sensor.getReadout();
-        
-        // No time yet
-        int time = 0;
-        long cell_id = sensor.makeStripId(channelNumber, 1).getValue();
-        
-        RawTrackerHit rawHit = new BaseRawTrackerHit(time, cell_id, adcValues, new ArrayList<SimTrackerHit>(), sensor);
-
-        ro.addHit(rawHit);
-        
-        return rawHit;
-    }

+	private RawTrackerHit makeRawTrackerHit( Integer channelNumber, SiSensor sensor, short[] adcValues)
+	{
+	IReadout ro = sensor.getReadout();
+	
+	// No time yet
+	int time = 0;
+	long cell_id = sensor.makeStripId(channelNumber, 1).getValue();
+	
+	RawTrackerHit rawHit = new BaseRawTrackerHit(time, cell_id, adcValues, new ArrayList<SimTrackerHit>(), sensor);
+	
+	ro.addHit(rawHit);
+	
+	return rawHit;
+	}

 	 */
 }