Changeset 8802 for trunk/MagicSoft/Mars


Ignore:
Timestamp:
01/09/08 11:45:59 (17 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r8801 r8802  
    2323   * mbadpixels/MBadPixelsTreat.[h,cc]:
    2424     - removed obsolete fRawHeader
     25
     26   * mpointing/MSrcPosCam.[h,cc]:
     27     - added Paint member function

  • trunk/MagicSoft/Mars/mpointing/MSrcPosCam.h

    r8657 r8802  
    3333    TVector2 GetXY() const;
    3434
     35    void Paint(Option_t *opt);
    3536    void Print(Option_t *opt=NULL) const;
    3637

  • trunk/MagicSoft/Mars/mpointing/MSrcPosRndm.cc

    r7690 r8802  
    6868        return kFALSE;
    6969
     70    fSrcPosAnti = (MSrcPosCam*)plist->FindCreateObj("MSrcPosCam", "MSrcPosAnti");
     71    if (!fSrcPosAnti)
     72        return kFALSE;
     73
    7074    if (fDistOfSource<0)
    7175    {
    … …  
    104108
    105109    fSrcPos->SetXY(x/fConvMm2Deg, y/fConvMm2Deg);
     110    if (fDistOfSource>=0)
     111        fSrcPosAnti->SetXY(-x/fConvMm2Deg, -y/fConvMm2Deg);
    106112    return kTRUE;
    107113}

  • trunk/MagicSoft/Mars/mpointing/MSrcPosRndm.h

    r7690 r8802  
    1212{
    1313private:
    14     MSrcPosCam   *fSrcPos; //!
    15     MHSrcPosCam  *fHist;   //!
     14    MSrcPosCam   *fSrcPos;     //!
     15    MSrcPosCam   *fSrcPosAnti; //!
     16    MHSrcPosCam  *fHist;       //!
    1617
    1718    Double_t fConvMm2Deg;

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

    r8744 r8802  
    8585//  -----------------
    8686//   - added fNumEventsRead;
     87//   * renamed fFreqSampling to fSamplingFrequency
     88//   * renamed fNumSignificantBits to fFadcResolution
    8789//
    8890//  Format Version 6:
    … …  
    487489    fNumBytesPerSample  = 1;      // 2 for MUX DATA
    488490    fSamplingFrequency  = 300;
    489     fFadcResolution = 8;
     491    fFadcResolution     = 8;
     492
    490493    if (fFormatVersion>7)
    491494    {
    492495        fin.read((char*)&fNumBytesPerSample,  2);
    493496        fin.read((char*)&fSamplingFrequency,  2); // [MHz], 2000 for MuxFadc
    494         fin.read((char*)&fFadcResolution, 1); // nominal resolution [# Bits], 10 for MuxFadc
     497        fin.read((char*)&fFadcResolution,     1); // nominal resolution [# Bits], 10 for MuxFadc
    495498
    496499        if (fNumBytesPerSample!=2)
Note: See TracChangeset for help on using the changeset viewer.