Changeset 9153


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

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r9152 r9153  
    4848     mimage/MHHillasSrc.[h,cc], mimage/MHImagePar.[h,cc],
    4949     mimage/MHNewImagePar.[h,cc], mimage/MHNewImagePar2.[h,cc],
    50      mimage/MHVsSize.[h,cc], mbadpixels/MHBadPixels.[h,cc]:
     50     mimage/MHVsSize.[h,cc], mbadpixels/MHBadPixels.[h,cc],
     51     mmuon/MHMuonPar.[h,cc], mmuon/MHSingleMuon.[h,cc],
     52     mpedestal/MHPedestalCor.[h,cc], mpointing/MHPointing.[h,cc],
     53     mranforest/MHRanForest.[h,cc], mranforest/MHRanForestGini.[h,cc],
     54     mreflector/MHReflector.[h,cc]:
    5155     - changed return type of Fill from bool to int
    5256     - fixed return value where necessary

  • trunk/MagicSoft/Mars/manalysis/Makefile

    r7928 r9153  
    3434           MEventRate.cc \
    3535           MEventRateCalc.cc \
    36            MMcTriggerLvl2.cc \
    37            MMcTriggerLvl2Calc.cc \
    3836           MMcCalibrationUpdate.cc
    3937
     38#           MMcTriggerLvl2.cc \
     39#           MMcTriggerLvl2Calc.cc \
    4040#           MCompProbCalc.cc \
    4141

  • trunk/MagicSoft/Mars/mbadpixels/MHBadPixels.cc

    r5431 r9153  
    170170//
    171171
    172 Bool_t MHBadPixels::Fill(const MParContainer *par, const Stat_t w)
     172Int_t MHBadPixels::Fill(const MParContainer *par, const Stat_t w)
    173173{
    174174    if (!par)
    175         return kFALSE;
    176 
    177     Double_t theta = fPointPos->GetZd();
     175    {
     176        *fLog << err << "ERROR - par==NULL." << endl;
     177        return kERROR;
     178    }
     179
     180    const Double_t theta = fPointPos->GetZd();
    178181
    179182    const MBadPixelsCam *fBadPixels = (MBadPixelsCam*)par;

  • trunk/MagicSoft/Mars/mbadpixels/MHBadPixels.h

    r5431 r9153  
    4444
    4545    void Draw(Option_t* option = "");
     46
    4647    Bool_t SetupFill(const MParList *plist);
    47     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     48    Int_t Fill(const MParContainer *par, const Stat_t w=1);
    4849
    4950    ClassDef(MHBadPixels, 1)  // Histogram of bad pixel Id vs. Theta

  • 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

  • trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc

    r8988 r9153  
    868868// Call FillHists()
    869869//
    870 Bool_t MHCalibrationCam::Fill(const MParContainer *par, const Stat_t w)
     870Int_t MHCalibrationCam::Fill(const MParContainer *par, const Stat_t w)
    871871{
    872872  if (fCurrentNumEvts >= fMaxNumEvts)
    … …  
    878878
    879879  if (!IsSizeCheck())
    880     return FillHists(par,w);
     880  {
     881      const Bool_t rc = FillHists(par,w);
     882      return rc ? kTRUE : kERROR;
     883  }
    881884
    882885  const Int_t npixels  = fGeom->GetNumPixels();
    … …  
    890893    {
    891894      *fLog << err << "ERROR - Size mismatch in number of pixels... abort." << endl;
    892       return kFALSE;
     895      return kERROR;
    893896    }
    894897 
    … …  
    898901        {
    899902          *fLog << err << "ERROR - Size mismatch in number of pixels... abort." << endl;
    900           return kFALSE;
     903          return kERROR;
    901904        }
    902905    }
    … …  
    908911    {
    909912      *fLog << err << "ERROR - Size mismatch in number of areas ... abort." << endl;
    910       return kFALSE;
     913      return kERROR;
    911914    }
    912915 
    … …  
    914917    {
    915918      *fLog << err << "ERROR - Size mismatch in number of sectors ... abort." << endl;
    916       return kFALSE;
     919      return kERROR;
    917920    }
    918921 
    … …  
    923926        {
    924927          *fLog << err << "ERROR - Size mismatch in number of areas ... abort." << endl;
    925           return kFALSE;
     928          return kERROR;
    926929        }
    927930     
    … …  
    929932        {
    930933          *fLog << err << "ERROR - Size mismatch in number of sectors ... abort." << endl;
    931           return kFALSE;
     934          return kERROR;
    932935        }
    933936    }
    934  
    935   return FillHists(par, w);
     937
     938  const Bool_t rc = FillHists(par, w);
     939
     940  return rc ? kTRUE : kERROR;
    936941}
    937942

  • trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.h

    r8452 r9153  
    180180  Bool_t SetupFill(const MParList *pList);
    181181  Bool_t ReInit   (      MParList *pList);
    182   Bool_t Fill     (const MParContainer *par, const Stat_t w=1);
     182  Int_t Fill     (const MParContainer *par, const Stat_t w=1);
    183183  Bool_t Finalize ( );
    184184

  • trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargePINDiode.cc

    r8341 r9153  
    225225// - FillRmsCharge(rms);
    226226//
    227 Bool_t MHCalibrationChargePINDiode::Fill(const MParContainer *par, const Stat_t w)
     227Int_t MHCalibrationChargePINDiode::Fill(const MParContainer *par, const Stat_t w)
    228228{
    229229
    … …  
    232232    {
    233233      *fLog << err << "No argument in MExtractedSignalPINDiode::Fill... abort." << endl;
    234       return kFALSE;
     234      return kERROR;
    235235    }
    236236 

  • trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargePINDiode.h

    r8339 r9153  
    7272  Bool_t SetupFill(const MParList *pList);
    7373  Bool_t ReInit   (      MParList *pList);
    74   Bool_t Fill     (const MParContainer *par, const Stat_t w=1);
     74  Int_t Fill     (const MParContainer *par, const Stat_t w=1);
    7575  Bool_t Finalize ();
    7676 

  • trunk/MagicSoft/Mars/mhflux/MHAlpha.cc

    r8996 r9153  
    463463// Fill the histogram. For details see the code or the class description
    464464//
    465 Bool_t MHAlpha::Fill(const MParContainer *par, const Stat_t w)
     465Int_t MHAlpha::Fill(const MParContainer *par, const Stat_t w)
    466466{
    467467    Double_t alpha, energy, theta;

  • trunk/MagicSoft/Mars/mhflux/MHAlpha.h

    r8879 r9153  
    9595    // MH
    9696    Bool_t SetupFill(const MParList *pl);
    97     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     97    Int_t Fill(const MParContainer *par, const Stat_t w=1);
    9898    Bool_t Finalize();
    9999

  • trunk/MagicSoft/Mars/mhflux/MHCollectionArea.cc

    r8911 r9153  
    464464}
    465465
    466 Bool_t MHCollectionArea::Fill(const MParContainer *par, const Stat_t weight)
     466Int_t MHCollectionArea::Fill(const MParContainer *par, const Stat_t weight)
    467467{
    468468    const Double_t energy = fMcEvt->GetEnergy();

  • trunk/MagicSoft/Mars/mhflux/MHCollectionArea.h

    r8911 r9153  
    4343    Bool_t SetupFill(const MParList *pList);
    4444    Bool_t ReInit(MParList *pList);
    45     Bool_t Fill(const MParContainer *par, const Stat_t weight=1);
     45    Int_t Fill(const MParContainer *par, const Stat_t weight=1);
    4646    Bool_t Finalize();
    4747

  • trunk/MagicSoft/Mars/mhflux/MHDisp.cc

    r8957 r9153  
    146146// Fill the histogram. For details see the code or the class description
    147147//
    148 Bool_t MHDisp::Fill(const MParContainer *par, const Stat_t w)
     148Int_t MHDisp::Fill(const MParContainer *par, const Stat_t w)
    149149{
    150150    const MHillas *hil = dynamic_cast<const MHillas*>(par);
    … …  
    152152    {
    153153        *fLog << err << "MHDisp::Fill: No container specified!" << endl;
    154         return kFALSE;
     154        return kERROR;
    155155    }
    156156

  • trunk/MagicSoft/Mars/mhflux/MHDisp.h

    r8719 r9153  
    8787    // MH
    8888    Bool_t SetupFill(const MParList *pList);
    89     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     89    Int_t Fill(const MParContainer *par, const Stat_t w=1);
    9090    Bool_t Finalize();
    9191

  • trunk/MagicSoft/Mars/mhflux/MHEffectiveOnTime.cc

    r8946 r9153  
    720720//  Fill the histogram
    721721//
    722 Bool_t MHEffectiveOnTime::Fill(const MParContainer *par, const Stat_t w)
     722Int_t MHEffectiveOnTime::Fill(const MParContainer *par, const Stat_t w)
    723723{
    724724    const MTime *time = dynamic_cast<const MTime*>(par);
    … …  
    726726    {
    727727        *fLog << err << "ERROR - MHEffectiveOnTime::Fill without argument or container doesn't inherit from MTime... abort." << endl;
    728         return kFALSE;
     728        return kERROR;
    729729    }
    730730

  • trunk/MagicSoft/Mars/mhflux/MHEffectiveOnTime.h

    r8929 r9153  
    6666    Bool_t SetupFill(const MParList *pList);
    6767    Bool_t ReInit(MParList *pList);
    68     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     68    Int_t Fill(const MParContainer *par, const Stat_t w=1);
    6969    Bool_t Finalize();
    7070

  • trunk/MagicSoft/Mars/mhflux/MHEnergyEst.cc

    r8985 r9153  
    187187// Fill the histogram
    188188//
    189 Bool_t MHEnergyEst::Fill(const MParContainer *par, const Stat_t w)
     189Int_t MHEnergyEst::Fill(const MParContainer *par, const Stat_t w)
    190190{
    191191    const Double_t eest  = fEnergy->GetVal();

  • trunk/MagicSoft/Mars/mhflux/MHEnergyEst.h

    r8935 r9153  
    4848
    4949    Bool_t SetupFill(const MParList *pList);
    50     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     50    Int_t Fill(const MParContainer *par, const Stat_t w=1);
    5151    Bool_t Finalize();
    5252

  • trunk/MagicSoft/Mars/mhflux/MHFalseSource.cc

    r8601 r9153  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MHFalseSource.cc,v 1.22 2007-06-24 16:31:57 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MHFalseSource.cc,v 1.23 2008-11-11 11:42:14 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    309309// Fill the histogram. For details see the code or the class description
    310310//
    311 Bool_t MHFalseSource::Fill(const MParContainer *par, const Stat_t w)
     311Int_t MHFalseSource::Fill(const MParContainer *par, const Stat_t w)
    312312{
    313313    const MHillas *hil = dynamic_cast<const MHillas*>(par);
    … …  
    315315    {
    316316        *fLog << err << "MHFalseSource::Fill: No container specified!" << endl;
    317         return kFALSE;
     317        return kERROR;
    318318    }
    319319

  • trunk/MagicSoft/Mars/mhflux/MHFalseSource.h

    r8185 r9153  
    9494    // MH
    9595    Bool_t SetupFill(const MParList *pList);
    96     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     96    Int_t Fill(const MParContainer *par, const Stat_t w=1);
    9797
    9898    // TObject

  • trunk/MagicSoft/Mars/mhflux/MHPhi.cc

    r7618 r9153  
    186186// MMuonSearchPar container.
    187187//
    188 Bool_t MHPhi::Fill(const MParContainer *par, const Stat_t weight)
     188Int_t MHPhi::Fill(const MParContainer *par, const Stat_t weight)
    189189{
    190190    // Here we calculate an upper phi cut to take a

  • trunk/MagicSoft/Mars/mhflux/MHPhi.h

    r7618 r9153  
    4141    // MH
    4242    Bool_t SetupFill(const MParList *plist);
    43     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     43    Int_t Fill(const MParContainer *par, const Stat_t w=1);
    4444
    4545public:

  • trunk/MagicSoft/Mars/mhflux/MHThetaSqN.cc

    r8592 r9153  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MHThetaSqN.cc,v 1.9 2007-06-22 15:49:50 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MHThetaSqN.cc,v 1.10 2008-11-11 11:42:14 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    215215}
    216216
    217 Bool_t MHThetaSqN::Fill(const MParContainer *par, const Stat_t weight)
     217Int_t MHThetaSqN::Fill(const MParContainer *par, const Stat_t weight)
    218218{
    219219    const TVector2 norm(GetVec(fHillas->GetNormAxis(), 6));
    … …  
    272272        SetVal(dist[i]);
    273273
    274         if (!MHAlpha::Fill(NULL, w))
    275             return kFALSE;
     274        const Int_t rc = MHAlpha::Fill(NULL, w);
     275        if (rc!=kTRUE)
     276            return rc;
    276277    }
    277278

  • trunk/MagicSoft/Mars/mhflux/MHThetaSqN.h

    r7775 r9153  
    4848    // MH
    4949    Bool_t SetupFill(const MParList *pl);
    50     Bool_t Fill(const MParContainer *par, const Stat_t weight);
     50    Int_t Fill(const MParContainer *par, const Stat_t weight);
    5151    Bool_t Finalize();
    5252

  • trunk/MagicSoft/Mars/mhflux/MHThreshold.cc

    r8988 r9153  
    164164}
    165165
    166 Bool_t MHThreshold::Fill(const MParContainer *par, const Stat_t weight)
     166Int_t MHThreshold::Fill(const MParContainer *par, const Stat_t weight)
    167167{
    168168    const Double_t energy = fMcEvt->GetEnergy();

  • trunk/MagicSoft/Mars/mhflux/MHThreshold.h

    r7349 r9153  
    2323
    2424    Bool_t SetupFill(const MParList *pList);
    25     Bool_t Fill(const MParContainer *par, const Stat_t weight=1);
     25    Int_t Fill(const MParContainer *par, const Stat_t weight=1);
    2626
    2727    void Draw(Option_t *option="");

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

    r8964 r9153  
    169169// Fill the histograms with data from a MCamEvent-Container.
    170170//
    171 Bool_t MHCamEvent::Fill(const MParContainer *par, const Stat_t w)
     171Int_t MHCamEvent::Fill(const MParContainer *par, const Stat_t w)
    172172{
    173173    const MCamEvent *evt = par ? dynamic_cast<const MCamEvent*>(par) : fEvt;
    … …  
    175175    {
    176176        *fLog << err << dbginf << "Got no MCamEvent as argument of Fill()..." << endl;
    177         return kFALSE;
     177        return kERROR;
    178178    }
    179179    if (fUseThreshold)

  • trunk/MagicSoft/Mars/mhist/MHCamEvent.h

    r8291 r9153  
    3232
    3333    Bool_t SetupFill(const MParList *pList);
    34     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     34    Int_t Fill(const MParContainer *par, const Stat_t w=1);
    3535
    3636public:

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

    r8907 r9153  
    176176// Fill the histogram. For details see the code or the class description
    177177//
    178 Bool_t MHCamEventRot::Fill(const MParContainer *par, const Stat_t w)
     178Int_t MHCamEventRot::Fill(const MParContainer *par, const Stat_t w)
    179179{
    180180    const MCamEvent *evt = dynamic_cast<const MCamEvent*>(par);
    … …  
    182182    {
    183183        *fLog << err << "MHCamEventRot::Fill: No container specified!" << endl;
    184         return kFALSE;
     184        return kERROR;
    185185    }
    186186

  • trunk/MagicSoft/Mars/mhist/MHCamEventRot.h

    r6977 r9153  
    4949
    5050    Bool_t SetupFill(const MParList *pList);
    51     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     51    Int_t Fill(const MParContainer *par, const Stat_t w=1);
    5252
    5353    TH1 *GetHistByName(const TString name) const { return const_cast<TH2D*>(&fHist); }

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

    r9141 r9153  
    191191}
    192192
    193 Bool_t MHEvent::Fill(const MParContainer *par, const Stat_t weight)
     193Int_t MHEvent::Fill(const MParContainer *par, const Stat_t weight)
    194194{
    195195    if (fHist->IsFreezed())
    … …  
    197197
    198198    if (!par)
    199         return kFALSE;
     199    {
     200        *fLog << err << "ERROR - par==NULL... abort." << endl;
     201        return kERROR;
     202    }
    200203
    201204    const MCamEvent *event = dynamic_cast<const MCamEvent*>(par);
    … …  
    203206    {
    204207        *fLog << err << par->GetDescriptor() << " doesn't inherit from MCamEvent... abort." << endl;
    205         return kFALSE;
     208        return kERROR;
    206209    }
    207210

  • trunk/MagicSoft/Mars/mhist/MHEvent.h

    r7297 r9153  
    5252
    5353    Bool_t SetupFill(const MParList *plist);
    54     Bool_t Fill(const MParContainer *par, const Stat_t weight=1);
     54    Int_t Fill(const MParContainer *par, const Stat_t weight=1);
    5555
    5656public:

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

    r8907 r9153  
    200200// are skipped at the moment.
    201201//
    202 Bool_t MHHadronness::Fill(const MParContainer *par, const Stat_t w)
     202Int_t MHHadronness::Fill(const MParContainer *par, const Stat_t w)
    203203{
    204204    // Preliminary Workaround: FIXME!
    … …  
    206206    {
    207207        *fLog << err << "MHHadronness::Fill: No MHadronness container specified!" << endl;
    208         return kFALSE;
     208        return kERROR;
    209209    }
    210210
    … …  
    214214
    215215    if (!TMath::Finite(h))
    216         return kCONTINUE;
     216        return kTRUE;  // Use kCONTINUE with extreme care!
    217217
    218218    const Int_t particleid = fMatrix ? (Int_t)(*fMatrix)[fMap] : fMcEvt->GetPartId();

  • trunk/MagicSoft/Mars/mhist/MHHadronness.h

    r6890 r9153  
    4949
    5050    Bool_t SetupFill(const MParList *plist);
    51     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     51    Int_t Fill(const MParContainer *par, const Stat_t w=1);
    5252    Bool_t Finalize();
    5353

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

    r8104 r9153  
    145145// MMuonSearchPar container.
    146146//
    147 Bool_t MHRate::Fill(const MParContainer *par, const Stat_t w)
     147Int_t MHRate::Fill(const MParContainer *par, const Stat_t w)
    148148{
    149149    const MTime *t = dynamic_cast<const MTime*>(par);

  • trunk/MagicSoft/Mars/mhist/MHRate.h

    r7198 r9153  
    4646
    4747    Bool_t SetupFill(const MParList *plist);
    48     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     48    Int_t Fill(const MParContainer *par, const Stat_t w=1);
    4949
    5050    void Draw(Option_t *opt="");

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

    r3666 r9153  
    189189// Be careful: Only call this with an object of type MHillas
    190190//
    191 Bool_t MHStarMap::Fill(const MParContainer *par, const Stat_t w)
     191Int_t MHStarMap::Fill(const MParContainer *par, const Stat_t w)
    192192{
    193193    const MHillas &h = *(MHillas*)par;

  • trunk/MagicSoft/Mars/mhist/MHStarMap.h

    r6977 r9153  
    3333
    3434    Bool_t SetupFill(const MParList *pList);
    35     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     35    Int_t Fill(const MParContainer *par, const Stat_t w=1);
    3636
    3737    Bool_t ReInit(MParList *pList);

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

    r6977 r9153  
    121121// Fill the histograms with data from a MCamEvent-Container.
    122122//
    123 Bool_t MHTriggerLvl0::Fill(const MParContainer *par, const Stat_t w)
     123Int_t MHTriggerLvl0::Fill(const MParContainer *par, const Stat_t w)
    124124{
    125125    const MCamEvent *evt = par ? dynamic_cast<const MCamEvent*>(par) : fEvt;
    … …  
    127127    {
    128128        *fLog << err << dbginf << "Got no MCamEvent as argument of Fill()..." << endl;
    129         return kFALSE;
     129        return kERROR;
    130130    }
    131131

  • trunk/MagicSoft/Mars/mhist/MHTriggerLvl0.h

    r6977 r9153  
    2121
    2222    Bool_t SetupFill(const MParList *pList);
    23     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     23    Int_t Fill(const MParContainer *par, const Stat_t w=1);
    2424    Bool_t Finalize();
    2525

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

    r8940 r9153  
    161161// MMuonSearchPar container.
    162162//
    163 Bool_t MHWeather::Fill(const MParContainer *par, const Stat_t w)
     163Int_t MHWeather::Fill(const MParContainer *par, const Stat_t w)
    164164{
    165165    const MTime *t = dynamic_cast<const MTime*>(par);

  • trunk/MagicSoft/Mars/mhist/MHWeather.h

    r8934 r9153  
    4141
    4242    Bool_t SetupFill(const MParList *plist);
    43     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     43    Int_t Fill(const MParContainer *par, const Stat_t w=1);
    4444
    4545    // If this is needed be aware that it would be called twice in star

  • trunk/MagicSoft/Mars/mhvstime/MHPixVsTime.cc

    r8907 r9153  
    169169// Fill the histograms with data from a MPixVsTime-Container.
    170170//
    171 Bool_t MHPixVsTime::Fill(const MParContainer *par, const Stat_t w)
     171Int_t MHPixVsTime::Fill(const MParContainer *par, const Stat_t w)
    172172{
    173173    const MCamEvent *evt = par ? dynamic_cast<const MCamEvent*>(par) : fEvt;
    … …  
    175175    {
    176176        *fLog << err << dbginf << "No MCamEvent found..." << endl;
    177         return kFALSE;
     177        return kERROR;
    178178    }
    179179
    … …  
    182182    evt->GetPixelContent(val, fIndex, *fCam, fType);
    183183    if (!TMath::Finite(val))
    184         return kCONTINUE;
     184        return kTRUE;  // Use kCONTINUE with extreme care!
    185185
    186186    Double_t t = 0;
    … …  
    196196        evt->GetPixelContent(rms, fIndex, *fCam, fTypeErr);
    197197        if (!TMath::Finite(rms))
    198             return kCONTINUE;
     198            return kTRUE;  // Use kCONTINUE with extreme care!
    199199    }
    200200

  • trunk/MagicSoft/Mars/mhvstime/MHPixVsTime.h

    r6977 r9153  
    3939
    4040    Bool_t SetupFill(const MParList *pList);
    41     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     41    Int_t Fill(const MParContainer *par, const Stat_t w=1);
    4242
    4343public:

  • trunk/MagicSoft/Mars/mhvstime/MHSectorVsTime.cc

    r8281 r9153  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MHSectorVsTime.cc,v 1.13 2007-02-01 11:24:19 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MHSectorVsTime.cc,v 1.14 2008-11-11 11:42:16 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    214214// Fill the histograms with data from a MCamEvent
    215215//
    216 Bool_t MHSectorVsTime::Fill(const MParContainer *par, const Stat_t w)
     216Int_t MHSectorVsTime::Fill(const MParContainer *par, const Stat_t w)
    217217{
    218218    const MCamEvent *evt = par ? dynamic_cast<const MCamEvent*>(par) : fEvt;
    … …  
    220220    {
    221221        *fLog << err << dbginf << "No MCamEvent found..." << endl;
    222         return kFALSE;
     222        return kERROR;
    223223    }
    224224

  • trunk/MagicSoft/Mars/mhvstime/MHSectorVsTime.h

    r8281 r9153  
    11/* ======================================================================== *\
    2 !  $Name: not supported by cvs2svn $:$Id: MHSectorVsTime.h,v 1.7 2007-02-01 11:24:19 tbretz Exp $
     2!  $Name: not supported by cvs2svn $:$Id: MHSectorVsTime.h,v 1.8 2008-11-11 11:42:16 tbretz Exp $
    33\* ======================================================================== */
    44#ifndef MARS_MHSectorVsTime
    … …  
    5757    // MH
    5858    Bool_t SetupFill(const MParList *pList);
    59     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     59    Int_t Fill(const MParContainer *par, const Stat_t w=1);
    6060    Bool_t Finalize();
    6161

  • trunk/MagicSoft/Mars/mhvstime/MHVsTime.cc

    r8907 r9153  
    205205// Set the next data point. If the graph exceeds fMaxPts remove the first
    206206//
    207 Bool_t MHVsTime::Fill(const MParContainer *par, const Stat_t w)
     207Int_t MHVsTime::Fill(const MParContainer *par, const Stat_t w)
    208208{
    209209    Double_t t = 0;
    … …  
    219219        {
    220220            *fLog << err << dbginf << "No MTime found..." << endl;
    221             return kFALSE;
     221            return kERROR;
    222222        }
    223223        // If the time is not valid skip this entry

  • trunk/MagicSoft/Mars/mhvstime/MHVsTime.h

    r8478 r9153  
    6565
    6666    Bool_t SetupFill(const MParList *pList);
    67     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     67    Int_t Fill(const MParContainer *par, const Stat_t w=1);
    6868
    6969    TString GetDataMember() const;

  • trunk/MagicSoft/Mars/mimage/MHHillas.cc

    r8996 r9153  
    246246// Be careful: Only call this with an object of type MHillas
    247247//
    248 Bool_t MHHillas::Fill(const MParContainer *par, const Stat_t w)
     248Int_t MHHillas::Fill(const MParContainer *par, const Stat_t w)
    249249{
    250250    if (!par)
    251251    {
    252252        *fLog << err << "MHHillas::Fill: Pointer (!=NULL) expected." << endl;
    253         return kFALSE;
     253        return kERROR;
    254254    }
    255255

  • trunk/MagicSoft/Mars/mimage/MHHillas.h

    r7841 r9153  
    3939
    4040    Bool_t SetupFill(const MParList *pList);
    41     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     41    Int_t Fill(const MParContainer *par, const Stat_t w=1);
    4242
    4343    TH1 *GetHistByName(const TString name) const;

  • trunk/MagicSoft/Mars/mimage/MHHillasExt.cc

    r8677 r9153  
    178178// Be careful: Only call this with an object of type MHillas
    179179//
    180 Bool_t MHHillasExt::Fill(const MParContainer *par, const Stat_t w)
     180Int_t MHHillasExt::Fill(const MParContainer *par, const Stat_t w)
    181181{
    182182    const MHillasSrc *src = (MHillasSrc*)par;

  • trunk/MagicSoft/Mars/mimage/MHHillasExt.h

    r8657 r9153  
    3737
    3838    Bool_t SetupFill(const MParList *pList);
    39     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     39    Int_t Fill(const MParContainer *par, const Stat_t w=1);
    4040
    4141    TH1 *GetHistByName(const TString name) const;

  • trunk/MagicSoft/Mars/mimage/MHHillasSrc.cc

    r8677 r9153  
    145145// Be careful: Only call this with an object of type MHillas
    146146//
    147 Bool_t MHHillasSrc::Fill(const MParContainer *par, const Stat_t w)
     147Int_t MHHillasSrc::Fill(const MParContainer *par, const Stat_t w)
    148148{
    149149    if (!par)
    150150    {
    151151        *fLog << err << "MHHillasSrc::Fill: Pointer (!=NULL) expected." << endl;
    152         return kFALSE;
     152        return kERROR;
    153153    }
    154154

  • trunk/MagicSoft/Mars/mimage/MHHillasSrc.h

    r6977 r9153  
    3030
    3131    Bool_t SetupFill(const MParList *pList);
    32     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     32    Int_t Fill(const MParContainer *par, const Stat_t w=1);
    3333
    3434    TH1 *GetHistByName(const TString name) const;

  • trunk/MagicSoft/Mars/mimage/MHImagePar.cc

    r8677 r9153  
    163163// Fill the histograms with data from a MNewImagePar container.
    164164//
    165 Bool_t MHImagePar::Fill(const MParContainer *par, const Stat_t w)
     165Int_t MHImagePar::Fill(const MParContainer *par, const Stat_t w)
    166166{
    167167    if (!par)
    168168    {
    169169        *fLog << err << "MImagePar::Fill: Pointer (!=NULL) expected." << endl;
    170         return kFALSE;
     170        return kERROR;
    171171    }
    172172

  • trunk/MagicSoft/Mars/mimage/MHImagePar.h

    r6977 r9153  
    3131
    3232    Bool_t SetupFill(const MParList *plist);
    33     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     33    Int_t Fill(const MParContainer *par, const Stat_t w=1);
    3434
    3535    TH1 *GetHistByName(const TString name) const;

  • trunk/MagicSoft/Mars/mimage/MHNewImagePar.cc

    r8677 r9153  
    224224// Fill the histograms with data from a MNewImagePar container.
    225225//
    226 Bool_t MHNewImagePar::Fill(const MParContainer *par, const Stat_t w)
     226Int_t MHNewImagePar::Fill(const MParContainer *par, const Stat_t w)
    227227{
    228228    if (!par)
    229229    {
    230230        *fLog << err << "MHNewImagePar::Fill: Pointer (!=NULL) expected." << endl;
    231         return kFALSE;
     231        return kERROR;
    232232    }
    233233

  • trunk/MagicSoft/Mars/mimage/MHNewImagePar.h

    r7538 r9153  
    3535
    3636    Bool_t SetupFill(const MParList *plist);
    37     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     37    Int_t Fill(const MParContainer *par, const Stat_t w=1);
    3838
    3939    TH1 *GetHistByName(const TString name) const;

  • trunk/MagicSoft/Mars/mimage/MHNewImagePar2.cc

    r6869 r9153  
    118118// Fill the histograms with data from a MNewImagePar2 container.
    119119//
    120 Bool_t MHNewImagePar2::Fill(const MParContainer *par, const Stat_t w)
     120Int_t MHNewImagePar2::Fill(const MParContainer *par, const Stat_t w)
    121121{
    122122    const MNewImagePar2 *h = dynamic_cast<const MNewImagePar2*>(par);
    … …  
    124124    {
    125125        *fLog << err << "MHNewImagePar2::Fill: Pointer (!=NULL) expected." << endl;
    126         return kFALSE;
     126        return kERROR;
    127127    }
    128128

  • trunk/MagicSoft/Mars/mimage/MHNewImagePar2.h

    r6869 r9153  
    2424
    2525    Bool_t SetupFill(const MParList *plist);
    26     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     26    Int_t Fill(const MParContainer *par, const Stat_t w=1);
    2727
    2828    void SetMmScale(Bool_t mmscale=kTRUE);

  • trunk/MagicSoft/Mars/mimage/MHVsSize.cc

    r8659 r9153  
    240240// Be careful: Only call this with an object of type MHillas
    241241//
    242 Bool_t MHVsSize::Fill(const MParContainer *par, const Stat_t w)
     242Int_t MHVsSize::Fill(const MParContainer *par, const Stat_t w)
    243243{
    244244    const MHillasSrc *src = dynamic_cast<const MHillasSrc*>(par);
    … …  
    246246    {
    247247        *fLog << err << "MHVsSize::Fill: Wrong argument... abort." << endl;
    248         return kFALSE;
     248        return kERROR;
    249249    }
    250250

  • trunk/MagicSoft/Mars/mimage/MHVsSize.h

    r6956 r9153  
    4040
    4141    Bool_t SetupFill(const MParList *pList);
    42     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     42    Int_t Fill(const MParContainer *par, const Stat_t w=1);
    4343
    4444    void Draw(Option_t *opt=NULL);

  • trunk/MagicSoft/Mars/mmuon/MHMuonPar.cc

    r8713 r9153  
    170170// MMuonSearchPar container.
    171171//
    172 Bool_t MHMuonPar::Fill(const MParContainer *par, const Stat_t w)
     172Int_t MHMuonPar::Fill(const MParContainer *par, const Stat_t w)
    173173{
    174174    fHistRadius.Fill(fMm2Deg*fMuonSearchPar->GetRadius(), w);

  • trunk/MagicSoft/Mars/mmuon/MHMuonPar.h

    r7366 r9153  
    4040
    4141    Bool_t SetupFill(const MParList *plist);
    42     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     42    Int_t Fill(const MParContainer *par, const Stat_t w=1);
    4343
    4444    const TH1F&     GetHistRadius() const    { return fHistRadius; }

  • trunk/MagicSoft/Mars/mmuon/MHSingleMuon.cc

    r8775 r9153  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MHSingleMuon.cc,v 1.17 2007-12-03 17:44:59 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MHSingleMuon.cc,v 1.18 2008-11-11 11:46:25 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    197197// MMuonSearchPar container.
    198198//
    199 Bool_t MHSingleMuon::Fill(const MParContainer *par, const Stat_t w)
     199Int_t MHSingleMuon::Fill(const MParContainer *par, const Stat_t w)
    200200{
    201201    fRelTimeMean  =  0;

  • trunk/MagicSoft/Mars/mmuon/MHSingleMuon.h

    r8776 r9153  
    3737
    3838    Bool_t SetupFill(const MParList *plist);
    39     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     39    Int_t Fill(const MParContainer *par, const Stat_t w=1);
    4040
    4141    Bool_t CalcPhi(Double_t, Double_t &, Double_t &) const;

  • trunk/MagicSoft/Mars/mpedestal/MHPedestalCor.cc

    r8573 r9153  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MHPedestalCor.cc,v 1.3 2007-06-17 20:50:58 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MHPedestalCor.cc,v 1.4 2008-11-11 11:49:49 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    103103// Fill the histograms with data from a MCamEvent-Container.
    104104//
    105 Bool_t MHPedestalCor::Fill(const MParContainer *par, const Stat_t w)
     105Int_t MHPedestalCor::Fill(const MParContainer *par, const Stat_t w)
    106106{
    107107    const MPedestalSubtractedEvt *evt = dynamic_cast<const MPedestalSubtractedEvt*>(par);
    … …  
    109109    {
    110110        *fLog << err << dbginf << "Got no MCamEvent as argument of Fill()..." << endl;
    111         return kFALSE;
     111        return kERROR;
    112112    }
    113113

  • trunk/MagicSoft/Mars/mpedestal/MHPedestalCor.h

    r8152 r9153  
    2020    TProfile fProf;
    2121
    22     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     22    Int_t Fill(const MParContainer *par, const Stat_t w=1);
    2323
    2424public:

  • trunk/MagicSoft/Mars/mpointing/MHPointing.cc

    r8907 r9153  
    152152// MMuonSearchPar container.
    153153//
    154 Bool_t MHPointing::Fill(const MParContainer *par, const Stat_t w)
     154Int_t MHPointing::Fill(const MParContainer *par, const Stat_t w)
    155155{
    156156    const MTime *t = dynamic_cast<const MTime*>(par);
    … …  
    168168        {
    169169            *fLog << err << "ERROR: fReportSG==NULL... abort." << endl;
    170             return kFALSE;
     170            return kERROR;
    171171        }
    172172
    … …  
    199199        {
    200200            *fLog << err << "ERROR: fReportCosy==NULL... abort." << endl;
    201             return kFALSE;
     201            return kERROR;
    202202        }
    203203

  • trunk/MagicSoft/Mars/mpointing/MHPointing.h

    r7726 r9153  
    4444
    4545    Bool_t SetupFill(const MParList *plist);
    46     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     46    Int_t Fill(const MParContainer *par, const Stat_t w=1);
    4747
    4848    void Draw(Option_t *opt="");

  • trunk/MagicSoft/Mars/mpointing/MHSrcPosCam.cc

    r9000 r9153  
    135135// deleted.
    136136//
    137 Bool_t MHSrcPosCam::Fill(const MParContainer *par, const Stat_t w)
     137Int_t MHSrcPosCam::Fill(const MParContainer *par, const Stat_t w)
    138138{
    139139    const MSrcPosCam *cam = dynamic_cast<const MSrcPosCam*>(par);
    … …  
    141141    {
    142142        *fLog << err << dbginf << "Got no MSrcPosCam as argument of Fill()..." << endl;
    143         return kFALSE;
     143        return kERROR;
    144144    }
    145145

  • trunk/MagicSoft/Mars/mpointing/MHSrcPosCam.h

    r9000 r9153  
    4141    // MH
    4242    Bool_t SetupFill(const MParList *pl);
    43     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     43    Int_t Fill(const MParContainer *par, const Stat_t w=1);
    4444
    4545    // MHSrcPosCam

  • trunk/MagicSoft/Mars/mranforest/MHRanForest.cc

    r8907 r9153  
    111111//
    112112//
    113 Bool_t MHRanForest::Fill(const MParContainer *par, const Stat_t w)
     113Int_t MHRanForest::Fill(const MParContainer *par, const Stat_t w)
    114114{
    115115    fNumEvent++;

  • trunk/MagicSoft/Mars/mranforest/MHRanForest.h

    r2071 r9153  
    3333
    3434    Bool_t SetupFill(const MParList *plist);
    35     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     35    Int_t Fill(const MParContainer *par, const Stat_t w=1);
    3636    Bool_t Finalize();
    3737

  • trunk/MagicSoft/Mars/mranforest/MHRanForestGini.cc

    r8907 r9153  
    11/* ======================================================================== *\
    2 ! $Name: not supported by cvs2svn $:$Id: MHRanForestGini.cc,v 1.8 2008-06-02 08:46:43 tbretz Exp $
     2! $Name: not supported by cvs2svn $:$Id: MHRanForestGini.cc,v 1.9 2008-11-11 11:46:50 tbretz Exp $
    33! --------------------------------------------------------------------------
    44!
    … …  
    9494    {
    9595        *fLog << err << dbginf << "MRanForest not found... aborting." << endl;
    96         return kFALSE;
     96        return kERROR;
    9797    }
    9898
    … …  
    107107//
    108108//
    109 Bool_t MHRanForestGini::Fill(const MParContainer *par, const Stat_t w)
     109Int_t MHRanForestGini::Fill(const MParContainer *par, const Stat_t w)
    110110{
    111111    MRanTree *t = fRanForest->GetCurTree();

  • trunk/MagicSoft/Mars/mranforest/MHRanForestGini.h

    r7413 r9153  
    3737
    3838    Bool_t SetupFill(const MParList *plist);
    39     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
     39    Int_t Fill(const MParContainer *par, const Stat_t w=1);
    4040    Bool_t Finalize();
    4141

  • trunk/MagicSoft/Mars/mreflector/MHReflector.cc

    r8907 r9153  
    128128//
    129129#include "MRflSinglePhoton.h"
    130 Bool_t MHReflector::Fill(const MParContainer *par, const Stat_t weight)
     130Int_t MHReflector::Fill(const MParContainer *par, const Stat_t weight)
    131131{
    132132    const Double_t energy = fHeader->GetEnergy();

  • trunk/MagicSoft/Mars/mreflector/MHReflector.h

    r8315 r9153  
    3030
    3131    Bool_t SetupFill(const MParList *pList);
    32     Bool_t Fill(const MParContainer *par, const Stat_t weight=1);
     32    Int_t Fill(const MParContainer *par, const Stat_t weight=1);
    3333    Bool_t Finalize();
    3434
Note: See TracChangeset for help on using the changeset viewer.