Changeset 2196 for trunk/MagicSoft


Ignore:
Timestamp:
06/18/03 13:46:13 (21 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r2194 r2196  
    2525   * mmain/MStatusDisplay.cc:
    2626     - removed an unsused variable
     27
     28   * Makefile.conf.osf1, Makefile.conf.osf5.1:
     29     - added definitions for __USE_STD_IOSTREAM and R__ANSISTREAM
     30       tp be able to compile on Alphas again
     31       
     32   * manalysis/MCT1PadONOFF.cc:
     33     - included math.h
     34     - commented out some code to be able to compile on Alpha - FIXME
     35     
     36   * mbase/MDirIter.h:
     37     - fixed a bug in the definition of MatchFilter
     38     
    2739
    2840

  • trunk/MagicSoft/Mars/Makefile.conf.osf1

    r2054 r2196  
    2525OPTIM    = -O2 -ieee -arch host -lpthread
    2626DEBUG    = -g  -w0 -msg_display_tag -msg_disable castqualtyp,undpreid,unrfunprm,extrasemi,intconlosbit,nonfundec,partovrd,stoclsnotfirst,boolexprconst
    27 ARCHDEF  = -D__OSF__
     27ARCHDEF  = -D__OSF__ -D__USE_STD_IOSTREAM -DR__ANSISTREAM
    2828
    2929MARS_LIB = -Llib $(SUBDIRS/*/-l&)  $(MARSLIBS)

  • trunk/MagicSoft/Mars/Makefile.conf.osf5.1

    r2054 r2196  
    2525OPTIM    = -O2 -ieee -arch host
    2626DEBUG    = -g3  -w0 -msg_display_tag -msg_disable castqualtyp,undpreid,unrfunprm,extrasemi,intconlosbit,nonfundec,partovrd,stoclsnotfirst,boolexprconst
    27 ARCHDEF  = -D__OSF__
     27ARCHDEF  = -D__OSF__ -D__USE_STD_IOSTREAM -DR__ANSISTREAM
    2828
    2929MARS_LIB = -Llib $(SUBDIRS/*/-l&)  $(MARSLIBS)

  • trunk/MagicSoft/Mars/manalysis/MCT1PadONOFF.cc

    r2175 r2196  
    6464#include "MCT1PadONOFF.h"
    6565
     66#include <math.h>
    6667#include <stdio.h>
    6768
    … …  
    11551156  delete nblind;
    11561157
    1157 
     1158#warn Code commented out due no compilation errors on Alpha OSF (tgb)
     1159/*
    11581160  // throw the Id of numBlind different pixels in this event
    11591161  TH1D *hblind;
    … …  
    11901192
    11911193  }
    1192 
     1194*/
    11931195  //******************************************************************
    11941196  // has the event to be padded ?

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

    r2180 r2196  
    2020    Bool_t  Check(const TString n) const;
    2121    Int_t   IsDir(const char *dir) const;
    22     Bool_t  MatchFilter(const TString &n, const TString &n) const;
     22    Bool_t  MatchFilter(const TString &name, const TString &filter) const;
    2323    TString ConcatFileName(const char *dir, const char *name) const;
    2424    void    PrintEntry(const TObject &o) const;
Note: See TracChangeset for help on using the changeset viewer.