Changeset 1747 for trunk/MagicSoft


Ignore:
Timestamp:
02/07/03 12:59:11 (22 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r1746 r1747  
    11
    22                                                         -*-*- END -*-*-
     3 2003/02/06: Thomas Bretz
     4
     5    * mgeom/MGeomCam.[h,cc]:
     6      - fixed a warning (GetPixRatio(int) --> GetPixRatio(Uint)
     7
     8
    39 2003/02/07: Antonio Stamerra
    410
    5     * manalisys/MTrigLvl2.[cc|h]
     11    * manalysis/MTrigLvl2.[cc|h]
    612      - added new function
    713        MTrigLvl2::GetLutCompactPixel(int cell, int lut, int neighpix=2)
    … …  
    1420      - Added comments using the standard layout
    1521      - some small changes following Thomas comments (memset, *fLog)   
     22
    1623
    1724

  • trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc

    r1745 r1747  
    431431    fIn->read((Byte_t*)&outpars, sizeof(struct outputpars));
    432432
    433 <<<<<<< MCT1ReadPreProc.cc
    434     return ProcessRunHeader(outpars);
    435 =======
    436433    ProcessRunHeader(outpars);
    437434
    438435    //rwagner: ReInit whenever new run commences
    439436    // rc==-1 means: ReInit didn't work out
    440     if (!fTaskList->ReInit(fParList)) return -1;
     437    if (!fTaskList->ReInit(fParList))
     438        return -1;
    441439
    442440    return kTRUE;
    443 >>>>>>> 1.13
    444441}
    445442

  • trunk/MagicSoft/Mars/mgeom/MGeomCam.cc

    r1715 r1747  
    115115//  the id 0 to scale variables with the pixel size.
    116116//
    117 Float_t MGeomCam::GetPixRatio(Int_t i) const
     117Float_t MGeomCam::GetPixRatio(UInt_t i) const
    118118{
    119119    return i<fNumPixels ? (*this)[0].GetA()/(*this)[i].GetA() : 0;

  • trunk/MagicSoft/Mars/mgeom/MGeomCam.h

    r1540 r1747  
    3636    UInt_t  GetNumPixels() const       { return fNumPixels; }
    3737    Float_t GetMaxRadius() const       { return fMaxRadius; }
    38     Float_t GetPixRatio(Int_t i) const;
     38    Float_t GetPixRatio(UInt_t i) const;
    3939
    4040    MGeomPix &operator[](Int_t i)       { return *(MGeomPix*)fPixels->UncheckedAt(i); }
Note: See TracChangeset for help on using the changeset viewer.