Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 2223)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 2224)
@@ -157,5 +157,6 @@
      - added filename to canvas
   
-   * macros/readMagic.C, macros/readCT1.C, macros/status.C:
+   * macros/readMagic.C, macros/readCT1.C, macros/status.C,
+     macros/readcurrents.C, macros/readrfl.C:
      - adapted to changes
      
Index: /trunk/MagicSoft/Mars/mreflector/MRflEvtData.cc
===================================================================
--- /trunk/MagicSoft/Mars/mreflector/MRflEvtData.cc	(revision 2223)
+++ /trunk/MagicSoft/Mars/mreflector/MRflEvtData.cc	(revision 2224)
@@ -123,19 +123,11 @@
     val = 0;
 
+    MHexagon hex(cam[idx]);
     for (Int_t i=0; i<entries; i++)
     {
         const MRflSinglePhoton &ph = GetPhoton(i);
 
-        UInt_t idx;
-        for (idx=0; idx<cam.GetNumPixels(); idx++)
-        {
-            MHexagon hex(cam[idx]);
-            if (hex.DistanceToPrimitive(ph.GetX(), ph.GetY())<0)
-                break;
-        }
-        if (idx==cam.GetNumPixels())
-            continue;
-
-        val += cam.GetPixRatio(idx);
+        if (hex.DistanceToPrimitive(ph.GetX(), ph.GetY())<=0)
+            val += cam.GetPixRatio(idx);
     }