Changeset 1325 for trunk/MagicSoft/Mars/macros

Timestamp:

04/30/02 12:00:44 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/macros

Files:

• readCT1.C (modified) (4 diffs)
• readMagic.C (modified) (4 diffs)

trunk/MagicSoft/Mars/macros/readCT1.C

@@ -23 +23 @@
 \* ======================================================================== */
 
+Bool_t HandleInput()
+{
+    TTimer timer("gSystem->ProcessEvents();", 50, kFALSE);
+    while (1)
+    {
+        //
+        // While reading the input process gui events asynchronously
+        //
+        timer.TurnOn();
+        TString input = Getline("Type 'q' to exit, <return> to go on: ");
+        timer.TurnOff();
 
-void readCT1()
+        if (input=="q\n")
+            return kFALSE;
+
+        if (input=="\n")
+            return kTRUE;
+    };
+
+    return kFALSE;
+}
+
+void readCT1(const char *fname="~/data/CT1_97_on1.dat")
 {
     MParList plist;
@@ -36 +57 @@
     plist.AddToList(&tlist);
 
-    MCT1ReadAscii read("/home/tbretz/data/CT1_97_on1.dat");
+    MCT1ReadAscii read(fname);
     MClone        clone("MCerPhotEvt");
     MImgCleanStd  clean;
@@ -66 +87 @@
 
         display.DrawPhotNum(evt);
-        gClient->HandleInput();
-        if (getchar()=='q')
+
+        if (!HandleInput())
             break;
 
@@ -74 +95 @@
         display.DrawPhotNum((MCerPhotEvt*)plist.FindObject("MCerPhotEvt"));
 
-        gClient->HandleInput();
-        if (getchar()=='q')
+        if (!HandleInput())
             break;
     } 

trunk/MagicSoft/Mars/macros/readMagic.C

@@ -24 +24 @@
 
 
-void readMagic()
+Bool_t HandleInput()
+{
+    TTimer timer("gSystem->ProcessEvents();", 50, kFALSE);
+    while (1)
+    {
+        //
+        // While reading the input process gui events asynchronously
+        //
+        timer.TurnOn();
+        TString input = Getline("Type 'q' to exit, <return> to go on: ");
+        timer.TurnOff();
+
+        if (input=="q\n")
+            return kFALSE;
+
+        if (input=="\n")
+            return kTRUE;
+    };
+
+    return kFALSE;
+}
+
+void readMagic(const char *fname="~/data/camera.root")
 {
     MParList plist;
@@ -36 +58 @@
     plist.AddToList(&tlist);
 
-    MReadMarsFile     read("Events", "~/data/camera.root");
+    MReadMarsFile     read("Events", fname);
 
     MMcPedestalCopy   pcopy;
@@ -71 +93 @@
         display.DrawPhotNum((MCerPhotEvt*)clone.GetClone());
 
-        gClient->HandleInput();
-        if(getchar()=='q')
+        if (!HandleInput())
             break;
 
@@ -80 +101 @@
         display.DrawPhotNum((MCerPhotEvt*)plist.FindObject("MCerPhotEvt"));
 
-        gClient->HandleInput();
-        if(getchar()=='q')
-        break;
+        if (!HandleInput())
+            break;
     } 
 
     evtloop.PostProcess();
-
 }
 
-
-
-