Changeset 2445 for trunk/MagicSoft/Mars/manalysis

Timestamp:

10/30/03 17:09:40 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MCerPhotEvt.cc (modified) (10 diffs)
• MCerPhotEvt.h (modified) (2 diffs)

trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc

@@ -124 +124 @@
 Bool_t MCerPhotEvt::IsPixelExisting(Int_t id) const
 {
-    const MCerPhotPix *pix = GetPixById(id);
-    return pix ? kTRUE : kFALSE;
+    return GetPixById(id) ? kTRUE : kFALSE;
 } 
 
@@ -163 +162 @@
     Float_t minval = FLT_MAX;
 
-    for (UInt_t i=1; i<fNumPixels; i++)
+    for (UInt_t i=0; i<fNumPixels; i++)
     {
         const MCerPhotPix &pix = (*this)[i];
@@ -170 +169 @@
 
         const UInt_t id = pix.GetPixId();
-        if (id>=n)
+        if (id<0 || id>=n)
             continue;
 
@@ -200 +199 @@
     Float_t maxval = -FLT_MAX;
 
-    for (UInt_t i=1; i<fNumPixels; i++)
+    for (UInt_t i=0; i<fNumPixels; i++)
     {
         const MCerPhotPix &pix = (*this)[i];
@@ -207 +206 @@
 
         const UInt_t id = pix.GetPixId();
-        if (id>=n)
+        if (id<0 || id>=n)
             continue;
 
@@ -229 +228 @@
         return -5.;
 
-    Float_t minval = (*this)[0].GetNumPhotons()/(*this)[0].GetErrorPhot();
-
-    for (UInt_t i=1; i<fNumPixels; i++)
+    Float_t minval = FLT_MAX;
+
+    for (UInt_t i=0; i<fNumPixels; i++)
     {
         const MCerPhotPix &pix = (*this)[i];
@@ -259 +258 @@
     Float_t maxval = -FLT_MAX;
 
-    for (UInt_t i=1; i<fNumPixels; i++)
+    for (UInt_t i=0; i<fNumPixels; i++)
     {
         const MCerPhotPix &pix = (*this)[i];
@@ -289 +288 @@
     Float_t minval = FLT_MAX;
 
-    for (UInt_t i=1; i<fNumPixels; i++)
+    for (UInt_t i=0; i<fNumPixels; i++)
     {
         const MCerPhotPix &pix = (*this)[i];
@@ -319 +318 @@
     Float_t maxval = -FLT_MAX;
 
-    for (UInt_t i=1; i<fNumPixels; i++)
+    for (UInt_t i=0; i<fNumPixels; i++)
     {
         const MCerPhotPix &pix = (*this)[i];
@@ -356 +355 @@
 // try to search in the array.
 //
-MCerPhotPix *MCerPhotEvt::GetPixById(int idx) const
-{
+MCerPhotPix *MCerPhotEvt::GetPixById(Int_t idx) const
+{
+    if (idx<0)
+        return 0;
+
     if (fLut.GetSize()>0)
-        return idx>=0 && idx<fLut.GetSize() ? (MCerPhotPix*)(fPixels->UncheckedAt(fLut[idx])) : 0;
+    {
+        if (idx>=fLut.GetSize())
+            return 0;
+
+        return fLut[idx]<0 ? 0 : (MCerPhotPix*)(fPixels->UncheckedAt(fLut[idx]));
+    }
 
     TIter Next(fPixels);

trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.h

@@ -39 +39 @@
         //
         if (idx>=fLut.GetSize())
+        {
+            const Int_t n = fLut.GetSize();
             fLut.Set(idx+1);
+            for (int i=n; i<idx; i++)
+                fLut[i] = -1;
+        }
 
         fLut[idx] = fNumPixels;
@@ -66 +71 @@
     void RemoveUnusedPixels();
 
-    MCerPhotPix *GetPixById(int idx) const;// { return idx>=0 && idx<fLut.GetSize() ? (MCerPhotPix*)(fPixels->UncheckedAt(fLut[idx])) : 0; } // Return a pointer to the pixel with the requested id. NULL if it doesn't exist.
+    MCerPhotPix *GetPixById(Int_t idx) const;
 
     void Reset();