Changeset 6453 for trunk/MagicSoft/Mars

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (4 diffs)
• callisto.cc (modified) (1 diff)
• ganymed.cc (modified) (3 diffs)
• mjobs/MDataSet.cc (added)
• mjobs/MDataSet.h (added)
• mjobs/MJCut.cc (modified) (6 diffs)
• mjobs/MJCut.h (modified) (2 diffs)
• mjobs/MSequences.cc (deleted)
• mjobs/MSequences.h (deleted)
• star.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -22 +22 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2005/02/14 Thomas Bretz
+
+   * callisto.cc, ganymed.cc, star.cc:  
+     - added some more information to '--help' output
+     - replaced MSequences by MDataSet
+
+   * mjobs/MJCut.[h,cc]: 
+     - replaced MSequences by MDataSet
+     - write MEnergyEst
+     - recalculate MHillasSrc
+
+   * mjobs/MSequences.[h,cc]: 
+     - removed
+
+   * mjobs/MDataSet.[h,cc]: 
+     - added
+
+
+
  2005/02/12 Abelardo Moralejo
 
@@ -45 +64 @@
 
 
+
  2005/02/12 Markus Gaug
 
@@ -61 +81 @@
 
 
+
  2005/02/12 Abelardo Moralejo
+
    * mmc/MMcTrig.hxx 
      - Added getter GetNumFirstLevel. This is necessary if that data
@@ -67 +89 @@
        already a getter, but it is called GetFirstLevel and hence not
        recognized.
+
+
 
  2005/02/11 Abelardo Moralejo

trunk/MagicSoft/Mars/callisto.cc

@@ -46 +46 @@
     gLog << " callisto [-c] [-y] [options] sequence.txt" << endl << endl;
     gLog << " Arguments:" << endl;
-    gLog << "   sequence.txt:             An ascii file defining a sequence of runs" << endl;
+    gLog << "   sequence.txt:             Ascii file defining a sequence of runs" << endl;
+    gLog << "                             For more details see MSequence" << endl;
     gLog << " Root Options:" << endl;
     gLog << "   -b                        Batch mode (no graphical output to screen)" << endl<<endl;

trunk/MagicSoft/Mars/ganymed.cc

@@ -15 +15 @@
 #include "MStatusDisplay.h"
 
-#include "MSequences.h"
+#include "MDataSet.h"
 #include "MJCut.h"
 
@@ -43 +43 @@
     gLog << " ganymed [-c] [-y] [options] sequences.txt" << endl << endl;
     gLog << " Arguments:" << endl;
-    gLog << "   sequences.txt:            An ascii file defining a collection of sequences" << endl;
+    gLog << "   dataset.txt:              Ascii file defining a collection of sequences" << endl;
+    gLog << "                             For more details see MDataSet." << endl;
     gLog << " Root Options:" << endl;
     gLog << "   -b                        Batch mode (no graphical output to screen)" << endl<<endl;
@@ -142 +143 @@
     // Setup sequence and check its validity
     //
-    MSequences seq(kSequences);
+    MDataSet seq(kSequences);
     if (kNumAnalysis>=0)
         seq.SetNumAnalysis(kNumAnalysis);

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

trunk/MagicSoft/Mars/star.cc

@@ -43 +43 @@
     gLog << " star [options] sequence.txt" << endl << endl;
     gLog << " Arguments:" << endl;
-    gLog << "   sequence.txt:             An ascii file defining a sequence of runs" << endl;
+    gLog << "   sequence.txt:             Ascii file defining a sequence of runs" << endl;
+    gLog << "                             For more details see MSequence" << endl;
     gLog << " Root Options:" << endl;
     gLog << "   -b                        Batch mode (no graphical output to screen)" << endl<<endl;