Changeset 8280 for trunk/MagicSoft


Ignore:
Timestamp:
01/30/07 14:20:47 (18 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r8279 r8280  
    3535     - added a new bit to allow the error to be switched between
    3636       mean and spread
     37
     38   * mjobs/MJStar.cc, mjobs/MJCalibrateSignal.cc:
     39     - adapted to changes in error display
    3740
    3841

  • trunk/MagicSoft/Mars/NEWS

    r8262 r8280  
    1212     weekly, monthly and yearly averages.
    1313     For more details see the plotall function of the macro
     14
     15   - general: fixed the error display of the camera display. It showed
     16     wrong results.
    1417
    1518   - callisto: Redone the signal extraction this includes:

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

    r8279 r8280  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MHCamera.cc,v 1.96 2007-01-30 14:16:45 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MHCamera.cc,v 1.97 2007-01-30 14:20:47 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    13521352    const Double_t val = fArray[bin]        / n;
    13531353
    1354     const Double_t spread = sqr>val*val ? TMath::Sqrt(sqr - val*val);
     1354    const Double_t spread = sqr>val*val ? TMath::Sqrt(sqr - val*val) : 0;
    13551355
    13561356    return TestBit(kErrorMean) ? spread/TMath::Sqrt(n) : spread;

  • trunk/MagicSoft/Mars/mhist/MHCamera.h

    r8106 r8280  
    11/* ======================================================================== *\
    2 !  $Name: not supported by cvs2svn $:$Id: MHCamera.h,v 1.60 2006-10-17 17:16:00 tbretz Exp $
     2!  $Name: not supported by cvs2svn $:$Id: MHCamera.h,v 1.61 2007-01-30 14:16:45 tbretz Exp $
    33\* ======================================================================== */
    44#ifndef MARS_MHCamera
    … …  
    4444        kNoLegend           = BIT(20),
    4545        kNoScale            = BIT(21),
    46         kNoUnused           = BIT(22)/*,
     46        kNoUnused           = BIT(22),
     47        kErrorMean          = BIT(23)/*,
    4748        kSqrtVariance       = BIT(21),
    4849        kSinglePixelProfile = BIT(22)*/
    … …  
    231232    Bool_t   IsFreezed() const { return TestBit(kFreezed); }
    232233    //void  SetOptStat(Int_t os=-1) { fOptStat = os; } // *MENU*
     234
     235    void     SetErrorSpread(Bool_t f=kTRUE) { f ? ResetBit(kErrorMean) : SetBit(kErrorMean); } // *TOGGLE* *GETTER=IsErrorSpread
     236    Bool_t   IsErrorSpread() const { return !TestBit(kErrorMean); }
    233237
    234238    void     SetAbberation(Float_t f=0.0713) { fAbberation=f; } // *MENU*

  • trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

    r8245 r8280  
    591591    MHCamEvent evtR(  4, "HiLoCal",    "Hi-/Lo-Gain ratio;;Ratio");
    592592    MHCamEvent evtO(  7, "HiLoOff",    "Lo-/Hi-Gain Offset;;Offset");
     593    evt2.SetErrorSpread(kFALSE);
     594    evt5.SetErrorSpread(kFALSE);
     595    evt6.SetErrorSpread(kFALSE);
    593596    evt6.SetThreshold();
    594597

  • trunk/MagicSoft/Mars/mjobs/MJStar.cc

    r8245 r8280  
    210210    MHCamEvent evt0a(0, "Cleaned", "Signal after Cleaning;;S [\\gamma]");
    211211    MHCamEvent evt0b(0, "UsedPix", "Fraction of Events in which Pixels are used;;Fraction");
     212    evt0a.SetErrorSpread(kFALSE);
     213    evt0b.SetErrorSpread(kFALSE);
    212214    evt0b.SetThreshold(0);
    213215
Note: See TracChangeset for help on using the changeset viewer.