lcsim/test/org/lcsim/detector/driver

diff -u -r1.1 -r1.2
--- TrackerDigitizationDriverTest.java	14 Oct 2007 06:15:46 -0000	1.1
+++ TrackerDigitizationDriverTest.java	31 Oct 2007 23:24:46 -0000	1.2
@@ -105,15 +105,13 @@

                                 {
                                     
                                     SortedMap<Integer,Integer> digitized_hits = kpix.readout(si_simulation.getReadoutData(carrier).getChargeMap(),sensor.getReadoutElectrodes(carrier));

-                                    SiElectrodeDataCollection digitized_data = new SiElectrodeDataCollection(si_simulation.getReadoutData(carrier));
-                                    digitized_data.putChargeMap(digitized_hits);

                                     
                                     // Create RawTrackerHits

-                                    for (Integer readout_cell : si_simulation.getReadoutData(carrier).getChargeMap().keySet())

+				    for (Integer readout_cell : digitized_hits.keySet())

                                     {
                                         int time = 0;
                                         long cell_id = sensor.makeStripId(readout_cell,carrier.charge()).getValue();

-                                        short[] adc_values = {(short)digitized_data.get(readout_cell).getCharge()};

+					short[] adc_values = { ((Integer)digitized_hits.get(readout_cell)).shortValue() };

                                         List<SimTrackerHit> simulated_hits = si_simulation.getReadoutData(carrier).get(readout_cell).getSimulatedHits();
                                         IDetectorElement detector_element = sensor;