Changeset 2768 for trunk/MagicSoft


Ignore:
Timestamp:
01/12/04 13:32:13 (21 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r2767 r2768  
    55                                                 -*-*- END OF LINE -*-*-
    66 2004/01/12: Markus Gaug
     7
    78  * manalysis/MExtractSignal.[h,cc]
    89    - take out some uncommented code
    … …  
    1112    - because in most data, maximum occurs in slice 4, shift default
    1213      from slices 4-9 to slices 3-8.
     14
     15  * manalysis/MExtractedSignalPix.[h,cc]
     16    - took out some uncommented code
     17    - new initializers: instead of -1. now 99999.9
    1318
    1419

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

    r2749 r2768  
    3939
    4040using namespace std;
    41 
     41static const Float_t gkSignalInitializer = 99999.9;
     42//
     43// MExtractedSignalPix holds the extracted signal (HiGain and LoGain)
     44// of the FADC slices and its error.
     45//
     46// Additionally, the number of saturated HiGain and LoGain Slices are stored.
     47//
     48// Default values for the extracted signals are: 99999.9
     49//
    4250MExtractedSignalPix::MExtractedSignalPix(const char* name, const char* title)
    43   : fExtractedSignalHiGain(-1.),
    44     fExtractedSignalHiGainError(-1.),
    45     fExtractedSignalLoGain(-1.),
    46     fExtractedSignalLoGainError(-1.),
     51  : fExtractedSignalHiGain(gkSignalInitializer),
     52    fExtractedSignalHiGainError(gkSignalInitializer),
     53    fExtractedSignalLoGain(gkSignalInitializer),
     54    fExtractedSignalLoGainError(gkSignalInitializer),
    4755    fIsLoGainUsed(kFALSE),
    4856    fNumHiGainSaturated(0),
    … …  
    6472{
    6573
    66   fExtractedSignalHiGain = 0.;
    67   //  fExtractedSignalHiGain = -1.;
    68   fExtractedSignalHiGainError = -1.;
    69 
     74  fExtractedSignalHiGain = gkSignalInitializer;
     75  fExtractedSignalHiGainError = gkSignalInitializer;
     76  fExtractedSignalLoGain = gkSignalInitializer;
     77  fExtractedSignalLoGainError = gkSignalInitializer;
     78 
    7079  fIsLoGainUsed = kFALSE;
    7180  fNumHiGainSaturated = 0;

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

    r2728 r2768  
    99{
    1010private:
    11     // FIXME: We can only store ONE signal. Everything else takes
    12     //        too much storage space - will change in the future.
    13     Float_t fExtractedSignalHiGain;      // mean value of the extracted signal
    14     Float_t fExtractedSignalHiGainError; // error of the mean value of the extracted signal
    15     Float_t fExtractedSignalLoGain;      // mean value of the extracted signal
    16     Float_t fExtractedSignalLoGainError; // error of the mean value of the extracted signal
    1711
    18     Bool_t fIsLoGainUsed;
    19     Byte_t fNumHiGainSaturated;
    20     Byte_t fNumLoGainSaturated;
     12  Float_t fExtractedSignalHiGain;      // mean value of the extracted signal
     13  Float_t fExtractedSignalHiGainError; // error of the mean value of the extracted signal
     14  Float_t fExtractedSignalLoGain;      // mean value of the extracted signal
     15  Float_t fExtractedSignalLoGainError; // error of the mean value of the extracted signal
     16
     17  Bool_t fIsLoGainUsed;
     18  Byte_t fNumHiGainSaturated;
     19  Byte_t fNumLoGainSaturated;
    2120
    2221    // FIXME: Will be removed. Must be stored in MArrivalTime
    23     Float_t fMeanArrivalTime;
    24     Float_t fWidthArrivalTime;
    25     Float_t fTailArrivalTime;
     22  Float_t fMeanArrivalTime;
     23  Float_t fWidthArrivalTime;
     24  Float_t fTailArrivalTime;
    2625
    2726public:
Note: See TracChangeset for help on using the changeset viewer.