Changeset 6932 for trunk/MagicSoft/Mars/mranforest

Timestamp:

04/12/05 17:05:49 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mranforest

Files:

• MRFEnergyEst.cc (modified) (6 diffs)
• MRFEnergyEst.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mranforest/MRFEnergyEst.cc

@@ -34 +34 @@
 #include <TList.h>
 
-#include <TH1F.h>
-#include <TH2F.h>
+#include <TH1.h>
+#include <TH2.h>
 #include <TStyle.h>
 #include <TCanvas.h>
+#include <TMath.h>
+#include <TVector.h>
 
 #include "MHMatrix.h"
@@ -53 +55 @@
 
 #include "MData.h"
-
-#include "TFile.h"
-#include "TList.h"
-
-#include "TH1F.h"
-#include "TH2F.h"
-#include "TStyle.h"
-#include "TCanvas.h"
-#include "TMath.h"
-#include "TVector.h"
-
-#include "MEnergyEst.h"
+#include "MParameters.h"
 
 
@@ -287 +278 @@
         Double_t e_true = (*mptr)(i,ncols-1);
         Double_t e_est = 0;
-        Double_t hmax  = 0;
+        //Double_t hmax  = 0;
         Double_t hsum  = 0;
 
@@ -388 +379 @@
 Int_t MRFEnergyEst::PreProcess(MParList *plist)
 {
-    fEnergyEst = (MEnergyEst*)plist->FindCreateObj("MEnergyEst");
+    fEnergyEst = (MParameterD*)plist->FindCreateObj("MParameterD", "MEnergyEst");
     if (!fEnergyEst)
     {
-        *fLog << err << dbginf << "MEnergyEst not found... aborting." << endl;
+        *fLog << err << dbginf << "MEnergyEst [MParameterD] not found... aborting." << endl;
         return kFALSE;
     }
@@ -424 +415 @@
     *fData >> event;
 
-    Double_t e_est = 0;
-    Double_t hmax  = 0;
+    Double_t eest = 0;
+    //Double_t hmax  = 0;
     Double_t hsum  = 0;
         
@@ -438 +429 @@
         }*/
         hsum+=h;
-        e_est+=h*e;
-    }
-    e_est/=hsum;
-    e_est=pow(10.,e_est);
-
-    fEnergyEst->SetEnergy(e_est);
+        eest+=h*e;
+    }
+    eest/=hsum;
+    eest=pow(10.,eest);
+
+    fEnergyEst->SetVal(eest);
     fEnergyEst->SetReadyToSave();
 
     return kTRUE;
 }
-
-Int_t MRFEnergyEst::PostProcess()
-{
-
-    return kTRUE;
-}

trunk/MagicSoft/Mars/mranforest/MRFEnergyEst.h

@@ -16 +16 @@
 class MHMatrix;
 class MDataArray;
-class MEnergyEst;
+class MParameterD;
 
 class MRFEnergyEst : public MTask
@@ -33 +33 @@
     TObjArray fEForests;
 
-    MEnergyEst *fEnergyEst;
+    MParameterD *fEnergyEst;
 
     Int_t PreProcess(MParList *plist);
     Int_t Process();
-    Int_t PostProcess();
 
     Int_t ReadForests(MParList *plist=NULL);