Index: trunk/MagicSoft/Mars/Changelog =================================================================== --- trunk/MagicSoft/Mars/Changelog (revision 1329) +++ trunk/MagicSoft/Mars/Changelog (revision 1330) @@ -1,3 +1,25 @@ -*-*- END -*-*- + 2002/05/03: Thomas Bretz + + * mars.cc: + - changed version to 0.8 + - added logo stuff + + * merpp.cc: + - changed usage-output + + * mgui/MCamDisplay.cc, mgui/MGeomCam.cc, mgui/MGeomCamCT1.cc, + mgui/MGeomCamMagic.cc, mgui/MHexagon.cc, mhist/MBinning.cc, + mhist/MFillH.cc, mhist/MH.cc, mhist/MHAlphaEnergyTheta.cc, + mhist/MHAlphaEnergyTime.cc, mhist/MHEffOnTimeTheta.cc, + mhist/MHEffOnTimeTime.cc, mhist/MHEnergyTheta.cc, MHEnergyTime.cc, + mhist/MHMcCollectionArea.cc, mhist/MHStarMap.cc, mmain/MMars.cc, + mmontecarlo/MMcCollectionAreaCalc.cc + - changed mail address + - added missing copyright notices + - added missing class description + + + 2002/04/30: Thomas Bretz Index: trunk/MagicSoft/Mars/mars.cc =================================================================== --- trunk/MagicSoft/Mars/mars.cc (revision 1329) +++ trunk/MagicSoft/Mars/mars.cc (revision 1330) @@ -10,4 +10,9 @@ #include "MArray.h" #include "MParContainer.h" + +//#define HAVE_LOGO 1 +#ifdef HAVE_LOGO +#include "MLogo.h" +#endif // ********************************************************************** @@ -30,6 +35,11 @@ } -int main(int argc, char **argv ) +int main(int argc, char **argv) { +#ifdef HAVE_LOGO + MLogo logo; + logo.Popup(); +#endif + gLog << all << endl; @@ -37,5 +47,5 @@ // 12345678901234567890123456789012345678901234567890 gLog << "==================================================" << endl; - gLog << " MARS V0.7 " << endl; + gLog << " MARS V0.8 " << endl; gLog << " Magic Analysis and Reconstruction Software " << endl; gLog << " Compiled on <" << __DATE__ << ">" << endl; @@ -96,4 +106,8 @@ TApplication app("MarsApp", &argc, argv); +#ifdef HAVE_LOGO + logo.Popdown(); +#endif + // // start the main window Index: trunk/MagicSoft/Mars/merpp.cc =================================================================== --- trunk/MagicSoft/Mars/merpp.cc (revision 1329) +++ trunk/MagicSoft/Mars/merpp.cc (revision 1330) @@ -51,5 +51,5 @@ gLog << " input file: Magic DAQ binary file." << endl; gLog << " ouput file: Merpped root file." << endl; - gLog << " compr. level: 1..9 [9]" << endl << endl; + gLog << " compr. level: 1..9 [default=9]" << endl << endl; return -1; } Index: trunk/MagicSoft/Mars/mgui/MCamDisplay.cc =================================================================== --- trunk/MagicSoft/Mars/mgui/MCamDisplay.cc (revision 1329) +++ trunk/MagicSoft/Mars/mgui/MCamDisplay.cc (revision 1330) @@ -1,2 +1,34 @@ +/* ======================================================================== *\ +! +! * +! * 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): Thomas Bretz 05/2002 +! Author(s): Harald Kornmayer 1/2001 +! +! Copyright: MAGIC Software Development, 2000-2002 +! +! +\* ======================================================================== */ + +///////////////////////////////////////////////////////////////////////////// +// +// MCamDisplay +// +// Camera Display +// +//////////////////////////////////////////////////////////////////////////// #include "MCamDisplay.h" Index: trunk/MagicSoft/Mars/mgui/MGeomCam.cc =================================================================== --- trunk/MagicSoft/Mars/mgui/MGeomCam.cc (revision 1329) +++ trunk/MagicSoft/Mars/mgui/MGeomCam.cc (revision 1330) @@ -19,5 +19,5 @@ ! Author(s): Harald Kornmayer 1/2001 ! -! Copyright: MAGIC Software Development, 2000-2001 +! Copyright: MAGIC Software Development, 2000-2002 ! ! Index: trunk/MagicSoft/Mars/mgui/MGeomCamCT1.cc =================================================================== --- trunk/MagicSoft/Mars/mgui/MGeomCamCT1.cc (revision 1329) +++ trunk/MagicSoft/Mars/mgui/MGeomCamCT1.cc (revision 1330) @@ -16,13 +16,13 @@ ! ! -! Author(s): Thomas Bretz 12/2000 +! Author(s): Thomas Bretz 12/2000 ! Author(s): Harald Kornmayer 1/2001 ! -! Copyright: MAGIC Software Development, 2000-2001 +! Copyright: MAGIC Software Development, 2000-2002 ! ! \* ======================================================================== */ -/////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////////// // // MGeomCamCT1 @@ -32,5 +32,5 @@ // is calculated (for Algorithm see CreateCam // -/////////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////// #include "MGeomCamCT1.h" Index: trunk/MagicSoft/Mars/mgui/MGeomCamMagic.cc =================================================================== --- trunk/MagicSoft/Mars/mgui/MGeomCamMagic.cc (revision 1329) +++ trunk/MagicSoft/Mars/mgui/MGeomCamMagic.cc (revision 1330) @@ -16,13 +16,13 @@ ! ! -! Author(s): Thomas Bretz 12/2000 +! Author(s): Thomas Bretz 12/2000 ! Author(s): Harald Kornmayer 1/2001 ! -! Copyright: MAGIC Software Development, 2000-2001 +! Copyright: MAGIC Software Development, 2000-2002 ! ! \* ======================================================================== */ -/////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////////// // // MGeomCamMagic @@ -31,5 +31,5 @@ // All information are copied from tables, see source code. // -/////////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////// #include "MGeomCamMagic.h" Index: trunk/MagicSoft/Mars/mgui/MGeomPix.cc =================================================================== --- trunk/MagicSoft/Mars/mgui/MGeomPix.cc (revision 1329) +++ trunk/MagicSoft/Mars/mgui/MGeomPix.cc (revision 1330) @@ -16,5 +16,5 @@ ! ! -! Author(s): Thomas Bretz 12/2000 +! Author(s): Thomas Bretz 12/2000 ! Author(s): Harald Kornmayer 1/2001 ! @@ -31,5 +31,5 @@ // a single pixel together with the information about next neighbors. // -////////////////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////// #include "MGeomPix.h" Index: trunk/MagicSoft/Mars/mgui/MHexagon.cc =================================================================== --- trunk/MagicSoft/Mars/mgui/MHexagon.cc (revision 1329) +++ trunk/MagicSoft/Mars/mgui/MHexagon.cc (revision 1330) @@ -16,16 +16,18 @@ ! ! -! Author(s): Thomas Bretz 12/2000 +! Author(s): Thomas Bretz 12/2000 ! Author(s): Harald Kornmayer 1/2001 ! -! Copyright: MAGIC Software Development, 2000-2001 +! Copyright: MAGIC Software Development, 2000-2002 ! ! \* ======================================================================== */ -// -// The class MHexagon is needed for the Event Display of -// MAGIC. -// +////////////////////////////////////////////////////////////////////////////// +// // +// MHexagon // +// // +////////////////////////////////////////////////////////////////////////////// + #include "MHexagon.h" Index: trunk/MagicSoft/Mars/mhist/MBinning.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MBinning.cc (revision 1329) +++ trunk/MagicSoft/Mars/mhist/MBinning.cc (revision 1330) @@ -16,5 +16,5 @@ ! ! -! Author(s): Thomas Bretz 01/2002 +! Author(s): Thomas Bretz 01/2002 ! ! Copyright: MAGIC Software Development, 2000-2002 Index: trunk/MagicSoft/Mars/mhist/MFillH.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MFillH.cc (revision 1329) +++ trunk/MagicSoft/Mars/mhist/MFillH.cc (revision 1330) @@ -16,5 +16,5 @@ ! ! -! Author(s): Thomas Bretz 07/2001 +! Author(s): Thomas Bretz 07/2001 ! ! Copyright: MAGIC Software Development, 2000-2002 Index: trunk/MagicSoft/Mars/mhist/MH.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MH.cc (revision 1329) +++ trunk/MagicSoft/Mars/mhist/MH.cc (revision 1330) @@ -16,5 +16,5 @@ ! ! -! Author(s): Thomas Bretz 07/2001 +! Author(s): Thomas Bretz 07/2001 ! ! Copyright: MAGIC Software Development, 2000-2002 Index: trunk/MagicSoft/Mars/mhist/MHAlphaEnergyTheta.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MHAlphaEnergyTheta.cc (revision 1329) +++ trunk/MagicSoft/Mars/mhist/MHAlphaEnergyTheta.cc (revision 1330) @@ -16,5 +16,5 @@ ! ! -! Author(s): Thomas Bretz 1/2002 +! Author(s): Thomas Bretz 1/2002 ! Author(s): Wolfgang Wittek 1/2002 ! @@ -66,5 +66,5 @@ fHist.SetTitle("3D-plot of alpha, E-est, Theta"); fHist.SetXTitle("\\alpha [\\circ]"); - fHist.SetYTitle("E-est [GeV] "); + fHist.SetYTitle("E_{est} [GeV]"); fHist.SetZTitle("\\Theta [\\circ]"); } @@ -146,5 +146,5 @@ h->SetTitle("Distribution of E-est [GeV]"); - h->SetXTitle("E-est [GeV] "); + h->SetXTitle("E_{est} [GeV]"); h->SetYTitle("Counts"); Index: trunk/MagicSoft/Mars/mhist/MHAlphaEnergyTime.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MHAlphaEnergyTime.cc (revision 1329) +++ trunk/MagicSoft/Mars/mhist/MHAlphaEnergyTime.cc (revision 1330) @@ -16,5 +16,5 @@ ! ! -! Author(s): Thomas Bretz 1/2002 +! Author(s): Thomas Bretz 1/2002 ! Author(s): Wolfgang Wittek 1/2002 ! @@ -68,5 +68,5 @@ fHist.SetTitle("3D-plot of alpha, E-est, time"); fHist.SetXTitle("\\alpha [\\circ]"); - fHist.SetYTitle("E-est [GeV] "); + fHist.SetYTitle("E_{est} [GeV]"); fHist.SetZTitle("time [s]"); } @@ -147,5 +147,5 @@ h->SetTitle("Distribution of E-est [GeV]"); - h->SetXTitle("E-est [GeV] "); + h->SetXTitle("E_{est} [GeV]"); h->SetYTitle("Counts"); Index: trunk/MagicSoft/Mars/mhist/MHEffOnTimeTheta.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MHEffOnTimeTheta.cc (revision 1329) +++ trunk/MagicSoft/Mars/mhist/MHEffOnTimeTheta.cc (revision 1330) @@ -16,5 +16,5 @@ ! ! -! Author(s): Thomas Bretz 1/2002 +! Author(s): Thomas Bretz 1/2002 ! Author(s): Wolfgang Wittek 1/2002 ! @@ -70,5 +70,5 @@ fHEffOn.SetXTitle("\\Theta [\\circ]"); - fHEffOn.SetYTitle("t-eff [s]"); + fHEffOn.SetYTitle("t_{eff} [s]"); // chi2/NDF versus theta @@ -79,5 +79,5 @@ fHChi2.SetXTitle("\\Theta [\\circ]"); - fHChi2.SetYTitle("chi2/NDF"); + fHChi2.SetYTitle("chi^{2}/NDF"); // lambda versus theta @@ -322,15 +322,2 @@ gPad->Update(); } - - - - - - - - - - - - - Index: trunk/MagicSoft/Mars/mhist/MHEffOnTimeTime.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MHEffOnTimeTime.cc (revision 1329) +++ trunk/MagicSoft/Mars/mhist/MHEffOnTimeTime.cc (revision 1330) @@ -16,5 +16,5 @@ ! ! -! Author(s): Thomas Bretz 1/2002 +! Author(s): Thomas Bretz 1/2002 ! Author(s): Wolfgang Wittek 1/2002 ! @@ -71,5 +71,5 @@ fHEffOn.SetXTitle("time [s]"); - fHEffOn.SetYTitle("t-eff [s]"); + fHEffOn.SetYTitle("t_{eff} [s]"); // chi2/NDF versus time @@ -80,5 +80,5 @@ fHChi2.SetXTitle("time [s]"); - fHChi2.SetYTitle("chi2/NDF"); + fHChi2.SetYTitle("chi^{2}/NDF"); // lambda versus time Index: trunk/MagicSoft/Mars/mhist/MHEnergyTheta.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MHEnergyTheta.cc (revision 1329) +++ trunk/MagicSoft/Mars/mhist/MHEnergyTheta.cc (revision 1330) @@ -16,5 +16,5 @@ ! ! -! Author(s): Thomas Bretz 1/2002 +! Author(s): Thomas Bretz 1/2002 ! ! Copyright: MAGIC Software Development, 2000-2002 @@ -23,5 +23,11 @@ \* ======================================================================== */ -#include "MHEnergyTheta.h" +////////////////////////////////////////////////////////////////////////////// +// // +// MHEnergyTheta // +// // +////////////////////////////////////////////////////////////////////////////// + +#include "MHEnergyTheta.h" #include Index: trunk/MagicSoft/Mars/mhist/MHEnergyTime.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MHEnergyTime.cc (revision 1329) +++ trunk/MagicSoft/Mars/mhist/MHEnergyTime.cc (revision 1330) @@ -16,5 +16,5 @@ ! ! -! Author(s): Thomas Bretz 1/2002 +! Author(s): Thomas Bretz 1/2002 ! ! Copyright: MAGIC Software Development, 2000-2002 @@ -22,4 +22,10 @@ ! \* ======================================================================== */ + +////////////////////////////////////////////////////////////////////////////// +// // +// MHEnergyTime // +// // +////////////////////////////////////////////////////////////////////////////// #include "MHEnergyTime.h" Index: trunk/MagicSoft/Mars/mhist/MHMcCollectionArea.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MHMcCollectionArea.cc (revision 1329) +++ trunk/MagicSoft/Mars/mhist/MHMcCollectionArea.cc (revision 1330) @@ -16,11 +16,17 @@ ! ! -! Author(s): Thomas Bretz 12/2000 +! Author(s): Thomas Bretz 12/2000 ! Author(s): Harald Kornmayer 1/2001 ! -! Copyright: MAGIC Software Development, 2000-2001 +! Copyright: MAGIC Software Development, 2000-2002 ! ! \* ======================================================================== */ + +////////////////////////////////////////////////////////////////////////////// +// // +// MHMcCollectionArea // +// // +////////////////////////////////////////////////////////////////////////////// #include "MHMcCollectionArea.h" Index: trunk/MagicSoft/Mars/mhist/MHMcEnergyMigration.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MHMcEnergyMigration.cc (revision 1329) +++ trunk/MagicSoft/Mars/mhist/MHMcEnergyMigration.cc (revision 1330) @@ -65,6 +65,6 @@ fHist.SetTitle("3D-plot E-true E-est Theta"); - fHist.SetXTitle("E-true [GeV] "); - fHist.SetYTitle("E-est [GeV] "); + fHist.SetXTitle("E_{true} [GeV]"); + fHist.SetYTitle("E_{est} [GeV]"); fHist.SetZTitle("\\Theta [\\circ]"); } @@ -123,5 +123,5 @@ h->SetTitle("Distribution of E-true"); - h->SetXTitle("E-true [GeV] "); + h->SetXTitle("E_{true} [GeV]"); h->SetYTitle("Counts"); @@ -135,5 +135,5 @@ h->SetTitle("Distribution of E-est"); - h->SetXTitle("E-est [GeV] "); + h->SetXTitle("E_{est} [GeV]"); h->SetYTitle("Counts"); @@ -179,5 +179,5 @@ h->SetTitle("Distribution of E-true"); - h->SetXTitle("E-true [GeV] "); + h->SetXTitle("E_{true} [GeV]"); h->Draw(opt); @@ -190,5 +190,5 @@ h->SetTitle("Distribution of E-est"); - h->SetXTitle("E-est [GeV] "); + h->SetXTitle("E_{est} [GeV]"); h->Draw(opt); h->SetBit(kCanDelete); Index: trunk/MagicSoft/Mars/mhist/MHStarMap.cc =================================================================== --- trunk/MagicSoft/Mars/mhist/MHStarMap.cc (revision 1329) +++ trunk/MagicSoft/Mars/mhist/MHStarMap.cc (revision 1330) @@ -16,5 +16,5 @@ ! ! -! Author(s): Thomas Bretz 12/2000 +! Author(s): Thomas Bretz 12/2000 ! ! Copyright: MAGIC Software Development, 2000-2002 @@ -23,5 +23,5 @@ \* ======================================================================== */ -/////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////////// // // MHStarMap @@ -31,5 +31,5 @@ // from the Hillas parameters (Fill) can be enhanced. // -/////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////////// #include "MHStarMap.h" Index: trunk/MagicSoft/Mars/mmain/MMars.cc =================================================================== --- trunk/MagicSoft/Mars/mmain/MMars.cc (revision 1329) +++ trunk/MagicSoft/Mars/mmain/MMars.cc (revision 1330) @@ -19,5 +19,5 @@ ! Author(s): Harald Kornmayer 1/2001 ! -! Copyright: MAGIC Software Development, 2000-2001 +! Copyright: MAGIC Software Development, 2000-2002 ! ! @@ -292,9 +292,11 @@ case kPicMagic: + cout << "Trying to start 'netscape http://hegra1.mppmu.mpg.de/MAGICWeb/'..." << endl; gSystem->Exec("netscape http://hegra1.mppmu.mpg.de/MAGICWeb/ &"); return kTRUE; case kPicMars: - gSystem->Exec("netscape http://magic.uni-sw.gwdg.de/mars/ &"); + cout << "Trying to start 'netscape http://magic.astro.uni-wuerzburg.de/mars/'..." << endl; + gSystem->Exec("netscape http://magic.astro.uni-wuerzburg.de/mars/ &"); return kTRUE; } Index: trunk/MagicSoft/Mars/mmontecarlo/MMcCollectionAreaCalc.cc =================================================================== --- trunk/MagicSoft/Mars/mmontecarlo/MMcCollectionAreaCalc.cc (revision 1329) +++ trunk/MagicSoft/Mars/mmontecarlo/MMcCollectionAreaCalc.cc (revision 1330) @@ -16,11 +16,17 @@ ! ! -! Author(s): Thomas Bretz 12/2000 +! Author(s): Thomas Bretz 12/2000 ! Author(s): Harald Kornmayer 1/2001 ! -! Copyright: MAGIC Software Development, 2000-2001 +! Copyright: MAGIC Software Development, 2000-2002 ! ! \* ======================================================================== */ + +////////////////////////////////////////////////////////////////////////////// +// // +// MHMcCollectionAreaCalc // +// // +////////////////////////////////////////////////////////////////////////////// #include "MMcCollectionAreaCalc.h"