Changeset 8456

Timestamp:

04/27/07 14:17:37 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• ganymed.rc (modified) (1 diff)
• ganymed_onoff.rc (modified) (1 diff)
• ganymed_wobble.rc (modified) (1 diff)
• mjobs/MJCut.cc (modified) (6 diffs)
• mjobs/MJCut.h (modified) (2 diffs)

trunk/MagicSoft/Mars/ganymed.rc

@@ -198 +198 @@
 # Cut1.CalcDisp: No
 
+# -------------------------------------------------------------------------
+# Use this to executa a task (eg to estimate energy) after all Cuts
+# -------------------------------------------------------------------------
+# EstimateEnergy: MRanForestCalc
+# EstimateEnergy.NameOutput: MEnergyEst
+# EstimateEnergy.FileName: ranforest.root
+# EstimateEnergy.Debug: No

trunk/MagicSoft/Mars/ganymed_onoff.rc

@@ -170 +170 @@
 # CalcDisp.Debug: No
 # Cut1.CalcDisp: No
+
+# -------------------------------------------------------------------------
+# Use this to executa a task (eg to estimate energy) after all Cuts
+# -------------------------------------------------------------------------
+# EstimateEnergy: MRanForestCalc
+# EstimateEnergy.NameOutput: MEnergyEst
+# EstimateEnergy.FileName: ranforest.root
+# EstimateEnergy.Debug: No

trunk/MagicSoft/Mars/ganymed_wobble.rc

@@ -170 +170 @@
 # CalcDisp.Debug: No
 # Cut1.CalcDisp: No
+
+# -------------------------------------------------------------------------
+# Use this to executa a task (eg to estimate energy) after all Cuts
+# -------------------------------------------------------------------------
+# EstimateEnergy: MRanForestCalc
+# EstimateEnergy.NameOutput: MEnergyEst
+# EstimateEnergy.FileName: ranforest.root
+# EstimateEnergy.Debug: No

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -90 +90 @@
     : fStoreSummary(kFALSE), fStoreResult(kTRUE), fWriteOnly(kFALSE),
     fFullDisplay(kTRUE),
-    fRndmSrcPos(kFALSE), fNameHist("MHThetaSq"), fCalcHadronness(0), fCalcDisp(0)
+    fRndmSrcPos(kFALSE), fNameHist("MHThetaSq"),
+    fCalcHadronness(0), fCalcDisp(0), fEstimateEnergy(0)
 {
     fName  = name  ? name  : "MJCut";
@@ -102 +103 @@
 MJCut::~MJCut()
 {
-    //if (fEstimateEnergy)
-    //    delete fEstimateEnergy;
+    if (fEstimateEnergy)
+        delete fEstimateEnergy;
     if (fCalcHadronness)
         delete fCalcHadronness;
@@ -177 +178 @@
         delete fCalcDisp;
     fCalcDisp = task ? (MTask*)task->Clone() : 0;
+}
+
+// --------------------------------------------------------------------------
+//
+// Setup a task estimating the eneryg. The given task is cloned.
+//
+void MJCut::SetEnergyEstimator(const MTask *task)
+{
+    if (fEstimateEnergy)
+        delete fEstimateEnergy;
+    fEstimateEnergy = task ? (MTask*)task->Clone() : 0;
 }
 
@@ -369 +381 @@
     write->AddContainer("OpticalAxis",    "Events", kFALSE);
     write->AddContainer("Disp",           "Events", kFALSE);
+    write->AddContainer("MEnergyEst",     "Events", kFALSE);
     write->AddContainer("MTime",          "Events", kFALSE);
     write->AddContainer("MMcEvt",         "Events", kFALSE);
@@ -663 +676 @@
     MTaskEnv taskenv3("CalcDisp");
     taskenv3.SetDefault(fCalcDisp);
+
+    MTaskEnv taskenv4("EstimateEnergy");
+    taskenv4.SetDefault(fEstimateEnergy);
 
     MParameterCalc setevtnum("MRawEvtHeader.fDAQEvtNumber", "SetEvtNumber");
@@ -754 +770 @@
     }
     tlist2.AddToList(&cont3);
+    tlist2.AddToList(&taskenv4);
+
     if (write1)
         tlist2.AddToList(write1);

trunk/MagicSoft/Mars/mjobs/MJCut.h

@@ -32 +32 @@
     TString fNameHistFS;
 
-    //MTask *fEstimateEnergy;
     MTask  *fCalcHadronness;
     MTask  *fCalcDisp;
+    MTask  *fEstimateEnergy;
 
     TString  GetOutputFile(UInt_t num) const;
@@ -69 +69 @@
     void SetNameHistFS(const char *name) { fNameHistFS=name; }
 
-    //void SetEnergyEstimator(const MTask *task=0);
+    void SetEnergyEstimator(const MTask *task=0);
     void SetHadronnessCalculator(const MTask *task=0);
     void SetDispCalculator(const MTask *task=0);