Changeset 7446 for trunk


Ignore:
Timestamp:
12/06/05 16:12:48 (19 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/mcamera/MCameraTD.cc

    r7445 r7446  
    6767// Return the discrimintaor delays
    6868//
    69 UShort_t MCameraTD::GetMin() const
     69Byte_t MCameraTD::GetMin() const
    7070{
    71     UShort_t val = (UShort_t)-1;
     71    Byte_t val = 0xff;
    7272    for (int i=0; i<fTD.GetSize(); i++)
    7373        val = TMath::Min(val, fTD[i]);
    … …  
    7979// Return the discrimintaor delays
    8080//
    81 UShort_t MCameraTD::GetMax() const
     81Byte_t MCameraTD::GetMax() const
    8282{
    83     UShort_t val = 0;
     83    Byte_t val = 0;
    8484    for (int i=0; i<fTD.GetSize(); i++)
    8585        val = TMath::Max(val, fTD[i]);

  • trunk/MagicSoft/Mars/mcamera/MCameraTD.h

    r7445 r7446  
    99#endif
    1010
    11 #ifndef ROOT_TArrayS
    12 #include <TArrayS.h>
     11#ifndef ROOT_TArrayC
     12#include <TArrayC.h>
    1313#endif
    1414
    … …  
    1717    friend class MReportCC;
    1818private:
    19     TArrayS fTD; // [au] discriminator delays
     19    TArrayC fTD; // [au] discriminator delays
    2020
    2121public:
    2222    MCameraTD(Int_t size=577, const char *name=NULL, const char *title=NULL);
    2323
    24     UShort_t operator[](Int_t i) { return (UShort_t)fTD[i]; }
     24    Byte_t operator[](Int_t i) { return fTD[i]; }
    2525
    26     UShort_t GetMin() const;
    27     UShort_t GetMax() const;
     26    Byte_t GetMin() const;
     27    Byte_t GetMax() const;
    2828
    2929    void Print(Option_t *opt=NULL) const;

  • trunk/MagicSoft/Mars/mcamera/MCameraTH.cc

    r7445 r7446  
    6767// Return the discriminator thresholds
    6868//
    69 UShort_t MCameraTH::GetMin() const
     69Byte_t MCameraTH::GetMin() const
    7070{
    71     UShort_t val = (UShort_t)-1;
     71    Byte_t val = 0xff;
    7272    for (int i=0; i<fTH.GetSize(); i++)
    7373        val = TMath::Min(val, fTH[i]);
    … …  
    7979// Return the discriminator thresholds
    8080//
    81 UShort_t MCameraTH::GetMax() const
     81Byte_t MCameraTH::GetMax() const
    8282{
    83     UShort_t val = 0;
     83    Byte_t val = 0;
    8484    for (int i=0; i<fTH.GetSize(); i++)
    8585        val = TMath::Max(val, fTH[i]);

  • trunk/MagicSoft/Mars/mcamera/MCameraTH.h

    r7445 r7446  
    99#endif
    1010
    11 #ifndef ROOT_TArrayS
    12 #include <TArrayS.h>
     11#ifndef ROOT_TArrayC
     12#include <TArrayC.h>
    1313#endif
    1414
    … …  
    1717    friend class MReportCC;
    1818private:
    19     TArrayS fTH; // [au] discriminator thresholds
     19    TArrayC fTH; // [au] discriminator thresholds
    2020
    2121public:
    2222    MCameraTH(Int_t size=577, const char *name=NULL, const char *title=NULL);
    2323
    24     UShort_t operator[](Int_t i) { return (UShort_t)fTH[i]; }
     24    Byte_t operator[](Int_t i) { return fTH[i]; }
    2525
    26     UShort_t GetMin() const;
    27     UShort_t GetMax() const;
     26    Byte_t GetMin() const;
     27    Byte_t GetMax() const;
    2828
    2929    void Print(Option_t *opt=NULL) const;

  • trunk/MagicSoft/Mars/mreport/MReportCC.cc

    r7430 r7446  
    150150        pos += 2;
    151151
    152         const Int_t n=sscanf(hex, "%2hx", &fTH->fTH[i++]);
     152        const Int_t n=sscanf(hex, "%2hhx", &fTH->fTH[i++]);
    153153        if (n==1)
    154154            continue;
Note: See TracChangeset for help on using the changeset viewer.