Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 5866)
+++ trunk/MagicSoft/Mars/Changelog	(revision 5867)
@@ -20,4 +20,10 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2005/01/17 Markus Gaug
+
+  * msignal/MExtractTimeAndChargeDigitalFilter.cc
+    - remove a situation where the high-gain signal can be 0.
+
 
  2005/01/16 Markus Gaug
Index: trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc	(revision 5866)
+++ trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc	(revision 5867)
@@ -332,5 +332,10 @@
   if (maxpos > uplim)
     {
-      time = uplim+1;
+      time = 1.+uplim;
+      for (Int_t ids=0; ids < fWindowSizeHiGain; ids++)
+        {
+          const Int_t   idx = fArrBinningResHiGain[ids] + fRandomIter;
+          sum              += fAmpWeightsHiGain [idx]*fHiGainSignal[range-fWindowSizeHiGain+ids]; 
+        }
       return;
     }
@@ -341,4 +346,9 @@
     {
       time = 0.;
+      for (Int_t ids=0; ids < fWindowSizeHiGain; ids++)
+        {
+          const Int_t   idx = fArrBinningResHiGain[ids] + fRandomIter;
+          sum              += fAmpWeightsHiGain [idx]*fHiGainSignal[ids]; 
+        }
       return;
     }
Index: trunk/MagicSoft/Mars/mtrigger/MTriggerPattern.h
===================================================================
--- trunk/MagicSoft/Mars/mtrigger/MTriggerPattern.h	(revision 5866)
+++ trunk/MagicSoft/Mars/mtrigger/MTriggerPattern.h	(revision 5867)
@@ -12,12 +12,12 @@
 public:
     enum Pattern_t {
-        kTriggerLvl1 = BIT(1),
-        kCalibration = BIT(2), // Pulse Trigger
-        kTriggerLvl2 = BIT(3), // LUT Pseudo Size selection
-        kPedestal    = BIT(4),
-        kPinDiode    = BIT(5)
+        kTriggerLvl1 = BIT(0),
+        kCalibration = BIT(1), // Pulse Trigger
+        kTriggerLvl2 = BIT(2), // LUT Pseudo Size selection
+        kPedestal    = BIT(3),
+        kPinDiode    = BIT(4)
+        //kUnused      = BIT(5)
         //kUnused      = BIT(6)
         //kUnused      = BIT(7)
-        //kUnused      = BIT(8)
     };