Changeset 1496 for trunk/MagicSoft

Timestamp:

08/12/02 14:14:13 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MBlindPixelCalc.cc (modified) (4 diffs)
• MBlindPixelCalc.h (modified) (1 diff)

trunk/MagicSoft/Mars/manalysis/MBlindPixelCalc.cc

@@ -160 +160 @@
         const Int_t n = gpix.GetNumNeighbors();
 
+        Int_t num = TESTBIT(fFlags, kUseCentralPixel) ? 1 : 0;
+
         nphot[i] = TESTBIT(fFlags, kUseCentralPixel) ? (*fEvt)[id].GetNumPhotons() : 0;
         perr[i]  = TESTBIT(fFlags, kUseCentralPixel) ? (*fEvt)[id].GetErrorPhot()  : 0;
@@ -166 +168 @@
             const UShort_t nid = gpix.GetNeighbor(j);
 
+            if (fPixels->IsBlind(nid))
+                continue;
+
             nphot[i] += (*fEvt)[nid].GetNumPhotons();
             perr[i]  += (*fEvt)[nid].GetErrorPhot();
+
+            num++;
         }
 
-        nphot[i] /= TESTBIT(fFlags, kUseCentralPixel) ? n+1 : n;
-        perr[i]  /= TESTBIT(fFlags, kUseCentralPixel) ? n+1 : n;
+        nphot[i] /= num;
+        perr[i]  /= num;
     }
 
@@ -263 +270 @@
     MMcRunHeader *mcrun = (MMcRunHeader*)pList->FindObject("MMcRunHeader");
     if (!mcrun)
+    {
+        *fLog << warn << "MBlindPixelCalc::ReInit: Warning - No run header available... no action." << endl;
         return kTRUE;
+    }
 
     Int_t rah, ram, ras;
@@ -272 +282 @@
     if (rah!=5 || ram!=34 || ras!=32 || ded!=22 || dem!=0 || des!=55)
     {
-        *fLog << warn << "Warning - Detected Starfield unknown..." << endl;
+        *fLog << warn << "Warning - Starfield unknown..." << endl;
         return kTRUE;
     }

trunk/MagicSoft/Mars/manalysis/MBlindPixelCalc.h

@@ -42 +42 @@
         b ? SETBIT(fFlags, kUseInterpolation) : CLRBIT(fFlags, kUseInterpolation);
     }
-    void SetUseCetralPixel(Bool_t b=kTRUE)
+    void SetUseCentralPixel(Bool_t b=kTRUE)
     {
         b ? SETBIT(fFlags, kUseCentralPixel) : CLRBIT(fFlags, kUseCentralPixel);