Changeset 6978 for trunk/MagicSoft/Mars/mjobs/MJCut.cc

Timestamp:

04/25/05 15:37:35 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJCut.cc (modified) (13 diffs)

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -48 +48 @@
 #include "MPrint.h"
 #include "MContinue.h"
-#include "MEnergyEstimate.h"
+//#include "MEnergyEstimate.h"
 #include "MTaskEnv.h"
 #include "MSrcPosCalc.h"
@@ -56 +56 @@
 
 #include "../mhflux/MAlphaFitter.h"
+#include "../mhflux/MHAlpha.h"
+
 #include "MH3.h"
 #include "MBinning.h"
@@ -71 +73 @@
 // Default constructor.  Set defaults for fStoreSummary, fStoreresult,
 // fWriteOnly, fIsWobble and fFullDisplay to kFALSE and initialize
-// fEstimateEnergy and fCalcHadronness with NULL.
+// /*fEstimateEnergy and*/ fCalcHadronness with NULL.
 //
 MJCut::MJCut(const char *name, const char *title)
-    : fStoreSummary(kFALSE), fStoreResult(kFALSE), fWriteOnly(kFALSE),
+    : fStoreSummary(kFALSE), fStoreResult(kTRUE), fWriteOnly(kFALSE),
     fIsWobble(kFALSE), fIsMonteCarlo(kFALSE),  fFullDisplay(kFALSE), /*fSubstraction(kFALSE),*/
-    fEstimateEnergy(0), fCalcHadronness(0)
+    /*fEstimateEnergy(0),*/ fCalcHadronness(0)
 {
     fName  = name  ? name  : "MJCut";
@@ -88 +90 @@
 MJCut::~MJCut()
 {
-    if (fEstimateEnergy)
-        delete fEstimateEnergy;
+    //if (fEstimateEnergy)
+    //    delete fEstimateEnergy;
     if (fCalcHadronness)
         delete fCalcHadronness;
@@ -132 +134 @@
 // Setup a task estimating the energy. The given task is cloned.
 //
+/*
 void MJCut::SetEnergyEstimator(const MTask *task)
 {
@@ -138 +141 @@
     fEstimateEnergy = task ? (MTask*)task->Clone() : 0;
 }
+*/
 
 // --------------------------------------------------------------------------
@@ -246 +250 @@
     TObjArray arr;
 
+    // Save all MBinnings
     TIter Next(plist);
     TObject *o=0;
@@ -252 +257 @@
             arr.Add(o);
 
+    // Save also the result, not only the setup
+    const MHAlpha *halpha = (MHAlpha*)plist.FindObject("MHAlpha");
+    if (halpha)
+        arr.Add((TObject*)(&halpha->GetAlphaFitter()));
+
     const TString fname(GetOutputFile(num));
 
+    // If requested, write to already open output file
     if (fNameResult.IsNull() && fStoreResult)
     {
@@ -413 +424 @@
         fit.SetScaleMode(MAlphaFitter::kNone);
 
+    MHAlpha halphaoff("MHAlphaOff");
+    halphaoff.ForceUsingSize();
+    plist.AddToList(&halphaoff);
+
     MFillH falpha("MHAlphaOff [MHAlpha]", "MHillasSrc", "FillAlpha");
     MFillH ffs("MHFalseSourceOff [MHFalseSource]", "MHillas", "FillFS");
@@ -452 +467 @@
     SetupWriter(write1, "WriteAfterCut3");
 
-
+/*
     MEnergyEstimate est;
 
     MTaskEnv taskenv1("EstimateEnergy");
     taskenv1.SetDefault(fEstimateEnergy ? fEstimateEnergy : &est);
-
+  */
     MTaskEnv taskenv2("CalcHadronness");
     taskenv2.SetDefault(fCalcHadronness);
@@ -495 +510 @@
     if (fIsWobble)
         tlist2.AddToList(&hcalc2);
-    tlist2.AddToList(&taskenv1);
+    //tlist2.AddToList(&taskenv1);
     tlist2.AddToList(&taskenv2);
     tlist2.AddToList(&cont0);
@@ -539 +554 @@
 
     TObjArray cont;
-    cont.Add(&fit);
     cont.Add(&cont0);
     cont.Add(&cont1);
     cont.Add(&cont2);
     cont.Add(&cont3);
-    if (taskenv1.GetTask())
-        cont.Add(taskenv1.GetTask());
+    //if (taskenv1.GetTask())
+    //    cont.Add(taskenv1.GetTask());
     if (taskenv2.GetTask())
         cont.Add(taskenv2.GetTask());
@@ -641 +655 @@
     }
     */
+    MHAlpha halphaon("MHAlpha");
+    halphaon.ForceUsingSize();
+    plist.AddToList(&halphaon);
+
     MFillH falpha2("MHAlpha", "MHillasSrc", "FillAlpha");
     MFillH ffs2("MHFalseSource", "MHillas", "FillFS");