Changeset 1015 for trunk/MagicSoft


Ignore:
Timestamp:
10/30/01 13:38:00 (23 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
24 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/meventdisp/EvtDispLinkDef.h

    r959 r1015  
    55#pragma link off all functions;
    66
    7 #pragma link C++ class MGEvtDisplay;
     7#pragma link C++ class MGEvtDisplay+;
    88
    9 #pragma link C++ class MGFadcDisp;
    10 #pragma link C++ class MGCamDisplay;
     9#pragma link C++ class MGFadcDisp+;
     10#pragma link C++ class MGCamDisplay+;
    1111
    1212#endif

  • trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.cc

    r991 r1015  
    7373    fDisplayHillas = kTRUE;
    7474
    75     /*
    76      FIXME: crashed the destructor
    77 
     75    /* FXIME:
    7876     fList->Add(but1);
    7977     fList->Add(but2);
    80      */
     78    */
    8179
    8280    but1->Associate(this);

  • trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.h

    r961 r1015  
    1 #ifndef MGCAMDISPLAY_H
    2 #define MGCAMDISPLAY_H
     1#ifndef MARS_MGCamDisplay
     2#define MARS_MGCamDisplay
    33
    4 #ifndef MAGIC_H
    5 #include "MAGIC.h"
    6 #endif
    7 
    8 #ifndef MGEVTDISPLAY_H
     4#ifndef MARS_MGEvtDisplay
    95#include "MGEvtDisplay.h"
    106#endif

  • trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.h

    r991 r1015  
    1 #ifndef MGEVTDISPLAY_H
    2 #define MGEVTDISPLAY_H
     1#ifndef MARS_MGEvtDisplay
     2#define MARS_MGEvtDisplay
    33
    4 #ifndef MAGIC_H
     4#ifndef MARS_MAGIC
    55#include "MAGIC.h"
    66#endif

  • trunk/MagicSoft/Mars/meventdisp/MGFadcDisp.h

    r961 r1015  
    1 #ifndef MGFADCDISP_H
    2 #define MGFADCDISP_H
     1#ifndef MARS_MGFadcDisp
     2#define MARS_MGFadcDisp
    33
    4 #ifndef MAGIC_H
    5 #include "MAGIC.h"
    6 #endif
    7 
    8 #ifndef MGEVTDISPLAY_H
     4#ifndef MARS_MGEvtDisplay
    95#include "MGEvtDisplay.h"
    106#endif

  • trunk/MagicSoft/Mars/mfilter/FilterLinkDef.h

    r856 r1015  
    55#pragma link off all functions;
    66
    7 #pragma link C++ class MFTriggerLvl1;
     7#pragma link C++ class MFTriggerLvl1+;
    88
    99#endif

  • trunk/MagicSoft/Mars/mfilter/MFTriggerLvl1.h

    r937 r1015  
    1 #ifndef MFTRIGGERLVL1_H
    2 #define MFTRIGGERLVL1_H
     1#ifndef MARS_MFTriggerLvl1
     2#define MARS_MFTriggerLvl1
    33
    44/////////////////////////////////////////////////////////////////////////////
    … …  
    88/////////////////////////////////////////////////////////////////////////////
    99
    10 #ifndef MFILTER_H
     10#ifndef MARS_MFilter
    1111#include "MFilter.h"
    1212#endif

  • trunk/MagicSoft/Mars/mgui/GuiLinkDef.h

    r715 r1015  
    55#pragma link off all functions;
    66
    7 #pragma link C++ class MHexagon;
     7#pragma link C++ class MHexagon+;
    88
    9 #pragma link C++ class MGeomPix;
    10 #pragma link C++ class MGeomCam;
    11 #pragma link C++ class MGeomCamCT1;
    12 #pragma link C++ class MGeomCamMagic;
     9#pragma link C++ class MGeomPix+;
     10#pragma link C++ class MGeomCam+;
     11#pragma link C++ class MGeomCamCT1+;
     12#pragma link C++ class MGeomCamMagic+;
    1313
    14 #pragma link C++ class MCamDisplay;
     14#pragma link C++ class MCamDisplay+;
    1515
    1616#endif

  • trunk/MagicSoft/Mars/mgui/MCamDisplay.h

    r980 r1015  
    1 #ifndef MCAMDISPLAY_H
    2 #define MCAMDISPLAY_H
     1#ifndef MARS_MCamDisplay
     2#define MARS_MCamDisplay
    33
    4 #ifndef MAGIC_H
     4#ifndef MARS_MAGIC
    55#include "MAGIC.h"
    66#endif

  • trunk/MagicSoft/Mars/mgui/MGeomCam.h

    r986 r1015  
    1 #ifndef MGEOMCAM_H
    2 #define MGEOMCAM_H
     1#ifndef MARS_MGeomCam
     2#define MARS_MGeomCam
    33
    4 #ifndef MAGIC_H
    5 #include "MAGIC.h"
    6 #endif
    7 #ifndef MPARCONTAINER_H
     4#ifndef MARS_MParContainer
    85#include "MParContainer.h"
    96#endif

  • trunk/MagicSoft/Mars/mgui/MGeomCamCT1.h

    r963 r1015  
    1 #ifndef MGEOMCAMCT1_H
    2 #define MGEOMCAMCT1_H
     1#ifndef MARS_MGeomCamCT1
     2#define MARS_MGeomCamCT1
    33
    4 #ifndef MAGIC_H
    5 #include "MAGIC.h"
    6 #endif
    7 #ifndef MGEOMCAM_H
     4#ifndef MARS_MGeomCam
    85#include "MGeomCam.h"
    96#endif

  • trunk/MagicSoft/Mars/mgui/MGeomCamMagic.h

    r963 r1015  
    1 #ifndef MGEOMCAMMAGIC_H
    2 #define MGEOMCAMMAGIC_H
     1#ifndef MARS_MGeomCamMagic
     2#define MARS_MGeomCamMagic
    33
    4 #ifndef MAGIC_H
    5 #include "MAGIC.h"
    6 #endif
    7 #ifndef MGEOMCAM_H
     4#ifndef MARS_MGeomCam
    85#include "MGeomCam.h"
    96#endif

  • trunk/MagicSoft/Mars/mgui/MGeomPix.h

    r986 r1015  
    1 #ifndef MGEOMPIX_H
    2 #define MGEOMPIX_H
     1#ifndef MARS_MGeomPix
     2#define MARS_MGeomPix
    33
    4 #ifndef MAGIC_H
    5 #include "MAGIC.h"
     4#ifndef MARS_MParContainer
     5#include "MParContainer.h"
    66#endif
    77
    8 class MGeomPix : public TObject
     8class MGeomPix : public MParContainer
    99{
    1010private:

  • trunk/MagicSoft/Mars/mgui/MHexagon.h

    r986 r1015  
    1 #ifndef MHEXAGON_H
    2 #define MHEXAGON_H
     1#ifndef MARS_MHexagon
     2#define MARS_MHexagon
    33
    44//////////////////////////////////////////////////////////////
    … …  
    99//
    1010//////////////////////////////////////////////////////////////
     11
     12#ifndef MARS_MAGIC
     13#include "MAGIC.h"
     14#endif
    1115
    1216#ifndef ROOT_TObject

  • trunk/MagicSoft/Mars/mhist/HistLinkDef.h

    r961 r1015  
    55#pragma link off all functions;
    66
    7 #pragma link C++ class MFillH;
     7#pragma link C++ class MFillH+;
    88
    9 #pragma link C++ class MH;
    10 #pragma link C++ class MHFadcCam;
    11 #pragma link C++ class MHFadcPix;
    12 #pragma link C++ class MHHillas;
    13 #pragma link C++ class MHStarMap;
    14 #pragma link C++ class MHMcEnergy;
    15 #pragma link C++ class MHMcCollectionArea;
     9#pragma link C++ class MH+;
     10#pragma link C++ class MHFadcCam+;
     11#pragma link C++ class MHFadcPix+;
     12#pragma link C++ class MHHillas+;
     13#pragma link C++ class MHStarMap+;
     14#pragma link C++ class MHMcEnergy+;
     15#pragma link C++ class MHMcCollectionArea+;
    1616
    17 #pragma link C++ class MHMcRate;
     17#pragma link C++ class MHMcRate+;
    1818
    1919#endif

  • trunk/MagicSoft/Mars/mhist/MFillH.h

    r961 r1015  
    1 #ifndef MFILLH_H
    2 #define MFILLH_H
     1#ifndef MARS_MFillH
     2#define MARS_MFillH
    33
    4 #ifndef MAGIC_H
    5 #include "MAGIC.h"
    6 #endif
    7 
    8 #ifndef MTASK_H
     4#ifndef MARS_MTask
    95#include "MTask.h"
    106#endif

  • trunk/MagicSoft/Mars/mhist/MH.h

    r1004 r1015  
    1 #ifndef MH_H
    2 #define MH_H
     1#ifndef MARS_MH
     2#define MARS_MH
    33
    4 #ifndef MAGIC_H
    5 #include "MAGIC.h"
    6 #endif
    7 
    8 #ifndef MPARCONTAINER_H
     4#ifndef MARS_MParContainer
    95#include "MParContainer.h"
    106#endif

  • trunk/MagicSoft/Mars/mhist/MHFadcCam.h

    r1004 r1015  
    1 #ifndef MHFADCCAM_H
    2 #define MHFADCCAM_H
    3 
    4 #ifndef MAGIC_H
    5 #include "MAGIC.h"
    6 #endif
     1#ifndef MARS_MHFadcCam
     2#define MARS_MHFadcCam
    73
    84#ifndef ROOT_TObjArray
    … …  
    106#endif
    117
    12 #ifndef MH_H
     8#ifndef MARS_MH
    139#include "MH.h"
    1410#endif
    15 #ifndef MHFADCPIX_H
     11#ifndef MARS_MHFadcPix
    1612#include "MHFadcPix.h"
    1713#endif

  • trunk/MagicSoft/Mars/mhist/MHFadcPix.h

    r1004 r1015  
    1 #ifndef MHFADCPIX_H
    2 #define MHFADCPIX_H
     1#ifndef MARS_MHFadcPix
     2#define MARS_MHFadcPix
    33
    4 #ifndef MAGIC_H
    5 #include "MAGIC.h"
     4#ifndef MARS_MParContainer
     5#include "MParContainer.h"
    66#endif
    7 
    8 //#ifndef ROOT_TH1
    9 //#include <TH1.h>
    10 //#endif
    117
    128class TH1F;
    139
    14 class MHFadcPix : public TObject
     10class MHFadcPix : public MParContainer
    1511{
    1612private:

  • trunk/MagicSoft/Mars/mhist/MHHillas.h

    r970 r1015  
    1 #ifndef MHHILLAS_H
    2 #define MHHILLAS_H
     1#ifndef MARS_MHHillas
     2#define MARS_MHHillas
    33
    4 #ifndef MAGIC_H
    5 #include "MAGIC.h"
    6 #endif
    7 
    8 #ifndef MH_H
     4#ifndef MARS_MH
    95#include "MH.h"
    106#endif

  • trunk/MagicSoft/Mars/mhist/MHMcCollectionArea.h

    r1004 r1015  
    1 #ifndef MHMCCOLLECTIONAREA_H
    2 #define MHMCCOLLECTIONAREA_H
     1#ifndef MARS_MHMcCollectionArea
     2#define MARS_MHMcCollectionArea
    33
    4 #ifndef MAGIC_H
    5 #include "MAGIC.h"
    6 #endif
    7 #ifndef MPARCONTAINER_H
     4#ifndef MARS_MParContainer
    85#include "MParContainer.h"
    96#endif

  • trunk/MagicSoft/Mars/mhist/MHMcEnergy.h

    r986 r1015  
    1 #ifndef MHMCENERGY_H
    2 #define MHMCENERGY_H
     1#ifndef MARS_MHMcEnergy
     2#define MARS_MHMcEnergy
    33
    4 #ifndef MAGIC_H
    5 #include "MAGIC.h"
    6 #endif
    7 #ifndef MPARCONTAINER_H
     4#ifndef MARS_MParContainer
    85#include "MParContainer.h"
    96#endif

  • trunk/MagicSoft/Mars/mhist/MHMcRate.h

    r986 r1015  
    1 #ifndef MHMCRATE_H
    2 #define MHMCRATE_H
     1#ifndef MARS_MHMcRate
     2#define MARS_MHMcRate
    33
    4 #ifndef MAGIC_H
    5 #include "MAGIC.h"
    6 #endif
    7 #ifndef MPARCONTAINER_H
     4#ifndef MARS_MParContainer
    85#include "MParContainer.h"
    96#endif

  • trunk/MagicSoft/Mars/mhist/MHStarMap.h

    r1004 r1015  
    1 #ifndef MHSTARMAP_H
    2 #define MHSTARMAP_H
     1#ifndef MARS_MHStarMap
     2#define MARS_MHStarMap
    33
    4 #ifndef MAGIC_H
    5 #include "MAGIC.h"
    6 #endif
    7 
    8 #ifndef MH_H
     4#ifndef MARS_MH
    95#include "MH.h"
    106#endif
Note: See TracChangeset for help on using the changeset viewer.