Changeset 2399


Ignore:
Timestamp:
10/20/03 11:48:38 (21 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r2398 r2399  
    1212     - MHMcTriggerLvl2::GetHistByName removed const-qualifier and
    1313       changed return type to TH1 according to definition in MH.
    14 
    15    * Makefile.conf.general:
    16      - changed MARSVERSION to 0.8.1
    1714
    1815

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

    r2398 r2399  
    1818#   export MARSLIBS="-lX11 -lXpm -L/usr/X11R6/lib"
    1919#
    20 #DEFINES          = -DMARSVER=\"\<cvs\>\" -D__MARS__ -DROOTVER=\"$(ROOTVER)\" $(ARCHDEF) $(MARSDEFINES)
    21 DEFINES   = -DMARSVER=\"0.8.1\" -D__MARS__ -DROOTVER=\"$(ROOTVER)\" $(ARCHDEF) $(MARSDEFINES)
     20DEFINES   = -DMARSVER=\"\<cvs\>\" -D__MARS__ -DROOTVER=\"$(ROOTVER)\" $(ARCHDEF) $(MARSDEFINES)
    2221
    2322CXXFLAGS  = $(ROOTCFLAGS) $(INCLUDES) $(OPTIM) $(DEBUG) $(DEFINES)

  • trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc

    r2377 r2399  
    138138        //const Float_t pedrms = pedest/sqrt((float)num);
    139139
    140         const Float_t sigma  = fMcPed->GetPedestalRms(i);
     140        const Float_t sigma  = fMcPed->GetElecNoise(i);
    141141        //const Float_t sigrms = sigma/sqrt(num*2.);
    142142

  • trunk/MagicSoft/Mars/mhistmc/MHMcTriggerLvl2.cc

    r2370 r2399  
    329329//  so remember to cast the returned object if you want to work with it.
    330330//
    331 TObject *MHMcTriggerLvl2::GetHistByName(const TString name) const
     331TH1 *MHMcTriggerLvl2::GetHistByName(const TString name)
    332332{
    333333    if (name.Contains("fHistLutPseudoSize", TString::kIgnoreCase))

  • trunk/MagicSoft/Mars/mhistmc/MHMcTriggerLvl2.h

    r2370 r2399  
    4343    Bool_t Fill(const MParContainer *par, const Stat_t w=1);
    4444
    45     TObject *GetHistByName(const TString name) const;
     45    TH1 *GetHistByName(const TString name);
    4646
    4747    TH1F *GetHistLutPseudoSize() const { return fHistLutPseudoSize; }

  • trunk/MagicSoft/include-Classes/MMcFormat/MMcTrig.cxx

    r2365 r2399  
    11#include "MMcTrig.hxx"
    22
    3 #include <iostream.h>
     3#include <iostream>
    44
    55
Note: See TracChangeset for help on using the changeset viewer.