Changeset 1574 for trunk/MagicSoft/Mars/manalysis/MBlindPixelCalc.cc

Timestamp:

11/04/02 10:06:08 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/manalysis/MBlindPixelCalc.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/manalysis/MBlindPixelCalc.cc

@@ -93 +93 @@
 Bool_t MBlindPixelCalc::PreProcess (MParList *pList)
 {
-    fPixels = (MBlindPixels*)pList->FindCreateObj("MBlindPixels");
+    if (TESTBIT(fFlags, kUseBlindPixels))
+        fPixels = (MBlindPixels*)pList->FindObject("MBlindPixels");
+    else
+        fPixels = (MBlindPixels*)pList->FindCreateObj("MBlindPixels");
     if (!fPixels)
         return kFALSE; 
@@ -106 +109 @@
     fGeomCam = (MGeomCam*)pList->FindObject("MGeomCam");
     if (!fGeomCam)
-        *fLog << warn << dbginf << "No camera geometry available... can't ude interpolation." << endl;
+        *fLog << warn << dbginf << "No camera geometry available... can't use interpolation." << endl;
+
+    if (TESTBIT(fFlags, kUseBlindPixels))
+        return kTRUE;
 
     const UShort_t size = fPixelsID.GetSize();
@@ -162 +168 @@
         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;
+        nphot[i] = TESTBIT(fFlags, kUseCentralPixel) ? pix.GetNumPhotons() : 0;
+        perr[i]  = TESTBIT(fFlags, kUseCentralPixel) ? pix.GetErrorPhot()  : 0;
         for (int j=0; j<n; j++)
         {
@@ -171 +177 @@
                 continue;
 
-            nphot[i] += (*fEvt)[nid].GetNumPhotons();
-            perr[i]  += (*fEvt)[nid].GetErrorPhot();
-
+            const MCerPhotPix *evtpix = fEvt->GetPixById(nid);
+            if (evtpix)
+            {
+                nphot[i] += evtpix->GetNumPhotons();
+                perr[i]  += evtpix->GetErrorPhot();
+            }
             num++;
         }
@@ -253 +262 @@
 Bool_t MBlindPixelCalc::ReInit(MParList *pList)
 {
+    if (TESTBIT(fFlags, kUseBlindPixels))
+        return kTRUE;
+
     //
     // If pixels are given by the user, we are already done