Changeset 8699 for trunk


Ignore:
Timestamp:
08/23/07 11:56:56 (17 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r8698 r8699  
    4444     - added the possibility to set a function which converts the
    4545       result of the rf. eg "pow(10, x)"
     46
     47   * mraw/MRawRunHeader.[h,cc]:
     48     - replaced fNumSignificantBits by fFadcResolution for compatibility
     49     - replaced fFreqSampling by fSamplingFrequency for compatibility
     50     - increased ClassVersion to 9
    4651
    4752

  • trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

    r8584 r8699  
    1818!   Author(s): Thomas Bretz 12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
    1919!
    20 !   Copyright: MAGIC Software Development, 2000-2004
     20!   Copyright: MAGIC Software Development, 2000-2007
    2121!
    2222!
    … …  
    3636//  -----------------
    3737//   + fNumEventsRead;
     38//   + fSamplingFrequency
     39//   - fFreqSampling
     40//   + fFadcResolution;
     41//   - fNumSignificantBits
    3842//
    3943//  Format Version 8:
    … …  
    4145//   + fNumBytesPerSample;
    4246//   + fFreqSampling;
    43 //   + fNumSignificantBits;
     47//   + fNumSignificantBits
    4448//   * changes in MRawCrateHeader
    4549//
    … …  
    8589//  -----------------
    8690//   - added fNumBytesPerSample;
    87 //   - added fFreqSampling;
    88 //   - added fNumSignificantBits;
     91//   - added fSamplingFrequency;
     92//   - added fFadcResolution;
    8993//
    9094//  Class Version 5:
    … …  
    167171    fNumEvents=0;
    168172    fNumBytesPerSample=1;
    169     fFreqSampling=300;
    170     fNumSignificantBits=8;
     173    fSamplingFrequency=300;
     174    fFadcResolution=8;
    171175}
    172176
    … …  
    482486    // New in general features: (should they be included in new MAGIC1 formats, too?)
    483487    fNumBytesPerSample  = 1;      // 2 for MUX DATA
    484     fFreqSampling       = 300;
    485     fNumSignificantBits = 8;
     488    fSamplingFrequency  = 300;
     489    fFadcResolution = 8;
    486490    if (fFormatVersion>7)
    487491    {
    488492        fin.read((char*)&fNumBytesPerSample,  2);
    489         fin.read((char*)&fFreqSampling,       2); // [MHz], 2000 for MuxFadc
    490         fin.read((char*)&fNumSignificantBits, 1); // nominal resolution [# Bits], 10 for MuxFadc
     493        fin.read((char*)&fSamplingFrequency,  2); // [MHz], 2000 for MuxFadc
     494        fin.read((char*)&fFadcResolution, 1); // nominal resolution [# Bits], 10 for MuxFadc
    491495
    492496        if (fNumBytesPerSample!=2)
    … …  
    581585    *fLog << "Num Pixels:   " << GetNumNormalPixels() << " (normal) + " << GetNumSpecialPixels() << " (special) = " << GetNumConnectedPixels() << " (total)" << endl;
    582586    if (fFormatVersion>6)
    583         *fLog << "Sampling:     " << fFreqSampling << "MHz with " << (int)fNumSignificantBits << " significant bits" << endl;
     587        *fLog << "Sampling:     " << fSamplingFrequency << "MHz with " << (int)fFadcResolution << " significant bits" << endl;
    584588    *fLog << "Samples:      " << fNumSamplesHiGain << "/" << fNumSamplesLoGain << " (hi/lo) * " << fNumBytesPerSample << "B/sample = " << (fNumSamplesLoGain+fNumSamplesHiGain) * fNumCrates * fNumPixInCrate * fNumBytesPerSample/1000 << "kB/Evt" << endl;
    585589    *fLog << "Evt Counter:  " << fNumEvents;

  • trunk/MagicSoft/Mars/mraw/MRawRunHeader.h

    r8584 r8699  
    5858    UInt_t    fNumEvents;            // number of events stored
    5959    UInt_t    fNumEventsRead;        // number of events read by the electronics
    60     UShort_t  fFreqSampling;         // Sampling Frequency [MHz]
    61     Byte_t    fNumSignificantBits;   // number of significant bits
     60    UShort_t  fSamplingFrequency;    // Sampling Frequency [MHz]
     61    Byte_t    fFadcResolution;       // number of significant bits
    6262    MTime     fRunStart;             // time of run start
    6363    MTime     fRunStop;              // time of run stop
    … …  
    108108    UInt_t   GetNumEvents() const         { return fNumEvents; }
    109109    UInt_t   GetNumEventsRead() const     { return fNumEventsRead; }
    110     UShort_t GetFreqSampling() const      { return fFreqSampling; }
     110    UShort_t GetFreqSampling() const      { return fSamplingFrequency; }
    111111    const MTime &GetRunStart() const      { return fRunStart; }
    112112    const MTime &GetRunEnd() const        { return fRunStop; }
    … …  
    135135    Bool_t ReadEvt(istream& fin);
    136136
    137     ClassDef(MRawRunHeader, 7)  // storage container for general info
     137    ClassDef(MRawRunHeader, 9)  // storage container for general info
    138138};
    139139#endif
Note: See TracChangeset for help on using the changeset viewer.