Changeset 2445 for trunk

Timestamp:

10/30/03 17:09:40 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MCerPhotEvt.cc (modified) (10 diffs)
• manalysis/MCerPhotEvt.h (modified) (2 diffs)
• mimage/MImgCleanStd.cc (modified) (13 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                  -*-*- END OF LINE -*-*-
+
+  2003/10/30: Thomas Bretz
+
+   * manalysis/MCerPhotEvt.[h,cc]:
+     - fixed a bug in the new Lut-stuff. Sometimes pixels where
+       considered existing, because there where no mark for 
+       empty entries in the Lut.
+     - all loops ignored pixel with index 0 and used it as reference
+       pixel - this is wrong, because pixel 0 must not exist at all.
+       Now all loops are starting with pixel 0.
+
+   * mimage/MImgCleanStd.[h,cc]:
+     - renamed various local variables from 'id' to 'idx'
+     - in clean step 4 we assumed that a pixel with idx2 is existing
+       - this is a dangerous assumption. It is checked now.
+
+
 
   2003/10/29: Thomas Bretz

trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc

@@ -124 +124 @@
 Bool_t MCerPhotEvt::IsPixelExisting(Int_t id) const
 {
-    const MCerPhotPix *pix = GetPixById(id);
-    return pix ? kTRUE : kFALSE;
+    return GetPixById(id) ? kTRUE : kFALSE;
 } 
 
@@ -163 +162 @@
     Float_t minval = FLT_MAX;
 
-    for (UInt_t i=1; i<fNumPixels; i++)
+    for (UInt_t i=0; i<fNumPixels; i++)
     {
         const MCerPhotPix &pix = (*this)[i];
@@ -170 +169 @@
 
         const UInt_t id = pix.GetPixId();
-        if (id>=n)
+        if (id<0 || id>=n)
             continue;
 
@@ -200 +199 @@
     Float_t maxval = -FLT_MAX;
 
-    for (UInt_t i=1; i<fNumPixels; i++)
+    for (UInt_t i=0; i<fNumPixels; i++)
     {
         const MCerPhotPix &pix = (*this)[i];
@@ -207 +206 @@
 
         const UInt_t id = pix.GetPixId();
-        if (id>=n)
+        if (id<0 || id>=n)
             continue;
 
@@ -229 +228 @@
         return -5.;
 
-    Float_t minval = (*this)[0].GetNumPhotons()/(*this)[0].GetErrorPhot();
-
-    for (UInt_t i=1; i<fNumPixels; i++)
+    Float_t minval = FLT_MAX;
+
+    for (UInt_t i=0; i<fNumPixels; i++)
     {
         const MCerPhotPix &pix = (*this)[i];
@@ -259 +258 @@
     Float_t maxval = -FLT_MAX;
 
-    for (UInt_t i=1; i<fNumPixels; i++)
+    for (UInt_t i=0; i<fNumPixels; i++)
     {
         const MCerPhotPix &pix = (*this)[i];
@@ -289 +288 @@
     Float_t minval = FLT_MAX;
 
-    for (UInt_t i=1; i<fNumPixels; i++)
+    for (UInt_t i=0; i<fNumPixels; i++)
     {
         const MCerPhotPix &pix = (*this)[i];
@@ -319 +318 @@
     Float_t maxval = -FLT_MAX;
 
-    for (UInt_t i=1; i<fNumPixels; i++)
+    for (UInt_t i=0; i<fNumPixels; i++)
     {
         const MCerPhotPix &pix = (*this)[i];
@@ -356 +355 @@
 // try to search in the array.
 //
-MCerPhotPix *MCerPhotEvt::GetPixById(int idx) const
-{
+MCerPhotPix *MCerPhotEvt::GetPixById(Int_t idx) const
+{
+    if (idx<0)
+        return 0;
+
     if (fLut.GetSize()>0)
-        return idx>=0 && idx<fLut.GetSize() ? (MCerPhotPix*)(fPixels->UncheckedAt(fLut[idx])) : 0;
+    {
+        if (idx>=fLut.GetSize())
+            return 0;
+
+        return fLut[idx]<0 ? 0 : (MCerPhotPix*)(fPixels->UncheckedAt(fLut[idx]));
+    }
 
     TIter Next(fPixels);

trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.h

@@ -39 +39 @@
         //
         if (idx>=fLut.GetSize())
+        {
+            const Int_t n = fLut.GetSize();
             fLut.Set(idx+1);
+            for (int i=n; i<idx; i++)
+                fLut[i] = -1;
+        }
 
         fLut[idx] = fNumPixels;
@@ -66 +71 @@
     void RemoveUnusedPixels();
 
-    MCerPhotPix *GetPixById(int idx) const;// { return idx>=0 && idx<fLut.GetSize() ? (MCerPhotPix*)(fPixels->UncheckedAt(fLut[idx])) : 0; } // Return a pointer to the pixel with the requested id. NULL if it doesn't exist.
+    MCerPhotPix *GetPixById(Int_t idx) const;
 
     void Reset();

trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc

@@ -329 +329 @@
     // set them to 'unused' state if necessary
     // 
+
     for (Int_t i=0; i<entries; i++ )
     {
@@ -373 +374 @@
         MCerPhotPix &pix = (*fEvt)[i];
 
-        const Int_t id = pix.GetPixId();
+        const Int_t idx = pix.GetPixId();
 
         const Float_t  entry = pix.GetNumPhotons();
-        const Double_t ratio = fCam->GetPixRatio(id);
+        const Double_t ratio = fCam->GetPixRatio(idx);
 
         // COBB: '<=' to skip entry=noise=0
@@ -422 +423 @@
     // (MCerPhotEvt::IsPixelUsed) all the time.
     //
+    // We allocate the array ourself because the TArrays always do
+    // range check which slows down the access to the array
+    // by 25-50%
+    //
     Byte_t *ispixused = new Byte_t[fCam->GetNumPixels()];
+    memset(ispixused, 0, sizeof(Byte_t)*fCam->GetNumPixels());
 
     for (Int_t i=0; i<entries; i++)
@@ -428 +434 @@
         const MCerPhotPix &pix = (*fEvt)[i];
         ispixused[pix.GetPixId()] = pix.IsPixelUsed() ? 1 : 0 ;
-    }
+   }
 
     for (Int_t i=0; i<entries; i++)
@@ -436 +442 @@
 
         // get pixel id of this entry
-        const Int_t id = pix.GetPixId();
+        const Int_t idx = pix.GetPixId();
 
         // check if pixel is in use, if not goto next pixel in list
-        if (ispixused[id] == 0)
+        if (ispixused[idx] == 0)
             continue;
  
         // check for 'used' neighbors of this pixel
-        const MGeomPix &gpix  = (*fCam)[id];
+        const MGeomPix &gpix  = (*fCam)[idx];
         const Int_t     nnmax = gpix.GetNumNeighbors();
 
@@ -451 +457 @@
         for (Int_t j=0; j<nnmax; j++)
         {
-            const Int_t id2 = gpix.GetNeighbor(j);
+            const Int_t idx2 = gpix.GetNeighbor(j);
 
             // when you find an used neighbor, break the loop
-            if (ispixused[id2] == 1)
+            if (ispixused[idx2] == 1)
             {
-                hasNeighbor = kTRUE;
-                break;
+                hasNeighbor = kTRUE;
+                break;
             }
         }
@@ -478 +484 @@
     }
 } 
+
 
 // --------------------------------------------------------------------------
@@ -518 +525 @@
     // get pixel id of this entry
     //
-    const Int_t id = pix.GetPixId();
+    const Int_t idx = pix.GetPixId();
 
     //
@@ -524 +531 @@
     //
     const Float_t  entry = pix.GetNumPhotons();
-    const Double_t ratio = fCam->GetPixRatio(id);
+    const Double_t ratio = fCam->GetPixRatio(idx);
 
     return (entry * ratio <= fCleanLvl2 * fInnerNoise);
@@ -531 +538 @@
 void MImgCleanStd::CleanStep3b(MCerPhotPix &pix)
 {
-    const Int_t id = pix.GetPixId();
+    const Int_t idx = pix.GetPixId();
 
     //
@@ -537 +544 @@
     // if it is a core pixel set pixel state to: used.
     //
-    MGeomPix   &gpix  = (*fCam)[id];
+    MGeomPix   &gpix  = (*fCam)[idx];
     const Int_t nnmax = gpix.GetNumNeighbors();
 
     for (Int_t j=0; j<nnmax; j++)
     {
-        const Int_t id2 = gpix.GetNeighbor(j);
-
-        if (!fEvt->GetPixById(id2) || !fEvt->IsPixelCore(id2)) 
-          continue;
+        const Int_t idx2 = gpix.GetNeighbor(j);
+
+        if (!fEvt->GetPixById(idx2) || !fEvt->IsPixelCore(idx2))
+            continue;
 
         pix.SetPixelUsed();
-           break;
+        break;
     }
 }
@@ -568 +575 @@
     // and tell to which ring it belongs to.
     //
-    const Int_t id = pix.GetPixId();
-    MGeomPix  &gpix  = (*fCam)[id];
+    const Int_t idx = pix.GetPixId();
+    MGeomPix  &gpix  = (*fCam)[idx];
 
     const Int_t nnmax = gpix.GetNumNeighbors();
@@ -575 +582 @@
     for (Int_t j=0; j<nnmax; j++)
     {
-        const Int_t id2 = gpix.GetNeighbor(j);
-
-        MCerPhotPix &npix = *fEvt->GetPixById(id2);
-
-        // FIXME!
-        // Needed check to read CT1 data without having a Segmentation fault
-        if (!fEvt->GetPixById(id2)) 
-            continue; 
-
-        if (!npix.IsPixelUsed() || npix.GetRing()>r-1 )
+        const Int_t idx2 = gpix.GetNeighbor(j);
+
+        MCerPhotPix *npix = fEvt->GetPixById(idx2);
+
+        if (!npix || !npix->IsPixelUsed() || npix->GetRing()>r-1 )
             continue;