Changeset 1330 for trunk/MagicSoft


Ignore:
Timestamp:
05/03/02 09:33:44 (23 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
23 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r1327 r1330  
    11                                                                  -*-*- END -*-*-
     2 2002/05/03: Thomas Bretz
     3
     4   * mars.cc:
     5     - changed version to 0.8
     6     - added logo stuff
     7
     8   * merpp.cc:
     9     - changed usage-output
     10
     11   * mgui/MCamDisplay.cc, mgui/MGeomCam.cc, mgui/MGeomCamCT1.cc,
     12     mgui/MGeomCamMagic.cc, mgui/MHexagon.cc, mhist/MBinning.cc,
     13     mhist/MFillH.cc, mhist/MH.cc, mhist/MHAlphaEnergyTheta.cc,
     14     mhist/MHAlphaEnergyTime.cc, mhist/MHEffOnTimeTheta.cc,
     15     mhist/MHEffOnTimeTime.cc, mhist/MHEnergyTheta.cc, MHEnergyTime.cc,
     16     mhist/MHMcCollectionArea.cc, mhist/MHStarMap.cc, mmain/MMars.cc,
     17     mmontecarlo/MMcCollectionAreaCalc.cc
     18     - changed mail address
     19     - added missing copyright notices
     20     - added missing class description
     21
     22
     23
    224 2002/04/30: Thomas Bretz
    325

  • trunk/MagicSoft/Mars/mars.cc

    r1185 r1330  
    1010#include "MArray.h"
    1111#include "MParContainer.h"
     12
     13//#define HAVE_LOGO 1
     14#ifdef HAVE_LOGO
     15#include "MLogo.h"
     16#endif
    1217
    1318// **********************************************************************
    … …  
    3035}
    3136
    32 int main(int argc, char **argv )
     37int main(int argc, char **argv)
    3338{
     39#ifdef HAVE_LOGO
     40    MLogo logo;
     41    logo.Popup();
     42#endif
     43
    3444    gLog << all << endl;
    3545
    … …  
    3747    //       12345678901234567890123456789012345678901234567890
    3848    gLog << "==================================================" << endl;
    39     gLog << "                    MARS V0.7                     " << endl;
     49    gLog << "                    MARS V0.8                     " << endl;
    4050    gLog << "    Magic Analysis and Reconstruction Software    " << endl;
    4151    gLog << "            Compiled on <" << __DATE__ << ">"       << endl;
    … …  
    96106    TApplication app("MarsApp", &argc, argv);
    97107
     108#ifdef HAVE_LOGO
     109    logo.Popdown();
     110#endif
     111
    98112    //
    99113    // start the main window

  • trunk/MagicSoft/Mars/merpp.cc

    r1082 r1330  
    5151        gLog << "     input file:   Magic DAQ binary file." << endl;
    5252        gLog << "     ouput file:   Merpped root file." << endl;
    53         gLog << "     compr. level: 1..9 [9]" << endl << endl;
     53        gLog << "     compr. level: 1..9 [default=9]" << endl << endl;
    5454        return -1;
    5555    }

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

    r1325 r1330  
     1/* ======================================================================== *\
     2!
     3! *
     4! * This file is part of MARS, the MAGIC Analysis and Reconstruction
     5! * Software. It is distributed to you in the hope that it can be a useful
     6! * and timesaving tool in analysing Data of imaging Cerenkov telescopes.
     7! * It is distributed WITHOUT ANY WARRANTY.
     8! *
     9! * Permission to use, copy, modify and distribute this software and its
     10! * documentation for any purpose is hereby granted without fee,
     11! * provided that the above copyright notice appear in all copies and
     12! * that both that copyright notice and this permission notice appear
     13! * in supporting documentation. It is provided "as is" without express
     14! * or implied warranty.
     15! *
     16!
     17!
     18!   Author(s): Thomas Bretz  05/2002 <mailto:tbretz@astro.uni-wuerzburg.de>
     19!   Author(s): Harald Kornmayer 1/2001
     20!
     21!   Copyright: MAGIC Software Development, 2000-2002
     22!
     23!
     24\* ======================================================================== */
     25
     26/////////////////////////////////////////////////////////////////////////////
     27//
     28// MCamDisplay
     29//
     30// Camera Display
     31//
     32////////////////////////////////////////////////////////////////////////////
    133#include "MCamDisplay.h"
    234

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

    r1276 r1330  
    1919!   Author(s): Harald Kornmayer 1/2001
    2020!
    21 !   Copyright: MAGIC Software Development, 2000-2001
     21!   Copyright: MAGIC Software Development, 2000-2002
    2222!
    2323!

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

    r1216 r1330  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
     18!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
    1919!   Author(s): Harald Kornmayer 1/2001
    2020!
    21 !   Copyright: MAGIC Software Development, 2000-2001
     21!   Copyright: MAGIC Software Development, 2000-2002
    2222!
    2323!
    2424\* ======================================================================== */
    2525
    26 ///////////////////////////////////////////////////////////////////////
     26/////////////////////////////////////////////////////////////////////////////
    2727//
    2828// MGeomCamCT1
    … …  
    3232// is calculated (for Algorithm see CreateCam
    3333//
    34 ///////////////////////////////////////////////////////////////////////
     34////////////////////////////////////////////////////////////////////////////
    3535
    3636#include "MGeomCamCT1.h"

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

    r1216 r1330  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
     18!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
    1919!   Author(s): Harald Kornmayer 1/2001
    2020!
    21 !   Copyright: MAGIC Software Development, 2000-2001
     21!   Copyright: MAGIC Software Development, 2000-2002
    2222!
    2323!
    2424\* ======================================================================== */
    2525
    26 ///////////////////////////////////////////////////////////////////////
     26/////////////////////////////////////////////////////////////////////////////
    2727//
    2828// MGeomCamMagic
    … …  
    3131// All information are copied from tables, see source code.
    3232//
    33 ///////////////////////////////////////////////////////////////////////
     33////////////////////////////////////////////////////////////////////////////
    3434
    3535#include "MGeomCamMagic.h"

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

    r1271 r1330  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
     18!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
    1919!   Author(s): Harald Kornmayer 1/2001
    2020!
    … …  
    3131// a single pixel together with the information about next neighbors.
    3232//
    33 //////////////////////////////////////////////////////////////////////////////
     33////////////////////////////////////////////////////////////////////////////
    3434
    3535#include "MGeomPix.h"

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

    r1082 r1330  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
     18!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
    1919!   Author(s): Harald Kornmayer 1/2001
    2020!
    21 !   Copyright: MAGIC Software Development, 2000-2001
     21!   Copyright: MAGIC Software Development, 2000-2002
    2222!
    2323!
    2424\* ======================================================================== */
    2525
    26 //
    27 //  The class MHexagon is needed for the Event Display of
    28 //  MAGIC.
    29 //
     26//////////////////////////////////////////////////////////////////////////////
     27//                                                                          //
     28// MHexagon                                                                 //
     29//                                                                          //
     30//////////////////////////////////////////////////////////////////////////////
     31
    3032#include "MHexagon.h"
    3133

  • trunk/MagicSoft/Mars/mhist/MBinning.cc

    r1188 r1330  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz  01/2002 <mailto:tbretz@uni-sw.gwdg.de>
     18!   Author(s): Thomas Bretz  01/2002 <mailto:tbretz@astro.uni-wuerzburg.de>
    1919!
    2020!   Copyright: MAGIC Software Development, 2000-2002

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

    r1283 r1330  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz  07/2001 <mailto:tbretz@uni-sw.gwdg.de>
     18!   Author(s): Thomas Bretz  07/2001 <mailto:tbretz@astro.uni-wuerzburg.de>
    1919!
    2020!   Copyright: MAGIC Software Development, 2000-2002

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

    r1300 r1330  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz  07/2001 <mailto:tbretz@uni-sw.gwdg.de>
     18!   Author(s): Thomas Bretz  07/2001 <mailto:tbretz@astro.uni-wuerzburg.de>
    1919!
    2020!   Copyright: MAGIC Software Development, 2000-2002

  • trunk/MagicSoft/Mars/mhist/MHAlphaEnergyTheta.cc

    r1292 r1330  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz    1/2002 <mailto:tbretz@uni-sw.gwdg.de>
     18!   Author(s): Thomas Bretz    1/2002 <mailto:tbretz@astro.uni-wuerzburg.de>
    1919!   Author(s): Wolfgang Wittek 1/2002 <mailto:wittek@mppmu.mpg.de>
    2020!
    … …  
    6666    fHist.SetTitle("3D-plot of alpha, E-est, Theta");
    6767    fHist.SetXTitle("\\alpha [\\circ]");
    68     fHist.SetYTitle("E-est [GeV]            ");
     68    fHist.SetYTitle("E_{est} [GeV]");
    6969    fHist.SetZTitle("\\Theta [\\circ]");
    7070}
    … …  
    146146
    147147    h->SetTitle("Distribution of E-est [GeV]");
    148     h->SetXTitle("E-est [GeV]            ");
     148    h->SetXTitle("E_{est} [GeV]");
    149149    h->SetYTitle("Counts");
    150150

  • trunk/MagicSoft/Mars/mhist/MHAlphaEnergyTime.cc

    r1292 r1330  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz    1/2002 <mailto:tbretz@uni-sw.gwdg.de>
     18!   Author(s): Thomas Bretz    1/2002 <mailto:tbretz@astro.uni-wuerzburg.de>
    1919!   Author(s): Wolfgang Wittek 1/2002 <mailto:wittek@mppmu.mpg.de>
    2020!
    … …  
    6868    fHist.SetTitle("3D-plot of alpha, E-est, time");
    6969    fHist.SetXTitle("\\alpha [\\circ]");
    70     fHist.SetYTitle("E-est [GeV]            ");
     70    fHist.SetYTitle("E_{est} [GeV]");
    7171    fHist.SetZTitle("time [s]");
    7272}
    … …  
    147147
    148148    h->SetTitle("Distribution of E-est [GeV]");
    149     h->SetXTitle("E-est [GeV]            ");
     149    h->SetXTitle("E_{est} [GeV]");
    150150    h->SetYTitle("Counts");
    151151

  • trunk/MagicSoft/Mars/mhist/MHEffOnTimeTheta.cc

    r1293 r1330  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz    1/2002 <mailto:tbretz@uni-sw.gwdg.de>
     18!   Author(s): Thomas Bretz    1/2002 <mailto:tbretz@astro.uni-wuerzburg.de>
    1919!   Author(s): Wolfgang Wittek 1/2002 <mailto:wittek@mppmu.mpg.de>
    2020!
    … …  
    7070
    7171    fHEffOn.SetXTitle("\\Theta [\\circ]");
    72     fHEffOn.SetYTitle("t-eff [s]");
     72    fHEffOn.SetYTitle("t_{eff} [s]");
    7373
    7474    // chi2/NDF versus theta
    … …  
    7979
    8080    fHChi2.SetXTitle("\\Theta [\\circ]");
    81     fHChi2.SetYTitle("chi2/NDF");
     81    fHChi2.SetYTitle("chi^{2}/NDF");
    8282
    8383    // lambda versus theta
    … …  
    322322    gPad->Update();
    323323}
    324 
    325 
    326 
    327 
    328 
    329 
    330 
    331 
    332 
    333 
    334 
    335 
    336 

  • trunk/MagicSoft/Mars/mhist/MHEffOnTimeTime.cc

    r1295 r1330  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz    1/2002 <mailto:tbretz@uni-sw.gwdg.de>
     18!   Author(s): Thomas Bretz    1/2002 <mailto:tbretz@astro.uni-wuerzburg.de>
    1919!   Author(s): Wolfgang Wittek 1/2002 <mailto:wittek@mppmu.mpg.de>
    2020!
    … …  
    7171
    7272    fHEffOn.SetXTitle("time [s]");
    73     fHEffOn.SetYTitle("t-eff [s]");
     73    fHEffOn.SetYTitle("t_{eff} [s]");
    7474
    7575    // chi2/NDF versus time
    … …  
    8080
    8181    fHChi2.SetXTitle("time [s]");
    82     fHChi2.SetYTitle("chi2/NDF");
     82    fHChi2.SetYTitle("chi^{2}/NDF");
    8383
    8484    // lambda versus time

  • trunk/MagicSoft/Mars/mhist/MHEnergyTheta.cc

    r1227 r1330  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz  1/2002 <mailto:tbretz@uni-sw.gwdg.de>
     18!   Author(s): Thomas Bretz  1/2002 <mailto:tbretz@astro.uni-wuerzburg.de>
    1919!
    2020!   Copyright: MAGIC Software Development, 2000-2002
    … …  
    2323\* ======================================================================== */
    2424
    25 #include "MHEnergyTheta.h"
     25//////////////////////////////////////////////////////////////////////////////
     26//                                                                          //
     27//  MHEnergyTheta                                                           //
     28//                                                                          //
     29//////////////////////////////////////////////////////////////////////////////
     30
     31#include "MHEnergyTheta.h"
    2632
    2733#include <TCanvas.h>

  • trunk/MagicSoft/Mars/mhist/MHEnergyTime.cc

    r1227 r1330  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz  1/2002 <mailto:tbretz@uni-sw.gwdg.de>
     18!   Author(s): Thomas Bretz  1/2002 <mailto:tbretz@astro.uni-wuerzburg.de>
    1919!
    2020!   Copyright: MAGIC Software Development, 2000-2002
    … …  
    2222!
    2323\* ======================================================================== */
     24
     25//////////////////////////////////////////////////////////////////////////////
     26//                                                                          //
     27//  MHEnergyTime                                                            //
     28//                                                                          //
     29//////////////////////////////////////////////////////////////////////////////
    2430
    2531#include "MHEnergyTime.h"

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

    r1300 r1330  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
     18!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
    1919!   Author(s): Harald Kornmayer 1/2001
    2020!
    21 !   Copyright: MAGIC Software Development, 2000-2001
     21!   Copyright: MAGIC Software Development, 2000-2002
    2222!
    2323!
    2424\* ======================================================================== */
     25
     26//////////////////////////////////////////////////////////////////////////////
     27//                                                                          //
     28//  MHMcCollectionArea                                                      //
     29//                                                                          //
     30//////////////////////////////////////////////////////////////////////////////
    2531
    2632#include "MHMcCollectionArea.h"

  • trunk/MagicSoft/Mars/mhist/MHMcEnergyMigration.cc

    r1322 r1330  
    6565
    6666    fHist.SetTitle("3D-plot   E-true E-est Theta");
    67     fHist.SetXTitle("E-true [GeV]            ");
    68     fHist.SetYTitle("E-est [GeV]            ");
     67    fHist.SetXTitle("E_{true} [GeV]");
     68    fHist.SetYTitle("E_{est} [GeV]");
    6969    fHist.SetZTitle("\\Theta [\\circ]");
    7070}
    … …  
    123123
    124124    h->SetTitle("Distribution of E-true");
    125     h->SetXTitle("E-true [GeV]            ");
     125    h->SetXTitle("E_{true} [GeV]");
    126126    h->SetYTitle("Counts");
    127127
    … …  
    135135
    136136    h->SetTitle("Distribution of E-est");
    137     h->SetXTitle("E-est [GeV]            ");
     137    h->SetXTitle("E_{est} [GeV]");
    138138    h->SetYTitle("Counts");
    139139
    … …  
    179179
    180180    h->SetTitle("Distribution of E-true");
    181     h->SetXTitle("E-true [GeV]            ");
     181    h->SetXTitle("E_{true} [GeV]");
    182182
    183183    h->Draw(opt);
    … …  
    190190
    191191    h->SetTitle("Distribution of E-est");
    192     h->SetXTitle("E-est [GeV]            ");
     192    h->SetXTitle("E_{est} [GeV]");
    193193    h->Draw(opt);
    194194    h->SetBit(kCanDelete);

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

    r1283 r1330  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
     18!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
    1919!
    2020!   Copyright: MAGIC Software Development, 2000-2002
    … …  
    2323\* ======================================================================== */
    2424
    25 ///////////////////////////////////////////////////////////////////////
     25/////////////////////////////////////////////////////////////////////////////
    2626//
    2727// MHStarMap
    … …  
    3131// from the Hillas parameters (Fill) can be enhanced.
    3232//
    33 ///////////////////////////////////////////////////////////////////////
     33/////////////////////////////////////////////////////////////////////////////
    3434
    3535#include "MHStarMap.h"

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

    r1108 r1330  
    1919!   Author(s): Harald Kornmayer 1/2001
    2020!
    21 !   Copyright: MAGIC Software Development, 2000-2001
     21!   Copyright: MAGIC Software Development, 2000-2002
    2222!
    2323!
    … …  
    292292
    293293            case kPicMagic:
     294                cout << "Trying to start 'netscape http://hegra1.mppmu.mpg.de/MAGICWeb/'..." << endl;
    294295                gSystem->Exec("netscape http://hegra1.mppmu.mpg.de/MAGICWeb/ &");
    295296                return kTRUE;
    296297
    297298            case kPicMars:
    298                 gSystem->Exec("netscape http://magic.uni-sw.gwdg.de/mars/ &");
     299                cout << "Trying to start 'netscape http://magic.astro.uni-wuerzburg.de/mars/'..." << endl;
     300                gSystem->Exec("netscape http://magic.astro.uni-wuerzburg.de/mars/ &");
    299301                return kTRUE;
    300302            }

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

    r1300 r1330  
    1616!
    1717!
    18 !   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
     18!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
    1919!   Author(s): Harald Kornmayer 1/2001
    2020!
    21 !   Copyright: MAGIC Software Development, 2000-2001
     21!   Copyright: MAGIC Software Development, 2000-2002
    2222!
    2323!
    2424\* ======================================================================== */
     25
     26//////////////////////////////////////////////////////////////////////////////
     27//                                                                          //
     28//  MHMcCollectionAreaCalc                                                  //
     29//                                                                          //
     30//////////////////////////////////////////////////////////////////////////////
    2531
    2632#include "MMcCollectionAreaCalc.h"
Note: See TracChangeset for help on using the changeset viewer.