Changeset 6155 for trunk/MagicSoft

Timestamp:

01/31/05 16:22:52 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrationChargeCalc.cc (modified) (3 diffs)
• msignal/MExtractTimeAndChargeDigitalFilterPeakSearch.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -30 +30 @@
   * 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.
 
 

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -590 +590 @@
 
   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 +632 @@
   
   fPulserColor = col;
+  fStrength    = strength;
 
   *fLog << inf << "Found new colour ... " << flush;
@@ -642 +645 @@
     }
 
-  *fLog << inf << " with strength: " << fCalibPattern->GetPulserStrength() << endl;
+  *fLog << inf << " with strength: " << strength << endl;
   
   fHCam->SetColor(col);

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilterPeakSearch.cc

@@ -79 +79 @@
 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;