Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 6154)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 6155)
@@ -30,4 +30,8 @@
   * mjobs/MJCalibrateSignal.[h,cc]
     - allow also for direct setting of an MRunIter (not used in callisto).
+
+  * mcalib/MCalibrationChargeCalc.[h,cc]
+    - test also for pulser strength changes additionally to changes in 
+      colour.
 
 
Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 6154)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 6155)
@@ -590,6 +590,8 @@
 
   const MCalibrationCam::PulserColor_t col = fCalibPattern->GetPulserColor();
-
-  if (col == fPulserColor)
+  const Float_t strength = fCalibPattern->GetPulserStrength();
+  const Float_t strdiff  = TMath::Abs(strength-fStrength);
+
+  if (col == fPulserColor && strdiff < 0.05 )
     {
       fNumProcessed++;
@@ -630,4 +632,5 @@
   
   fPulserColor = col;
+  fStrength    = strength;
 
   *fLog << inf << "Found new colour ... " << flush;
@@ -642,5 +645,5 @@
     }
 
-  *fLog << inf << " with strength: " << fCalibPattern->GetPulserStrength() << endl;
+  *fLog << inf << " with strength: " << strength << endl;
   
   fHCam->SetColor(col);
Index: /trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilterPeakSearch.cc
===================================================================
--- /trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilterPeakSearch.cc	(revision 6154)
+++ /trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilterPeakSearch.cc	(revision 6155)
@@ -79,5 +79,5 @@
 const Byte_t MExtractTimeAndChargeDigitalFilterPeakSearch::fgHiGainFirst             =  0;
 const Byte_t MExtractTimeAndChargeDigitalFilterPeakSearch::fgHiGainLast              = 20;
-const Byte_t MExtractTimeAndChargeDigitalFilterPeakSearch::fgLoGainFirst             =  1;
+const Byte_t MExtractTimeAndChargeDigitalFilterPeakSearch::fgLoGainFirst             =  0;
 const Byte_t MExtractTimeAndChargeDigitalFilterPeakSearch::fgLoGainLast              = 14;
 const Byte_t MExtractTimeAndChargeDigitalFilterPeakSearch::fgOffsetLeftFromPeak      =  1;