Changeset 1334 for trunk/MagicSoft/Mars/mhist

Timestamp:

05/29/02 11:14:45 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• HistLinkDef.h (modified) (1 diff)
• MFillH.cc (modified) (1 diff)
• MH.h (modified) (1 diff)
• MH3.cc (modified) (1 diff)
• MHMatrix.cc (added)
• MHMatrix.h (added)
• Makefile (modified) (2 diffs)

trunk/MagicSoft/Mars/mhist/HistLinkDef.h

@@ -9 +9 @@
 #pragma link C++ class MH+;
 #pragma link C++ class MH3+;
+#pragma link C++ class MHMatrix+;
 #pragma link C++ class MHFadcCam+;
 #pragma link C++ class MHFadcPix+;

trunk/MagicSoft/Mars/mhist/MFillH.cc

@@ -313 +313 @@
 Bool_t MFillH::PostProcess()
 {
+    //
+    // Now all data is in the histogram. Maybe some final action is
+    // necessary.
+    //
+    if (!fH->Finalize())
+    {
+        *fLog << err << dbginf << "Error: calling Finalize for ";
+        *fLog << fH->GetDescriptor() << "... aborting." << endl;
+        return kFALSE;
+    }
+
     fH->SetReadyToSave();
     return kTRUE;

trunk/MagicSoft/Mars/mhist/MH.h

@@ -23 +23 @@
     virtual Bool_t SetupFill(const MParList *pList) { return kTRUE; }
     virtual Bool_t Fill(const MParContainer *par) = 0;
+    virtual Bool_t Finalize() { return kTRUE; }
 
     static TCanvas *MakeDefCanvas(TString name="", const char *title="",

trunk/MagicSoft/Mars/mhist/MH3.cc

@@ -67 +67 @@
 #include <TPad.h>
 #include <TCanvas.h>
-#include <TDataMember.h>
-#include <TMethodCall.h>
 
 #include "MLog.h"

trunk/MagicSoft/Mars/mhist/Makefile

@@ -32 +32 @@
            MH.cc \
            MH3.cc \
+           MHMatrix.cc \
            MHFadcPix.cc \
            MHFadcCam.cc \
@@ -53 +54 @@
            MHMcEnergyImpact.cc \
            MHThetabarTime.cc \
-           MHThetabarTheta.cc \
-           MHMcEnergyMigration.cc \
            MHMcRate.cc \
            MHMcIntRate.cc \