Changeset 2224

Timestamp:

06/23/03 17:58:32 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mreflector/MRflEvtData.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -157 +157 @@
      - 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
      

trunk/MagicSoft/Mars/mreflector/MRflEvtData.cc

@@ -123 +123 @@
     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);
     }