Changeset 1210 for trunk/MagicSoft/Mars/mhist

Timestamp:

01/22/02 19:07:32 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• HistLinkDef.h (modified) (2 diffs)
• MFillH.cc (modified) (1 diff)
• MHHillas.cc (modified) (3 diffs)
• MHHillas.h (modified) (1 diff)
• MHHillasSrc.cc (modified) (3 diffs)
• MHHillasSrc.h (modified) (1 diff)

trunk/MagicSoft/Mars/mhist/HistLinkDef.h

@@ -8 +8 @@
 
 #pragma link C++ class MH+;
-#pragma link C++ class MBinning+;
 #pragma link C++ class MHFadcCam+;
 #pragma link C++ class MHFadcPix+;
@@ -14 +13 @@
 #pragma link C++ class MHHillasSrc+;
 #pragma link C++ class MHStarMap+;
+#pragma link C++ class MHEnergyTime+;
+#pragma link C++ class MHEnergyTheta+;
 #pragma link C++ class MHMcEnergy+;
 #pragma link C++ class MHMcCollectionArea+;
+#pragma link C++ class MHAlphaEnergyTime;
+#pragma link C++ class MHAlphaEnergyTheta;
+#pragma link C++ class MHEffOnTimeTime+;
+#pragma link C++ class MHEffOnTimeTheta+;
+#pragma link C++ class MHDiffTimeTime+;
+#pragma link C++ class MHDiffTimeTheta+;
+
+#pragma link C++ class MBinning+;
 
 #pragma link C++ class MHMcRate+;

trunk/MagicSoft/Mars/mhist/MFillH.cc

@@ -87 +87 @@
     fTitle = title ? title : "Task to fill Mars histograms";
 
-    fH            = NULL;
-    fParContainer = NULL;
+    fH                = NULL;
+    fParContainer     = NULL;
 }
 

trunk/MagicSoft/Mars/mhist/MHHillas.cc

@@ -40 +40 @@
 
 #include "MHillas.h"
+#include "MParList.h"
 
 ClassImp(MHHillas);
@@ -47 +48 @@
 // Setup four histograms for Width, Length
 //
-MHHillas::MHHillas (const char *name, const char *title)
+MHHillas::MHHillas(const char *name, const char *title)
 {
     //
     //   set the name and title of this object
     //
-    fName  = name  ? name  : "MHHillas" ;
-    fTitle = title ? title : "Container for Hillas histograms" ;
+    fName  = name  ? name  : "MHHillas";
+    fTitle = title ? title : "Container for Hillas histograms";
 
     //
@@ -81 +82 @@
     delete fWidth;
     delete fLength;
+}
+
+// --------------------------------------------------------------------------
+//
+// Setup the Binning for the histograms automatically if the correct
+// instances of MBinning (with the names 'BinningWidth' and 'BinningLength')
+// are found in the parameter list
+//
+Bool_t MHHillas::SetupFill(const MParList *plist)
+{
+    const MBinning* binsw = (MBinning*)plist->FindObject("BinningWidth");
+    const MBinning* binsl = (MBinning*)plist->FindObject("BinningLength");
+
+    if (binsw)
+        SetBinning(fWidth, binsw);
+
+    if (binsl)
+        SetBinning(fLength, binsl);
+
+    return kTRUE;
 }
 

trunk/MagicSoft/Mars/mhist/MHHillas.h

@@ -19 +19 @@
     ~MHHillas();
 
+    Bool_t SetupFill(const MParList *pList);
     Bool_t Fill(const MParContainer *par);
 

trunk/MagicSoft/Mars/mhist/MHHillasSrc.cc

@@ -38 +38 @@
 #include <TCanvas.h>
 
+#include "MParList.h"
+
 #include "MHillas.h"
 #include "MHillasSrc.h"
@@ -52 +54 @@
     //   set the name and title of this object
     //
-    fName  = name  ? name  : "MHHillasSrc" ;
-    fTitle = title ? title : "Container for Hillas histograms" ;
+    fName  = name  ? name  : "MHHillasSrc";
+    fTitle = title ? title : "Container for Hillas histograms";
 
     //
@@ -81 +83 @@
     delete fAlpha;
     delete fDist;
+}
+
+// --------------------------------------------------------------------------
+//
+// Setup the Binning for the histograms automatically if the correct
+// instances of MBinning (with the names 'BinningAlpha' and 'BinningDist')
+// are found in the parameter list
+//
+Bool_t MHHillasSrc::SetupFill(const MParList *plist)
+{
+    const MBinning* binsa = (MBinning*)plist->FindObject("BinningAlpha");
+    const MBinning* binsd = (MBinning*)plist->FindObject("BinningDist");
+
+    if (binsa)
+        SetBinning(fAlpha, binsa);
+
+    if (binsd)
+        SetBinning(fDist, binsd);
+
+    return kTRUE;
 }
 

trunk/MagicSoft/Mars/mhist/MHHillasSrc.h

@@ -19 +19 @@
     ~MHHillasSrc();
 
+    Bool_t SetupFill(const MParList *pList);
     Bool_t Fill(const MParContainer *par);