Changeset 2492 for trunk/MagicSoft


Ignore:
Timestamp:
11/10/03 11:32:23 (21 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r2491 r2492  
    11                                                 -*-*- END OF LINE -*-*-
    22
    3   2003/11/10: Thomas Bretz
     3 2003/11/10: Thomas Bretz
    44 
    55   * macros/dohtml.C:
    … …  
    7171
    7272
    73  
    74   2003/11/08: Nicola Galante
     73
     74 2003/11/08: Nicola Galante
    7575
    7676   * mhistmc/MHMcTriggerLvl2.[cc,h]:
    … …  
    9090
    9191
    92   2003/11/07: Thomas Bretz
     92 2003/11/07: Thomas Bretz
    9393 
    9494   * mmain/MCameraDisplay.cc:
    … …  
    155155
    156156
    157   2003/11/06: Antonio Stamerra
     157 2003/11/06: Antonio Stamerra
    158158
    159159   * manalysis/MMcTriggerLvl2.cc
    … …  
    162162
    163163
    164   2003/11/05: Wolfgang Wittek
     164 2003/11/05: Wolfgang Wittek
    165165
    166166   * macros/CT1Analysis.C, macros/ONOFFCT1Analysis.C:

  • trunk/MagicSoft/Mars/Makefile

    r2491 r2492  
    2121
    2222#PROGRAMS = readraw merpp mars test mona status
    23 PROGRAMS = readraw merpp mars
     23PROGRAMS = readraw merpp star mars
    2424SOLIB    = libmars.so
    2525CINT     = M
    … …  
    132132        root -b -q dohtml.C
    133133
    134 clean:  rmcint rmobjs rmcore rmlib
     134clean:  rmmake rmcint rmobjs rmcore rmlib
    135135
    136 mrproper:       $(MRPROPERS) rmbin rmbak rmbakmac rmhtml clean
     136mrproper:       $(MRPROPERS) rmmake rmbin rmbak rmbakmac rmhtml clean
    137137        @echo " Done."
    138138        @echo " "

  • trunk/MagicSoft/Mars/Makefile.rules

    r2485 r2492  
    2626# The cleaning facility
    2727#
     28
     29rmmake:
     30        @echo " Removing Makefile.depend"
     31        @rm -f Makefile.depend
    2832
    2933rmcint:

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

    r2490 r2492  
    193193//  use operator!() or operator void*() or fail()
    194194//
    195 Bool_t MReadSocket::Open(int port, Bool_t block=kFALSE)
     195Bool_t MReadSocket::Open(int port, Bool_t block)
    196196{
    197197    //

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

    r2491 r2492  
    894894    // in the same thread
    895895    //
    896     if (mutex->TryLock()==13)
     896    if (fMutex->TryLock()==13)
    897897        return;
    898898
    … …  
    927927    //c->Paint();
    928928
    929     mutex->UnLock();
     929    fMutex->UnLock();
    930930}
    931931
Note: See TracChangeset for help on using the changeset viewer.