Changeset 2624 for trunk/MagicSoft


Ignore:
Timestamp:
12/08/03 12:08:49 (21 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r2622 r2624  
    1111   * star.cc, macros/star.C:
    1212     - works now with MC files and real data.
     13
     14   * mimage/MHillas.[h.cc], mimage/MHillasExt.[h.cc],
     15     mimage/MHillasSrc.[h.cc]:
     16     - implemented member functions Print(const MGeomCam&)
     17
     18   * macros/readMagic.C, macros/readCT1.C, mmain/MEventDisplay.cc:
     19     - changed to display deg instead of millimeters
    1320
    1421

  • trunk/MagicSoft/Mars/macros/readCT1.C

    r2554 r2624  
    123123        }
    124124
    125         hillas.Print();
    126         hillasext.Print();
     125        hillas.Print(*geomcam);
     126        hillasext.Print(*geomcam);
    127127        newimgpar.Print();
    128128

  • trunk/MagicSoft/Mars/macros/readMagic.C

    r2554 r2624  
    134134        }
    135135
    136         hillas.Print();
    137         hillasext.Print();
     136        hillas.Print(*geomcam);
     137        hillasext.Print(*geomcam);
    138138        newimgpar.Print();
    139139

  • trunk/MagicSoft/Mars/mimage/MHillas.cc

    r2468 r2624  
    127127    *fLog << all;
    128128    *fLog << "Basic Image Parameters (" << GetName() << ")" << endl;
    129     *fLog << " - Length      [mm]  = " << fLength << endl;
    130     *fLog << " - Width       [mm]  = " << fWidth  << endl;
    131     *fLog << " - Delta       [deg] = " << fDelta*kRad2Deg << endl;
    132     *fLog << " - Size        [1]   = " << fSize   << " #CherPhot"   << endl;
    133     *fLog << " - Meanx       [mm]  = " << fMeanX  << endl;
    134     *fLog << " - Meany       [mm]  = " << fMeanY  << endl;
    135     *fLog << " - atg(y/x)    [deg] = " << atg     << endl;
     129    *fLog << " - Length         [mm]  = " << fLength << endl;
     130    *fLog << " - Width          [mm]  = " << fWidth  << endl;
     131    *fLog << " - Delta          [deg] = " << fDelta*kRad2Deg << endl;
     132    *fLog << " - Size           [1]   = " << fSize   << " #CherPhot"   << endl;
     133    *fLog << " - Meanx          [mm]  = " << fMeanX  << endl;
     134    *fLog << " - Meany          [mm]  = " << fMeanY  << endl;
     135    *fLog << " - atg(y/x)       [deg] = " << atg     << endl;
     136}
     137
     138// --------------------------------------------------------------------------
     139//
     140// Print the hillas Parameters to *fLog, depending on the geometry in
     141// units of deg
     142//
     143void MHillas::Print(const MGeomCam &geom) const
     144{
     145    Double_t atg = atan2(fMeanY, fMeanX)*kRad2Deg;
     146
     147    if (atg<0)
     148        atg += 180;
     149
     150    *fLog << all;
     151    *fLog << "Basic Image Parameters (" << GetName() << ")" << endl;
     152    *fLog << " - Length         [deg] = " << fLength*geom.GetConvMm2Deg() << endl;
     153    *fLog << " - Width          [deg] = " << fWidth *geom.GetConvMm2Deg() << endl;
     154    *fLog << " - Delta          [deg] = " << fDelta*kRad2Deg << endl;
     155    *fLog << " - Size           [1]   = " << fSize   << " #CherPhot"   << endl;
     156    *fLog << " - Meanx          [deg] = " << fMeanX *geom.GetConvMm2Deg() << endl;
     157    *fLog << " - Meany          [deg] = " << fMeanY *geom.GetConvMm2Deg() << endl;
     158    *fLog << " - atg(y/x)       [deg] = " << atg     << endl;
    136159}
    137160

  • trunk/MagicSoft/Mars/mimage/MHillas.h

    r2468 r2624  
    3333    Int_t Calc(const MGeomCam &geom, const MCerPhotEvt &pix);
    3434
     35    void Print(const MGeomCam &geom) const;
    3536    void Print(Option_t *opt=NULL) const;
    3637    void Paint(Option_t *opt=NULL);

  • trunk/MagicSoft/Mars/mimage/MHillasExt.cc

    r2173 r2624  
    100100// -------------------------------------------------------------------------
    101101//
     102// Print contents of MHillasExt to *fLog.
     103//
    102104void MHillasExt::Print(Option_t *) const
    103105{
     106    *fLog << all;
    104107    *fLog << "Extended Image Parameters (" << GetName() << ")" << endl;
    105     *fLog << " - Asymmetry        = " << fAsym    << " mm" << endl;
    106     *fLog << " - 3rd Moment Long  = " << fM3Long  << " mm" << endl;
    107     *fLog << " - 3rd Moment Trans = " << fM3Trans << " mm" << endl;
     108    *fLog << " - Asymmetry            = " << fAsym    << endl;
     109    *fLog << " - 3.Moment Long  [mm]  = " << fM3Long  << endl;
     110    *fLog << " - 3.Moment Trans [mm]  = " << fM3Trans << endl;
     111}
     112
     113// -------------------------------------------------------------------------
     114//
     115// Print contents of MHillasExt to *fLog, depending on the geometry in
     116// units of deg.
     117//
     118void MHillasExt::Print(const MGeomCam &geom) const
     119{
     120    *fLog << all;
     121    *fLog << "Extended Image Parameters (" << GetName() << ")" << endl;
     122    *fLog << " - Asymmetry            = " << fAsym   *geom.GetConvMm2Deg() << endl;
     123    *fLog << " - 3.Moment Long  [deg] = " << fM3Long *geom.GetConvMm2Deg() << endl;
     124    *fLog << " - 3.Moment Trans [deg] = " << fM3Trans*geom.GetConvMm2Deg() << endl;
    108125}
    109126

  • trunk/MagicSoft/Mars/mimage/MHillasExt.h

    r2092 r2624  
    3232
    3333    void Print(Option_t *opt=NULL) const;
     34    void Print(const MGeomCam &geom) const;
    3435
    3536    void Set(const TArrayF &arr);

  • trunk/MagicSoft/Mars/mimage/MHillasSrc.cc

    r2330 r2624  
    6969#include "MLogManip.h"
    7070
     71#include "MGeomCam.h"
    7172#include "MSrcPosCam.h"
    7273
    … …  
    148149}
    149150
     151// --------------------------------------------------------------------------
     152//
     153// Print contents of MHillasSrc to *fLog
     154//
    150155void MHillasSrc::Print(Option_t *) const
    151156{
    152157    *fLog << all;
    153158    *fLog << "Source dependant Image Parameters (" << GetName() << ")" << endl;
    154     *fLog << " - Dist          [mm]  = " << fDist << endl;
    155     *fLog << " - Alpha         [deg] = " << fAlpha << endl;
    156     *fLog << " - CosDeltaAlpha       = " << fCosDeltaAlpha << endl;
     159    *fLog << " - Dist           [mm]  = " << fDist << endl;
     160    *fLog << " - Alpha          [deg] = " << fAlpha << endl;
     161    *fLog << " - CosDeltaAlpha        = " << fCosDeltaAlpha << endl;
    157162}
     163
     164// --------------------------------------------------------------------------
     165//
     166// Print contents of MHillasSrc to *fLog depending on the geometry in
     167// units of deg.
     168//
     169void MHillasSrc::Print(const MGeomCam &geom) const
     170{
     171    *fLog << all;
     172    *fLog << "Source dependant Image Parameters (" << GetName() << ")" << endl;
     173    *fLog << " - Dist           [deg] = " << fDist*geom.GetConvMm2Deg() << endl;
     174    *fLog << " - Alpha          [deg] = " << fAlpha << endl;
     175    *fLog << " - CosDeltaAlpha        = " << fCosDeltaAlpha << endl;
     176}
     177
    158178// --------------------------------------------------------------------------
    159179//

  • trunk/MagicSoft/Mars/mimage/MHillasSrc.h

    r2026 r2624  
    3030
    3131    void Print(Option_t *opt=NULL) const;
     32    void Print(const MGeomCam &geom) const;
    3233
    3334    virtual Bool_t Calc(const MHillas *hillas);

  • trunk/MagicSoft/Mars/mimage/MNewImagePar.cc

    r2173 r2624  
    154154    *fLog << all;
    155155    *fLog << "New Image Parameters (" << GetName() << ")" << endl;
    156     *fLog << " - Leakage1        = " << fLeakage1      << endl;
    157     *fLog << " - Leakage2        = " << fLeakage2      << endl;
    158     *fLog << " - Conc            = " << fConc          << " (ratio)" << endl;
    159     *fLog << " - Conc1          = " << fConc1         << " (ratio)" << endl;
    160     *fLog << " - Used Pixels [#] = " << fNumUsedPixels << " Pixels" << endl;
    161     *fLog << " - Core Pixels [#] = " << fNumCorePixels << " Pixels" << endl;
     156    *fLog << " - Leakage1       [1]  = " << fLeakage1      << endl;
     157    *fLog << " - Leakage2       [1]  = " << fLeakage2      << endl;
     158    *fLog << " - Conc           [1]  = " << fConc          << " (ratio)" << endl;
     159    *fLog << " - Conc1          [1]  = " << fConc1         << " (ratio)" << endl;
     160    *fLog << " - Used Pixels    [#]  = " << fNumUsedPixels << " Pixels" << endl;
     161    *fLog << " - Core Pixels    [#]  = " << fNumCorePixels << " Pixels" << endl;
    162162}

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

    r2578 r2624  
    7474// Container
    7575//
     76#include "MHillas.h"             // MHillas::Print(const MGeomCam&)
     77#include "MHillasExt.h"          // MHillasExt::Print(const MGeomCam&)
     78#include "MHillasSrc.h"          // MHillasSrc::Print(const MGeomCam&)
    7679#include "MHEvent.h"             // MHEvent
    7780#include "MHCamera.h"            // MHCamera
    … …  
    372375{
    373376    MParList    *plist = (MParList*)fEvtLoop->GetParList();
     377    MGeomCam    *geom  = (MGeomCam*) plist->FindObject("MGeomCam");
    374378    MTaskList   *tlist = (MTaskList*)plist->FindObject("MTaskList");
    375379    MRawEvtData *raw = (MRawEvtData*)plist->FindObject("MRawEvtData");
    … …  
    414418    // Print parameters
    415419    //
    416     plist->FindObject("MHillas")->Print();
    417     plist->FindObject("MHillasExt")->Print();
    418     plist->FindObject("MHillasSrc")->Print();
     420    ((MHillas*)   plist->FindObject("MHillas"))->Print(*geom);
     421    ((MHillasExt*)plist->FindObject("MHillasExt"))->Print(*geom);
     422    ((MHillasSrc*)plist->FindObject("MHillasSrc"))->Print(*geom);
    419423    plist->FindObject("MNewImagePar")->Print();
    420424
Note: See TracChangeset for help on using the changeset viewer.