Changeset 9219 for trunk/MagicSoft/Mars/mmain

Timestamp:

01/14/09 12:31:37 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mmain/MEventDisplay.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mmain/MEventDisplay.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MEventDisplay.cc,v 1.65 2008-07-20 14:21:39 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MEventDisplay.cc,v 1.66 2009-01-14 12:31:36 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -334 +334 @@
         MCalibrationPatternDecode *decode = new MCalibrationPatternDecode;
 
-        MPedestalSubtract *pedsub1  = new MPedestalSubtract;
-        MPedestalSubtract *pedsub2  = new MPedestalSubtract;
+        MPedestalSubtract *pedsub1  = new MPedestalSubtract("PedSubstract1");
+        MPedestalSubtract *pedsub2  = new MPedestalSubtract("PedSubstract2");
         pedsub2->SetNamePedestalCam();
 
@@ -678 +678 @@
 void MEventDisplay::ShowHide()
 {
-    TGCheckButton *but1 = (TGCheckButton*)fList->FindWidget(kShowMuon);
-    TGCheckButton *but2 = (TGCheckButton*)fList->FindWidget(kShowImgPar);
+    TGCheckButton *but1 = (TGCheckButton*)fList->FindWidget(kShowImgPar);
+    TGCheckButton *but2 = (TGCheckButton*)fList->FindWidget(kShowMuon);
 
     const Bool_t imgpar = but1 && but1->IsDown();
@@ -722 +722 @@
         for (int j=0;j<n; j++)
             if (obj[j])
+            {
                 if (state[j] && !list->FindObject(obj[j]))
                     list->Add(obj[j]);
-                else
+                if (!state[j] && list->FindObject(obj[j]))
                     list->Remove(obj[j]);
+            }
 
         gPad->Modified(kTRUE);
@@ -744 +746 @@
 
     //
-    // Add Geometry tab
+    // Now read event...
+    //
+    // FIXME: Can we safely replace ReadinEvent() by RedinEvent(1)?
+    ReadinEvent();
+
+    //
+    // After ReInit (MGeomCam might be read from RunHeaders): Add Geometry tab
     //
     AddGeometryTabs();
-
-    //
-    // Now read event...
-    //
-    // FIXME: Can we safly replace ReadinEvent() by RedinEvent(1)?
-    ReadinEvent();
-
 
     MReadTree *reader = (MReadTree*)fEvtLoop->FindTask("MRead");