Changeset 662 for trunk/MagicSoft

Timestamp:

03/01/01 17:47:30 (24 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• meventdisp/MGFadcDisp.cc (modified) (2 diffs)
• mraw/MRawEvtPixelIter.h (modified) (2 diffs)

trunk/MagicSoft/Mars/meventdisp/MGFadcDisp.cc

@@ -278 +278 @@
   //   the list of pixels in the fPixelList (TGListBox)
   //
+  const Int_t redraw = fPixelList->GetSelected() ;
   
   MRawEvtPixelIter fPixelIter( fEvtData );
 
   //   put the selection of the last event in memory
-  const Int_t redraw = fPixelList->GetSelected() ;
-  
-  fPixelList->RemoveEntries(0, fPixelsinList) ; 
-  fPixelsinList = 0 ; 
+  
+  fPixelList->RemoveEntries(0, fPixelIter.GetNumPixels()) ;
 
   while ( fPixelIter.Next() )
@@ -293 +292 @@
         sprintf( wortdummy, "%d", fPixelIter.GetPixelId() ) ;
 
-        fPixelList->AddEntry( wortdummy, fPixelsinList++ ) ;
+        fPixelList->AddEntry( wortdummy, fPixelIter.GetNumEntry()) ;
     }
 

trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.h

@@ -26 +26 @@
     Byte_t   *fLoGainPos;       //! pointer to lo-gain samples of actual pixel
 
+    UShort_t fNumEntry;
+
     MRawEvtData *fData;         //! pointer to object which we are iterating
 
@@ -42 +44 @@
         //
         return *fHiGainId;
+    }
+
+    UShort_t GetNumEntry() const
+    {
+        return fNumHiGainEntry;
+    }
+
+    Byte_t GetNumPixels() const
+    {
+        return fData->GetNumPixels();
     }