Changeset 1439 for trunk/MagicSoft


Ignore:
Timestamp:
07/25/02 10:20:43 (22 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r1434 r1439  
    11                                                                  -*-*- END -*-*-
     2
     3
     4 2002/07/25: Thomas Bretz
     5
     6   * mtools, mtools/Makefile, mtools/ToolsLinkDef.h, mtools/ToolsIncl.h:
     7     - added
     8
     9   * mgeom, mgeom/Makefile, mgeom/GeomLinkDef.h, mgeom/GeomIncl.h:
     10     - added
     11
     12   * Makefile:
     13     - mtools added
     14     - mgeom added
     15
     16   * mtools/MagicCivilization.[h,cc], mtools/MagicDomino.[h,cc],
     17     mtools/MagicShow.[h,cc], mtools/MagicSnake.[h,cc]:
     18     - added
     19
     20   * mgui/MineSweeper.[h,cc]:
     21     - moved to mtools
     22
     23   * mgui/MGeom*.[h,cc]:
     24     - moved to mgeom
     25
     26   * mgeom/MGeomCamMagic.cc:
     27     - corrected 48(!) wrong entries in the Next Neighbor table
     28
     29   * mmain/Makefile, eventdisp/Makefile:
     30     - added mgeom
     31
     32   * mgui/Makefile, mgui/LinkDef.h, mhist/Makefile, manalysis/Makefile:
     33     - removed MGeom* and MineSweeper
     34
     35   * macros/rootlogon.C:
     36     - added new include paths
     37
     38   * manalysis/MCerPhotEvt.cc, mgeom/MGeomCam.cc:
     39     - removed include of MHexagon
     40
     41
    242
    343 2002/07/23: Thomas Bretz

  • trunk/MagicSoft/Mars/Makefile

    r1406 r1439  
    3737SUBDIRS = mmain       \
    3838          mmc         \
    39           mgui        \
    4039          manalysis   \
    4140          mfileio     \
    … …  
    4746          mdata       \
    4847          mfilter     \
     48          mtools      \
     49          mgui        \
     50          mgeom       \
    4951          mraw
    5052

  • trunk/MagicSoft/Mars/manalysis/Makefile

    r1438 r1439  
    5050           MCerPhotCalc.cc \
    5151           MCerPhotCalc2.cc \
    52            MImageFit.cc \
    5352           MPedCalcPedRun.cc \
    5453           MBlindPixels.cc \

  • trunk/MagicSoft/Mars/mhist/Makefile

    r1438 r1439  
    5656           MHMcEnergyImpact.cc \
    5757           MHMcRate.cc \
     58           MHMcIntRate.cc \
     59           MHMcDifRate.cc \
    5860           MHThetabarTime.cc \
    5961           MHThetabarTheta.cc \

  • trunk/MagicSoft/Mars/mtools/MagicCivilization.cc

    r1435 r1439  
    438438}
    439439
    440 char       *MagicCivilization::GetObjectInfo(Int_t px, Int_t py) const
    441 {
    442     cout << "GET " << px << " " << py << endl;
    443     return 0;
    444 }

  • trunk/MagicSoft/Mars/mtools/MagicCivilization.h

    r1435 r1439  
    3030        kHasFlag      = BIT(15),
    3131        kHasCreation  = BIT(16),
    32         kUserBits     = 0x0000ff00, // 14-23 are allowed
     32        kUserBits     = 0x0000ff00 // 14-23 are allowed
    3333    };
    3434
    … …  
    7676    void Reset();        //*MENU*
    7777
    78     char       *MagicCivilization::GetObjectInfo(Int_t px, Int_t py) const;
    79 
    8078    ClassDef(MagicCivilization, 0) // Tool to visualize next neighbours
    8179};

  • trunk/MagicSoft/Mars/mtools/MagicShow.h

    r1435 r1439  
    2828    {
    2929        kBackground = 50,
    30         kUserBits   = 0x0000ff00, // 14-23 are allowed
     30        kUserBits   = 0x0000ff00 // 14-23 are allowed
    3131
    3232    };

  • trunk/MagicSoft/Mars/mtools/MagicSnake.cc

    r1435 r1439  
    175175}
    176176
    177 void MagicSnake::Pause(Bool_t yes=kTRUE)
     177void MagicSnake::Pause(Bool_t yes)
    178178{
    179179    if (yes && !fPaused)

  • trunk/MagicSoft/Mars/mtools/MagicSnake.h

    r1435 r1439  
    4242        kHasTransport = BIT(18),
    4343        kHasDoor      = BIT(19),
    44         kUserBits     = 0x0000ff00, // 14-23 are allowed
     44        kUserBits     = 0x0000ff00 // 14-23 are allowed
    4545
    4646    };

  • trunk/MagicSoft/Mars/mtools/Makefile

    r1435 r1439  
    2222#  connect the include files defined in the config.mk file
    2323#
    24 INCLUDES = -I. -I../mbase -I../mgui
     24INCLUDES = -I. -I../mbase -I../mgui -I../mgeom
    2525
    2626#------------------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.