Changeset 8957 for trunk/MagicSoft/Mars/mimage

Timestamp:

06/14/08 16:55:58 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mimage

Files:

• ImageLinkDef.h (modified) (1 diff)
• MCameraSmooth.cc (modified) (2 diffs)
• MConcentration.cc (modified) (2 diffs)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mimage/ImageLinkDef.h

@@ -6 +6 @@
 
 #pragma link C++ class MImgCleanStd+;
-#pragma link C++ class MCameraSmooth+;
 
 #pragma link C++ class MHillas+;

trunk/MagicSoft/Mars/mimage/MCameraSmooth.cc

@@ -110 +110 @@
             const MGeomPix &gpix = (*fGeomCam)[i];
 
-            const Int_t n = gpix.GetNumNeighbors();
+            const Int_t nn = gpix.GetNumNeighbors();
 
             Int_t num  = fUseCentralPixel ? 1 : 0;
@@ -116 +116 @@
             errors[i]  = fUseCentralPixel ? pix.GetErrorPhot()  : 0;
 
-            for (int j=0; j<n; j++)
+            for (int j=0; j<nn; j++)
             {
                 const UShort_t nid = gpix.GetNeighbor(j);

trunk/MagicSoft/Mars/mimage/MConcentration.cc

@@ -111 +111 @@
 
    const UInt_t npix = evt.GetNumPixels();
-   for (UInt_t i=0; i<npix; i++)
+   for (UInt_t j=0; j<npix; j++)
    {
-       const MSignalPix &pix = evt[i];
+       const MSignalPix &pix = evt[j];
        if (!pix.IsPixelUsed())
            continue;
 
-        const Double_t nphot = pix.GetNumPhotons()* geom.GetPixRatio(i);
+        const Double_t nphot = pix.GetNumPhotons()* geom.GetPixRatio(j);
 
         // Get number of photons in the 8 most populated pixels 
@@ -134 +134 @@
                 continue;
 
-            for(int j=0;j<i-1;j++)
-                maxpix[7-j]=maxpix[6-j];                 // [#phot]
+            for(int k=0;k<i-1;k++)
+                maxpix[7-k]=maxpix[6-k];                 // [#phot]
 
             maxpix[8-i]=nphot;

trunk/MagicSoft/Mars/mimage/Makefile

@@ -27 +27 @@
 
 SRCFILES = MImgCleanStd.cc \
-           MCameraSmooth.cc \
            MHillas.cc \
            MHillasSrc.cc \