Changeset 1992 for trunk/MagicSoft/Mars

Timestamp:

04/23/03 16:45:19 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• mhist/MFillH.cc (modified) (4 diffs)
• mhist/MFillH.h (modified) (3 diffs)
• mhist/MH.cc (modified) (1 diff)
• mhist/MH.h (modified) (1 diff)
• mhist/MHAlphaEnergyTheta.cc (modified) (1 diff)
• mhist/MHAlphaEnergyTheta.h (modified) (1 diff)
• mhist/MHAlphaEnergyTime.cc (modified) (1 diff)
• mhist/MHAlphaEnergyTime.h (modified) (1 diff)
• mhist/MHArray.cc (modified) (1 diff)
• mhist/MHArray.h (modified) (1 diff)
• mhist/MHBlindPixels.cc (modified) (1 diff)
• mhist/MHBlindPixels.h (modified) (1 diff)
• mhist/MHCompProb.cc (modified) (1 diff)
• mhist/MHCompProb.h (modified) (1 diff)
• mhist/MHEffOnTime.cc (modified) (1 diff)
• mhist/MHEffOnTime.h (modified) (1 diff)
• mhist/MHEffOnTimeTheta.cc (modified) (1 diff)
• mhist/MHEffOnTimeTheta.h (modified) (1 diff)
• mhist/MHEffOnTimeTime.cc (modified) (1 diff)
• mhist/MHEffOnTimeTime.h (modified) (1 diff)
• mhist/MHEnergyTheta.cc (modified) (1 diff)
• mhist/MHEnergyTheta.h (modified) (1 diff)
• mhist/MHFadcCam.cc (modified) (2 diffs)
• mhist/MHFadcCam.h (modified) (1 diff)
• mhist/MHFlux.cc (modified) (1 diff)
• mhist/MHFlux.h (modified) (1 diff)
• mhist/MHGamma.cc (modified) (1 diff)
• mhist/MHGamma.h (modified) (1 diff)
• mhist/MHHadronness.cc (modified) (1 diff)
• mhist/MHHadronness.h (modified) (1 diff)
• mhist/MHMatrix.cc (modified) (1 diff)
• mhist/MHMatrix.h (modified) (1 diff)
• mhist/MHRanForest.cc (modified) (1 diff)
• mhist/MHRanForest.h (modified) (1 diff)
• mhist/MHRanForestGini.cc (modified) (1 diff)
• mhist/MHRanForestGini.h (modified) (1 diff)
• mhist/MHSigmaPixel.cc (modified) (1 diff)
• mhist/MHSigmaPixel.h (modified) (1 diff)
• mhist/MHSigmaTheta.cc (modified) (1 diff)
• mhist/MHSigmaTheta.h (modified) (1 diff)
• mhist/MHSigmabarTheta.cc (modified) (1 diff)
• mhist/MHSigmabarTheta.h (modified) (1 diff)
• mhist/MHStarMap.cc (modified) (1 diff)
• mhist/MHStarMap.h (modified) (1 diff)
• mhist/MHThetabarTheta.cc (modified) (1 diff)
• mhist/MHThetabarTheta.h (modified) (1 diff)
• mhist/MHThetabarTime.h (modified) (1 diff)
• mhist/MHTimeDiffTheta.cc (modified) (1 diff)
• mhist/MHTimeDiffTheta.h (modified) (1 diff)
• mhist/MHTimeDiffTime.cc (modified) (1 diff)
• mhist/MHTimeDiffTime.h (modified) (1 diff)
• mhistmc/MHMcCT1CollectionArea.cc (modified) (1 diff)
• mhistmc/MHMcCT1CollectionArea.h (modified) (1 diff)
• mhistmc/MHMcEnergyImpact.cc (modified) (1 diff)
• mhistmc/MHMcEnergyImpact.h (modified) (1 diff)
• mhistmc/MHMcEnergyMigration.cc (modified) (1 diff)
• mhistmc/MHMcEnergyMigration.h (modified) (1 diff)
• mhistmc/MHMcTriggerLvl2.cc (modified) (1 diff)
• mhistmc/MHMcTriggerLvl2.h (modified) (1 diff)
• mimage/MHHillas.cc (modified) (1 diff)
• mimage/MHHillas.h (modified) (1 diff)
• mimage/MHHillasExt.cc (modified) (1 diff)
• mimage/MHHillasExt.h (modified) (1 diff)
• mimage/MHHillasSrc.cc (modified) (1 diff)
• mimage/MHHillasSrc.h (modified) (1 diff)
• mimage/MHNewImagePar.cc (modified) (1 diff)
• mimage/MHNewImagePar.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -6 +6 @@
       - updated dox
 
