Changeset 3520

Timestamp:

03/16/04 11:49:29 (21 years ago)

Author:

blanch

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mimage

Files:

• MNewImagePar.cc (modified) (5 diffs)
• MNewImagePar.h (modified) (1 diff)

trunk/MagicSoft/Mars/mimage/MNewImagePar.cc

@@ -79 +79 @@
     fLeakage2 = -1;
 
+    fInnerLeakage1 = -1;
+    fInnerLeakage2 = -1;
+    fInnerSize = -1;
+
     fConc  = -1;
     fConc1 = -1;
@@ -102 +106 @@
     fNumHGSaturatedPixels = 0;
 
+    fInnerSize = 0;
+
     const UInt_t npixevt = evt.GetNumPixels();
 
@@ -107 +113 @@
     Double_t edgepix2 = 0;
 
+    Double_t edgepixin1 = 0;
+    Double_t edgepixin2 = 0;
+
+    Float_t maxpix[9] = {0,0,0,0,0,0,0,0,0};             // [#phot]
     Float_t maxpix1 = 0;                                 // [#phot]
     Float_t maxpix2 = 0;                                 // [#phot]
@@ -151 +161 @@
         nphot *= geom.GetPixRatio(pixid);
 
+        // count inner pixels: To dependent on MAGIC Camera --> FIXME
+
+        if (pixid<397){
+          fInnerSize += nphot;
+          if(pixid>270){
+            edgepixin2 += nphot;
+            if(pixid>330)
+              edgepixin1 += nphot;
+          }
+        }
+
+        // Compute Concentrations 1-8   
+
+        if(maxpix[0]<=nphot) {
+          for(int i=0;i<8;i++)
+            maxpix[8-i]=maxpix[7-i];
+          maxpix[0]=nphot;
+        }
+        else 
+          for(int i=0;i<8;i++){
+            if (nphot<maxpix[7-i]){
+              for(int j=0;j<i-1;j++){  
+                maxpix[7-j]=maxpix[6-j];                    // [1]
+              }
+              maxpix[8-i]=nphot;
+              break;
+            }
+          }
+
+        // Compute Concetration 1 -2 
+
         if (nphot>maxpix1)
-        {
+          {
             maxpix2  = maxpix1;
             maxpix1  = nphot;                            // [1]
             continue;                                    // [1]
-        }
-
+          }
+        
         if (nphot>maxpix2)
-            maxpix2 = nphot;                             // [1]
+          maxpix2 = nphot;                             // [1]
     }
-
+    
+    fInnerLeakage1 = edgepixin1 / fInnerSize;
+    fInnerLeakage2 = edgepixin2 / fInnerSize;
     fLeakage1 = edgepix1 / hillas.GetSize();
     fLeakage2 = edgepix2 / hillas.GetSize();
@@ -167 +210 @@
     fConc  = (maxpix1+maxpix2)/hillas.GetSize();         // [ratio]
     fConc1 = maxpix1/hillas.GetSize();                   // [ratio]
+
+    fConc3 = (maxpix[0]+maxpix[1]+maxpix[2]);
+    fConc4 = (fConc3+maxpix[3]);
+    fConc5 = (fConc4+maxpix[4]);
+    fConc6 = (fConc5+maxpix[5]);
+    fConc7 = (fConc6+maxpix[6]);
+    fConc8 = (fConc7+maxpix[7]);
+
+    fConc3/=hillas.GetSize();                           // [ratio]
+    fConc4/=hillas.GetSize();                           // [ratio]
+    fConc5/=hillas.GetSize();                           // [ratio]
+    fConc6/=hillas.GetSize();                           // [ratio]
+    fConc7/=hillas.GetSize();                           // [ratio]
+    fConc8/=hillas.GetSize();                           // [ratio]
 
     SetReadyToSave();

trunk/MagicSoft/Mars/mimage/MNewImagePar.h

@@ -15 +15 @@
     Float_t fLeakage1;           // (photons in most outer ring of pixels) over fSize
     Float_t fLeakage2;           // (photons in the 2 outer rings of pixels) over fSize
+    Float_t fInnerLeakage1;           // (photons in most outer rings of inner pixels) over fInnerSize
+    Float_t fInnerLeakage2;           // (photons in the 2 outer rings of inner pixels) over fInnerSize
+    Float_t fInnerSize;
 
     Float_t fConc;               // [ratio] concentration ratio: sum of the two highest pixels / fSize
     Float_t fConc1;              // [ratio] concentration ratio: sum of the highest pixel / fSize
+    Float_t fConc3;              // [ratio] concentration ratio: sum of the 3 highest pixel / fSize
+    Float_t fConc4;              // [ratio] concentration ratio: sum of the 4 highest pixel / fSize
+    Float_t fConc5;              // [ratio] concentration ratio: sum of the 5 highest pixel / fSize
+    Float_t fConc6;              // [ratio] concentration ratio: sum of the 6 highest pixel / fSize
+    Float_t fConc7;              // [ratio] concentration ratio: sum of the 7 highest pixel / fSize
+    Float_t fConc8;              // [ratio] concentration ratio: sum of the 8 highest pixel / fSize
 
     Short_t fNumUsedPixels;      // Number of pixels which survived the image cleaning