Changeset 574 for trunk/MagicSoft


Ignore:
Timestamp:
01/18/01 17:10:59 (24 years ago)
Author:
tbretz
Message:
see Mars/Changelog
Location:
trunk/MagicSoft
Files:
5 added
1 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r543 r574  
    11                                                               -*-*- END -*-*-
     2 2000/01/18: Thomas Bretz
     3 
     4 * Makefile:
     5    - mmc-library added
     6 
     7 * Makefile.conf.general:
     8    - Added definition of __MARS__
     9   
     10 * Makefile.rules:
     11    - Added definitions to rootcint
     12 
     13 * Oscar added the McFormat subdir of the Monte Carlo as mmc
     14 
     15 * mmc/MMcEvt.h:
     16    - renamed to MMcEvt.hxx
     17 
     18 * mmc/*.hxx:
     19    - added necessary defintions from MDefineTrigger.h
     20 
     21 * mmc/Makefile, mmc/McLinkDef.h, mmc/McIncl.h, mmc/readme.txt:
     22    - added
     23   
     24 * mmc/LinkDef.h:
     25    - removed
     26   
    227
    328 2000/01/17: Thomas Bretz

  • trunk/MagicSoft/Mars/Makefile

    r546 r574  
    3535#  ----->>>   mars libraries
    3636#
    37 SUBDIRS = mgui mdatacheck mbase mraw
     37SUBDIRS = mgui mdatacheck mbase mraw mmc
    3838
    3939LIBRARIES = $(SUBDIRS:=.a)
    … …  
    9090        @cd mdatacheck; make mrproper; cd ..
    9191        @echo "cd .."
     92        @echo "cd mmc"
     93        @cd mmc; make mrproper; cd ..
     94        @echo "cd .."
    9295
    9396

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

    r454 r574  
    1111#
    1212
    13 CXXFLAGS  = $(ROOTCFLAGS) $(INCLUDES) $(OPTIM) $(DEBUG)
     13DEFINES   = -D__MARS__
     14
     15CXXFLAGS  = $(ROOTCFLAGS) $(INCLUDES) $(OPTIM) $(DEBUG) $(DEFINES)
    1416CFLAGS    = $(CXXFLAGS)
    1517FFLAGS    = $(CXXFLAGS)

  • trunk/MagicSoft/Mars/Makefile.rules

    r546 r574  
    1313
    1414        $(ROOTSYS)/bin/rootcint -f $(CINT)Cint.cc \
    15         -c $(INCLUDES) $(HEADERS) $(CINT)Incl.h $(CINT)LinkDef.h
     15        -c $(INCLUDES) $(DEFINES) $(HEADERS) $(CINT)Incl.h $(CINT)LinkDef.h
    1616
    1717.cxx.o:

  • trunk/MagicSoft/include-Classes/MMcFormat/MHeaderTrig.hxx

    r480 r574  
    1111#include "TObject.h"
    1212
     13#ifndef __MARS__
    1314#include "../../Simulation/Detector/include-MTrigger/MTriggerDefine.h"
     15#else
     16//
     17// From the include file above
     18//
     19#define TRIGGER_PIXELS        271
     20#endif
    1421
    1522class MHeaderTrig : public TObject {

  • trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.cxx

    r481 r574  
    11#include <iostream.h>
    2 #include "MMcEvt.h"
     2#include "MMcEvt.hxx"
    33
    44

  • trunk/MagicSoft/include-Classes/MMcFormat/MMcTrig.hxx

    r484 r574  
    1111#include "TObject.h"
    1212
     13#ifndef __MARS__
    1314#include "../../Simulation/Detector/include-MTrigger/MTriggerDefine.h"
     15#else
     16//
     17// From the include file above
     18//
     19#define TOTAL_TRIGGER_TIME    160
     20#define LEVEL1_DEAD_TIME       50
     21#define LEVEL2_DEAD_TIME      300
     22#endif
    1423
    1524class MMcTrig : public TObject {
Note: See TracChangeset for help on using the changeset viewer.