+   * NEWS:
+     - updated
+     
+   * mfileio/MWriteRootFile.[hcc]:
+     - fixed the missing function of UPDATE files
+     
+   * mhist/MFillH.[h,cc]:
+     - implemented fWeight
+   
+   * mhist/MH.[h,cc], mhist/MHAlphaEnergyTheta.[h,cc],
+     mhist/MHAlphaEnergyTime.[h,cc], mhist/MHArray.[h,cc],
+     mhist/MHBlindPixels.[h,cc], mhist/MHCompProb.[h,cc],
+     mhist/MHEffOnTime.[h,cc], mhist/MHEffOnTimeTheta.[h,cc],
+     mhist/MHEffOnTimeTime.[h,cc], mhist/MHEnergyTheta.[h,cc],
+     mhist/MHFadcCam.[h,cc], mhist/MHFlux.[h,cc],
+     mhist/MHGamma.[h,cc], mhist/MHHadronness.[h,cc],
+     mhist/MHMatrix.[h,cc], mhist/MHRanForest.[h,cc],
+     mhist/MHRanForestGini.[h,cc], mhist/MHSigmaPixel.[h,cc],
+     mhist/MHSigmaTheta.[h,cc], mhist/MHSigmabarTheta.[h,cc],
+     mhist/MHStarMap.[h,cc], mhist/MHThetabarTheta.[h,cc],
+     mhist/MHThetabarTime.[h,cc], mhist/MHTimeDiffTheta.[h,cc],
+     mhist/MHTimeDiffTime.[h,cc], mhistmc/MHMcCT1CollectionArea.[h,cc],
+     mhistmc/MHMcEnergyImpact.[h,cc], mhistmc/MHMcEnergyMigration.[h,cc]
+     mhistmc/MHMcTriggerLvl2.[h,cc], mimage/MHHillas.[h,cc],
+     mimage/MHHillasExt.[h,cc], mimage/MHHillasSrc.[h,cc],
+     mimage/MHNewImagePar.[h,cc]:
+     - added second (weight) argument to Fill
+     - in some headers: removed obvious virtual
+     - removed some dummy Fill function (not necessary anymore)
+     
 
 

trunk/MagicSoft/Mars/NEWS

@@ -45 +45 @@
 
    - made compatible with the latest PRO version of root (3.04/02)
+
+   - added a new status display which can show the present status
+     of histograms while an eventloop is running (MStatusDisplay,
+     an example can be found at status.C)
+
+   - reorganized directories:
+     classes describing the image              --> mimage
+     classes containing Monte Carlo Histograms --> mhistmc
+
+   - added (event-)weights to fill histograms
 
 

trunk/MagicSoft/Mars/mhist/MFillH.cc

@@ -82 +82 @@
 #include "MHArray.h"
 
+#include "MWeight.h"
+
 #include "MParList.h"
 #include "MStatusDisplay.h"
@@ -102 +104 @@
     fIndex  = NULL;
     fCanvas = NULL;
+
+    fWeight     = NULL;
+    fWeightName = "";
 }
 
@@ -350 +355 @@
             return kFALSE;
         }
+    }
+
+    //
+    // If the user defined the use of a weight: search for it.
+    //
+    if (!fWeight && !fWeightName.IsNull())
+    {
+        fWeight = (MWeight*)pList->FindObject(fWeightName, "MWeight");
+        *fLog << err << fWeightName << " [MWeight] not found... aborting." << endl;
+        return kFALSE;
     }
 
@@ -442 +457 @@
      */
 
-    return fH->Fill(fParContainer);
+    return fH->Fill(fParContainer, fWeight?fWeight->GetWeight():1);
 } 
 

trunk/MagicSoft/Mars/mhist/MFillH.h

@@ -9 +9 @@
 class MMap;
 class MData;
+class MWeight;
 class MParList;
 
@@ -21 +22 @@
     MH* fH;
     TString fHName;
+
+    MWeight *fWeight;
+    TString fWeightName;
 
     MData *fIndex;    // MData object describing the 'key' to an automatic index for an MHArray
@@ -42 +46 @@
     MFillH(MH *hist,         const char *par=NULL, const char *name=NULL, const char *title=NULL);
     MFillH(MH *hist,         MParContainer *par,   const char *name=NULL, const char *title=NULL);
