Changeset 1992


Ignore:
Timestamp:
04/23/03 16:45:19 (21 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
69 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r1989 r1992  
    66      - updated dox
    77
     8   * NEWS:
     9     - updated
     10     
     11   * mfileio/MWriteRootFile.[hcc]:
     12     - fixed the missing function of UPDATE files
     13     
     14   * mhist/MFillH.[h,cc]:
     15     - implemented fWeight
     16   
     17   * mhist/MH.[h,cc], mhist/MHAlphaEnergyTheta.[h,cc],
     18     mhist/MHAlphaEnergyTime.[h,cc], mhist/MHArray.[h,cc],
     19     mhist/MHBlindPixels.[h,cc], mhist/MHCompProb.[h,cc],
     20     mhist/MHEffOnTime.[h,cc], mhist/MHEffOnTimeTheta.[h,cc],
     21     mhist/MHEffOnTimeTime.[h,cc], mhist/MHEnergyTheta.[h,cc],
     22     mhist/MHFadcCam.[h,cc], mhist/MHFlux.[h,cc],
     23     mhist/MHGamma.[h,cc], mhist/MHHadronness.[h,cc],
     24     mhist/MHMatrix.[h,cc], mhist/MHRanForest.[h,cc],
     25     mhist/MHRanForestGini.[h,cc], mhist/MHSigmaPixel.[h,cc],
     26     mhist/MHSigmaTheta.[h,cc], mhist/MHSigmabarTheta.[h,cc],
     27     mhist/MHStarMap.[h,cc], mhist/MHThetabarTheta.[h,cc],
     28     mhist/MHThetabarTime.[h,cc], mhist/MHTimeDiffTheta.[h,cc],
     29     mhist/MHTimeDiffTime.[h,cc], mhistmc/MHMcCT1CollectionArea.[h,cc],
     30     mhistmc/MHMcEnergyImpact.[h,cc], mhistmc/MHMcEnergyMigration.[h,cc]
     31     mhistmc/MHMcTriggerLvl2.[h,cc], mimage/MHHillas.[h,cc],
     32     mimage/MHHillasExt.[h,cc], mimage/MHHillasSrc.[h,cc],
     33     mimage/MHNewImagePar.[h,cc]:
     34     - added second (weight) argument to Fill
     35     - in some headers: removed obvious virtual
     36     - removed some dummy Fill function (not necessary anymore)
     37     
    838
    939

  • trunk/MagicSoft/Mars/NEWS

    r1925 r1992  
    4545
    4646   - made compatible with the latest PRO version of root (3.04/02)
     47
     48   - added a new status display which can show the present status
     49     of histograms while an eventloop is running (MStatusDisplay,
     50     an example can be found at status.C)
     51
     52   - reorganized directories:
     53     classes describing the image              --> mimage
     54     classes containing Monte Carlo Histograms --> mhistmc
     55
     56   - added (event-)weights to fill histograms
    4757
    4858

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

    r1966 r1992  
    8282#include "MHArray.h"
    8383
     84#include "MWeight.h"
     85
    8486#include "MParList.h"
    8587#include "MStatusDisplay.h"
    … …  
    102104    fIndex  = NULL;
    103105    fCanvas = NULL;
     106
     107    fWeight     = NULL;
     108    fWeightName = "";
    104109}
    105110
    … …  
    350355            return kFALSE;
    351356        }
     357    }
     358
     359    //
     360    // If the user defined the use of a weight: search for it.
     361    //
     362    if (!fWeight && !fWeightName.IsNull())
     363    {
     364        fWeight = (MWeight*)pList->FindObject(fWeightName, "MWeight");
     365        *fLog << err << fWeightName << " [MWeight] not found... aborting." << endl;
     366        return kFALSE;
    352367    }
    353368
    … …  
    442457     */
    443458
    444     return fH->Fill(fParContainer);
     459    return fH->Fill(fParContainer, fWeight?fWeight->GetWeight():1);
    445460}
    446461

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

    r1965 r1992  
    99class MMap;
    1010class MData;
     11class MWeight;
    1112class MParList;
    1213
    … …  
    2122    MH* fH;
    2223    TString fHName;
     24
     25    MWeight *fWeight;
     26    TString fWeightName;
    2327
    2428    MData *fIndex;    // MData object describing the 'key' to an automatic index for an MHArray
    … …  
    4246    MFillH(MH *hist,         const char *par=NULL, const char *name=NULL, const char *title=NULL);
    4347    MFillH(MH *hist,         MParContainer *par,   const char *name=NULL, const char *title=NULL);
    44 
    4548    ~MFillH();
    4649
    4750    void SetRuleForIdx(const TString rule);
    4851    void SetRuleForIdx(MData *rule);
     52
     53    void SetWeight(MWeight *w)       { fWeight = w; }
     54    void SetWeight(const char *name) { fWeightName = name; }
    4955
    5056    Bool_t PreProcess(MParList *pList);

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

    r1967 r1992  
    9797// to your class definition.
    9898//
    99 Bool_t MH::Fill(const MParContainer *par)
     99Bool_t MH::Fill(const MParContainer *par, Double_t w)
    100100{
    101101    *fLog << warn << GetDescriptor() << ": Fill not overloaded! Can't be used!" << endl;

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

    r1971 r1992  
    2222
    2323    virtual Bool_t SetupFill(const MParList *pList) { return kTRUE; }
    24     virtual Bool_t Fill(const MParContainer *par);
     24    virtual Bool_t Fill(const MParContainer *par, Double_t weight=1);
    2525    virtual Bool_t Finalize() { return kTRUE; }
    2626

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

    r1668 r1992  
    110110// Fill the histogram
    111111//
    112 Bool_t MHAlphaEnergyTheta::Fill(const MParContainer *par)
     112Bool_t MHAlphaEnergyTheta::Fill(const MParContainer *par, Double_t w)
    113113{
    114114    MHillasSrc &hil = *(MHillasSrc*)par;

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

    r1668 r1992  
    3333    MHAlphaEnergyTheta(const char *name=NULL, const char *title=NULL);
    3434
    35     virtual Bool_t SetupFill(const MParList *pList);
    36     virtual Bool_t Fill(const MParContainer *par);
     35    Bool_t SetupFill(const MParList *pList);
     36    Bool_t Fill(const MParContainer *par, Double_t w=1);
    3737
    3838    const TH3D *GetHist()       { return &fHist; }

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

    r1415 r1992  
    112112// Fill the histogram
    113113//
    114 Bool_t MHAlphaEnergyTime::Fill(const MParContainer *par)
     114Bool_t MHAlphaEnergyTime::Fill(const MParContainer *par, Double_t w)
    115115{
    116116    MHillasSrc &hil = *(MHillasSrc*)par;

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

    r1668 r1992  
    3232    MHAlphaEnergyTime(const char *name=NULL, const char *title=NULL);
    3333
    34     virtual Bool_t SetupFill(const MParList *pList);
    35     virtual Bool_t Fill(const MParContainer *par);
     34    Bool_t SetupFill(const MParList *pList);
     35    Bool_t Fill(const MParContainer *par, Double_t w=1);
    3636
    3737    const TH3D *GetHist()       { return &fHist; }

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

    r1895 r1992  
    463463// successfull filled.
    464464//
    465 Bool_t MHArray::Fill(const MParContainer *par)
     465Bool_t MHArray::Fill(const MParContainer *par, Double_t w)
    466466{
    467467    const Int_t n = fArray->GetSize();

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

    r1883 r1992  
    4141    void Set(const MH *hist);
    4242
    43     virtual Bool_t SetupFill(const MParList *pList);
    44     virtual Bool_t Fill(const MParContainer *par);
    45     virtual Bool_t Finalize();
     43    Bool_t SetupFill(const MParList *pList);
     44    Bool_t Fill(const MParContainer *par, Double_t w=1);
     45    Bool_t Finalize();
    4646
    4747    Bool_t AddHistogram();

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

    r1967 r1992  
    7474}
    7575
    76 Bool_t MHBlindPixels::Fill(const MParContainer *par)
     76Bool_t MHBlindPixels::Fill(const MParContainer *par, Double_t w)
    7777{
    7878    if (!par)

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

    r1967 r1992  
    2323
    2424    void Draw(Option_t* option = "");
    25     Bool_t Fill(const MParContainer *par);
     25    Bool_t Fill(const MParContainer *par, Double_t w=1);
    2626
    2727    ClassDef(MHBlindPixels, 1)  // Histogram of blind pixels

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

    r1336 r1992  
    159159//
    160160//
    161 Bool_t MHCompProb::Fill(const MParContainer *par)
     161Bool_t MHCompProb::Fill(const MParContainer *par, Double_t w)
    162162{
    163163    const MMcEvt &mcevt = *(MMcEvt*)par;

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

    r1336 r1992  
    2929
    3030    Bool_t SetupFill(const MParList *plist);
    31     Bool_t Fill(const MParContainer *par);
     31    Bool_t Fill(const MParContainer *par, Double_t w=1);
    3232    Bool_t Finalize();
    3333

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

    r1669 r1992  
    361361// -------------------------------------------------------------------------
    362362//
    363 // Dummy Fill
    364 //
    365 Bool_t MHEffOnTime::Fill(const MParContainer *par)
    366 {
    367   return kTRUE;
    368 }
    369 
    370 // -------------------------------------------------------------------------
    371 //
    372363// Draw a copy of the histogram
    373364//

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

    r1668 r1992  
    3232    MHEffOnTime(const char *varname=NULL, const char *unit=NULL);
    3333
    34     virtual Bool_t SetupFill(const MParList *pList);
    35     virtual Bool_t Fill(const MParContainer *par);
     34    Bool_t SetupFill(const MParList *pList);
    3635
    3736    const TH1D *GetHist() { return &fHEffOn; }

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

    r1330 r1992  
    257257// -------------------------------------------------------------------------
    258258//
    259 // Dummy Fill
    260 // without it get the error message :
    261 // Error: MHEffOnTimeTime() no default constructor FILE:macros/wowflux.C LINE:359
    262 // *** Interpreter error recovered ***
    263 //
    264 Bool_t MHEffOnTimeTheta::Fill(const MParContainer *par)
    265 {
    266   return kTRUE;
    267 }     
    268 // -------------------------------------------------------------------------
    269 //
    270259// Draw a copy of the histogram
    271260//

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

    r1668 r1992  
    2424    MHEffOnTimeTheta(const char *name=NULL, const char *title=NULL);
    2525
    26     virtual Bool_t SetupFill(const MParList *pList);
    27     virtual Bool_t Fill(const MParContainer *par);
     26    Bool_t SetupFill(const MParList *pList);
    2827
    2928    const TH1D *GetHist() { return &fHEffOn; }

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

    r1330 r1992  
    264264// -------------------------------------------------------------------------
    265265//
    266 // Dummy Fill
    267 // without it get error message :
    268 // Error: MHEffOnTimeTime() no default constructor FILE:macros/wowflux.C LINE:359
    269 //*** Interpreter error recovered ***
    270 Bool_t MHEffOnTimeTime::Fill(const MParContainer *par)
    271 {
    272   return kTRUE;
    273 }
    274 
    275 // -------------------------------------------------------------------------
    276 //
    277266// Draw a copy of the histogram
    278267//

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

    r1668 r1992  
    2424    MHEffOnTimeTime(const char *name=NULL, const char *title=NULL);
    2525
    26     virtual Bool_t SetupFill(const MParList *pList);
    27     virtual Bool_t Fill(const MParContainer *par);
     26    Bool_t SetupFill(const MParList *pList);
    2827
    2928    const TH1D *GetHist() { return &fHEffOn; }

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

    r1330 r1992  
    9999// Fill data into the histogram which contains all showers
    100100//
    101 Bool_t MHEnergyTheta::Fill(const MParContainer *par)
     101Bool_t MHEnergyTheta::Fill(const MParContainer *par, Double_t w)
    102102{
    103103    const MMcEvt &mcevt = *(MMcEvt*)par;

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

    r1663 r1992  
    2222    ~MHEnergyTheta();
    2323
    24     Bool_t Fill(const MParContainer *cont);
     24    Bool_t Fill(const MParContainer *cont, Double_t w=1);
    2525
    2626    void Draw(Option_t *option="");

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

    r1916 r1992  
    9191
    9292// --------------------------------------------------------------------------
    93 Bool_t MHFadcCam::Fill(const MParContainer *par)
     93Bool_t MHFadcCam::Fill(const MParContainer *par, Double_t w)
    9494{
    9595    return Fill((MRawEvtData*)par);
    … …  
    138138    GetHistLo(i)->Reset();
    139139}
     140

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

    r1916 r1992  
    4545    const TH1F *GetHistLo(UInt_t i) const { return (*this)[i].GetHistLo(); }
    4646
    47     Bool_t Fill(const MParContainer *par);
     47    Bool_t Fill(const MParContainer *par, Double_t w=1);
    4848    Bool_t Fill(const MRawEvtData *par);
    4949

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

    r1668 r1992  
    185185// -------------------------------------------------------------------------
    186186//
    187 // Dummy Fill (has to be included because in base class MH Fill is set to 0
    188 //             (abstract member function));
    189 // without the dummy Fill one gets the error message :
    190 //
    191 // Error: Can't call MHFlux::MHFlux(evttime,"time","[s]") in current scope
    192 // FILE:macros/flux.C LINE:465
    193 // Possible candidates are...
    194 // filename       line:size busy function type and name  (in MHFlux)
    195 // filename       line:size busy function type and name  (in MH)
    196 // filename       line:size busy function type and name  (in MParContainer)
    197 // filename       line:size busy function type and name  (in TObject)
    198 //
    199 Bool_t MHFlux::Fill(const MParContainer *par)
    200 {
    201     return kTRUE;
    202 }
    203 
    204 
    205 // -------------------------------------------------------------------------
    206 //
    207187// Unfold the distribution in E-est
    208188//

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

    r1668 r1992  
    5050    MHFlux(const MHGamma &h2d, const TString varname, const TString unit);
    5151
    52     Bool_t Fill(const MParContainer *par);
    53 
    5452    void Unfold();
    5553    void CalcFlux(const TH1D *teff, const TProfile *thetabar,

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

    r1669 r1992  
    6060}
    6161
    62 // --------------------------------------------------------------------------
    63 //
    64 // Dummy Fill
    65 //
    66 Bool_t MHGamma::Fill(const MParContainer *par)
    67 {
    68   return kTRUE;
    69 }
    70 
    7162TH3D *MHGamma::Subtract(const MHAlphaEnergyTheta &h1, const MHAlphaEnergyTheta &h2)
    7263{

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

    r1668 r1992  
    2323    MHGamma(const TString &name="", const TString &title="");
    2424
    25     Bool_t Fill(const MParContainer *par);
    26 
    2725    TH3D *Subtract(const TH3D *h1, const TH3D *h2);
    2826

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

    r1968 r1992  
    183183// are skipped at the moment.
    184184//
    185 Bool_t MHHadronness::Fill(const MParContainer *par)
     185Bool_t MHHadronness::Fill(const MParContainer *par, Double_t w)
    186186{
    187187    // Preliminary Workaround: FIXME!

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

    r1968 r1992  
    4545
    4646    Bool_t SetupFill(const MParList *plist);
    47     Bool_t Fill(const MParContainer *par);
     47    Bool_t Fill(const MParContainer *par, Double_t w=1);
    4848    Bool_t Finalize();
    4949

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

    r1967 r1992  
    227227// Add the values correspoding to the columns to the new row
    228228//
    229 Bool_t MHMatrix::Fill(const MParContainer *par)
     229Bool_t MHMatrix::Fill(const MParContainer *par, Double_t w)
    230230{
    231231    AddRow();

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

    r1948 r1992  
    4848    Bool_t SetupFill(const MParList *pList);
    4949
    50     Bool_t Fill(const MParContainer *par);
     50    Bool_t Fill(const MParContainer *par, Double_t w=1);
    5151    Bool_t Finalize();
    5252

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

    r1966 r1992  
    108108//
    109109//
    110 Bool_t MHRanForest::Fill(const MParContainer *par)
     110Bool_t MHRanForest::Fill(const MParContainer *par, Double_t w)
    111111{
    112112    fNumEvent++;

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

    r1966 r1992  
    3333
    3434    Bool_t SetupFill(const MParList *plist);
    35     Bool_t Fill(const MParContainer *par);
     35    Bool_t Fill(const MParContainer *par, Double_t w=1);
    3636    Bool_t Finalize();
    3737

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

    r1966 r1992  
    101101//
    102102//
    103 Bool_t MHRanForestGini::Fill(const MParContainer *par)
     103Bool_t MHRanForestGini::Fill(const MParContainer *par, Double_t w)
    104104{
    105105    for (Int_t i=0;i<fRanForest->GetNumDim();i++)

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

    r1966 r1992  
    3131
    3232    Bool_t SetupFill(const MParList *plist);
    33     Bool_t Fill(const MParContainer *par);
     33    Bool_t Fill(const MParContainer *par, Double_t w=1);
    3434    Bool_t Finalize();
    3535

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

    r1966 r1992  
    107107// Fill the histogram
    108108//
    109 Bool_t MHSigmaPixel::Fill(const MParContainer *par)
     109Bool_t MHSigmaPixel::Fill(const MParContainer *par, Double_t w)
    110110{
    111111    const MPedestalCam &ped = *(MPedestalCam*)par;

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

    r1966 r1992  
    2626    MHSigmaPixel(const char *name=NULL, const char *title=NULL);
    2727
    28     virtual Bool_t SetupFill(const MParList *pList);
    29     virtual Bool_t Fill(const MParContainer *par);
     28    Bool_t SetupFill(const MParList *pList);
     29    Bool_t Fill(const MParContainer *par, Double_t w=1);
    3030
    3131    const TH2D *GetHist()       { return &fHist; }

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

    r1967 r1992  
    177177//  Fill the histograms
    178178//
    179 Bool_t MHSigmaTheta::Fill(const MParContainer *par)
     179Bool_t MHSigmaTheta::Fill(const MParContainer *par, Double_t w)
    180180{
    181181    Double_t theta = fMcEvt->GetTelescopeTheta()*kRad2Deg;

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

    r1961 r1992  
    4444
    4545    Bool_t SetupFill(const MParList *plist);
    46     Bool_t Fill(const MParContainer *par);
     46    Bool_t Fill(const MParContainer *par, Double_t w=1);
    4747
    4848    const TH2D *GetSigmaTheta() { return &fSigmaTheta; }

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

    r1966 r1992  
    111111// Fill the histogram
    112112//
    113 Bool_t MHSigmabarTheta::Fill(const MParContainer *par)
     113Bool_t MHSigmabarTheta::Fill(const MParContainer *par, Double_t w)
    114114{
    115115    fHist.Fill(fMcEvt->GetTheta()*kRad2Deg, fSigmabar->GetSigmabar()); 

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

    r1966 r1992  
    2727    MHSigmabarTheta(const char *name=NULL, const char *title=NULL);
    2828
    29     virtual Bool_t SetupFill(const MParList *pList);
    30     virtual Bool_t Fill(const MParContainer *par);
     29    Bool_t SetupFill(const MParList *pList);
     30    Bool_t Fill(const MParContainer *par, Double_t w=1);
    3131
    3232    const TH2D *GetHist()       { return &fHist; }

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

    r1965 r1992  
    146146// Be careful: Only call this with an object of type MHillas
    147147//
    148 Bool_t MHStarMap::Fill(const MParContainer *par)
     148Bool_t MHStarMap::Fill(const MParContainer *par, Double_t w)
    149149{
    150150    const MHillas &h = *(MHillas*)par;

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

    r1965 r1992  
    3333
    3434    Bool_t SetupFill(const MParList *pList);
    35     Bool_t Fill(const MParContainer *par);
     35    Bool_t Fill(const MParContainer *par, Double_t w=1);
    3636
    3737    TH1 *GetHistByName(const TString name) { return fStarMap; }

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

    r1966 r1992  
    110110// Fill the histogram
    111111//
    112 Bool_t MHThetabarTheta::Fill(const MParContainer *par)
     112Bool_t MHThetabarTheta::Fill(const MParContainer *par, Double_t w)
    113113{
    114114    const Double_t theta = fMcEvt->GetTelescopeTheta()*kRad2Deg;

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

    r1966 r1992  
    2525    MHThetabarTheta(const char *name=NULL, const char *title=NULL);
    2626
    27     virtual Bool_t SetupFill(const MParList *pList);
    28     virtual Bool_t Fill(const MParContainer *par);
     27    Bool_t SetupFill(const MParList *pList);
     28    Bool_t Fill(const MParContainer *par, Double_t w=1);
    2929
    3030    const TProfile *GetHist() { return &fHist; }

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

    r1966 r1992  
    2828    MHThetabarTime(const char *name=NULL, const char *title=NULL);
    2929
    30     virtual Bool_t SetupFill(const MParList *pList);
    31     virtual Bool_t Fill(const MParContainer *par);
     30    Bool_t SetupFill(const MParList *pList);
     31    Bool_t Fill(const MParContainer *par, Double_t w=1);
    3232
    3333    const TProfile *GetHist() { return &fHist; }

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

    r1966 r1992  
    143143//  Fill the histogram
    144144//
    145 Bool_t MHTimeDiffTheta::Fill(const MParContainer *par)
     145Bool_t MHTimeDiffTheta::Fill(const MParContainer *par, Double_t w)
    146146{
    147147    const Double_t time = 200e-9*fTime->GetTimeLo() + fTime->GetTimeHi();

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

    r1966 r1992  
    2626    MHTimeDiffTheta(const char *name=NULL, const char *title=NULL);
    2727
    28     virtual Bool_t SetupFill(const MParList *pList);
    29     virtual Bool_t Fill(const MParContainer *par);
     28    Bool_t SetupFill(const MParList *pList);
     29    Bool_t Fill(const MParContainer *par, Double_t w=1);
    3030
    3131    const TH2D *GetHist() { return &fHist; }

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

    r1966 r1992  
    136136//  Fill the histogram
    137137//
    138 Bool_t MHTimeDiffTime::Fill(const MParContainer *par)
     138Bool_t MHTimeDiffTime::Fill(const MParContainer *par, Double_t w)
    139139{
    140140    const Double_t time = 200e-9*fTime->GetTimeLo() + fTime->GetTimeHi();

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

    r1966 r1992  
    2525
    2626    virtual Bool_t SetupFill(const MParList *pList);
    27     virtual Bool_t Fill(const MParContainer *par);
     27    virtual Bool_t Fill(const MParContainer *par, Double_t w=1);
    2828
    2929    const TH2D *GetHist() { return &fHist; }

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

    r1989 r1992  
    137137// Fill data into the histogram which contains the selected showers
    138138//
    139 Bool_t MHMcCT1CollectionArea::Fill(const MParContainer *par)
     139Bool_t MHMcCT1CollectionArea::Fill(const MParContainer *par, Double_t w)
    140140{
    141141  MMcEvt &mcevt = *(MMcEvt*)par;

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

    r1986 r1992  
    1919    ~MHMcCT1CollectionArea();
    2020
    21     virtual Bool_t SetupFill(const MParList *pList);
    22     virtual Bool_t Fill(const MParContainer *par);
     21    Bool_t SetupFill(const MParList *pList);
     22    Bool_t Fill(const MParContainer *par, Double_t w=1);
    2323
    2424    void DrawAll(Option_t *option="");

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

    r1974 r1992  
    119119//  Fill the histogram with the log10 of the energy for triggered events.
    120120//
    121 Bool_t MHMcEnergyImpact::Fill(const MParContainer *cont)
     121Bool_t MHMcEnergyImpact::Fill(const MParContainer *cont, Double_t w)
    122122{
    123123    const MMcEvt &mcevt = *(MMcEvt*)cont;

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

    r1974 r1992  
    2424
    2525    Bool_t SetupFill(const MParList *pList);
    26     Bool_t Fill(const MParContainer *pcont=NULL);
     26    Bool_t Fill(const MParContainer *pcont=NULL, Double_t w=1);
    2727
    2828    const TH2D *GetHist()       { return &fHist; }

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

    r1974 r1992  
    215215// Fill the histogram
    216216//
    217 Bool_t MHMcEnergyMigration::Fill(const MParContainer *par)
     217Bool_t MHMcEnergyMigration::Fill(const MParContainer *par, Double_t w)
    218218{
    219219    //    MHillasSrc &hil = *(MHillasSrc*)par;

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

    r1981 r1992  
    2929    MHMcEnergyMigration(const char *name=NULL, const char *title=NULL);
    3030
    31     virtual Bool_t SetupFill(const MParList *pList);
    32     virtual Bool_t Fill(const MParContainer *par);
     31    Bool_t SetupFill(const MParList *pList);
     32    Bool_t Fill(const MParContainer *par, Double_t w=1);
    3333
    3434    const TH3D *GetHist() { return &fHist; }

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

    r1974 r1992  
    141141// Be careful: Only call this with an object of type MMcTriggerLvl2
    142142//
    143 Bool_t MHMcTriggerLvl2::Fill(const MParContainer *par)
     143Bool_t MHMcTriggerLvl2::Fill(const MParContainer *par, Double_t w)
    144144{
    145145  const MMcTriggerLvl2 &h = *(MMcTriggerLvl2 *)par;

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

    r1974 r1992  
    3434    ~MHMcTriggerLvl2();
    3535
    36     Bool_t Fill(const MParContainer *par);
     36    Bool_t Fill(const MParContainer *par, Double_t w=1);
    3737
    3838    TH1 *GetHistByName(const TString name);

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

    r1967 r1992  
    255255// Be careful: Only call this with an object of type MHillas
    256256//
    257 Bool_t MHHillas::Fill(const MParContainer *par)
     257Bool_t MHHillas::Fill(const MParContainer *par, Double_t w)
    258258{
    259259    const MHillas &h = *(MHillas*)par;

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

    r1965 r1992  
    4141
    4242    Bool_t SetupFill(const MParList *pList);
    43     Bool_t Fill(const MParContainer *par);
     43    Bool_t Fill(const MParContainer *par, Double_t w=1);
    4444
    4545    TH1 *GetHistByName(const TString name);

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

    r1965 r1992  
    165165// Be careful: Only call this with an object of type MHillas
    166166//
    167 Bool_t MHHillasExt::Fill(const MParContainer *par)
     167Bool_t MHHillasExt::Fill(const MParContainer *par, Double_t w)
    168168{
    169169    const MHillasSrc *src = (MHillasSrc*)par;

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

    r1965 r1992  
    3636
    3737    Bool_t SetupFill(const MParList *pList);
    38     Bool_t Fill(const MParContainer *par);
     38    Bool_t Fill(const MParContainer *par, Double_t w=1);
    3939
    4040    TH1 *GetHistByName(const TString name);

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

    r1965 r1992  
    134134// Be careful: Only call this with an object of type MHillas
    135135//
    136 Bool_t MHHillasSrc::Fill(const MParContainer *par)
     136Bool_t MHHillasSrc::Fill(const MParContainer *par, Double_t w)
    137137{
    138138    const MHillasSrc &h = *(MHillasSrc*)par;

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

    r1940 r1992  
    2828
    2929    Bool_t SetupFill(const MParList *pList);
    30     Bool_t Fill(const MParContainer *par);
     30    Bool_t Fill(const MParContainer *par, Double_t w=1);
    3131
    3232    TH1 *GetHistByName(const TString name);

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

    r1966 r1992  
    8585// Fill the histograms with data from a MNewImagePar container.
    8686//
    87 Bool_t MHNewImagePar::Fill(const MParContainer *par)
     87Bool_t MHNewImagePar::Fill(const MParContainer *par, Double_t w)
    8888{
    8989    const MNewImagePar &h = *(MNewImagePar*)par;

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

    r1966 r1992  
    1919    ~MHNewImagePar();
    2020
    21     Bool_t Fill(const MParContainer *par);
     21    Bool_t Fill(const MParContainer *par, Double_t w=1);
    2222
    2323    TH1 *GetHistByName(const TString name);
Note: See TracChangeset for help on using the changeset viewer.