Changeset 659 for trunk/MagicSoft

Timestamp:

03/01/01 17:32:46 (24 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mbase/MReadTree.cc (modified) (1 diff)
• meventdisp/MGFadcDisp.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mbase/MReadTree.cc

@@ -173 +173 @@
 Bool_t MReadTree::GetEvent() 
 {
-  // Get the Event with the current EventNumber fNumEntry 
-  //
-  fTree->GetEntry(fNumEntry );
-
-  return kTRUE;
-}
+    //
+    // Get the Event with the current EventNumber fNumEntry
+    //
+    fTree->GetEntry(fNumEntry);
+
+    return kTRUE;
+}
+
 Bool_t MReadTree::DecEventNum(UInt_t dec)
 {

trunk/MagicSoft/Mars/meventdisp/MGFadcDisp.cc

@@ -283 +283 @@
   //
   
-  Int_t redraw ; 
-
   MRawEvtPixelIter fPixelIter( fEvtData );
-  char wortdummy[100] ; 
 
   //   put the selection of the last event in memory
-  redraw = fPixelList->GetSelected() ; 
+  const Int_t redraw = fPixelList->GetSelected() ;
   
   fPixelList->RemoveEntries(0, fPixelsinList) ; 
@@ -296 +293 @@
   while ( fPixelIter.Next() )
     {
-      //      cout << fPixelIter.GetPixelId() << endl ; 
-      sprintf( wortdummy, "%d", fPixelIter.GetPixelId() ) ; 
-      
-      fPixelList->AddEntry( wortdummy, fPixelsinList++ ) ; 
+        char wortdummy[100] ;
+        //      cout << fPixelIter.GetPixelId() << endl ;
+        sprintf( wortdummy, "%d", fPixelIter.GetPixelId() ) ;
+
+        fPixelList->AddEntry( wortdummy, fPixelsinList++ ) ;
     }
 
@@ -307 +305 @@
   // check if the pixel from last event also occurs in this event
 
-  Bool_t neuzeich = kFALSE ;  
   fPixelIter.Reset() ; 
 
   while ( fPixelIter.Next() )
-    {
-      if (fPixelIter.GetPixelId() == redraw ) 
-        neuzeich = kTRUE ; 
-    }
-
-  if ( neuzeich == kTRUE ) 
-    {
-      sprintf(wortdummy, "GRAPH%d", redraw ) ; 
-      
-      fCan->Clear() ; 
-      fCan->cd() ; 
-      
-      fEvtData->Draw(wortdummy) ; 
-      
-      fCan->Modified() ; 
-      fCan->Update() ; 
-      
-      fPixelList->Select(redraw, kTRUE) ; 
-    }
-  else 
-    {
-      fCan->Clear() ; 
-      fCan->cd() ; 
-      fCan->Modified() ; 
-      fCan->Update() ; 
-      
-    }
-  
-  
+  {
+      if (fPixelIter.GetPixelId() != redraw )
+          continue;
+
+      fCan->Clear() ;
+      fCan->cd() ;
+
+      char wortdummy[100] ;
+      sprintf(wortdummy, "GRAPH%d", redraw ) ;
+      fEvtData->Draw(wortdummy) ;
+
+      fCan->Modified() ;
+      fCan->Update() ;
+
+      fPixelList->Select(redraw, kTRUE) ;
+      return;
+  }
+
+  fCan->Clear() ;
+  fCan->cd() ;
+  fCan->Modified() ;
+  fCan->Update() ;
 }
 
@@ -351 +341 @@
   
   fTxtEvtNr->SetText(wortdummy) ; 
-
-
-
 }
 
@@ -378 +365 @@
 }  
 
-
-
-  
 Bool_t MGFadcDisp::ProcessMessage(Long_t msg, Long_t parm1, Long_t parm2) 
 {