Changeset 989 for trunk/MagicSoft/Mars

Timestamp:

10/24/01 15:40:24 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mbase/MLog.cc (modified) (2 diffs)
• mbase/MLog.h (modified) (3 diffs)
• mmain/MMonteCarlo.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MLog.cc

@@ -43 +43 @@
 #include "MLog.h"
 
+#include <stdlib.h>     // mkstempe
 #include <fstream.h>
 #include <TGListBox.h>
@@ -204 +205 @@
 void MLog::AllocateFile(const char *fname)
 {
-    fout = new ofstream(fname);
+    fout = fname ? new ofstream(fname) : new ofstream(mkstemp("logXXXXXX"));
     fOutAllocated = kTRUE;
 }

trunk/MagicSoft/Mars/mbase/MLog.h

@@ -5 +5 @@
 //#include "MAGIC.h"
 //#endif
+#ifndef ROOT_TObject
+#include <TObject.h>
+#endif
 
-#include <TObject.h>
-
-#include <stdio.h>     // tmpname
 #include <iostream.h>  // base classes for MLog
 
@@ -95 +95 @@
     }
 
-    void SetOutputFile(const char *f=tmpnam(NULL), int flag=-1)
+    void SetOutputFile(const char *f=NULL, int flag=-1)
     {
         //
@@ -121 +121 @@
         //
         if (!fout)
-            ReallocateFile(tmpnam(NULL));
+            ReallocateFile(NULL);
         return *fout;
     }

trunk/MagicSoft/Mars/mmain/MMonteCarlo.cc

@@ -85 +85 @@
     fRadioButton3 = new TGRadioButton(group, "Use a number of trigger conditions (1..n).");
 
-    fList->Add(fRadioButton1);
-    fList->Add(fRadioButton2);
-    fList->Add(fRadioButton3);
+    /*
+     FIXME: ~TGRadioButton fails with segfault in GetMainFrame
+
+     fList->Add(fRadioButton1);
+     fList->Add(fRadioButton2);
+     fList->Add(fRadioButton3);
+    */
 
     //