Changeset 3770 for trunk/MagicSoft

Timestamp:

04/16/04 21:34:13 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• manalysis/MHPedestalCam.cc (modified) (4 diffs)
• manalysis/MHPedestalPix.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -46 +46 @@
        "SetWindows". No change in behaviour of the function.
 
+
  2004/04/16: Markus Gaug
 
@@ -61 +62 @@
        into the "low-gain samples" and mislead thus sliding window to 
        be maximized on the tail of the high-gain pulse.
+
+   * mcalib/MHPedestalPix.cc
+     - fixed a bug which made normalization to values per slice not happen
 
  2004/04/15: Markus Gaug

trunk/MagicSoft/Mars/manalysis/MHPedestalCam.cc

@@ -312 +312 @@
   }
 
+
+  fLambda.Set(npixels);
+  fLambdaErr.Set(npixels);
+
   return kTRUE;
 
@@ -442 +446 @@
                   MBadPixelsPix::kLoGainOscillating);
 
+
   return kTRUE;
   
+
 }
 
@@ -476 +482 @@
 // 12: Fourier spectrum not OK
 //
+// Poisson fit:
+// ============
+//
+// 13: Poisson fit lambda
+// 14: Poisson fit lambda error 
+//
 Bool_t MHPedestalCam::GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type) const
 {
 
   if (fHiGainArray->GetSize() <= idx)
+    return kFALSE;
+
+  if ((*this)[idx].IsExcluded())
     return kFALSE;
 
@@ -540 +555 @@
         val = 1.;
       break;
+    case 13:
+      if (!(*this)[idx].IsPoissonFitOK())
+        return kFALSE;
+      val = fLambda[idx];
+      break;
+    case 14:
+      if (!(*this)[idx].IsPoissonFitOK())
+        return kFALSE;
+      val = fLambdaErr[idx];
+      break;
     default:
       return kFALSE;

trunk/MagicSoft/Mars/manalysis/MHPedestalPix.cc

@@ -42 +42 @@
 #include "MHPedestalPix.h"
 
+#include "MLog.h"
+#include "MLogManip.h"
+
 #include <TH1.h>
 
@@ -48 +51 @@
 using namespace std;
 //
-const Int_t   MHPedestalPix::fgChargeNbins    = 450 ;
-const Axis_t  MHPedestalPix::fgChargeFirst    = -0.5;
+const Int_t   MHPedestalPix::fgChargeNbins    = 500;
+const Axis_t  MHPedestalPix::fgChargeFirst    = -49.5;
 const Axis_t  MHPedestalPix::fgChargeLast     = 449.5;
 // --------------------------------------------------------------------------
@@ -103 +106 @@
 {
 
-  if (fMean == fMeanErr == fSigma == fSigmaErr == 0.)
-    return;
-
   //
   // One never knows...
@@ -113 +113 @@
   
   const Float_t sqslices = TMath::Sqrt(fNSlices);
-  
+
   SetMean     ( GetMean()    / fNSlices  );
   //