-
     ~MFillH();
 
     void SetRuleForIdx(const TString rule);
     void SetRuleForIdx(MData *rule);
+
+    void SetWeight(MWeight *w)       { fWeight = w; }
+    void SetWeight(const char *name) { fWeightName = name; }
 
     Bool_t PreProcess(MParList *pList);

trunk/MagicSoft/Mars/mhist/MH.cc

@@ -97 +97 @@
 // to your class definition.
 //
-Bool_t MH::Fill(const MParContainer *par)
+Bool_t MH::Fill(const MParContainer *par, Double_t w)
 {
     *fLog << warn << GetDescriptor() << ": Fill not overloaded! Can't be used!" << endl;

trunk/MagicSoft/Mars/mhist/MH.h

@@ -22 +22 @@
 
     virtual Bool_t SetupFill(const MParList *pList) { return kTRUE; }
-    virtual Bool_t Fill(const MParContainer *par);
+    virtual Bool_t Fill(const MParContainer *par, Double_t weight=1);
     virtual Bool_t Finalize() { return kTRUE; }
 

trunk/MagicSoft/Mars/mhist/MHAlphaEnergyTheta.cc

@@ -110 +110 @@
 // Fill the histogram
 // 
-Bool_t MHAlphaEnergyTheta::Fill(const MParContainer *par)
+Bool_t MHAlphaEnergyTheta::Fill(const MParContainer *par, Double_t w)
 {
     MHillasSrc &hil = *(MHillasSrc*)par;

trunk/MagicSoft/Mars/mhist/MHAlphaEnergyTheta.h

@@ -33 +33 @@
     MHAlphaEnergyTheta(const char *name=NULL, const char *title=NULL);
 
-    virtual Bool_t SetupFill(const MParList *pList);
-    virtual Bool_t Fill(const MParContainer *par);
+    Bool_t SetupFill(const MParList *pList);
+    Bool_t Fill(const MParContainer *par, Double_t w=1);
 
     const TH3D *GetHist()       { return &fHist; }

trunk/MagicSoft/Mars/mhist/MHAlphaEnergyTime.cc

@@ -112 +112 @@
 // Fill the histogram
 // 
-Bool_t MHAlphaEnergyTime::Fill(const MParContainer *par)
+Bool_t MHAlphaEnergyTime::Fill(const MParContainer *par, Double_t w)
 {
     MHillasSrc &hil = *(MHillasSrc*)par;

trunk/MagicSoft/Mars/mhist/MHAlphaEnergyTime.h

@@ -32 +32 @@
     MHAlphaEnergyTime(const char *name=NULL, const char *title=NULL);
 
-    virtual Bool_t SetupFill(const MParList *pList);
-    virtual Bool_t Fill(const MParContainer *par);
+    Bool_t SetupFill(const MParList *pList);
+    Bool_t Fill(const MParContainer *par, Double_t w=1);
 
     const TH3D *GetHist()       { return &fHist; }

trunk/MagicSoft/Mars/mhist/MHArray.cc

@@ -463 +463 @@
 // successfull filled.
 //
-Bool_t MHArray::Fill(const MParContainer *par)
+Bool_t MHArray::Fill(const MParContainer *par, Double_t w)
 {
     const Int_t n = fArray->GetSize();

trunk/MagicSoft/Mars/mhist/MHArray.h

@@ -41 +41 @@
     void Set(const MH *hist);
 
-    virtual Bool_t SetupFill(const MParList *pList);
-    virtual Bool_t Fill(const MParContainer *par);
-    virtual Bool_t Finalize();
+    Bool_t SetupFill(const MParList *pList);
+    Bool_t Fill(const MParContainer *par, Double_t w=1);
+    Bool_t Finalize();
 
     Bool_t AddHistogram();

trunk/MagicSoft/Mars/mhist/MHBlindPixels.cc

@@ -74 +74 @@
 }
 
-Bool_t MHBlindPixels::Fill(const MParContainer *par)
+Bool_t MHBlindPixels::Fill(const MParContainer *par, Double_t w)
 {
     if (!par)

trunk/MagicSoft/Mars/mhist/MHBlindPixels.h

@@ -23 +23 @@
 
     void Draw(Option_t* option = "");
-    Bool_t Fill(const MParContainer *par);
+    Bool_t Fill(const MParContainer *par, Double_t w=1);
 
     ClassDef(MHBlindPixels, 1)  // Histogram of blind pixels

trunk/MagicSoft/Mars/mhist/MHCompProb.cc

@@ -159 +159 @@
 //
 //
-Bool_t MHCompProb::Fill(const MParContainer *par)
+Bool_t MHCompProb::Fill(const MParContainer *par, Double_t w)
 {
     const MMcEvt &mcevt = *(MMcEvt*)par;

trunk/MagicSoft/Mars/mhist/MHCompProb.h

@@ -29 +29 @@
 
     Bool_t SetupFill(const MParList *plist);
-    Bool_t Fill(const MParContainer *par);
+    Bool_t Fill(const MParContainer *par, Double_t w=1);
     Bool_t Finalize();
 

trunk/MagicSoft/Mars/mhist/MHEffOnTime.cc

@@ -361 +361 @@
 // -------------------------------------------------------------------------
 //
-// Dummy Fill
-//
-Bool_t MHEffOnTime::Fill(const MParContainer *par)
-{
-  return kTRUE;
-}
-
-// -------------------------------------------------------------------------
-//
 // Draw a copy of the histogram
 //

trunk/MagicSoft/Mars/mhist/MHEffOnTime.h

@@ -32 +32 @@
     MHEffOnTime(const char *varname=NULL, const char *unit=NULL);
 
-    virtual Bool_t SetupFill(const MParList *pList);
-    virtual Bool_t Fill(const MParContainer *par);
+    Bool_t SetupFill(const MParList *pList);
 
     const TH1D *GetHist() { return &fHEffOn; }

trunk/MagicSoft/Mars/mhist/MHEffOnTimeTheta.cc

@@ -257 +257 @@
 // -------------------------------------------------------------------------
 //
-// Dummy Fill
-// without it get the error message :
-// Error: MHEffOnTimeTime() no default constructor FILE:macros/wowflux.C LINE:359
-// *** Interpreter error recovered ***
-//
-Bool_t MHEffOnTimeTheta::Fill(const MParContainer *par)
-{
-  return kTRUE; 
-}     
-// -------------------------------------------------------------------------
-//
 // Draw a copy of the histogram
 //

trunk/MagicSoft/Mars/mhist/MHEffOnTimeTheta.h

@@ -24 +24 @@
     MHEffOnTimeTheta(const char *name=NULL, const char *title=NULL);
 
-    virtual Bool_t SetupFill(const MParList *pList);
-    virtual Bool_t Fill(const MParContainer *par);
+    Bool_t SetupFill(const MParList *pList);
 
     const TH1D *GetHist() { return &fHEffOn; }

trunk/MagicSoft/Mars/mhist/MHEffOnTimeTime.cc

@@ -264 +264 @@
 // -------------------------------------------------------------------------
 //
-// Dummy Fill
-// without it get error message :
-// Error: MHEffOnTimeTime() no default constructor FILE:macros/wowflux.C LINE:359
-//*** Interpreter error recovered ***
-Bool_t MHEffOnTimeTime::Fill(const MParContainer *par)
-{
-  return kTRUE;
-}
-
-// -------------------------------------------------------------------------
-//
 // Draw a copy of the histogram
 //

trunk/MagicSoft/Mars/mhist/MHEffOnTimeTime.h

@@ -24 +24 @@
     MHEffOnTimeTime(const char *name=NULL, const char *title=NULL);
 
-    virtual Bool_t SetupFill(const MParList *pList);
-    virtual Bool_t Fill(const MParContainer *par);
+    Bool_t SetupFill(const MParList *pList);
 
     const TH1D *GetHist() { return &fHEffOn; }

trunk/MagicSoft/Mars/mhist/MHEnergyTheta.cc

@@ -99 +99 @@
 // Fill data into the histogram which contains all showers
 //
-Bool_t MHEnergyTheta::Fill(const MParContainer *par)
+Bool_t MHEnergyTheta::Fill(const MParContainer *par, Double_t w)
 {
     const MMcEvt &mcevt = *(MMcEvt*)par;

trunk/MagicSoft/Mars/mhist/MHEnergyTheta.h

@@ -22 +22 @@
     ~MHEnergyTheta();
 
-    Bool_t Fill(const MParContainer *cont);
+    Bool_t Fill(const MParContainer *cont, Double_t w=1);
 
     void Draw(Option_t *option="");

trunk/MagicSoft/Mars/mhist/MHFadcCam.cc

@@ -91 +91 @@
 
 // --------------------------------------------------------------------------
-Bool_t MHFadcCam::Fill(const MParContainer *par)
+Bool_t MHFadcCam::Fill(const MParContainer *par, Double_t w)
 {
     return Fill((MRawEvtData*)par);
@@ -138 +138 @@
     GetHistLo(i)->Reset();
 }
+

trunk/MagicSoft/Mars/mhist/MHFadcCam.h

@@ -45 +45 @@
     const TH1F *GetHistLo(UInt_t i) const { return (*this)[i].GetHistLo(); }
 
-    Bool_t Fill(const MParContainer *par);
+    Bool_t Fill(const MParContainer *par, Double_t w=1);
     Bool_t Fill(const MRawEvtData *par);
 

trunk/MagicSoft/Mars/mhist/MHFlux.cc

@@ -185 +185 @@
 // -------------------------------------------------------------------------
 //
-// Dummy Fill (has to be included because in base class MH Fill is set to 0 
-//             (abstract member function));
-// without the dummy Fill one gets the error message :
-//
-// Error: Can't call MHFlux::MHFlux(evttime,"time","[s]") in current scope 
-// FILE:macros/flux.C LINE:465
-// Possible candidates are...
-// filename       line:size busy function type and name  (in MHFlux)
-// filename       line:size busy function type and name  (in MH)
-// filename       line:size busy function type and name  (in MParContainer)
-// filename       line:size busy function type and name  (in TObject)
-//
-Bool_t MHFlux::Fill(const MParContainer *par)
-{
-    return kTRUE;
-}
-
-
-// -------------------------------------------------------------------------
-//
 // Unfold the distribution in E-est
 //

trunk/MagicSoft/Mars/mhist/MHFlux.h

@@ -50 +50 @@
     MHFlux(const MHGamma &h2d, const TString varname, const TString unit);
 
-    Bool_t Fill(const MParContainer *par);
-
     void Unfold();
     void CalcFlux(const TH1D *teff, const TProfile *thetabar,

trunk/MagicSoft/Mars/mhist/MHGamma.cc

@@ -60 +60 @@
 }
 
-// --------------------------------------------------------------------------
-//
-// Dummy Fill
-//
-Bool_t MHGamma::Fill(const MParContainer *par)
-{
-  return kTRUE;
-}
-
 TH3D *MHGamma::Subtract(const MHAlphaEnergyTheta &h1, const MHAlphaEnergyTheta &h2)
 {

trunk/MagicSoft/Mars/mhist/MHGamma.h

@@ -23 +23 @@
     MHGamma(const TString &name="", const TString &title="");
 
-    Bool_t Fill(const MParContainer *par);
-
     TH3D *Subtract(const TH3D *h1, const TH3D *h2);
 

trunk/MagicSoft/Mars/mhist/MHHadronness.cc

@@ -183 +183 @@
 // are skipped at the moment.
 //
-Bool_t MHHadronness::Fill(const MParContainer *par)
+Bool_t MHHadronness::Fill(const MParContainer *par, Double_t w)
 {
     // Preliminary Workaround: FIXME!

trunk/MagicSoft/Mars/mhist/MHHadronness.h

@@ -45 +45 @@
 
     Bool_t SetupFill(const MParList *plist);
-    Bool_t Fill(const MParContainer *par);
+    Bool_t Fill(const MParContainer *par, Double_t w=1);
     Bool_t Finalize();
 

trunk/MagicSoft/Mars/mhist/MHMatrix.cc

@@ -227 +227 @@
 // Add the values correspoding to the columns to the new row
 //
-Bool_t MHMatrix::Fill(const MParContainer *par)
+Bool_t MHMatrix::Fill(const MParContainer *par, Double_t w)
 {
     AddRow();

trunk/MagicSoft/Mars/mhist/MHMatrix.h

@@ -48 +48 @@
     Bool_t SetupFill(const MParList *pList);
 
-    Bool_t Fill(const MParContainer *par);
+    Bool_t Fill(const MParContainer *par, Double_t w=1);
     Bool_t Finalize();
 

trunk/MagicSoft/Mars/mhist/MHRanForest.cc

@@ -108 +108 @@
 //
 //
-Bool_t MHRanForest::Fill(const MParContainer *par)
+Bool_t MHRanForest::Fill(const MParContainer *par, Double_t w)
 {
     fNumEvent++;

trunk/MagicSoft/Mars/mhist/MHRanForest.h

@@ -33 +33 @@
 
     Bool_t SetupFill(const MParList *plist);
-    Bool_t Fill(const MParContainer *par);
+    Bool_t Fill(const MParContainer *par, Double_t w=1);
     Bool_t Finalize();
 

trunk/MagicSoft/Mars/mhist/MHRanForestGini.cc

@@ -101 +101 @@
 //
 //
-Bool_t MHRanForestGini::Fill(const MParContainer *par)
+Bool_t MHRanForestGini::Fill(const MParContainer *par, Double_t w)
 {
     for (Int_t i=0;i<fRanForest->GetNumDim();i++)

trunk/MagicSoft/Mars/mhist/MHRanForestGini.h

@@ -31 +31 @@
 
     Bool_t SetupFill(const MParList *plist);
-    Bool_t Fill(const MParContainer *par);
+    Bool_t Fill(const MParContainer *par, Double_t w=1);
     Bool_t Finalize();
 

trunk/MagicSoft/Mars/mhist/MHSigmaPixel.cc

@@ -107 +107 @@
 // Fill the histogram
 // 
-Bool_t MHSigmaPixel::Fill(const MParContainer *par)
+Bool_t MHSigmaPixel::Fill(const MParContainer *par, Double_t w)
 {
     const MPedestalCam &ped = *(MPedestalCam*)par;

trunk/MagicSoft/Mars/mhist/MHSigmaPixel.h

@@ -26 +26 @@
     MHSigmaPixel(const char *name=NULL, const char *title=NULL);
 
-    virtual Bool_t SetupFill(const MParList *pList);
-    virtual Bool_t Fill(const MParContainer *par);
+    Bool_t SetupFill(const MParList *pList);
+    Bool_t Fill(const MParContainer *par, Double_t w=1);
 
     const TH2D *GetHist()       { return &fHist; }

trunk/MagicSoft/Mars/mhist/MHSigmaTheta.cc

@@ -177 +177 @@
 //  Fill the histograms
 //
-Bool_t MHSigmaTheta::Fill(const MParContainer *par)
+Bool_t MHSigmaTheta::Fill(const MParContainer *par, Double_t w)
 {
     Double_t theta = fMcEvt->GetTelescopeTheta()*kRad2Deg;

trunk/MagicSoft/Mars/mhist/MHSigmaTheta.h

@@ -44 +44 @@
 
     Bool_t SetupFill(const MParList *plist);
-    Bool_t Fill(const MParContainer *par);
+    Bool_t Fill(const MParContainer *par, Double_t w=1);
 
     const TH2D *GetSigmaTheta() { return &fSigmaTheta; }

trunk/MagicSoft/Mars/mhist/MHSigmabarTheta.cc

@@ -111 +111 @@
 // Fill the histogram
 // 
-Bool_t MHSigmabarTheta::Fill(const MParContainer *par)
+Bool_t MHSigmabarTheta::Fill(const MParContainer *par, Double_t w)
 {
     fHist.Fill(fMcEvt->GetTheta()*kRad2Deg, fSigmabar->GetSigmabar());  

trunk/MagicSoft/Mars/mhist/MHSigmabarTheta.h

@@ -27 +27 @@
     MHSigmabarTheta(const char *name=NULL, const char *title=NULL);
 
-    virtual Bool_t SetupFill(const MParList *pList);
-    virtual Bool_t Fill(const MParContainer *par);
+    Bool_t SetupFill(const MParList *pList);
+    Bool_t Fill(const MParContainer *par, Double_t w=1);
 
     const TH2D *GetHist()       { return &fHist; }

trunk/MagicSoft/Mars/mhist/MHStarMap.cc

@@ -146 +146 @@
 // Be careful: Only call this with an object of type MHillas
 //
-Bool_t MHStarMap::Fill(const MParContainer *par)
+Bool_t MHStarMap::Fill(const MParContainer *par, Double_t w)
 {
     const MHillas &h = *(MHillas*)par;

trunk/MagicSoft/Mars/mhist/MHStarMap.h

@@ -33 +33 @@
 
     Bool_t SetupFill(const MParList *pList);
-    Bool_t Fill(const MParContainer *par);
+    Bool_t Fill(const MParContainer *par, Double_t w=1);
 
     TH1 *GetHistByName(const TString name) { return fStarMap; }

trunk/MagicSoft/Mars/mhist/MHThetabarTheta.cc

@@ -110 +110 @@
 // Fill the histogram
 //
-Bool_t MHThetabarTheta::Fill(const MParContainer *par)
+Bool_t MHThetabarTheta::Fill(const MParContainer *par, Double_t w)
 {
     const Double_t theta = fMcEvt->GetTelescopeTheta()*kRad2Deg;

trunk/MagicSoft/Mars/mhist/MHThetabarTheta.h

@@ -25 +25 @@
     MHThetabarTheta(const char *name=NULL, const char *title=NULL);
 
-    virtual Bool_t SetupFill(const MParList *pList);
-    virtual Bool_t Fill(const MParContainer *par);
+    Bool_t SetupFill(const MParList *pList);
+    Bool_t Fill(const MParContainer *par, Double_t w=1);
 
     const TProfile *GetHist() { return &fHist; }

trunk/MagicSoft/Mars/mhist/MHThetabarTime.h

@@ -28 +28 @@
     MHThetabarTime(const char *name=NULL, const char *title=NULL);
 
-    virtual Bool_t SetupFill(const MParList *pList);
-    virtual Bool_t Fill(const MParContainer *par);
+    Bool_t SetupFill(const MParList *pList);
+    Bool_t Fill(const MParContainer *par, Double_t w=1);
 
     const TProfile *GetHist() { return &fHist; }

trunk/MagicSoft/Mars/mhist/MHTimeDiffTheta.cc

@@ -143 +143 @@
 //  Fill the histogram
 //
-Bool_t MHTimeDiffTheta::Fill(const MParContainer *par)
+Bool_t MHTimeDiffTheta::Fill(const MParContainer *par, Double_t w)
 {
     const Double_t time = 200e-9*fTime->GetTimeLo() + fTime->GetTimeHi();

trunk/MagicSoft/Mars/mhist/MHTimeDiffTheta.h

@@ -26 +26 @@
     MHTimeDiffTheta(const char *name=NULL, const char *title=NULL);
 
-    virtual Bool_t SetupFill(const MParList *pList);
-    virtual Bool_t Fill(const MParContainer *par);
+    Bool_t SetupFill(const MParList *pList);
+    Bool_t Fill(const MParContainer *par, Double_t w=1);
 
     const TH2D *GetHist() { return &fHist; }

trunk/MagicSoft/Mars/mhist/MHTimeDiffTime.cc

@@ -136 +136 @@
 //  Fill the histogram
 //
-Bool_t MHTimeDiffTime::Fill(const MParContainer *par)
+Bool_t MHTimeDiffTime::Fill(const MParContainer *par, Double_t w)
 {
     const Double_t time = 200e-9*fTime->GetTimeLo() + fTime->GetTimeHi();

trunk/MagicSoft/Mars/mhist/MHTimeDiffTime.h

@@ -25 +25 @@
 
     virtual Bool_t SetupFill(const MParList *pList);
-    virtual Bool_t Fill(const MParContainer *par);
+    virtual Bool_t Fill(const MParContainer *par, Double_t w=1);
 
     const TH2D *GetHist() { return &fHist; }

trunk/MagicSoft/Mars/mhistmc/MHMcCT1CollectionArea.cc

@@ -137 +137 @@
 // Fill data into the histogram which contains the selected showers
 //
-Bool_t MHMcCT1CollectionArea::Fill(const MParContainer *par)
+Bool_t MHMcCT1CollectionArea::Fill(const MParContainer *par, Double_t w)
 { 
   MMcEvt &mcevt = *(MMcEvt*)par;

trunk/MagicSoft/Mars/mhistmc/MHMcCT1CollectionArea.h

@@ -19 +19 @@
     ~MHMcCT1CollectionArea();
 
-    virtual Bool_t SetupFill(const MParList *pList);
-    virtual Bool_t Fill(const MParContainer *par);
+    Bool_t SetupFill(const MParList *pList);
+    Bool_t Fill(const MParContainer *par, Double_t w=1);
 
     void DrawAll(Option_t *option="");

trunk/MagicSoft/Mars/mhistmc/MHMcEnergyImpact.cc

@@ -119 +119 @@
 //  Fill the histogram with the log10 of the energy for triggered events.
 //
-Bool_t MHMcEnergyImpact::Fill(const MParContainer *cont)
+Bool_t MHMcEnergyImpact::Fill(const MParContainer *cont, Double_t w)
 {
     const MMcEvt &mcevt = *(MMcEvt*)cont;

trunk/MagicSoft/Mars/mhistmc/MHMcEnergyImpact.h

@@ -24 +24 @@
 
     Bool_t SetupFill(const MParList *pList);
-    Bool_t Fill(const MParContainer *pcont=NULL);
+    Bool_t Fill(const MParContainer *pcont=NULL, Double_t w=1);
 
     const TH2D *GetHist()       { return &fHist; }

trunk/MagicSoft/Mars/mhistmc/MHMcEnergyMigration.cc

@@ -215 +215 @@
 // Fill the histogram
 //
-Bool_t MHMcEnergyMigration::Fill(const MParContainer *par)
+Bool_t MHMcEnergyMigration::Fill(const MParContainer *par, Double_t w)
 {
     //    MHillasSrc &hil = *(MHillasSrc*)par;

trunk/MagicSoft/Mars/mhistmc/MHMcEnergyMigration.h

@@ -29 +29 @@
     MHMcEnergyMigration(const char *name=NULL, const char *title=NULL);
 
-    virtual Bool_t SetupFill(const MParList *pList);
-    virtual Bool_t Fill(const MParContainer *par);
+    Bool_t SetupFill(const MParList *pList);
+    Bool_t Fill(const MParContainer *par, Double_t w=1);
 
     const TH3D *GetHist() { return &fHist; }

trunk/MagicSoft/Mars/mhistmc/MHMcTriggerLvl2.cc

@@ -141 +141 @@
 // Be careful: Only call this with an object of type MMcTriggerLvl2
 //
-Bool_t MHMcTriggerLvl2::Fill(const MParContainer *par)
+Bool_t MHMcTriggerLvl2::Fill(const MParContainer *par, Double_t w)
 {
   const MMcTriggerLvl2 &h = *(MMcTriggerLvl2 *)par;

trunk/MagicSoft/Mars/mhistmc/MHMcTriggerLvl2.h

@@ -34 +34 @@
     ~MHMcTriggerLvl2();
 
-    Bool_t Fill(const MParContainer *par);
+    Bool_t Fill(const MParContainer *par, Double_t w=1);
 
     TH1 *GetHistByName(const TString name);

trunk/MagicSoft/Mars/mimage/MHHillas.cc

@@ -255 +255 @@
 // Be careful: Only call this with an object of type MHillas
 //
-Bool_t MHHillas::Fill(const MParContainer *par)
+Bool_t MHHillas::Fill(const MParContainer *par, Double_t w)
 {
     const MHillas &h = *(MHillas*)par;

trunk/MagicSoft/Mars/mimage/MHHillas.h

@@ -41 +41 @@
 
     Bool_t SetupFill(const MParList *pList);
-    Bool_t Fill(const MParContainer *par);
+    Bool_t Fill(const MParContainer *par, Double_t w=1);
 
     TH1 *GetHistByName(const TString name);

trunk/MagicSoft/Mars/mimage/MHHillasExt.cc

@@ -165 +165 @@
 // Be careful: Only call this with an object of type MHillas
 //
-Bool_t MHHillasExt::Fill(const MParContainer *par)
+Bool_t MHHillasExt::Fill(const MParContainer *par, Double_t w)
 {
     const MHillasSrc *src = (MHillasSrc*)par;

trunk/MagicSoft/Mars/mimage/MHHillasExt.h

@@ -36 +36 @@
 
     Bool_t SetupFill(const MParList *pList);
-    Bool_t Fill(const MParContainer *par);
+    Bool_t Fill(const MParContainer *par, Double_t w=1);
 
     TH1 *GetHistByName(const TString name);

trunk/MagicSoft/Mars/mimage/MHHillasSrc.cc

@@ -134 +134 @@
 // Be careful: Only call this with an object of type MHillas
 //
-Bool_t MHHillasSrc::Fill(const MParContainer *par)
+Bool_t MHHillasSrc::Fill(const MParContainer *par, Double_t w)
 {
     const MHillasSrc &h = *(MHillasSrc*)par;

trunk/MagicSoft/Mars/mimage/MHHillasSrc.h

@@ -28 +28 @@
 
     Bool_t SetupFill(const MParList *pList);
-    Bool_t Fill(const MParContainer *par);
+    Bool_t Fill(const MParContainer *par, Double_t w=1);
 
     TH1 *GetHistByName(const TString name);

trunk/MagicSoft/Mars/mimage/MHNewImagePar.cc

@@ -85 +85 @@
 // Fill the histograms with data from a MNewImagePar container.
 //
-Bool_t MHNewImagePar::Fill(const MParContainer *par)
+Bool_t MHNewImagePar::Fill(const MParContainer *par, Double_t w)
 {
     const MNewImagePar &h = *(MNewImagePar*)par;

trunk/MagicSoft/Mars/mimage/MHNewImagePar.h

@@ -19 +19 @@
     ~MHNewImagePar();
 
-    Bool_t Fill(const MParContainer *par);
+    Bool_t Fill(const MParContainer *par, Double_t w=1);
 
     TH1 *GetHistByName(const TString name);