Changeset 3734 for trunk/MagicSoft/Mars/manalysis

Timestamp:

04/14/04 16:35:59 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MCerPhotEvt.cc (modified) (3 diffs)
• MCerPhotEvt.h (modified) (1 diff)
• MCerPhotPix.cc (modified) (1 diff)

trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc

@@ -96 +96 @@
 void MCerPhotEvt::Reset()
 {
-    fNumPixels = 0;
-    fMaxIndex  = 0;
+    fNumPixels =  0;
+    fMaxIndex  = -1;
     fLut.Set(0);
     // fPixels->Delete();
@@ -104 +104 @@
 void MCerPhotEvt::FixSize()
 {
-    fLut.Set(fMaxIndex);
+    fLut.Set(fMaxIndex+1);
 
     if (fPixels->GetEntriesFast() == (Int_t)fNumPixels)
@@ -401 +401 @@
 
         fLut[idx] = fNumPixels;
-        if ((UInt_t)idx>fMaxIndex)
-            fMaxIndex=(UInt_t)idx;
+        if (idx>fMaxIndex)
+            fMaxIndex=idx;
 
         return new ((*fPixels)[fNumPixels++]) MCerPhotPix(idx, nph, er);

trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.h

@@ -24 +24 @@
 private:
     UInt_t        fNumPixels;
-    UInt_t        fMaxIndex;
+     Int_t        fMaxIndex;
     TArrayI       fLut;        // Lookup tabel to lookup pixel by index
     TClonesArray *fPixels;     //-> FIXME: Change TClonesArray away from a pointer?

trunk/MagicSoft/Mars/manalysis/MCerPhotPix.cc

@@ -73 +73 @@
     gLog << (fRing>0?"   Used ":" Unused ");
     gLog << (fIsCore?" Core ":"      ");
-    gLog << "High gain " << (fIsHGSaturated?"   ":"not") << " saturated";
-    gLog << (fIsSaturated?"   ":"Not") << " saturated";
-    gLog << " Nphot= " << fPhot << " Error(Nphot)=" << fErrPhot << endl;
+    gLog << (fIsSaturated?"   ":"not") << " saturated ";
+    gLog << "High gain " << (fIsHGSaturated?"   ":"not") << " saturated ";
+    gLog << "Nphot= " << fPhot << " Error(Nphot)=" << fErrPhot << endl;
 }