Changeset 2230


Ignore:
Timestamp:
06/24/03 16:19:04 (21 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r2229 r2230  
    4646   * mreflector/MRflEvtData.[h,cc]:
    4747     - implemented Paint function
     48
     49   * meventdisp/MGCamDisplay.cc:
     50     - Set Name and title of MHCamera instances
     51     
     52   * mraw/MRawEvtData.cc:
     53     - fixed a degug level problem
    4854
    4955
  • trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.cc

    r2228 r2230  
    184184    }
    185185
     186    fDisplay[0]->SetNameTitle("photons",   "Number of Photons");
     187    fDisplay[1]->SetNameTitle("errors",    "Error of Photons");
     188    fDisplay[2]->SetNameTitle("photerr",   "Number of Photons / Error");
     189    fDisplay[3]->SetNameTitle("levels",    "Cleaning Levels");
     190    fDisplay[4]->SetNameTitle("pedestals", "Pedestals");
     191
    186192    ReadFirstEvent();
    187193
     
    205211//  together with the hillas ellipse or not.
    206212//
    207 #include <iostream>
    208213void MGCamDisplay::UpdateDisplay()
    209214{
     
    253258            fCanvas2[i]->cd();
    254259            hillas->Draw();
     260            fCanvas2[i]->Modified();
    255261            fCanvas2[i]->Update();
    256262         }
  • trunk/MagicSoft/Mars/mgui/MHexagon.cc

    r2229 r2230  
    6464//    normal constructor for MHexagon
    6565//
    66 MHexagon::MHexagon(MGeomPix &pix)
     66MHexagon::MHexagon(const MGeomPix &pix)
    6767: TAttLine(1, 1, 1), TAttFill(0, 1001)
    6868{
     
    7676//    copy constructor for MHexagon
    7777//
    78 MHexagon::MHexagon(const MHexagon &hexagon)
    79 {
    80     ((MHexagon&) hexagon).Copy(*this);
     78MHexagon::MHexagon(const MHexagon &hexagon) : TObject(hexagon), TAttLine(hexagon), TAttFill(hexagon)
     79{
     80    fX = hexagon.fX;
     81    fY = hexagon.fY;
     82    fD = hexagon.fD;
    8183}
    8284
     
    8991const
    9092#endif
    91 
    9293{
    9394    MHexagon &hex = (MHexagon&) obj;
     
    245246    const Float_t dy[np+1] = { .2886,  .5772,  .2886, -.2886, -.5772, -.2886, .2886 };
    246247
    247     TAttLine::Modify();    // Change line attributes only if neccessary
    248     TAttFill::Modify();    // Change fill attributes only if neccessary
    249 
    250248    //
    251249    //  calculate the positions of the pixel corners
     
    257255        y[i] = inY + dy[i]*inD;
    258256    }
     257
     258    TAttLine::Modify();    // Change line attributes only if neccessary
     259    TAttFill::Modify();    // Change fill attributes only if neccessary
    259260
    260261    //
  • trunk/MagicSoft/Mars/mraw/MRawEvtData.cc

    r2229 r2230  
    279279    {
    280280        // FIXME: Add Legend
    281         *fLog << "Drawing Histogram of Pixel with Idx #" << pix.GetPixelId() << endl;
     281        *fLog << inf << "Drawing Histogram of Pixel with Idx #" << pix.GetPixelId() << endl;
    282282
    283283        TH1F *histh = new TH1F(name, "FADC Samples", nh, -0.5, nh-.5);
Note: See TracChangeset for help on using the changeset viewer.