Changeset 6393 for trunk

Timestamp:

02/12/05 11:36:50 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrationChargeCalc.cc (modified) (1 diff)
• mhcalib/MHPedestalCam.cc (modified) (1 diff)
• mpedestal/MExtractPedestal.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -29 +29 @@
    * callisto.rc
      - made intitializations of extractors more explicit
+
+   * mpedestal/MExtractPedestal.cc
+     - make check for even number of slices in the case of "fundamental"
+       pedestal calc.
 
 

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -565 +565 @@
 {
 
-  /*
-  if (IsInterlaced())
-    {
-      if (!(fTrigPattern->GetPrescaled() & MTriggerPattern::kCalibration))
-        {
-          if (IsDebug())
-            {
-            for (Int_t i=16; i>= 0; i--)
-              *fLog << err << (fTrigPattern->GetPrescaled() >> i & 1);
-            *fLog  << endl;
-            }
-          return kTRUE;
-        }
-      else
-        {
-          if (IsDebug())
-            {
-              for (Int_t i=16; i>= 0; i--)
-                *fLog << inf << (fTrigPattern->GetPrescaled() >> i & 1);
-              *fLog  << endl;
-            }
-        }
-    }
-  */
-
   const MCalibrationCam::PulserColor_t col = fCalibPattern->GetPulserColor();
   const Float_t strength = fCalibPattern->GetPulserStrength();

trunk/MagicSoft/Mars/mhcalib/MHPedestalCam.cc

@@ -119 +119 @@
 using namespace std;
 
-const Int_t   MHPedestalCam::fgNbins      = 100;
-const Axis_t  MHPedestalCam::fgFirst      = -49.;
-const Axis_t  MHPedestalCam::fgLast       = 151.;
+const Int_t   MHPedestalCam::fgNbins      = 200;
+const Axis_t  MHPedestalCam::fgFirst      = -49.5;
+const Axis_t  MHPedestalCam::fgLast       = 150.5;
 const TString MHPedestalCam::gsHistName   = "Pedestal";
 const TString MHPedestalCam::gsHistTitle  = "Pedestal";

trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc

@@ -267 +267 @@
   const Int_t odd  = windows & 0x1;
   
-  if (odd)
+  if (odd && !fExtractor)
   {
       *fLog << warn << GetDescriptor();
-      *fLog << " - WARNING: Window size in SetExtraxtWindow has to be even... ";
+      *fLog << " - WARNING: Window size in SetExtractWindow has to be even... ";
       *fLog << " raising from " << windows << " to ";
       windows += 1;
@@ -280 +280 @@
   {
       *fLog << warn << GetDescriptor();
-      *fLog << " - WARNING: Window size in SetExtraxtWindow has to be > 0... adjusting to 2!" << endl;
+      *fLog << " - WARNING: Window size in SetExtractWindow has to be > 0... adjusting to 2!" << endl;
       windows = 2;
       rc = kFALSE;