Changeset 2264 for trunk/MagicSoft/Mars


Ignore:
Timestamp:
07/06/03 14:24:09 (21 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
1 added
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r2263 r2264  
    2727   * mraw/MRawEvtPixelIter.[h,cc]:
    2828     - added GetMax[Hi,Lo]GainSample
     29
     30   * macros/pixsatrate.C:
     31     - added
    2932
    3033

  • trunk/MagicSoft/Mars/Makefile.conf.linux-gnu

    r2054 r2264  
    2323DEBUG    =
    2424ARCHDEF  = -D__LINUX__
     25DYNLIB   = -shared
    2526
    2627# To be tested:

  • trunk/MagicSoft/Mars/Makefile.conf.osf1

    r2196 r2264  
    2626DEBUG    = -g  -w0 -msg_display_tag -msg_disable castqualtyp,undpreid,unrfunprm,extrasemi,intconlosbit,nonfundec,partovrd,stoclsnotfirst,boolexprconst
    2727ARCHDEF  = -D__OSF__ -D__USE_STD_IOSTREAM -DR__ANSISTREAM
     28DYNLIB   = -shared
    2829
    2930MARS_LIB = -Llib $(SUBDIRS/*/-l&)  $(MARSLIBS)

  • trunk/MagicSoft/Mars/Makefile.conf.osf5.1

    r2196 r2264  
    2626DEBUG    = -g3  -w0 -msg_display_tag -msg_disable castqualtyp,undpreid,unrfunprm,extrasemi,intconlosbit,nonfundec,partovrd,stoclsnotfirst,boolexprconst
    2727ARCHDEF  = -D__OSF__ -D__USE_STD_IOSTREAM -DR__ANSISTREAM
     28DYNLIB   = -shared
    2829
    2930MARS_LIB = -Llib $(SUBDIRS/*/-l&)  $(MARSLIBS)

  • trunk/MagicSoft/Mars/mgui/MCamEvent.cc

    r2229 r2264  
    3232#include "MCamEvent.h"
    3333
    34 #include "MGeomCam.h"
    35 
    3634ClassImp(MCamEvent);
    3735

  • trunk/MagicSoft/Mars/mgui/Makefile

    r2210 r2264  
    2222#  connect the include files defined in the config.mk file
    2323#
    24 INCLUDES = -I. -I../mbase -I../mgeom -I../manalysis -I../mimage -I../mhist \
    25            -I../mreflector -I../mraw
     24INCLUDES = -I. -I../mbase -I../mgeom
    2625
    2726#------------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mhist/MHCamera.cc

    r2248 r2264  
    422422    // box with the histogram title
    423423    ptitle->SetTextColor(gStyle->GetTitleTextColor());
    424 #if ROOT_VERSION_CODE > ROOT_VERSION(3,05,00)
     424#if ROOT_VERSION_CODE > ROOT_VERSION(3,05,01)
    425425    ptitle->SetTextFont(gStyle->GetTitleFont(""));
    426426#endif
    … …  
    487487
    488488    // box with the histogram title
    489 #if ROOT_VERSION_CODE > ROOT_VERSION(3,05,00)
     489#if ROOT_VERSION_CODE > ROOT_VERSION(3,05,01)
    490490    ptitle->SetFillColor(gStyle->GetTitleFillColor());
    491491    ptitle->SetTextFont(gStyle->GetTitleFont(""));

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

    r2244 r2264  
    480480        return kFALSE;
    481481
    482     val = Next.GetSumHiGainSamples()-(float)GetNumHiGainSamples()*fHiGainFadcSamples->GetArray()[0];
    483     val *= cam.GetPixRatio(idx);
     482    switch (type)
     483    {
     484    case 0:
     485        val = Next.GetSumHiGainSamples()-(float)GetNumHiGainSamples()*fHiGainFadcSamples->GetArray()[0];
     486        val*= cam.GetPixRatio(idx);
     487        break;
     488    case 1:
     489        val = Next.GetMaxHiGainSample();
     490        break;
     491    case 2:
     492        val = Next.GetMaxLoGainSample();
     493        break;
     494    }
    484495
    485496    return kTRUE;

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

    r2259 r2264  
    247247// --------------------------------------------------------------------------
    248248//
     249// Returns the maximum signal of all sliced in the hi gain samples
     250//
     251Byte_t MRawEvtPixelIter::GetMaxHiGainSample() const
     252{
     253    Byte_t max = 0;
     254
     255    for (int i=0; i<fNumHiGainSamples; i++)
     256        if (fHiGainPos[i]>max)
     257            max = fHiGainPos[i];
     258
     259    return max;
     260}
     261
     262// --------------------------------------------------------------------------
     263//
     264// Returns the maximum signal of all sliced in the hi gain samples
     265//
     266Byte_t MRawEvtPixelIter::GetMaxLoGainSample() const
     267{
     268    Byte_t max = 0;
     269
     270    for (int i=fNumLoGainSamples-1; i>=0; i--)
     271        if (fLoGainPos[i]>max)
     272            max = fLoGainPos[i];
     273
     274    return max;
     275}
     276
     277// --------------------------------------------------------------------------
     278//
    249279// returns the sum of all lo gain fadc samples of the actual pixel.
    250280// if no lo gain information is available 0 is returned.

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

    r2236 r2264  
    8383    Byte_t GetNumMaxHiGainSample() const;
    8484    Byte_t GetNumMaxLoGainSample() const;
     85    Byte_t GetMaxHiGainSample() const;
     86    Byte_t GetMaxLoGainSample() const;
    8587
    8688    Bool_t HasLoGain() const
Note: See TracChangeset for help on using the changeset viewer.