Changeset 3666 for trunk/MagicSoft/Mars/mimage/MNewImagePar.cc

Timestamp:

04/06/04 13:41:56 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mimage/MNewImagePar.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mimage/MNewImagePar.cc

@@ -44 +44 @@
 //  - added fInnerLeakage2
 //  - added fInnerSize
+//  - added fUsedArea
+//  - added fCoreArea
+// 
 // 
 /////////////////////////////////////////////////////////////////////////////
@@ -92 +95 @@
     fNumCorePixels = -1;
 
+    fUsedArea = -1;
+    fCoreArea = -1;
+
     fNumSaturatedPixels = -1;
     fNumHGSaturatedPixels = -1;
@@ -105 +111 @@
     fNumUsedPixels = 0;
     fNumCorePixels = 0;
+
+    fUsedArea = 0;
+    fCoreArea = 0;
 
     fNumSaturatedPixels = 0;
@@ -136 +145 @@
             continue;
 
+        // Get geometry of pixel
+        const Int_t pixid = pix.GetPixId();
+        const MGeomPix &gpix = geom[pixid];
+
         // count used and core pixels
         if (pix.IsPixelCore())
+        {
             fNumCorePixels++;
+            fCoreArea += gpix.GetA();
+        }
 
         // count used pixels
         fNumUsedPixels++;
-
-        const Int_t pixid = pix.GetPixId();
-
-        const MGeomPix &gpix = geom[pixid];
+        fUsedArea += gpix.GetA();
 
         Double_t nphot = pix.GetNumPhotons();
@@ -165 +178 @@
         // count inner pixels: To dependent on MAGIC Camera --> FIXME
 
-        if (pixid<397){
-          fInnerSize += nphot;
-          if(pixid>270){
-            edgepixin2 += nphot;
-            if(pixid>330)
-              edgepixin1 += nphot;
-          }
-        }
+        if (pixid<397){
+            fInnerSize += nphot;
+            if(pixid>270){
+                edgepixin2 += nphot;
+                if(pixid>330)
+                    edgepixin1 += nphot;
+            }
+        }
 
         // Compute Concetration 1 -2 
 
         if (nphot>maxpix1)
-          {
+        {
             maxpix2  = maxpix1;
             maxpix1  = nphot;                            // [1]
             continue;                                    // [1]
-          }
-        
+        }
+
         if (nphot>maxpix2)
-          maxpix2 = nphot;                             // [1]
+            maxpix2 = nphot;                             // [1]
     }