Changeset 6453 for trunk


Ignore:
Timestamp:
02/14/05 11:15:39 (20 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
2 added
2 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r6403 r6453  
    2222                                                 -*-*- END OF LINE -*-*-
    2323
     24 2005/02/14 Thomas Bretz
     25
     26   * callisto.cc, ganymed.cc, star.cc: 
     27     - added some more information to '--help' output
     28     - replaced MSequences by MDataSet
     29
     30   * mjobs/MJCut.[h,cc]:
     31     - replaced MSequences by MDataSet
     32     - write MEnergyEst
     33     - recalculate MHillasSrc
     34
     35   * mjobs/MSequences.[h,cc]:
     36     - removed
     37
     38   * mjobs/MDataSet.[h,cc]:
     39     - added
     40
     41
     42
    2443 2005/02/12 Abelardo Moralejo
    2544
    … …  
    4564
    4665
     66
    4767 2005/02/12 Markus Gaug
    4868
    … …  
    6181
    6282
     83
    6384 2005/02/12 Abelardo Moralejo
     85
    6486   * mmc/MMcTrig.hxx
    6587     - Added getter GetNumFirstLevel. This is necessary if that data
    … …  
    6789       already a getter, but it is called GetFirstLevel and hence not
    6890       recognized.
     91
     92
    6993
    7094 2005/02/11 Abelardo Moralejo

  • trunk/MagicSoft/Mars/callisto.cc

    r6282 r6453  
    4646    gLog << " callisto [-c] [-y] [options] sequence.txt" << endl << endl;
    4747    gLog << " Arguments:" << endl;
    48     gLog << "   sequence.txt:             An ascii file defining a sequence of runs" << endl;
     48    gLog << "   sequence.txt:             Ascii file defining a sequence of runs" << endl;
     49    gLog << "                             For more details see MSequence" << endl;
    4950    gLog << " Root Options:" << endl;
    5051    gLog << "   -b                        Batch mode (no graphical output to screen)" << endl<<endl;

  • trunk/MagicSoft/Mars/ganymed.cc

    r6282 r6453  
    1515#include "MStatusDisplay.h"
    1616
    17 #include "MSequences.h"
     17#include "MDataSet.h"
    1818#include "MJCut.h"
    1919
    … …  
    4343    gLog << " ganymed [-c] [-y] [options] sequences.txt" << endl << endl;
    4444    gLog << " Arguments:" << endl;
    45     gLog << "   sequences.txt:            An ascii file defining a collection of sequences" << endl;
     45    gLog << "   dataset.txt:              Ascii file defining a collection of sequences" << endl;
     46    gLog << "                             For more details see MDataSet." << endl;
    4647    gLog << " Root Options:" << endl;
    4748    gLog << "   -b                        Batch mode (no graphical output to screen)" << endl<<endl;
    … …  
    142143    // Setup sequence and check its validity
    143144    //
    144     MSequences seq(kSequences);
     145    MDataSet seq(kSequences);
    145146    if (kNumAnalysis>=0)
    146147        seq.SetNumAnalysis(kNumAnalysis);

  • trunk/MagicSoft/Mars/mjobs/MJCut.cc

    r6282 r6453  
    5656#include "../mhflux/MAlphaFitter.h"
    5757#include "MBinning.h"
    58 #include "MSequences.h"
     58#include "MDataSet.h"
    5959#include "MParameters.h"
    6060#include "MObservatory.h"
    … …  
    255255//   "MHillasSrc"   to  "Events"
    256256//   "MHadronness"  to  "Events"       yes
     257//   "MEnergyEst"   to  "Events"       yes
    257258//   "DataType"     to  "Events"
    258259//
    … …  
    262263    write.AddContainer("MHillasSrc",  "Events");
    263264    write.AddContainer("MHadronness", "Events", kFALSE);
     265    write.AddContainer("MEnergyEst",  "Events", kFALSE);
    264266    write.AddContainer("DataType",    "Events");
    265267
    … …  
    271273}
    272274
    273 Bool_t MJCut::ProcessFile(const MSequences &seq)
     275Bool_t MJCut::ProcessFile(const MDataSet &seq)
    274276{
    275277    if (!seq.IsValid())
    … …  
    371373    // How to get source position from off- and on-data?
    372374    MSrcPosCalc scalc;
    373 
    374     //MHillasCalc hcalc;
    375     //hcalc.SetFlags(MHillasCalc::kCalcHillasSrc);
     375    MHillasCalc hcalc;
     376    hcalc.SetFlags(MHillasCalc::kCalcHillasSrc);
    376377
    377378    MTaskList tlist2;
     379    tlist2.AddToList(&scalc);
     380    tlist2.AddToList(&hcalc);
    378381    tlist2.AddToList(&taskenv1);
    379382    tlist2.AddToList(&taskenv2);
    … …  
    386389    if (!fWriteOnly)
    387390        tlist2.AddToList(&ffs);
    388     //tlist2.AddToList(&scalc);
    389     //tlist2.AddToList(&hcalc);
    390391    tlist2.AddToList(&cont2);
    391392    if (!fWriteOnly)

  • trunk/MagicSoft/Mars/mjobs/MJCut.h

    r6282 r6453  
    77
    88class MTask;
    9 class MSequences;
     9class MDataSet;
    1010class MWriteRootFile;
    1111
    … …  
    3737    ~MJCut();
    3838
    39     Bool_t ProcessFile(const MSequences &seq);
     39    Bool_t ProcessFile(const MDataSet &seq);
    4040
    4141    void EnableStorageOfSummary(Bool_t b=kTRUE)  { fStoreSummary = b; } // See SetNameSummary

  • trunk/MagicSoft/Mars/star.cc

    r6253 r6453  
    4343    gLog << " star [options] sequence.txt" << endl << endl;
    4444    gLog << " Arguments:" << endl;
    45     gLog << "   sequence.txt:             An ascii file defining a sequence of runs" << endl;
     45    gLog << "   sequence.txt:             Ascii file defining a sequence of runs" << endl;
     46    gLog << "                             For more details see MSequence" << endl;
    4647    gLog << " Root Options:" << endl;
    4748    gLog << "   -b                        Batch mode (no graphical output to screen)" << endl<<endl;
Note: See TracChangeset for help on using the changeset viewer.