Changeset 3258 for trunk


Ignore:
Timestamp:
02/21/04 16:32:05 (21 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r3255 r3258  
    66 
    77
     8 2004/02/21: Markus Gaug
     9
     10   * manalysis/MExtractedSignalPix.[h,cc]
     11     
     12     - changed variable fIsLoGainUsed to fLoGainUsed
     13
    814 2004/02/20: Markus Gaug
     15
     16   * mcalib/MHCalibrationChargeHiGainPix.[h,cc]
     17   * mcalib/MHCalibrationChargeLoGainPix.[h,cc]
     18   * mcalib/Makefile
     19   * mcalib/CalibLinkDef.h
     20
     21   - new class to replace MHCalibrationPixel,
     22     based on MHCalibrationChargePix
    923
    1024   * mcalib/MCalibrationChargeCalc.[h,cc]

  • trunk/MagicSoft/Mars/manalysis/MExtractedSignalPix.cc

    r2914 r3258  
    1919!   Author(s): Thomas Bretz 12/2003 <mailto:tbretz@astro.uni-wuerzburg.de>
    2020!
    21 !   Copyright: MAGIC Software Development, 2000-2003
     21!   Copyright: MAGIC Software Development, 2000-2004
    2222!
    2323!
    … …  
    5757    fExtractedSignalLoGain(gkSignalInitializer),
    5858    fExtractedSignalLoGainError(gkSignalInitializer),
    59     fIsLoGainUsed(kFALSE),
     59    fLoGainUsed(kFALSE),
    6060    fNumHiGainSaturated(0),
    6161    fNumLoGainSaturated(0)
    … …  
    7676  fExtractedSignalLoGainError = gkSignalInitializer;
    7777 
    78   fIsLoGainUsed = kFALSE;
     78  fLoGainUsed = kFALSE;
    7979
    8080  fNumHiGainSaturated = 0;
    … …  
    105105{
    106106
    107   fIsLoGainUsed = sat;
     107  fLoGainUsed = sat;
    108108  fNumHiGainSaturated = higain;
    109109  fNumLoGainSaturated = logain;
    … …  
    114114    *fLog << " Signal: " << fExtractedSignalHiGain
    115115        << " +- " << fExtractedSignalHiGainError
    116         << " LoGain? " << fIsLoGainUsed
     116        << " LoGain? " << fLoGainUsed
    117117        << " Nr. Sat. Hi Gain: " <<  fNumHiGainSaturated
    118118        << " Nr. Sat. Lo Gain: " <<  fNumLoGainSaturated

  • trunk/MagicSoft/Mars/manalysis/MExtractedSignalPix.h

    r2914 r3258  
    1414  Float_t fExtractedSignalLoGainError; // error of the mean value of the extracted signal
    1515
    16   Bool_t fIsLoGainUsed;
     16  Bool_t fLoGainUsed;
    1717  Byte_t fNumHiGainSaturated;
    1818  Byte_t fNumLoGainSaturated;
    … …  
    3838    Byte_t GetNumLoGainSaturated()          const { return fNumLoGainSaturated; }
    3939
    40     Bool_t IsLoGainUsed() const { return fIsLoGainUsed; }
     40    Bool_t IsLoGainUsed() const { return fLoGainUsed; }
    4141    Bool_t IsValid() const;   
    4242

  • trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePix.h

    r3256 r3258  
    3636  Axis_t   fAbsTimeLast;
    3737
     38  Bool_t   fSaturated;
     39
    3840  enum { kMeanTimeInFirstBin, kMeanTimeInLastBin }; // Bits to hold information about arrival time results
    3941 
    … …  
    5860  void SetPulserFrequency(Float_t f=fgPulserFrequency);
    5961
     62  void    SetSaturated( const Bool_t b) { fSaturated = b; }
     63
    6064  // Getters
    6165  TH1F *GetHAbsTime()                       { return &fHAbsTime;  }
    … …  
    6670  const Float_t  GetAbsTimeMean()     const;
    6771  const Float_t  GetAbsTimeRms()      const;
     72
     73  const Bool_t   IsSaturated()        const { return fSaturated;   }
    6874
    6975  void ChangeHistId(Int_t i);
Note: See TracChangeset for help on using the changeset viewer.