Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 2805)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 2806)
@@ -13,5 +13,11 @@
    * manalysis/AnalysisLinkDef.h
      - include MFFT
-     - put MCurrents.cc back into the Makefile (was only in the LinkDef)
+
+   * manalysis/MExtractedSignalCam.h
+     - removed variables fNumHiGainSamples and fNumLoGainSamples
+     - function SetNumUsedFADCSlices replaced by SetUsedFADCSlices
+
+   * manalysis/MExtractSignal.cc
+     - updated call to SetUsedFADCSlices
 
 
Index: /trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc	(revision 2805)
+++ /trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc	(revision 2806)
@@ -136,6 +136,6 @@
     fSignals->InitSize(cam->GetNumPixels());    
 
-    fSignals->SetNumUsedFADCSlices(fNumHiGainSamples, fHiGainFirst, fHiGainFirst+fNumHiGainSamples-1,
-				   fNumLoGainSamples, fLoGainFirst, fLoGainFirst+fNumLoGainSamples-1);
+    fSignals->SetUsedFADCSlices(fHiGainFirst, fHiGainFirst+fNumHiGainSamples-1,
+                                fLoGainFirst, fLoGainFirst+fNumLoGainSamples-1);
 
     return kTRUE;
Index: /trunk/MagicSoft/Mars/manalysis/MExtractedSignalCam.h
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MExtractedSignalCam.h	(revision 2805)
+++ /trunk/MagicSoft/Mars/manalysis/MExtractedSignalCam.h	(revision 2806)
@@ -13,8 +13,4 @@
 private:
     TClonesArray *fArray; // FIXME: Change TClonesArray away from a pointer?
-
-    // FIXME: Is it necessary to store this information for each event?
-    Byte_t fNumUsedHiGainFADCSlices;
-    Byte_t fNumUsedLoGainFADCSlices;
 
     Byte_t fFirstUsedSliceHiGain;
@@ -34,7 +30,7 @@
     Int_t GetSize() const;
 
-    Byte_t GetNumUsedFADCSlices()          { return fNumUsedHiGainFADCSlices; }
-    Byte_t GetNumUsedHiGainFADCSlices()    { return fNumUsedHiGainFADCSlices; }
-    Byte_t GetNumUsedLoGainFADCSlices()    { return fNumUsedLoGainFADCSlices; }
+    Byte_t GetNumUsedFADCSlices()          { return fLastUsedSliceHiGain-fFirstUsedSliceHiGain+1; }
+    Byte_t GetNumUsedHiGainFADCSlices()    { return fLastUsedSliceHiGain-fFirstUsedSliceHiGain+1; }
+    Byte_t GetNumUsedLoGainFADCSlices()    { return fLastUsedSliceLoGain-fFirstUsedSliceLoGain+1; }
 
     Byte_t GetFirstUsedSliceHiGain()       { return fFirstUsedSliceHiGain; }
@@ -44,16 +40,11 @@
     Byte_t GetLastUsedSliceLoGain()        { return fLastUsedSliceLoGain; }
 
-    void   SetNumUsedFADCSlices(Byte_t numh, Byte_t firsth, Byte_t lasth, 
-                                Byte_t numl, Byte_t firstl, Byte_t lastl)
+    void   SetUsedFADCSlices(Byte_t firsth, Byte_t lasth, 
+                       Byte_t firstl, Byte_t lastl)
     {
-        // FIXME: Calculate the number of used slices from first/last
-        //        to make sure, that the stored values are always
-        //        consistent!
-        fNumUsedHiGainFADCSlices = numh;
-        fFirstUsedSliceHiGain    = firsth;
-        fLastUsedSliceHiGain     = lasth;
-        fNumUsedLoGainFADCSlices = numl;
-        fFirstUsedSliceLoGain    = firstl;
-        fLastUsedSliceLoGain     = lastl;
+      fFirstUsedSliceHiGain    = firsth;
+      fLastUsedSliceHiGain     = lasth;
+      fFirstUsedSliceLoGain    = firstl;
+      fLastUsedSliceLoGain     = lastl;
     }
 
Index: /trunk/MagicSoft/Mars/manalysis/MPedCalcPedRun.cc
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MPedCalcPedRun.cc	(revision 2805)
+++ /trunk/MagicSoft/Mars/manalysis/MPedCalcPedRun.cc	(revision 2806)
@@ -173,5 +173,6 @@
 {
     Int_t sum=0;
-    Byte_t EvenNumSamples=(fNumHiGainSamples/2*2==fNumHiGainSamples) ? fNumHiGainSamples:fNumHiGainSamples-1;
+    Byte_t EvenNumSamples=(fNumHiGainSamples/2*2==fNumHiGainSamples) 
+                        ? fNumHiGainSamples : fNumHiGainSamples-1;
 
     do sum += *ptr;