Changeset 5739 for trunk


Ignore:
Timestamp:
01/08/05 11:33:28 (20 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r5738 r5739  
    2424   * msignal/MExtractedSignalPix.[h,cc]
    2525     - added data member fChisquare, set to -1. by Clear() and Reset()
     26     - raised version number by 1
    2627
    2728   * msignal/MExtractedSignalCam.[h,cc]
    … …  
    3031       calculate the joint probability of Chisquare of pixel "pixidx"
    3132       and fNdf
     33     - raised version number by 1
    3234
    3335

  • trunk/MagicSoft/Mars/msignal/MExtractedSignalCam.h

    r5601 r5739  
    1616{
    1717private:
    18     TClonesArray *fArray; //-> FIXME: Change TClonesArray away from a pointer?
    1918
    20     Byte_t fFirstUsedSliceHiGain;
    21     Byte_t fFirstUsedSliceLoGain;
     19  TClonesArray *fArray;                //-> FIXME: Change TClonesArray away from a pointer?
    2220
    23     Byte_t fLastUsedSliceHiGain;
    24     Byte_t fLastUsedSliceLoGain;
     21  Byte_t fFirstUsedSliceHiGain;        // First High Gain FADC used for extraction (incl.)
     22  Byte_t fFirstUsedSliceLoGain;        // First Low Gain FADC used for extraction (incl.)
     23 
     24  Byte_t fLastUsedSliceHiGain;         // Last High Gain FADC used for extraction (incl.)
     25  Byte_t fLastUsedSliceLoGain;         // Last Low Gain FADC used for extraction (incl.)
     26 
     27  Float_t fUsedWindowHiGain;           // High Gain FADC extraction window
     28  Float_t fUsedWindowLoGain;           // Low Gain FADC extraction window
    2529
    26     Float_t fUsedWindowHiGain;
    27     Float_t fUsedWindowLoGain;
    28    
     30  Int_t   fNdf;                        // Number of degrees of freedom for a possible fit
     31 
    2932public:
    3033
    … …  
    3235    ~MExtractedSignalCam();
    3336
    34     void Print(Option_t *o="") const;
    35     void Clear(Option_t *o="");
    36     void SetLogStream(MLog *lg);
    37     void Reset() { Clear(); }
     37    void    Print(Option_t *o="") const;
     38    void    Clear(Option_t *o="");
     39    void    Reset() { Clear(); }
    3840
    39     void InitSize(const UInt_t i);
    40     Int_t GetSize() const;
     41    void    InitSize(const UInt_t i);
     42    Int_t   GetSize () const;
    4143
    42     Float_t GetNumUsedHiGainFADCSlices() const { return fUsedWindowHiGain; }
    43     Float_t GetNumUsedLoGainFADCSlices() const { return fUsedWindowLoGain; }
     44    Byte_t  GetFirstUsedSliceHiGain()    const { return fFirstUsedSliceHiGain; }
     45    Byte_t  GetFirstUsedSliceLoGain()    const { return fFirstUsedSliceLoGain; }
    4446
    45     Byte_t GetFirstUsedSliceHiGain() const    { return fFirstUsedSliceHiGain; }
    46     Byte_t GetFirstUsedSliceLoGain() const    { return fFirstUsedSliceLoGain; }
     47    Byte_t  GetLastUsedSliceHiGain()     const { return fLastUsedSliceHiGain; }
     48    Byte_t  GetLastUsedSliceLoGain()     const { return fLastUsedSliceLoGain; }
    4749
    48     Byte_t GetLastUsedSliceHiGain()  const    { return fLastUsedSliceHiGain; }
    49     Byte_t GetLastUsedSliceLoGain()  const    { return fLastUsedSliceLoGain; }
     50    Float_t GetNumUsedHiGainFADCSlices() const { return fUsedWindowHiGain;    }
     51    Float_t GetNumUsedLoGainFADCSlices() const { return fUsedWindowLoGain;    }
    5052
    51     void   SetUsedFADCSlices(Byte_t firsth, Byte_t lasth, Float_t winh,
    52                              Byte_t firstl, Byte_t lastl, Float_t winl)
     53    Float_t GetNdf()                     const { return fNdf;                  }
     54    Float_t GetProb( const Int_t pixidx) const;
     55
     56    void    SetLogStream     ( MLog *lg  );
     57    void    SetNdf           ( Int_t ndf ) { fNdf = ndf;  }
     58    void    SetUsedFADCSlices(Byte_t firsth, Byte_t lasth, Float_t winh,
     59                              Byte_t firstl, Byte_t lastl, Float_t winl)
    5360    {
    5461      fFirstUsedSliceHiGain    = firsth;
    … …  
    6673    void DrawPixelContent(Int_t num) const;
    6774
    68     ClassDef(MExtractedSignalCam, 1)    // Storage Container for extracted signals in the camera
     75    ClassDef(MExtractedSignalCam, 2)    // Storage Container for extracted signals in the camera
    6976};
    7077

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

    r4274 r5739  
    99{
    1010private:
     11
    1112  Float_t fExtractedSignalHiGain;      // mean value of the extracted signal
    1213  Float_t fExtractedSignalHiGainError; // error of the mean value of the extracted signal
    … …  
    1415  Float_t fExtractedSignalLoGainError; // error of the mean value of the extracted signal
    1516
     17  Float_t fChisquare;                  // Chi-square of a possible fit the pulse
     18 
    1619  Bool_t fLoGainUsed;
    1720  Byte_t fNumHiGainSaturated;
    … …  
    1922
    2023public:
    21     MExtractedSignalPix(const char* name=NULL, const char* title=NULL);
     24  MExtractedSignalPix(const char* name=NULL, const char* title=NULL);
    2225
    23     void Clear(Option_t *o="");
    24     void Print(Option_t *o="") const;
     26  void Clear(Option_t *o="");
     27  void Print(Option_t *o="") const;
    2528
    26     // Setter
    27     void SetExtractedSignal(Float_t sig, Float_t sigerr);
    28     void SetExtractedSignal(Float_t sighi, Float_t sighierr,Float_t siglo, Float_t sigloerr);
    29     void SetGainSaturation(Bool_t sat, Byte_t higain, Byte_t logain);
     29  // Setter
     30  void SetExtractedSignal( Float_t sig, Float_t sigerr);
     31  void SetExtractedSignal( Float_t sighi, Float_t sighierr,Float_t siglo, Float_t sigloerr);
     32  void SetGainSaturation ( Bool_t sat, Byte_t higain, Byte_t logain);
     33  void SetChisquare      ( Float_t chi2 )   { fChisquare = chi2; }
     34   
     35  // Getter
     36  Float_t GetExtractedSignalHiGain()      const { return fExtractedSignalHiGain;       }
     37  Float_t GetExtractedSignalHiGainError() const { return fExtractedSignalHiGainError;  }
    3038
    31     // Getter
    32     Float_t GetExtractedSignalHiGain()      const { return fExtractedSignalHiGain; }
    33     Float_t GetExtractedSignalHiGainError() const { return fExtractedSignalHiGainError; }
     39  Float_t GetExtractedSignalLoGain()      const { return fExtractedSignalLoGain;       }
     40  Float_t GetExtractedSignalLoGainError() const { return fExtractedSignalLoGainError;  }
    3441
    35     Float_t GetExtractedSignalLoGain()      const { return fExtractedSignalLoGain; }
    36     Float_t GetExtractedSignalLoGainError() const { return fExtractedSignalLoGainError; }
     42  Byte_t GetNumHiGainSaturated()          const { return fNumHiGainSaturated;          }
     43  Byte_t GetNumLoGainSaturated()          const { return fNumLoGainSaturated;          }
    3744
    38     Byte_t GetNumHiGainSaturated()          const { return fNumHiGainSaturated; }
    39     Byte_t GetNumLoGainSaturated()          const { return fNumLoGainSaturated; }
     45  Float_t GetChisquare()                  const { return fChisquare;                   }
     46   
     47  Bool_t IsLoGainUsed()                   const { return fLoGainUsed;                  }
     48  Bool_t IsValid()                        const;   
    4049
    41     Bool_t IsLoGainUsed() const { return fLoGainUsed; }
    42     Bool_t IsValid() const;   
    43 
    44     ClassDef(MExtractedSignalPix, 1)    // Storage Container for Extracted Signal information of one pixel
     50  ClassDef(MExtractedSignalPix, 2) // Storage Container for Extracted Signal information of one pixel
    4551};
    4652
Note: See TracChangeset for help on using the changeset viewer.