Index: /trunk/MagicSoft/Mars/mmain/MAnalysis.h =================================================================== --- /trunk/MagicSoft/Mars/mmain/MAnalysis.h (revision 1015) +++ /trunk/MagicSoft/Mars/mmain/MAnalysis.h (revision 1016) @@ -1,10 +1,6 @@ -#ifndef MANALYSIS_H -#define MANALYSIS_H +#ifndef MARS_MAnalysis +#define MARS_MAnalysis -#ifndef MAGIC_H -#include "MAGIC.h" -#endif - -#ifndef MBROWSER_H +#ifndef MARS_MBrowser #include "MBrowser.h" #endif Index: /trunk/MagicSoft/Mars/mmain/MBrowser.h =================================================================== --- /trunk/MagicSoft/Mars/mmain/MBrowser.h (revision 1015) +++ /trunk/MagicSoft/Mars/mmain/MBrowser.h (revision 1016) @@ -1,6 +1,6 @@ -#ifndef MBROWSER_H -#define MBROWSER_H +#ifndef MARS_MBrowser +#define MARS_MBrowser -#ifndef MAGIC_H +#ifndef MARS_MAGIC #include "MAGIC.h" #endif Index: /trunk/MagicSoft/Mars/mmain/MCameraDisplay.h =================================================================== --- /trunk/MagicSoft/Mars/mmain/MCameraDisplay.h (revision 1015) +++ /trunk/MagicSoft/Mars/mmain/MCameraDisplay.h (revision 1016) @@ -1,10 +1,6 @@ -#ifndef MCAMERADISPLAY_H -#define MCAMERADISPLAY_H +#ifndef MARS_MCameraDisplay +#define MARS_MCameraDisplay -#ifndef MAGIC_H -#include "MAGIC.h" -#endif - -#ifndef MBROWSER_H +#ifndef MARS_MBrowser #include "MBrowser.h" #endif Index: /trunk/MagicSoft/Mars/mmain/MDataCheck.h =================================================================== --- /trunk/MagicSoft/Mars/mmain/MDataCheck.h (revision 1015) +++ /trunk/MagicSoft/Mars/mmain/MDataCheck.h (revision 1016) @@ -1,10 +1,6 @@ -#ifndef MDATACHECK_H -#define MDATACHECK_H +#ifndef MARS_MDataCheck +#define MARS_MDataCheck -#ifndef MAGIC_H -#include "MAGIC.h" -#endif - -#ifndef MBROWSER_H +#ifndef MARS_MBrowser #include "MBrowser.h" #endif Index: /trunk/MagicSoft/Mars/mmain/MEvtDisp.h =================================================================== --- /trunk/MagicSoft/Mars/mmain/MEvtDisp.h (revision 1015) +++ /trunk/MagicSoft/Mars/mmain/MEvtDisp.h (revision 1016) @@ -1,10 +1,6 @@ -#ifndef MEVTDISP_H -#define MEVTDISP_H +#ifndef MARS_MEvtDisp +#define MARS_MEvtDisp -#ifndef MAGIC_H -#include "MAGIC.h" -#endif - -#ifndef MBROWSER_H +#ifndef MARS_MBrowser #include "MBrowser.h" #endif Index: unk/MagicSoft/Mars/mmain/MGPrototyp.cc =================================================================== --- /trunk/MagicSoft/Mars/mmain/MGPrototyp.cc (revision 1015) +++ (revision ) @@ -1,475 +1,0 @@ -/* ======================================================================== *\ -! -! * -! * This file is part of MARS, the MAGIC Analysis and Reconstruction -! * Software. It is distributed to you in the hope that it can be a useful -! * and timesaving tool in analysing Data of imaging Cerenkov telescopes. -! * It is distributed WITHOUT ANY WARRANTY. -! * -! * Permission to use, copy, modify and distribute this software and its -! * documentation for any purpose is hereby granted without fee, -! * provided that the above copyright notice appear in all copies and -! * that both that copyright notice and this permission notice appear -! * in supporting documentation. It is provided "as is" without express -! * or implied warranty. -! * -! -! -! Author(s): Harald Kornmayer 1/2001 (harald@mppmu.mpg.de) -! Author(s): Thomas Bretz 12/2000 (tbretz@uni-sw.gwdg.de) -! -! Copyright: MAGIC Software Development, 2000-2001 -! -! -\* ======================================================================== */ - -#include "MGPrototyp.h" - -#include // gSystem - -#include // TGTab -#include // TGPopupMenu -#include // TGTextButton -#include // TGMsgBox -#include // TGListBox -#include // TGFileContainer -#include // TGHorizontal3DLine -#include -#include // TGLabel - - -// FIXME: Move to MAGIC.h -#define S_ISDIR(m) (((m)&(0170000)) == (0040000)) - -ClassImp(MGPrototyp) - -enum CommandPrototyp { - M_FILE_CLOSE , - M_BUTTON_ACTION, - - M_FILERESET, - M_PBUTTON_CDIR_UP, - M_PBUTTON_LIST_MODE, - M_PBUTTON_DETAIL_MODE -} ; - - -MGPrototyp::MGPrototyp(const TGWindow *p, const TGWindow *main, - UInt_t w, UInt_t h ) - : TGTransientFrame(p, main, w, h ) -{ - // - // Main window to controll the october test - // - - // set non-gui members to starting values - - sprintf ( fInputFile, "\n" ) ; - - // - // First create the MenuBar. - // - - // Layout objects for menue. - - fLayMenuBar = new TGLayoutHints ( kLHintsTop | kLHintsLeft | kLHintsExpandX, 2, 2, 2, 2 ) ; - fLayMenuItem = new TGLayoutHints ( kLHintsTop | kLHintsLeft , 0, 4, 0, 0 ) ; - - // crate the menu bar - - fFileMenu = new TGPopupMenu ( fClient->GetRoot() ) ; - fFileMenu->AddEntry ("Close", M_FILE_CLOSE ) ; - fFileMenu->Associate(this) ; - - // the button messages are handled by main frame (this) - - fMenuBar = new TGMenuBar ( this, 1, 1, kHorizontalFrame ) ; - fMenuBar->AddPopup("File", fFileMenu, fLayMenuItem ) ; - AddFrame(fMenuBar, fLayMenuBar ) ; - - fLineSep1 = new TGHorizontal3DLine(this) ; - AddFrame(fLineSep1, new TGLayoutHints(kLHintsTop | kLHintsExpandX) ); - - - // - // Create the top window with a lot of buttons - // - - fFrameTop = new TGCompositeFrame (this, 300,100, kVerticalFrame ) ; - - fTop1 = new TGHorizontalFrame (fFrameTop, 300, 100 ) ; - - fButAction = new TGTextButton(fTop1, "ACTION", M_BUTTON_ACTION ); - fButAction->Associate(this) ; - fTop1->AddFrame (fButAction, new TGLayoutHints(kLHintsTop | kLHintsLeft, 10, 10, 5, 5) ); - - fFrameTop->AddFrame (fTop1, new TGLayoutHints(kLHintsCenterX, 10, 10, 5, 5) ); - - AddFrame(fFrameTop, new TGLayoutHints (kLHintsTop ) ) ; - - // a line between top and low frame - - fLineSep2 = new TGHorizontal3DLine(this) ; - AddFrame(fLineSep2, new TGLayoutHints(kLHintsTop | kLHintsExpandX) ); - - // - // Create the low window with a tabs in it - // - - fFrameLow = new TGCompositeFrame (this, 300,100, kHorizontalFrame ) ; - - fLayTab = new TGLayoutHints ( kLHintsExpandX , 5, 5, 5, 5 ) ; - - // create the first tab - - fTab = new TGTab ( fFrameLow, 400, 400 ) ; - - TGCompositeFrame *tf = fTab->AddTab("Input File") ; - - fTabF1 = new TGCompositeFrame (tf, 100, 100, kHorizontalFrame) ; - // tf->AddFrame(fTabF1, fLayTab ) ; - - fTabF1a = new TGCompositeFrame (tf, 100, 100, kHorizontalFrame) ; - tf->AddFrame(fTabF1a, new TGLayoutHints ( kLHintsTop | kLHintsLeft | kLHintsExpandX, 5, 5, 5, 5 ) ) ; - - fTabF1b = new TGCompositeFrame (tf, 100, 100, kHorizontalFrame) ; - tf->AddFrame(fTabF1b, new TGLayoutHints ( kLHintsTop | kLHintsLeft | kLHintsExpandX, 5, 5, 5, 5 ) ) ; - - fTabF1c = new TGCompositeFrame (tf, 100, 100, kVerticalFrame) ; - // tf->AddFrame(fTabF1c, new TGLayoutHints ( kLHintsTop | kLHintsLeft | kLHintsExpandX | kLHintsExpandY , 5, 5, 5, 5 ) ) ; - tf->AddFrame(fTabF1c, new TGLayoutHints ( kLHintsExpandX | kLHintsExpandY , 5, 5, 5, 5 ) ) ; - - // the items in the first subframe - - fLabFileName = new TGLabel(fTabF1a, new TGString("selected File:") ); - fTabF1a->AddFrame( fLabFileName, new TGLayoutHints (kLHintsLeft, 10, 10, 10, 10)) ; - - fTxtFileName = new TGTextEntry(fTabF1a, fTxtBufFileName = new TGTextBuffer(256) ); - fTxtFileName->Resize(60, fTxtFileName->GetDefaultHeight()); - fTabF1a->AddFrame(fTxtFileName, new TGLayoutHints(kLHintsTop | kLHintsExpandX, 5, 5, 5, 5)); - - fButFileReset = new TGTextButton (fTabF1a, "Reset", M_FILERESET ) ; - fButFileReset->Associate(this) ; - fTabF1a->AddFrame (fButFileReset, new TGLayoutHints (kLHintsRight, 10, 10, 10, 10 ) ) ; - - - - // the items in the second subfraem - - fLabDir = new TGLabel(fTabF1b, new TGString("Directory:") ); - fTabF1b->AddFrame( fLabDir, new TGLayoutHints (kLHintsLeft, 10, 10, 10, 10)) ; - - fDir = new TGListBox(fTabF1b, -1) ; - fDir->Resize(350,20) ; - char temp[100] ; - // sprintf ( temp, "%s", START_DIRECTORY ) ; - sprintf ( temp, "%s", gSystem->WorkingDirectory() ) ; - fDir->AddEntry(temp, 1) ; - fTabF1b->AddFrame( fDir, new TGLayoutHints(kLHintsTop | kLHintsLeft | kLHintsExpandX, 5, 5, 5, 5 ) ) ; - - - fPicCdup = fClient->GetPicture("tb_uplevel.xpm") ; - fCdup = new TGPictureButton(fTabF1b, fPicCdup, M_PBUTTON_CDIR_UP ) ; - fCdup->SetToolTipText("One Level up!") ; - fCdup->Associate(this) ; - fTabF1b->AddFrame (fCdup, new TGLayoutHints(kLHintsLeft | kLHintsTop, 5, 5, 5, 5) ) ; - - fPicList = fClient->GetPicture("tb_list.xpm") ; - fListMode = new TGPictureButton(fTabF1b, fPicList, M_PBUTTON_LIST_MODE ) ; - fListMode->SetToolTipText("List Mode") ; - fListMode->Associate(this) ; - fListMode->SetState(kButtonUp) ; - fListMode->AllowStayDown(kTRUE) ; - fListMode->AllowStayDown(kTRUE) ; fTabF1b->AddFrame (fListMode, new TGLayoutHints(kLHintsLeft | kLHintsTop, 5, 5, 5, 5) ) ; - - fPicDetail = fClient->GetPicture("tb_details.xpm") ; - fDetail = new TGPictureButton(fTabF1b, fPicDetail, M_PBUTTON_DETAIL_MODE ) ; - fDetail->SetToolTipText("Details Mode") ; - fDetail->Associate(this) ; - fDetail->SetState(kButtonEngaged) ; - fDetail->AllowStayDown(kTRUE) ; - fTabF1b->AddFrame (fDetail, new TGLayoutHints(kLHintsLeft | kLHintsTop, 5, 5, 5, 5) ) ; - - // the items in the third subframe - - fFileView = new TGListView(fTabF1c, 540, 380 ) ; - fFileCont = new TGFileContainer(fFileView->GetViewPort(), 100, 100, - kVerticalFrame, fgWhitePixel) ; - - fFileCont->Associate(this) ; - fFileView->GetViewPort()->SetBackgroundColor(fgWhitePixel) ; - fFileView->SetContainer(fFileCont) ; - fFileCont->SetFilter("*") ; - // fFileCont->ChangeDirectory(START_DIRECTORY) ; - fFileCont->ChangeDirectory(gSystem->WorkingDirectory()) ; - fFileView->SetViewMode(kLVDetails); - fFileCont->Sort(kSortByName) ; - - fTabF1c->AddFrame(fFileView, new TGLayoutHints(kLHintsTop | kLHintsExpandX | kLHintsExpandY, 5, 5, 5, 5) ) ; - - tf->AddFrame(fTabF1, fLayTab) ; - - fFrameLow->AddFrame ( fTab, new TGLayoutHints(kLHintsBottom | kLHintsExpandX | kLHintsExpandY, 5, 5, 5, 5) ); - - AddFrame(fFrameLow, new TGLayoutHints (kLHintsExpandX|kLHintsExpandY) ) ; - - // - // Map the window, set up the layout, etc. - // - - SetWMSizeHints(200, 250, 1000, 1000, 10, 10 ) ; // set the smallest and biggest size of the Main frame - - MapSubwindows(); - - Layout(); - - SetWindowName("Prototyp"); - SetIconName("Prototyp"); - - MapWindow(); - -} - - -// ====================================================================== -// ====================================================================== - -MGPrototyp::~MGPrototyp() -{ - //delete fPicCdup, fPicList, fPicDetail; - delete fLayTab; - delete fLayMenuBar; - delete fLayMenuItem; - delete fFileView; - delete fFileCont; - delete fCdup; - delete fListMode; - delete fDetail; - delete fDir ; - delete fLabDir ; - - delete fButFileReset ; - delete fTxtFileName ; - delete fLabFileName ; - - delete fTabF1c; - delete fTabF1b; - delete fTabF1a; - delete fTabF1; - delete fButAction; - delete fTop1; - delete fTab; - - delete fFrameTop; - delete fFrameLow; - delete fLineSep2 ; - delete fLineSep1 ; - - delete fFileMenu; - delete fMenuBar; - -} - - -// ====================================================================== -// ====================================================================== - -void MGPrototyp::CloseWindow() -{ - // Got close message for this MainFrame. Calls parent CloseWindow() - // (which destroys the window) and terminate the application. - // The close message is generated by the window manager when its close - // window menu item is selected. - - delete this ; -} - - -// ====================================================================== -// ====================================================================== - -Bool_t MGPrototyp::InputFileSelected() -{ - // Checks if there is a selected input root file - - if ( strcmp ( fInputFile, "\n") == 0 ) - { - return ( kFALSE ) ; - } - - return (kTRUE) ; -} - - -// ====================================================================== -// ====================================================================== - -Bool_t MGPrototyp::ProcessMessage(Long_t msg, Long_t parm1, Long_t) -{ - // Process events generated by the buttons in the frame. - - Int_t buttons = 4, retval = 0 ; - Char_t wort[100] ; - Char_t extens[5] ; - Char_t command[110] ; - - TGFileItem *item ; // to process items in the file view container - void *np = NULL ; // null pointer - - switch (GET_MSG(msg)) - { - case kC_COMMAND: - switch (GET_SUBMSG(msg)) - { - case kCM_BUTTON: - - switch (parm1) - { - - case M_BUTTON_ACTION: - - if ( InputFileSelected() == kFALSE ) { // it is not selected - - new TGMsgBox(fClient->GetRoot(), this, "ERROR!", - "No Input (root) File selected!", kMBIconExclamation, buttons, &retval); - break ; - } - - new TGMsgBox(fClient->GetRoot(), this, "INFORMATION!", - "Put Intelligence here!!!", kMBIconExclamation, buttons, &retval); - - break ; - - - case M_FILERESET: - - sprintf ( fInputFile, "\n" ) ; - fTxtFileName->SetText( fInputFile ) ; - - break; - case M_PBUTTON_CDIR_UP : - - // goto the parent directory - - gSystem->ChangeDirectory("..") ; - fDir->RemoveEntry(1) ; - sprintf (wort, "%s", gSystem->WorkingDirectory() ) ; - fDir->AddEntry(wort,1) ; - fDir->MapSubwindows() ; - fDir->Layout() ; - fFileCont->ChangeDirectory( wort ) ; - fFileCont->DisplayDirectory() ; - - break ; - - case M_PBUTTON_LIST_MODE: - fFileView->SetViewMode(kLVList) ; - fDetail->SetState(kButtonUp) ; - - break ; - - case M_PBUTTON_DETAIL_MODE: - fFileView->SetViewMode(kLVDetails) ; - fListMode->SetState(kButtonUp) ; - - break ; - - default: - break ; - } - - case kCM_MENU: - - switch (parm1) { - case M_FILE_CLOSE: - CloseWindow() ; - - break; - } - break ; - - default: - break ; - - } - - case kC_CONTAINER: - switch (GET_SUBMSG(msg)) { - - // case kCT_ITEMCLICK: - // printf ("itemclick\n"); - // break; - - - case kCT_ITEMDBLCLICK: - // - // process the double click in the file view container - // - - if ( parm1 == kButton1) { - if ( fFileCont->NumSelected() == 1 ) { - // - // one file selected - // - item = (TGFileItem *) fFileCont->GetNextSelected(&np) ; - - if ( S_ISDIR(item->GetType()) ) // file is directory - { - // goto directory - - sprintf (wort, "%s", item->GetItemName()->GetString()) ; - fFileCont->ChangeDirectory ( wort ) ; - gSystem->ChangeDirectory( wort ) ; - - sprintf (wort, "%s", gSystem->WorkingDirectory() ) ; - fDir->RemoveEntry(1) ; - fDir->AddEntry( wort, 1 ) ; - fDir->MapSubwindows() ; - fDir->Layout() ; - } - else // file is no directory, is a file - { - sprintf (wort, "%s", item->GetItemName()->GetString() ) ; - - // determine the file type by extensions - - for (Int_t i = 0 ; i<5; i++) - extens[i] = '\0' ; - - for ( Int_t i=0; wort[i] != '\0'; i++) { - if ( wort[i] == '.') { - strncpy (extens, &wort[i+1], 4 ) ; - break ; - } - } - - if ( ! strcmp(extens, "ps") ) { // postscript file - sprintf ( command, "gv %s/%s &", - gSystem->WorkingDirectory(), - wort ) ; - gSystem->Exec(command) ; - break ; - } - else if ( ! strcmp(extens, "root") ) { // root file - sprintf ( fInputFile, "%s/%s" , gSystem->WorkingDirectory(), wort ) ; - fTxtFileName->SetText( fInputFile ) ; - - break ; - } - - } - } - } - break; - - default: - break ; - } - - - - default: - break; - } - return kTRUE; -} Index: unk/MagicSoft/Mars/mmain/MGPrototyp.h =================================================================== --- /trunk/MagicSoft/Mars/mmain/MGPrototyp.h (revision 1015) +++ (revision ) @@ -1,101 +1,0 @@ -#ifndef MGPROTOTYP_H -#define MGPROTOTYP_H - -#ifndef MAGIC_H -#include "MAGIC.h" -#endif - -#ifndef ROOT_TGFrame -#include -#endif - -class TGMenuBar; -class TGPopupMenu; -class TGTab; -class TGTextButton; -class TGListBox; -class TGPictureButton; -class TGFileContainer; -class TGListView; -class TGHorizontal3DLine; -class TGLabel ; -class TGTextEntry ; -class TGTextBuffer; - -class MGPrototyp : public TGTransientFrame { - private: - - // - // Create a main frame with a number of different buttons. - // - - // some member not connected with Gui - - Char_t fInputFile[256] ; - - // the things for the menu bar - - TGMenuBar *fMenuBar ; - TGPopupMenu *fFileMenu ; - TGHorizontal3DLine *fLineSep1, *fLineSep2 ; - - - // divide the Window in two different parts - - TGCompositeFrame *fFrameTop ; // top part of the main window - TGCompositeFrame *fFrameLow ; // low part of the main window - TGTab *fTab ; // different tabs in the low window - - // the horizontal frame in the top part - - TGHorizontalFrame *fTop1 ; - - // the buttons in the Top Part - - TGTextButton *fButAction ; - - // the things in the file selector - - TGCompositeFrame *fTabF1 ; // first tab of low part - TGCompositeFrame *fTabF1a, *fTabF1b, *fTabF1c ; // subpart of the file selector in low window - - TGLabel *fLabFileName ; - TGTextEntry *fTxtFileName ; - TGTextBuffer *fTxtBufFileName ; //! - TGTextButton *fButFileReset ; - - TGLabel *fLabDir ; - TGListBox *fDir ; - TGPictureButton *fCdup, *fListMode, *fDetail ; - TGFileContainer *fFileCont ; - TGListView *fFileView ; - - // Layout hints for different uses - - TGLayoutHints *fLayMenuBar, *fLayMenuItem ; - TGLayoutHints *fLayTab ; - - // some icons and pictures often used - - const TGPicture *fPicCdup; //! - const TGPicture *fPicList; //! - const TGPicture *fPicDetail; //! - - public: - MGPrototyp(const TGWindow *p, const TGWindow *main, UInt_t w, UInt_t h) ; - - ~MGPrototyp(); - - void CloseWindow() ; - - Bool_t InputFileSelected() ; - - Bool_t ProcessMessage(Long_t msg, Long_t parm1, Long_t parm2); - - ClassDef(MGPrototyp, 0) - -} ; - -#endif - - Index: /trunk/MagicSoft/Mars/mmain/MMars.h =================================================================== --- /trunk/MagicSoft/Mars/mmain/MMars.h (revision 1015) +++ /trunk/MagicSoft/Mars/mmain/MMars.h (revision 1016) @@ -1,6 +1,6 @@ -#ifndef MMARS_H -#define MMARS_H +#ifndef MARS_MMars +#define MARS_MMars -#ifndef MAGIC_H +#ifndef MMARS_MAGIC #include "MAGIC.h" #endif @@ -9,10 +9,4 @@ #include #endif - -/* - #ifndef MBROWSER_H - #include - #endif - */ class TList; Index: /trunk/MagicSoft/Mars/mmain/MMonteCarlo.cc =================================================================== --- /trunk/MagicSoft/Mars/mmain/MMonteCarlo.cc (revision 1015) +++ /trunk/MagicSoft/Mars/mmain/MMonteCarlo.cc (revision 1016) @@ -74,11 +74,9 @@ // Create a button group (it alignes the buttons and make // them automatic radio buttons) + // Create three (auto) radio buttons in the button group // TGVButtonGroup *group = new TGVButtonGroup(frame); fList->Add(group); - // - // Create three (auto) radio buttons in the button group - // fRadioButton1 = new TGRadioButton(group, "Use unnumbered trigger condition olny."); fRadioButton2 = new TGRadioButton(group, "Use only one trigger condition (specify number below)."); @@ -87,7 +85,5 @@ fRadioButton1->SetState(kButtonDown); - /* - FIXME: ~TGRadioButton fails with segfault in GetMainFrame - + /* FIXME: fList->Add(fRadioButton1); fList->Add(fRadioButton2); @@ -236,7 +232,7 @@ // MReadTree reader("Events", fInputFile); - reader.UseLeaf("fImpact"); - reader.UseLeaf("fEnergy"); - reader.UseLeaf("fNumFirstLevel"); +// reader.UseLeaf("fImpact"); +// reader.UseLeaf("fEnergy"); +// reader.UseLeaf("fNumFirstLevel"); tlist.AddToList(&reader); @@ -337,5 +333,5 @@ // MReadTree reader("Events", fInputFile); - reader.UseLeaf("fImpact"); +/* reader.UseLeaf("fImpact"); reader.UseLeaf("fEnergy"); reader.UseLeaf("fPhi"); @@ -343,5 +339,5 @@ reader.UseLeaf("fNumFirstLevel"); reader.UseLeaf("fPhotElfromShower"); - +*/ tlist.AddToList(&reader); @@ -428,7 +424,7 @@ // MReadTree read("Events", fInputFile); - read.UseLeaf("fEnergy"); +/* read.UseLeaf("fEnergy"); read.UseLeaf("fNumFirstLevel"); - +*/ MMcThresholdCalc calc(dim); tlist.AddToList(&read); Index: /trunk/MagicSoft/Mars/mmain/MMonteCarlo.h =================================================================== --- /trunk/MagicSoft/Mars/mmain/MMonteCarlo.h (revision 1015) +++ /trunk/MagicSoft/Mars/mmain/MMonteCarlo.h (revision 1016) @@ -1,10 +1,6 @@ -#ifndef MMONTECARLO_H -#define MMONTECARLO_H +#ifndef MARS_MMonteCarlo +#define MARS_MMonteCarlo -#ifndef MAGIC_H -#include "MAGIC.h" -#endif - -#ifndef MBROWSER_H +#ifndef MARS_MBrowser #include "MBrowser.h" #endif Index: /trunk/MagicSoft/Mars/mmain/MainLinkDef.h =================================================================== --- /trunk/MagicSoft/Mars/mmain/MainLinkDef.h (revision 1015) +++ /trunk/MagicSoft/Mars/mmain/MainLinkDef.h (revision 1016) @@ -5,12 +5,12 @@ #pragma link off all functions; -#pragma link C++ class MBrowser; +#pragma link C++ class MBrowser+; -#pragma link C++ class MMars; -#pragma link C++ class MAnalysis; -#pragma link C++ class MEvtDisp; -#pragma link C++ class MDataCheck; -#pragma link C++ class MMonteCarlo; -#pragma link C++ class MCameraDisplay; +#pragma link C++ class MMars+; +#pragma link C++ class MAnalysis+; +#pragma link C++ class MEvtDisp+; +#pragma link C++ class MDataCheck+; +#pragma link C++ class MMonteCarlo+; +#pragma link C++ class MCameraDisplay+; #endif Index: /trunk/MagicSoft/Mars/mmontecarlo/MMcCollectionAreaCalc.h =================================================================== --- /trunk/MagicSoft/Mars/mmontecarlo/MMcCollectionAreaCalc.h (revision 1015) +++ /trunk/MagicSoft/Mars/mmontecarlo/MMcCollectionAreaCalc.h (revision 1016) @@ -1,6 +1,6 @@ -#ifndef MMCCOLLECTIONAREACALC_H -#define MMCCOLLECTIONAREACALC_H +#ifndef MARS_MMcCollectionAreaCalc +#define MARS_MMcCollectionAreaCalc -#ifndef MTASK_H +#ifndef MARS_MTask #include "MTask.h" #endif Index: /trunk/MagicSoft/Mars/mmontecarlo/MMcThresholdCalc.h =================================================================== --- /trunk/MagicSoft/Mars/mmontecarlo/MMcThresholdCalc.h (revision 1015) +++ /trunk/MagicSoft/Mars/mmontecarlo/MMcThresholdCalc.h (revision 1016) @@ -1,4 +1,4 @@ -#ifndef MMCTHREASHOLDCALC_H -#define MMCTHREASHOLDCALC_H +#ifndef MARS_MMcThresholdCalc +#define MARS_MMcThresholdCalc ///////////////////////////////////////////////////////////////////////////// @@ -10,5 +10,5 @@ ///////////////////////////////////////////////////////////////////////////// -#ifndef MTASK_h +#ifndef MARS_MTask #include "MTask.h" #endif Index: /trunk/MagicSoft/Mars/mmontecarlo/MMcTriggerRateCalc.h =================================================================== --- /trunk/MagicSoft/Mars/mmontecarlo/MMcTriggerRateCalc.h (revision 1015) +++ /trunk/MagicSoft/Mars/mmontecarlo/MMcTriggerRateCalc.h (revision 1016) @@ -1,12 +1,9 @@ -#ifndef MTRIGGERRATECALC_H -#define MTRIGGERRATECALC_H +#ifndef MARS_MTriggerRateCalc +#define MARS_MTriggerRateCalc -#ifndef MAGIC_H -#include "MAGIC.h" -#endif #ifndef ROOT_TObjArray #include #endif -#ifndef MTASK_H +#ifndef MARS_MTask #include "MTask.h" #endif Index: /trunk/MagicSoft/Mars/mmontecarlo/MonteCarloLinkDef.h =================================================================== --- /trunk/MagicSoft/Mars/mmontecarlo/MonteCarloLinkDef.h (revision 1015) +++ /trunk/MagicSoft/Mars/mmontecarlo/MonteCarloLinkDef.h (revision 1016) @@ -5,7 +5,7 @@ #pragma link off all functions; -#pragma link C++ class MMcThresholdCalc; -#pragma link C++ class MMcCollectionAreaCalc; -#pragma link C++ class MMcTriggerRateCalc ; +#pragma link C++ class MMcThresholdCalc+; +#pragma link C++ class MMcCollectionAreaCalc+; +#pragma link C++ class MMcTriggerRateCalc+; #endif