Changeset 989 for trunk


Ignore:
Timestamp:
10/24/01 15:40:24 (23 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/mbase/MLog.cc

    r936 r989  
    4343#include "MLog.h"
    4444
     45#include <stdlib.h>     // mkstempe
    4546#include <fstream.h>
    4647#include <TGListBox.h>
    … …  
    204205void MLog::AllocateFile(const char *fname)
    205206{
    206     fout = new ofstream(fname);
     207    fout = fname ? new ofstream(fname) : new ofstream(mkstemp("logXXXXXX"));
    207208    fOutAllocated = kTRUE;
    208209}

  • trunk/MagicSoft/Mars/mbase/MLog.h

    r936 r989  
    55//#include "MAGIC.h"
    66//#endif
     7#ifndef ROOT_TObject
     8#include <TObject.h>
     9#endif
    710
    8 #include <TObject.h>
    9 
    10 #include <stdio.h>     // tmpname
    1111#include <iostream.h>  // base classes for MLog
    1212
    … …  
    9595    }
    9696
    97     void SetOutputFile(const char *f=tmpnam(NULL), int flag=-1)
     97    void SetOutputFile(const char *f=NULL, int flag=-1)
    9898    {
    9999        //
    … …  
    121121        //
    122122        if (!fout)
    123             ReallocateFile(tmpnam(NULL));
     123            ReallocateFile(NULL);
    124124        return *fout;
    125125    }

  • trunk/MagicSoft/Mars/mmain/MMonteCarlo.cc

    r988 r989  
    8585    fRadioButton3 = new TGRadioButton(group, "Use a number of trigger conditions (1..n).");
    8686
    87     fList->Add(fRadioButton1);
    88     fList->Add(fRadioButton2);
    89     fList->Add(fRadioButton3);
     87    /*
     88     FIXME: ~TGRadioButton fails with segfault in GetMainFrame
     89
     90     fList->Add(fRadioButton1);
     91     fList->Add(fRadioButton2);
     92     fList->Add(fRadioButton3);
     93    */
    9094
    9195    //
Note: See TracChangeset for help on using the changeset viewer.