Changeset 4840


Ignore:
Timestamp:
09/03/04 13:57:47 (20 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r4838 r4840  
    2323   * manalysis/MCameraData.[h,cc], mimage/MImgCleanStd.[h,cc]:
    2424     - implemeted cleaning in absolute number of photons
     25 
     26   * mhbase/MBinning.[h,cc]:
     27     - added const-qualifier to Apply
     28
     29   * mhist/MHAlpha.cc:
     30     - let TLatex use NDC coordinates
     31
     32   * mimage/MHHillasSrc.cc:
     33     - cosmetics
     34
     35   * mreport/MReportDrive.[h,cc]:
     36     - added Print member function
    2537
    2638

  • trunk/MagicSoft/Mars/NEWS

    r4826 r4840  
    2323     The index corresponds to the order of the islands in size.
    2424
     25   - added a cleaning which takes signal height _and_ arrival time into
     26     account: probability cleaning (for more details see MImgCleanStd)
     27
     28   - added a cleaning which takes takes the absolute number of photons
     29     times the area ratio as cleaning level
     30     (for more details see MImgCleanStd)
     31
    2532   - Changed calculation of image parameters such, that it can be done
    2633     for all used pixels or the pixels with a defined island index only
    … …  
    3138   - event display in executable changed to support also calibrated files
    3239     (done with MJCalibrateSignal)
    33 
    34    - added a cleaning which takes signal height _and_ arrival time into
    35      account: probability cleaning (for more details see MImgCleanStd)
    3640
    3741   - added program doing the calibration and the signal extraction

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

    r3789 r4840  
    183183//  histograms use MH::SetBinning directly)
    184184//
    185 void MBinning::Apply(TH1 &h)
     185void MBinning::Apply(TH1 &h) const
    186186{
    187187    if (h.InheritsFrom("TH2") || h.InheritsFrom("TH3"))

  • trunk/MagicSoft/Mars/mhbase/MBinning.h

    r3788 r4840  
    8080    Bool_t IsUserArray() const { return fType==kIsUserArray; }
    8181
    82     void Apply(TH1 &);
     82    void Apply(TH1 &) const;
    8383
    8484    ClassDef(MBinning, 1) //Container to store the binning of a histogram

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

    r4837 r4840  
    283283    if (paint)
    284284    {
    285         TLatex text;
    286         text.PaintLatex(3, fHist.GetMaximum()*1.11, 0, 0.04,
    287                         Form("\\sigma_{Li/Ma}=%.1f (\\alpha<%.1f\\circ)  \\omega=%.1f\\circ  E=%d  (\\chi_{b}^{2}/N=%.1f  \\chi_{s}^{2}/N=%.1f)",
    288                              sig, fSigInt, sigmagaus, (int)(s-b), chisq1, chisq2));
     285        TLatex text(0.13, 0.94, Form("\\sigma_{Li/Ma}=%.1f (\\alpha<%.1f\\circ)  \\omega=%.1f\\circ  E=%d  (\\chi_{b}^{2}/N=%.1f  \\chi_{s}^{2}/N=%.1f)",
     286                                     sig, fSigInt, sigmagaus, (int)(s-b), chisq1, chisq2));
     287        text.SetBit(TLatex::kTextNDC);
     288        text.SetTextSize(0.04);
     289        text.Paint();
    289290    }
    290291    // ------------------------------------

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

    r4826 r4840  
    7070    // connect all the histogram with the container fHist
    7171    //
    72     fAlpha = new TH1F("Alpha", "Alpha of Ellipse",                181, -90,  90);
    73     fDist  = new TH1F("Dist",  "Dist of Ellipse",                 100,   0, 445);
    74     fCosDA = new TH1F("CosDA", "cos(Delta,Alpha) of Ellipse",     101,  -1,   1);
    75     fDCA   = new TH1F("DCA",   "Distance of closest aproach",     101,  -500,  500);
    76     fDCADelta = new TH1F("DCADelta", "Angle between shower and x-axis", 101,   0, 360);
     72    fAlpha    = new TH1F("Alpha",    "Alpha of Ellipse",                181,  -90,  90);
     73    fDist     = new TH1F("Dist",     "Dist of Ellipse",                 100,     0, 445);
     74    fCosDA    = new TH1F("CosDA",    "cos(Delta,Alpha) of Ellipse",     101,    -1,   1);
     75    fDCA      = new TH1F("DCA",      "Distance of closest aproach",     101,  -500, 500);
     76    fDCADelta = new TH1F("DCADelta", "Angle between shower and x-axis", 101,     0, 360);
    7777
    7878    fAlpha->SetDirectory(NULL);

  • trunk/MagicSoft/Mars/mreport/MReportDrive.cc

    r4575 r4840  
    125125// --------------------------------------------------------------------------
    126126//
     127// GetAbsError [deg]
     128//
    127129// Returns the absolute deviation from the nominal position calculated
    128130// from the system error.
     131//
    129132//
    130133Double_t MReportDrive::GetAbsError() const
    … …  
    154157    return acos(d)*TMath::RadToDeg();
    155158}
     159
     160void MReportDrive::Print(Option_t *o) const
     161{
     162    *fLog << GetDescriptor() << ": Mjd=" << fMjd << " Ra=" << fRa << " Dec=" << fDec;
     163    *fLog << " dZd=" << fErrorZd << " dAz=" << fErrorAz << " D=" << GetAbsError() << endl;
     164}

  • trunk/MagicSoft/Mars/mreport/MReportDrive.h

    r4575 r4840  
    2020    Double_t fCurrentAz;  // [deg] current azimuth
    2121
    22     Double_t fErrorZd;    // [?] system error in the zenith angle axis
    23     Double_t fErrorAz;    // [?] sistem error in the azimuth angle axis
     22    Double_t fErrorZd;    // [deg] system error in the zenith angle axis
     23    Double_t fErrorAz;    // [deg] sistem error in the azimuth angle axis
    2424
    2525    Int_t InterpreteBody(TString &str, Int_t ver);
    … …  
    4444    Double_t GetAbsError() const;
    4545
     46    void Print(Option_t *o="") const;
     47
    4648    ClassDef(MReportDrive, 1) // Class for DRIVE-REPORT information
    4749};
Note: See TracChangeset for help on using the changeset viewer.