Changeset 2274 for trunk/MagicSoft/Mars/manalysis

Timestamp:

07/12/03 22:01:34 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MBlindPixelCalc.cc (modified) (12 diffs)
• MBlindPixelCalc.h (modified) (2 diffs)

trunk/MagicSoft/Mars/manalysis/MBlindPixelCalc.cc

@@ -29 +29 @@
 //
 //  This is the specific image cleaning for a list of pixels. This task
-//  sets the pixels listed in fPixelsID to unused so they should not be
+//  sets the pixels listed in fPixelsIdx to unused so they should not be
 //  used for analysis (eg calculation of hillas parameters).
 //
@@ -130 +130 @@
         return kTRUE;
 
-    const UShort_t size = fPixelsID.GetSize();
+    const UShort_t size = fPixelsIdx.GetSize();
 
     if (size == 0)
@@ -145 +145 @@
     // through the macros
 
-    UShort_t numids = fPixelsID.GetSize();
+    UShort_t numids = fPixelsIdx.GetSize();
 
     for(Int_t i = 0; i<numids; i++)
-        fPixels->SetPixelBlind(fPixelsID[i]);
+        fPixels->SetPixelBlind(fPixelsIdx[i]);
 
     return kTRUE;
@@ -167 +167 @@
 
     //
-    // remove the pixels in fPixelsID if they are set to be used,
+    // remove the pixels in fPixelsIdx if they are set to be used,
     // (set them to 'unused' state)
     //
@@ -174 +174 @@
         MCerPhotPix &pix = (*fEvt)[i];
 
-        const Int_t id = pix.GetPixId();
-
-        if (!fPixels->IsBlind(id))
+        const Int_t idx = pix.GetPixId();
+
+        if (!fPixels->IsBlind(idx))
             continue;
 
-        const MGeomPix &gpix = (*fGeomCam)[id];
-
-        const Int_t n = gpix.GetNumNeighbors();
+        const MGeomPix &gpix = (*fGeomCam)[idx];
 
         Int_t num = TESTBIT(fFlags, kUseCentralPixel) ? 1 : 0;
@@ -188 +186 @@
         perr[i]  = TESTBIT(fFlags, kUseCentralPixel) ? pix.GetErrorPhot()  : 0;
 
-        nphot[i] *= fGeomCam->GetPixRatio(id);
+        nphot[i] *= fGeomCam->GetPixRatio(idx);
         // FIXME: perr[i] ???
 
+        const Int_t n = gpix.GetNumNeighbors();
         for (int j=0; j<n; j++)
         {
-            const UShort_t nid = gpix.GetNeighbor(j);
-
-            if (fPixels->IsBlind(nid))
+            const UShort_t nidx = gpix.GetNeighbor(j);
+
+            if (fPixels->IsBlind(nidx))
                 continue;
 
-            const MCerPhotPix *evtpix = fEvt->GetPixById(nid);
+            const MCerPhotPix *evtpix = fEvt->GetPixById(nidx);
             if (evtpix)
             {
-                nphot[i] += evtpix->GetNumPhotons()*fGeomCam->GetPixRatio(nid);
+                nphot[i] += evtpix->GetNumPhotons()*fGeomCam->GetPixRatio(nidx);
                 perr[i]  += evtpix->GetErrorPhot();
                 // FIXME: perr[i] ???
@@ -208 +207 @@
         }
 
-        nphot[i] /= num*fGeomCam->GetPixRatio(id);
+        nphot[i] /= num*fGeomCam->GetPixRatio(idx);
         perr[i]  /= num/*FIXME:???*/;
     }
@@ -235 +234 @@
 
     //
-    // remove the pixels in fPixelsID if they are set to be used,
+    // remove the pixels in fPixelsIdx if they are set to be used,
     // (set them to 'unused' state)
     //
@@ -244 +243 @@
         if (fPixels->IsBlind(pix.GetPixId()))
             pix.SetPixelUnused();
-
     }
 }
@@ -264 +262 @@
 // --------------------------------------------------------------------------
 //
-//  Set pixels to no be used. 
-//  This member function (public) should be called from the macro (or
-//  analysis program) setting the desired blind pixels.
-//  In the future, the blind pixels may be extracted from information which
-//  is already in the root file.  
-//
-void MBlindPixelCalc::SetPixels(Int_t num, Short_t *ids)
-{
-    fPixelsID.Adopt(num, ids);
-}
-
-// --------------------------------------------------------------------------
-//
 //  - Check whether pixels to disable are available. If pixels are
 //    given by the user nothing more is done.
@@ -290 +275 @@
     // If pixels are given by the user, we are already done
     //
-    if (fPixelsID.GetSize() > 0)
+    if (fPixelsIdx.GetSize() > 0)
         return kTRUE;
 
@@ -355 +340 @@
         out << "   " << GetUniqueName() << ".SetUseCentralPixel();" << endl;
 
-    if (fPixelsID.GetSize()==0)
+    if (fPixelsIdx.GetSize()==0)
         return;
 
     out << "   {" << endl;
     out << "      TArrayS dummy;" << endl;
-    for (int i=0; i<fPixelsID.GetSize(); i++)
-        out << "      dummy[" << i << "]=" << ((TArrayS)fPixelsID)[i] << ";" << endl;
+    for (int i=0; i<fPixelsIdx.GetSize(); i++)
+        out << "      dummy[" << i << "]=" << ((TArrayS)fPixelsIdx)[i] << ";" << endl;
     out << "      " << GetUniqueName() << ".SetPixels(dummy);" << endl;
     out << "   }" << endl;

trunk/MagicSoft/Mars/manalysis/MBlindPixelCalc.h

@@ -21 +21 @@
     MGeomCam     *fGeomCam; //!
 
-    TArrayS fPixelsID;  // Pixel IDs for blind pixels, which are entered by the user.
+    TArrayS fPixelsIdx;  // Pixel Indices for blind pixels, which are entered by the user.
 
     Byte_t fFlags;      // flag for the method which is used
@@ -55 +55 @@
     }
 
-    void SetPixels(Int_t num, Short_t *ids);
-    void SetPixels(const TArrayS pix) { SetPixels((Int_t)pix.GetSize(), (Short_t*)pix.GetArray()); }
+    void SetPixelIndices(const TArrayS &pix) { fPixelsIdx = pix; }
     virtual Bool_t ReInit(MParList *pList);