Changeset 1016 for trunk/MagicSoft/Mars


Ignore:
Timestamp:
10/30/01 13:44:09 (23 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
2 deleted
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/mmain/MAnalysis.h

    r961 r1016  
    1 #ifndef MANALYSIS_H
    2 #define MANALYSIS_H
     1#ifndef MARS_MAnalysis
     2#define MARS_MAnalysis
    33
    4 #ifndef MAGIC_H
    5 #include "MAGIC.h"
    6 #endif
    7 
    8 #ifndef MBROWSER_H
     4#ifndef MARS_MBrowser
    95#include "MBrowser.h"
    106#endif

  • trunk/MagicSoft/Mars/mmain/MBrowser.h

    r961 r1016  
    1 #ifndef MBROWSER_H
    2 #define MBROWSER_H
     1#ifndef MARS_MBrowser
     2#define MARS_MBrowser
    33
    4 #ifndef MAGIC_H
     4#ifndef MARS_MAGIC
    55#include "MAGIC.h"
    66#endif

  • trunk/MagicSoft/Mars/mmain/MCameraDisplay.h

    r961 r1016  
    1 #ifndef MCAMERADISPLAY_H
    2 #define MCAMERADISPLAY_H
     1#ifndef MARS_MCameraDisplay
     2#define MARS_MCameraDisplay
    33
    4 #ifndef MAGIC_H
    5 #include "MAGIC.h"
    6 #endif
    7 
    8 #ifndef MBROWSER_H
     4#ifndef MARS_MBrowser
    95#include "MBrowser.h"
    106#endif

  • trunk/MagicSoft/Mars/mmain/MDataCheck.h

    r961 r1016  
    1 #ifndef MDATACHECK_H
    2 #define MDATACHECK_H
     1#ifndef MARS_MDataCheck
     2#define MARS_MDataCheck
    33
    4 #ifndef MAGIC_H
    5 #include "MAGIC.h"
    6 #endif
    7 
    8 #ifndef MBROWSER_H
     4#ifndef MARS_MBrowser
    95#include "MBrowser.h"
    106#endif

  • trunk/MagicSoft/Mars/mmain/MEvtDisp.h

    r961 r1016  
    1 #ifndef MEVTDISP_H
    2 #define MEVTDISP_H
     1#ifndef MARS_MEvtDisp
     2#define MARS_MEvtDisp
    33
    4 #ifndef MAGIC_H
    5 #include "MAGIC.h"
    6 #endif
    7 
    8 #ifndef MBROWSER_H
     4#ifndef MARS_MBrowser
    95#include "MBrowser.h"
    106#endif

  • trunk/MagicSoft/Mars/mmain/MMars.h

    r959 r1016  
    1 #ifndef MMARS_H
    2 #define MMARS_H
     1#ifndef MARS_MMars
     2#define MARS_MMars
    33
    4 #ifndef MAGIC_H
     4#ifndef MMARS_MAGIC
    55#include "MAGIC.h"
    66#endif
    … …  
    99#include <TGFrame.h>
    1010#endif
    11 
    12 /*
    13  #ifndef MBROWSER_H
    14  #include <MBrowser.h>
    15  #endif
    16  */
    1711
    1812class TList;

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

    r993 r1016  
    7474    // Create a button group (it alignes the buttons and make
    7575    // them automatic radio buttons)
     76    // Create three (auto) radio buttons in the button group
    7677    //
    7778    TGVButtonGroup *group = new TGVButtonGroup(frame);
    7879    fList->Add(group);
    7980
    80     //
    81     // Create three (auto) radio buttons in the button group
    82     //
    8381    fRadioButton1 = new TGRadioButton(group, "Use unnumbered trigger condition olny.");
    8482    fRadioButton2 = new TGRadioButton(group, "Use only one trigger condition (specify number below).");
    … …  
    8785    fRadioButton1->SetState(kButtonDown);
    8886
    89     /*
    90      FIXME: ~TGRadioButton fails with segfault in GetMainFrame
    91 
     87    /* FIXME:
    9288     fList->Add(fRadioButton1);
    9389     fList->Add(fRadioButton2);
    … …  
    236232    //
    237233    MReadTree reader("Events", fInputFile);
    238     reader.UseLeaf("fImpact");
    239     reader.UseLeaf("fEnergy");
    240     reader.UseLeaf("fNumFirstLevel");
     234//    reader.UseLeaf("fImpact");
     235//    reader.UseLeaf("fEnergy");
     236//    reader.UseLeaf("fNumFirstLevel");
    241237
    242238    tlist.AddToList(&reader);
    … …  
    337333    //
    338334    MReadTree reader("Events", fInputFile);
    339     reader.UseLeaf("fImpact");
     335/*    reader.UseLeaf("fImpact");
    340336    reader.UseLeaf("fEnergy");
    341337    reader.UseLeaf("fPhi");
    … …  
    343339    reader.UseLeaf("fNumFirstLevel");
    344340    reader.UseLeaf("fPhotElfromShower");
    345 
     341*/
    346342    tlist.AddToList(&reader);
    347343
    … …  
    428424    //
    429425    MReadTree read("Events", fInputFile);
    430     read.UseLeaf("fEnergy");
     426/*    read.UseLeaf("fEnergy");
    431427    read.UseLeaf("fNumFirstLevel");
    432 
     428*/
    433429    MMcThresholdCalc calc(dim);
    434430    tlist.AddToList(&read);

  • trunk/MagicSoft/Mars/mmain/MMonteCarlo.h

    r961 r1016  
    1 #ifndef MMONTECARLO_H
    2 #define MMONTECARLO_H
     1#ifndef MARS_MMonteCarlo
     2#define MARS_MMonteCarlo
    33
    4 #ifndef MAGIC_H
    5 #include "MAGIC.h"
    6 #endif
    7 
    8 #ifndef MBROWSER_H
     4#ifndef MARS_MBrowser
    95#include "MBrowser.h"
    106#endif

  • trunk/MagicSoft/Mars/mmain/MainLinkDef.h

    r959 r1016  
    55#pragma link off all functions;
    66
    7 #pragma link C++ class MBrowser;
     7#pragma link C++ class MBrowser+;
    88
    9 #pragma link C++ class MMars;
    10 #pragma link C++ class MAnalysis;
    11 #pragma link C++ class MEvtDisp;
    12 #pragma link C++ class MDataCheck;
    13 #pragma link C++ class MMonteCarlo;
    14 #pragma link C++ class MCameraDisplay;
     9#pragma link C++ class MMars+;
     10#pragma link C++ class MAnalysis+;
     11#pragma link C++ class MEvtDisp+;
     12#pragma link C++ class MDataCheck+;
     13#pragma link C++ class MMonteCarlo+;
     14#pragma link C++ class MCameraDisplay+;
    1515
    1616#endif

  • trunk/MagicSoft/Mars/mmontecarlo/MMcCollectionAreaCalc.h

    r867 r1016  
    1 #ifndef MMCCOLLECTIONAREACALC_H
    2 #define MMCCOLLECTIONAREACALC_H
     1#ifndef MARS_MMcCollectionAreaCalc
     2#define MARS_MMcCollectionAreaCalc
    33
    4 #ifndef MTASK_H
     4#ifndef MARS_MTask
    55#include "MTask.h"
    66#endif

  • trunk/MagicSoft/Mars/mmontecarlo/MMcThresholdCalc.h

    r1007 r1016  
    1 #ifndef MMCTHREASHOLDCALC_H
    2 #define MMCTHREASHOLDCALC_H
     1#ifndef MARS_MMcThresholdCalc
     2#define MARS_MMcThresholdCalc
    33
    44/////////////////////////////////////////////////////////////////////////////
    … …  
    1010/////////////////////////////////////////////////////////////////////////////
    1111
    12 #ifndef MTASK_h
     12#ifndef MARS_MTask
    1313#include "MTask.h"
    1414#endif

  • trunk/MagicSoft/Mars/mmontecarlo/MMcTriggerRateCalc.h

    r1007 r1016  
    1 #ifndef MTRIGGERRATECALC_H
    2 #define MTRIGGERRATECALC_H
     1#ifndef MARS_MTriggerRateCalc
     2#define MARS_MTriggerRateCalc
    33
    4 #ifndef MAGIC_H
    5 #include "MAGIC.h"
    6 #endif
    74#ifndef ROOT_TObjArray
    85#include <TObjArray.h>
    96#endif
    10 #ifndef MTASK_H
     7#ifndef MARS_MTask
    118#include "MTask.h"
    129#endif

  • trunk/MagicSoft/Mars/mmontecarlo/MonteCarloLinkDef.h

    r880 r1016  
    55#pragma link off all functions;
    66
    7 #pragma link C++ class MMcThresholdCalc;
    8 #pragma link C++ class MMcCollectionAreaCalc;
    9 #pragma link C++ class MMcTriggerRateCalc ;
     7#pragma link C++ class MMcThresholdCalc+;
     8#pragma link C++ class MMcCollectionAreaCalc+;
     9#pragma link C++ class MMcTriggerRateCalc+;
    1010
    1111#endif
Note: See TracChangeset for help on using the changeset viewer.