Changeset 1076 for trunk/MagicSoft/Mars/macros

Timestamp:

11/14/01 10:03:20 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/macros

Files:

• readCT1.C (modified) (2 diffs)
• readMagic.C (modified) (3 diffs)

trunk/MagicSoft/Mars/macros/readCT1.C

@@ -37 +37 @@
 
     MCT1ReadAscii read("/home/tbretz/data/CT1_97_off1.dat");
+    MClone        clone("MCerPhotEvt");
     MImgCleanStd  clean;
     MHillasCalc   hcalc;
 
     tlist.AddToList(&read);
+    tlist.AddToList(&clone);
     tlist.AddToList(&clean);
     tlist.AddToList(&hcalc);
@@ -50 +52 @@
         return;
 
-    MCerPhotEvt &phevt = *(MCerPhotEvt*)plist->FindObject("MCerPhotEvt");
-
     Int_t icount = 0;
     MCamDisplay display(&geomcam);
     display.Draw();
 
-    while (read.Process())
+    while (tlist.Process())
     {
-        cout << "Event: " << icount++  << endl;
-        hillas.Reset();
+        cout << "Event #" << icount++ << endl;
 
-        display.DrawPhotNum(&phevt);
+        display.DrawPhotNum((MCerPhotEvt*)clone.GetClone());
         gClient->HandleInput();
         if(getchar()=='q')
             break;
 
-        clean.Process();
-
-        if (hcalc.Process()==kCONTINUE)
-        {
-            cout << "skipped." << endl;
-            continue;
-        }
-
         hillas.Print();
         hillas.Draw();
-
-        display.DrawPhotNum(&phevt);
+        display.DrawPhotNum((MCerPhotEvt*)plist.FindObject("MCerPhotEvt"));
 
         gClient->HandleInput();

trunk/MagicSoft/Mars/macros/readMagic.C

@@ -40 +40 @@
     MReadTree    read("Events", "~/data/camera.root");
     MCerPhotCalc ncalc;
+    MClone       clone("MCerPhotEvt");
     MImgCleanStd clean;
     MHillasCalc  hcalc;
@@ -45 +46 @@
     tlist.AddToList(&read);
     tlist.AddToList(&ncalc);
+    tlist.AddToList(&clone);
     tlist.AddToList(&clean);
     tlist.AddToList(&hcalc);
@@ -54 +56 @@
         return;
 
-    MCerPhotEvt &phevt = *(MCerPhotEvt*)plist.FindObject("MCerPhotEvt");
-
     MCamDisplay display(&geomcam);
     display.Draw();
 
-    while (read.Process())
+    while (tlist.Process())
     {
-        cout << "Event #" << read.GetEventNum() ":" << endl;
-        hillas.Reset();
-        phevt.Reset();
+        cout << "Event #" << read.GetEventNum() << endl;
 
-        ncalc.Process();
-
-        display.DrawPhotNum(&phevt);
+        display.DrawPhotNum((MCerPhotEvt*)clone.GetClone());
         gClient->HandleInput();
         if(getchar()=='q')
             break;
 
-        clean.Process();
-        hcalc.Process();
-
         hillas.Print();
         hillas.Draw();
-
-        display.DrawPhotNum(&phevt);
+        display.DrawPhotNum((MCerPhotEvt*)plist.FindObject("MCerPhotEvt"));
 
         gClient->HandleInput();