Ignore:
Timestamp:
11/11/08 11:49:49 (16 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars/mhbase
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/mhbase/MFillH.cc

    r8961 r9153  
    564564//        fCanvas->cd();
    565565
    566     const Bool_t rc = fH->Fill(fParContainer, fWeight?fWeight->GetVal():1);
     566    const Int_t rc = fH->Fill(fParContainer, fWeight?fWeight->GetVal():1);
    567567    fH->SetNumExecutions(GetNumExecutions()+1);
    568568
    569569//    if (save && fCanvas)
    570570//        save->cd();
    571     return rc==kFALSE ? kCONTINUE : kTRUE;
     571    return rc;
    572572}
    573573

  • trunk/MagicSoft/Mars/mhbase/MH.cc

    r8957 r9153  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MH.cc,v 1.39 2008-06-14 15:55:52 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MH.cc,v 1.40 2008-11-11 11:42:13 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    112112// to your class definition.
    113113//
    114 Bool_t MH::Fill(const MParContainer *par, const Stat_t w)
     114Int_t MH::Fill(const MParContainer *par, const Stat_t w)
    115115{
    116116    *fLog << warn << GetDescriptor() << ": Fill not overloaded! Can't be used!" << endl;
    117     return kFALSE;
     117    return kERROR;
    118118}
    119119

  • trunk/MagicSoft/Mars/mhbase/MH.h

    r8957 r9153  
    4747    virtual Bool_t SetupFill(const MParList *pList) { return kTRUE; }
    4848    virtual Bool_t ReInit(MParList *pList) { return kTRUE; }
    49     virtual Bool_t Fill(const MParContainer *par, const Stat_t weight=1);
     49    virtual Int_t Fill(const MParContainer *par, const Stat_t weight=1);
    5050    virtual Bool_t Finalize() { return kTRUE; }
    5151

  • trunk/MagicSoft/Mars/mhbase/MH3.cc

    r9041 r9153  
    674674// Fills the one, two or three data members into our histogram
    675675//
    676 Bool_t MH3::Fill(const MParContainer *par, const Stat_t ww)
     676Int_t MH3::Fill(const MParContainer *par, const Stat_t ww)
    677677{
    678678    // Get Information about labels (UInt_t, to supress warning about

  • trunk/MagicSoft/Mars/mhbase/MH3.h

    r9044 r9153  
    135135    // MH
    136136    Bool_t SetupFill(const MParList *pList);
    137     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     137    Int_t Fill(const MParContainer *par, const Stat_t w=1);
    138138    Bool_t Finalize();
    139139

  • trunk/MagicSoft/Mars/mhbase/MHArray.cc

    r8907 r9153  
    466466// successfull filled.
    467467//
    468 Bool_t MHArray::Fill(const MParContainer *par, const Stat_t w)
     468Int_t MHArray::Fill(const MParContainer *par, const Stat_t w)
    469469{
    470470    const Int_t n = fArray->GetSize();
    … …  
    474474        *fLog << warn << "Histogram Index #" << fIdx << " out of bounds (>";
    475475        *fLog << n << ")... skipped." << endl;
    476         return kCONTINUE;
     476        return kERROR;
    477477    }
    478478
    479479    if (fIdx==n)
    480480        if (!CreateH())
    481             return kFALSE;
     481            return kERROR;
    482482
    483483    return GetH()->Fill(par, w);

  • trunk/MagicSoft/Mars/mhbase/MHArray.h

    r2735 r9153  
    4242
    4343    Bool_t SetupFill(const MParList *pList);
    44     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     44    Int_t Fill(const MParContainer *par, const Stat_t w=1);
    4545    Bool_t Finalize();
    4646

  • trunk/MagicSoft/Mars/mhbase/MHMatrix.cc

    r8957 r9153  
    268268// Add the values correspoding to the columns to the new row
    269269//
    270 Bool_t MHMatrix::Fill(const MParContainer *par, const Stat_t w)
     270Int_t MHMatrix::Fill(const MParContainer *par, const Stat_t w)
    271271{
    272272    AddRow();

  • trunk/MagicSoft/Mars/mhbase/MHMatrix.h

    r7804 r9153  
    5555    Bool_t SetupFill(const MParList *pList);
    5656
    57     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     57    Int_t Fill(const MParContainer *par, const Stat_t w=1);
    5858    Bool_t Finalize();
    5959

  • trunk/MagicSoft/Mars/mhbase/MHn.cc

    r8957 r9153  
    499499// Call Fill for all initialized histograms
    500500//
    501 Bool_t MHn::Fill(const MParContainer *par, const Stat_t w)
     501Int_t MHn::Fill(const MParContainer *par, const Stat_t w)
    502502{
    503503    for (int i=0; i<fNum; i++)
    504         if (!fHist[i]->Fill(par, w))
    505             return kFALSE;
     504    {
     505        const Int_t rc = fHist[i]->Fill(par, w);
     506        if (rc!=kTRUE)
     507            return rc;
     508    }
    506509
    507510    return kTRUE;

  • trunk/MagicSoft/Mars/mhbase/MHn.h

    r8893 r9153  
    6767    // MH
    6868    Bool_t SetupFill(const MParList *pList);
    69     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     69    Int_t Fill(const MParContainer *par, const Stat_t w=1);
    7070    Bool_t Finalize();
    7171
Note: See TracChangeset for help on using the changeset viewer.