Changeset 2831 for trunk/MagicSoft

Timestamp:

01/16/04 14:27:54 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrationCalc.cc (modified) (10 diffs)
• mcalib/MHCalibrationConfig.h (modified) (2 diffs)
• mcalib/MHCalibrationPixel.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -11 +11 @@
 
    * mcalib/MHCalibrationBlindPixel.[h,cc] 
+   * mcalib/MHCalibrationConfig.h 
    * mcalib/MCalibrationBlindPix.h, 
      - incorporate Fit functions

trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc

@@ -70 +70 @@
 //                                                                          
 //////////////////////////////////////////////////////////////////////////////
-
 #include "MCalibrationCalc.h"
 #include "MCalibrationConfig.h"
-#include "MCalibrationFits.h"
 
 #include "MCalibrationCam.h"
@@ -149 +147 @@
     if (!fRawEvt)
     {
-        *fLog << dbginf << "MRawEvtData not found... aborting." << endl;
-        return kFALSE;
+      *fLog << err << dbginf << "MRawEvtData not found... aborting." << endl;
+      return kFALSE;
     }
 
     const MRawRunHeader *runheader = (MRawRunHeader*)pList->FindObject("MRawRunHeader");
     if (!runheader)
-        *fLog << warn << dbginf << "Warning - cannot check file type, MRawRunHeader not found." << endl;
+      *fLog << warn << dbginf << "Warning - cannot check file type, MRawRunHeader not found." << endl;
     else
-        if (runheader->GetRunType() == kRTMonteCarlo)
+      if (runheader->GetRunType() == kRTMonteCarlo)
         {
-            return kTRUE;
+          return kTRUE;
         }
-
+    
     fCalibrations = (MCalibrationCam*)pList->FindCreateObj("MCalibrationCam");
     if (!fCalibrations)
@@ -218 +216 @@
     if (!fRunHeader)
     {
-        *fLog << dbginf << "MRawRunHeader not found... aborting." << endl;
-        return kFALSE;
+      *fLog << err << dbginf << ": MRawRunHeader not found... aborting." << endl;
+      return kFALSE;
     }
 
@@ -226 +224 @@
     if (!cam)
     {
-        *fLog << err << GetDescriptor() << ": No MGeomCam found... aborting." << endl;
-        return kFALSE;
+      *fLog << err << GetDescriptor() << ": No MGeomCam found... aborting." << endl;
+      return kFALSE;
     }
 
@@ -340 +338 @@
 
             if (!blindpixel.FillCharge(sumhi)) 
-              *fLog << err << 
+              *fLog << warn << 
                 "Overflow or Underflow occurred filling Blind Pixel sum = " << sumhi << endl;
 
             if (!blindpixel.FillTime((int)mtime)) 
-              *fLog << err << 
+              *fLog << warn << 
                 "Overflow or Underflow occurred filling Blind Pixel time = " << mtime << endl;
             
@@ -411 +409 @@
 {
 
-
   *fLog << inf << endl;
 
@@ -427 +424 @@
 
 
-  *fLog << GetDescriptor() << " Cut Histogram Edges" << endl;
+  *fLog << GetDescriptor() << ": Cut Histogram Edges" << endl;
 
   //
@@ -439 +436 @@
   MCalibrationBlindPix &blindpixel = *(fCalibrations->GetBlindPixel());
 
-  *fLog << GetDescriptor() << " Fitting the Blind Pixel" << endl;
+  *fLog << GetDescriptor() << ": Fitting the Blind Pixel" << endl;
 
   // 
@@ -448 +445 @@
 
       if (!blindpixel.FitCharge())
-        *fLog << err << dbginf << "Could not fit the blind pixel " << endl;
+        {
+          *fLog << err << dbginf << "Could not fit the blind pixel! " << endl;
+          blindpixel.DrawClone();
+          return kFALSE;
+        }
 
       blindpixel.DrawClone();
     }
   
-  *fLog << GetDescriptor() << " Fitting the Normal Pixels" << endl;
+  *fLog << GetDescriptor() << ": Fitting the Normal Pixels" << endl;
 
   //
@@ -488 +489 @@
 
   if (!fCalibrations->CalcNumPhotInsidePlexiglass())
-    *fLog << err << dbginf << "Could not calculate the number of photons from the blind pixel " << endl;
-
+    {
+      *fLog << err << GetDescriptor() 
+            << ": Could not calculate the number of photons from the blind pixel " << endl;
+      return kFALSE;
+    }
+  
   fCalibrations->SetReadyToSave();
   

trunk/MagicSoft/Mars/mcalib/MHCalibrationConfig.h

@@ -11 +11 @@
 
 
-// Global rejection criteria for the acceptance of a fit: Prob=0.01 == 99% Probability
+// Global rejection criteria for the acceptance of a fit: Prob=0.001 == 99.7% Probability
 const Float_t gkProbLimit = 0.001;
 
@@ -23 +23 @@
 const Float_t gkSq2Pi = 2.506628274631;
 
-// typedef to the fitting functions for the blind pixel
-typedef Double_t (*BlindPixelFitFunc)(Double_t *, Double_t *);
-
 #endif /* MARS_MHCalibrationBlindPixelConfig */

trunk/MagicSoft/Mars/mcalib/MHCalibrationPixel.cc

@@ -31 +31 @@
 //                                                                          //
 //////////////////////////////////////////////////////////////////////////////
-
 #include "MHCalibrationPixel.h"
 #include "MHCalibrationConfig.h"
-#include "MCalibrationFits.h"
 
 #include <TStyle.h>