Changeset 2220

Timestamp:

06/23/03 15:50:44 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• macros/readCT1.C (modified) (3 diffs)
• macros/readMagic.C (modified) (6 diffs)
• mbase/MPrint.cc (modified) (1 diff)

trunk/MagicSoft/Mars/macros/readCT1.C

@@ -78 +78 @@
 
     Int_t icount = 0;
-    MCamDisplay display(&geomcam);
+    MHCamera display(geomcam);
     display.Draw();
 
@@ -89 +89 @@
             continue;
 
-        display.Fill(*evt);
+        display.SetCamContent(*evt);
         display.Update();
 
@@ -100 +100 @@
         newimgpar.Print();
 
-        display.Fill(*(MCerPhotEvt*)plist.FindObject("MCerPhotEvt"));
+        display.SetCamContent(*(MCerPhotEvt*)plist.FindObject("MCerPhotEvt"));
         display.Update();
 

trunk/MagicSoft/Mars/macros/readMagic.C

@@ -79 +79 @@
     MHillasCalc       hcalc;
 
-
     tlist.AddToList(&read);
-    //tlist.AddToList(&print1);
+    tlist.AddToList(&print1);
     tlist.AddToList(&print2);
     tlist.AddToList(&pcopy);
@@ -97 +96 @@
         return;
 
-    MCamDisplay display(&geomcam);
+    MHCamera display(geomcam);
     display.Draw();
 
-    display.SetAutoScale(kFALSE);
-    display.SetMinimum(0);
-    display.SetMaximum(100);
+    // Use this if you don't want the event to be autoscaled
+    //display.SetMinimum(0);
+    //display.SetMaximum(100);
 
     while (tlist.Process())
@@ -108 +107 @@
         cout << "Event #" << read.GetNumEntry() ":" << endl;
 
-        display.Fill(*(MCerPhotEvt*)clone.GetClone());
+        display.SetCamContent(*(MCerPhotEvt*)clone.GetClone());
         gPad->Modified();
         gPad->Update();
@@ -114 +113 @@
         if (!HandleInput())
             break;
-/*
+
         hillas.Draw();
         hillas.Print();
@@ -120 +119 @@
         newimgpar.Print();
 
-        display.Fill(*(MCerPhotEvt*)plist.FindObject("MCerPhotEvt"));
+        display.SetCamContent(*(MCerPhotEvt*)plist.FindObject("MCerPhotEvt"));
         gPad->Modified();
         gPad->Update();
@@ -126 +125 @@
         if (!HandleInput())
             break;
-*/    }
+    }
 
     evtloop.PostProcess();

trunk/MagicSoft/Mars/mbase/MPrint.cc

@@ -126 +126 @@
     //
     *fLog << err << dbginf << fObjName << " not found... ";
-    if (TestBit(kSKIP))
+    if (TestBit(kSkip))
     {
         *fLog << "removing task from list." << endl;