Changeset 6453 for trunk/MagicSoft/Mars/mjobs

Timestamp:

02/14/05 11:15:39 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MDataSet.cc (added)
• MDataSet.h (added)
• MJCut.cc (modified) (6 diffs)
• MJCut.h (modified) (2 diffs)
• MSequences.cc (deleted)
• MSequences.h (deleted)

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -56 +56 @@
 #include "../mhflux/MAlphaFitter.h"
 #include "MBinning.h"
-#include "MSequences.h"
+#include "MDataSet.h"
 #include "MParameters.h"
 #include "MObservatory.h"
@@ -255 +255 @@
 //   "MHillasSrc"   to  "Events"
 //   "MHadronness"  to  "Events"       yes
+//   "MEnergyEst"   to  "Events"       yes
 //   "DataType"     to  "Events"
 //
@@ -262 +263 @@
     write.AddContainer("MHillasSrc",  "Events");
     write.AddContainer("MHadronness", "Events", kFALSE);
+    write.AddContainer("MEnergyEst",  "Events", kFALSE);
     write.AddContainer("DataType",    "Events");
 
@@ -271 +273 @@
 }
 
-Bool_t MJCut::ProcessFile(const MSequences &seq)
+Bool_t MJCut::ProcessFile(const MDataSet &seq)
 {
     if (!seq.IsValid())
@@ -371 +373 @@
     // How to get source position from off- and on-data?
     MSrcPosCalc scalc;
-
-    //MHillasCalc hcalc;
-    //hcalc.SetFlags(MHillasCalc::kCalcHillasSrc);
+    MHillasCalc hcalc;
+    hcalc.SetFlags(MHillasCalc::kCalcHillasSrc);
 
     MTaskList tlist2;
+    tlist2.AddToList(&scalc);
+    tlist2.AddToList(&hcalc);
     tlist2.AddToList(&taskenv1);
     tlist2.AddToList(&taskenv2);
@@ -386 +389 @@
     if (!fWriteOnly)
         tlist2.AddToList(&ffs);
-    //tlist2.AddToList(&scalc);
-    //tlist2.AddToList(&hcalc);
     tlist2.AddToList(&cont2);
     if (!fWriteOnly)

trunk/MagicSoft/Mars/mjobs/MJCut.h

@@ -7 +7 @@
 
 class MTask;
-class MSequences;
+class MDataSet;
 class MWriteRootFile;
 
@@ -37 +37 @@
     ~MJCut();
 
-    Bool_t ProcessFile(const MSequences &seq);
+    Bool_t ProcessFile(const MDataSet &seq);
 
     void EnableStorageOfSummary(Bool_t b=kTRUE)  { fStoreSummary = b; } // See SetNameSummary