Changeset 8647 for trunk

Timestamp:

07/26/07 12:21:51 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mimage/MNewImagePar.cc (modified) (10 diffs)
• mimage/MNewImagePar.h (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -42 +42 @@
    * mranforest/MRanForestCalc.cc:
      - set fTitle as eventloop name instead of fName
+
+   * mimage/MNewImagePar.[h,cc]:
+     - removed the fInner-stuff. It was never good for anything
+       only for space- and time-consumption
+     - increased class-version number by one
 
 

trunk/MagicSoft/Mars/mimage/MNewImagePar.cc

@@ -32 +32 @@
 //    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
@@ -72 +69 @@
 //  - added fConcCore
 //
+// Version 6:
+// ----------
+//  - removed fInnerLeakage1
+//  - removed fInnerLeakage2
+//  - removed fInnerSize
 //
 /////////////////////////////////////////////////////////////////////////////
@@ -109 +111 @@
     fLeakage1 = -1;
     fLeakage2 = -1;
-
-    fInnerLeakage1 = -1;
-    fInnerLeakage2 = -1;
-    fInnerSize     = -1;
 
     fConc     = -1;
@@ -139 +137 @@
     fCoreArea = 0;
 
-    fInnerSize = 0;
     fConcCore  = 0;
 
     Double_t edgepix1 = 0;
     Double_t edgepix2 = 0;
-
-    Double_t edgepixin1 = 0;
-    Double_t edgepixin2 = 0;
 
     Float_t maxpix1 = 0;                                 // [#phot]
@@ -157 +151 @@
     const Double_t rl = 1./(hillas.GetLength()*hillas.GetLength());
     const Double_t rw = 1./(hillas.GetWidth() *hillas.GetWidth());
-
-    const Bool_t ismagiclike =
-        geom.GetNumPixels() == 577 &&
-        geom.GetNumAreas()  == 2   &&
-        geom.GetPixRatio(396) > geom.GetPixRatio(397);
 
     UInt_t npix = evt.GetNumPixels();
@@ -245 +234 @@
            edgepix2 += nphot;
 
-        const Double_t ratio = geom.GetPixRatio(i);
-        if (TMath::Nint(ratio)==1) // Means this is a small (= inner pixel)
-        {
-            fInnerSize += nphot;
-
-            // Do calculation of "inner leakage" only for MAGIC-like geometry,
-            // i.e., 577 pixels, pixels of 2 different areas, inner part
-            // from pixel 0 to 396:
-            if (ismagiclike)
-            {
-                if(i > 270) // last two "rings" of inner pixels
-                {
-                    edgepixin2 += nphot;
-                    if(i > 330)  // last "ring" of inner pixels
-                        edgepixin1 += nphot;
-                }
-            }
-        }
-
         //
         // Now convert nphot from absolute number of photons or phe to signal
@@ -269 +239 @@
         // density:
         //
-        nphot *= ratio;
+        nphot *= geom.GetPixRatio(i);
 
         // Look for signal density in two highest pixels:
@@ -282 +252 @@
     }
 
-    fInnerLeakage1 = edgepixin1 / fInnerSize;
-    fInnerLeakage2 = edgepixin2 / fInnerSize;
-
     fLeakage1 = edgepix1 / hillas.GetSize();
     fLeakage2 = edgepix2 / hillas.GetSize();
@@ -318 +285 @@
     *fLog << " - Leakage1         [1] = " << fLeakage1      << endl;
     *fLog << " - Leakage2         [1] = " << fLeakage2      << endl;
-    *fLog << " - InnerLeakage1    [1] = " << fInnerLeakage1 << endl;
-    *fLog << " - InnerLeakage2    [1] = " << fInnerLeakage2 << endl;
-    *fLog << " - InnerSize      [phe] = " << fInnerSize     << endl;
     *fLog << " - Conc             [1] = " << fConc          << endl;
     *fLog << " - Conc1            [1] = " << fConc1         << endl;
@@ -342 +306 @@
     *fLog << " - Leakage1         [1] = " << fLeakage1      << endl;
     *fLog << " - Leakage2         [1] = " << fLeakage2      << endl;
-    *fLog << " - InnerLeakage1    [1] = " << fInnerLeakage1 << endl;
-    *fLog << " - InnerLeakage2    [1] = " << fInnerLeakage2 << endl;
-    *fLog << " - InnerSize      [phe] = " << fInnerSize     << endl;
     *fLog << " - Conc             [1] = " << fConc          << endl;
     *fLog << " - Conc1            [1] = " << fConc1         << endl;

trunk/MagicSoft/Mars/mimage/MNewImagePar.h

@@ -17 +17 @@
     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
@@ -39 +36 @@
     Float_t GetLeakage2() const { return fLeakage2; }
 
-    Float_t GetInnerLeakage1() const { return fInnerLeakage1; }
-    Float_t GetInnerLeakage2() const { return fInnerLeakage2; }
-    Float_t GetInnerSize()     const { return fInnerSize; }
-
     Float_t GetConc() const     { return fConc;     }
     Float_t GetConc1() const    { return fConc1;    }
@@ -60 +53 @@
               const MHillas &hillas, Int_t island=-1);
 
-    ClassDef(MNewImagePar, 5) // Container to hold new image parameters
+    ClassDef(MNewImagePar, 6) // Container to hold new image parameters
 };