@@ -220,12 +220,14 @@ private void fitPulses(DetectorDataDgtz data, IndexedTable cfg) {
             if (adc.getPulseSize() > 0) {
                 try {
                     ExtendedFADCFitter[] hits = extendedFitter.multiFit(nsa, nsb, tet, ped, adc.getPulseArray());
+                    // the first hit is treated conventionally:
                     adc.setADC(nsa, nsb);
                     adc.setIntegral(hits[0].adc + hits[0].ped*(nsa+nsb));
                     adc.setHeight((short) hits[0].pulsePeakValue);
                     adc.setTimeWord(hits[0].t0);
                     adc.setPedestal((short) hits[0].ped);
-                    for (int j = 0; j < hits.length; j++) {
+                    // and extra hits get a new object here:
+                    for (int j = 1; j < hits.length; j++) {
                         ADCData a = new ADCData();
                         a.setADC(nsa, nsb);
                         a.setOrder(adc.getOrder());
@@ -236,6 +238,7 @@ private void fitPulses(DetectorDataDgtz data, IndexedTable cfg) {
                         data.addADC(a);
                     }
                 } catch (Exception e) {
+                    e.printStackTrace();
                     System.err.println(">>>> error : fitting pulse "+dd.getCrate()+
                         " / "+dd.getSlot()+" / "+dd.getChannel());
                 }
 
@@ -167,37 +167,44 @@ public ExtendedFADCFitter[] multiFit(int nsa, int nsb, int tet, int pedr, short[
 
         List<ExtendedFADCFitter> hits = new ArrayList<>();
 
-        // start with our conventional pulse fitting:
+        // initialize with our conventional pulse fitting:
         fit(nsa, nsb, tet, pedr, pulse);
         hits.add(this);
 
         // and look for more later pulses:
         if (pulsePeakPosition > 0) {
+
+            // start at the first pulse's maximum and look forward:
             boolean belowThreshold = false;
-            for (int bin=pulsePeakPosition+1; bin<pulse.length; bin++) {
+            for (int crossBin=pulsePeakPosition+1; crossBin<pulse.length; crossBin++) {
 
                 // mark that we went below theshold:
-                if (pulse[bin] <= ped+tet) belowThreshold = true;
+                if (pulse[crossBin] <= ped+tet) belowThreshold = true;
 
-                // we crossed theshold again, find the next hit:
+                // we went below and above theshold again:
                 else if (belowThreshold) {
 
                     belowThreshold = false;
 
-                    // search for the maximum:
-                    for (int maxBin = bin; maxBin<pulse.length; maxBin++) {
-                        // found the next hit's maximum:
+                    // find the maximum:
+                    for (int maxBin = crossBin; maxBin<pulse.length; maxBin++) {
                         if (pulse[maxBin] < pulse[maxBin-1]) {
 
                             // make a new hit:
                             ExtendedFADCFitter f = new ExtendedFADCFitter();
-                            f.thresholdCrossing = bin;
+                            f.ped = ped;
+                            f.thresholdCrossing = crossBin;
                             f.pulsePeakPosition = maxBin-1;
                             f.pulsePeakValue = pulse[maxBin-1];
 
+                            // define its energy:
+                            final int eLimit = Math.min(pulse.length, crossBin + nsa);
+                            for (int eBin = Math.max(crossBin-nsb,0); eBin < eLimit; eBin++)
+                                f.adc += pulse[eBin] - f.ped;
+
                             // find the half-max crossing upwards:
                             final double halfMax = (pulse[maxBin-1] + baseline)/2;
-                            for (int halfBinUp = bin+1; halfBinUp < maxBin; halfBinUp++) {
+                            for (int halfBinUp = crossBin+1; halfBinUp < maxBin; halfBinUp++) {
                                 if (pulse[halfBinUp] <= halfMax && pulse[halfBinUp+1] > halfMax) {
 
                                     // define timing:
@@ -220,8 +227,9 @@ else if (belowThreshold) {
 
                             // add the new hit we just made:
                             hits.add(f);
+
                             // move search bin forward:
-                            bin = f.pulsePeakPosition;
+                            crossBin = f.pulsePeakPosition;
                             break;
                         }
                     }