Changeset 5867 for trunk/MagicSoft/Mars

Timestamp:

01/17/05 10:06:27 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• msignal/MExtractTimeAndChargeDigitalFilter.cc (modified) (2 diffs)
• mtrigger/MTriggerPattern.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -20 +20 @@
 
                                                  -*-*- 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

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc

@@ -332 +332 @@
   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 +346 @@
     {
       time = 0.;
+      for (Int_t ids=0; ids < fWindowSizeHiGain; ids++)
+        {
+          const Int_t   idx = fArrBinningResHiGain[ids] + fRandomIter;
+          sum              += fAmpWeightsHiGain [idx]*fHiGainSignal[ids]; 
+        }
       return;
     }

trunk/MagicSoft/Mars/mtrigger/MTriggerPattern.h

@@ -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)
     };