Changeset 8617 for trunk

Timestamp:

06/28/07 20:49:30 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mars.cc (modified) (4 diffs)
• mmain/MEventDisplay.cc (modified) (7 diffs)
• mmain/MEventDisplay.h (modified) (2 diffs)
• mmain/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+
+ 2007/06/28 Thomas Bretz
+
+   * mars.cc:
+     - added new options to use a sequence file instead of a run
+
+   * mhbase/MFillH.h:
+     - added new member function to reset weights
+
+   * mmain/MEventDisplay.[h,cc]:
+     - added path argument to allow to give an input path
+     - added to allow to setup a sequence file for reading
+
+   * mmain/Makefile:
+     - added inlcude of mjobs for MSequence
+
 
 

trunk/MagicSoft/Mars/mars.cc

@@ -45 +45 @@
     gLog << all << endl;
     gLog << "Sorry the usage is:" << endl;
-    gLog << " mars [options] [filename]" << endl << endl;
+    gLog << " mars [options] filename|number [path]" << endl << endl;
+    gLog << " Arguments:" << endl;
+    gLog << "   filename: Name of a merpped raw file, a calibrated (Y)," << endl;
+    gLog << "             sequence file or sequence number." << endl;
+    gLog << "   path:     Path where the data is stored in case of a" << endl;
+    gLog << "             sequence (datacenter default if omitted)." << endl << endl;
     gLog << " Options:" << endl;
+    gLog.Usage();
+    gLog << "   --config=mars.rc: Change configuration file" << endl;
+    gLog << "                     <not yet implemented!>" << endl;
     gLog.Usage();
     gLog << "     -?/-h: This help" << endl << endl;
 }
+
+/*
+Bool_t InflateRun(TString &run, Bool_t ismc)
+{
+    if (run.IsDigit())
+    {
+        const Int_t numrun = run.Atoi();
+        seq = "/magic/";
+        if (ismc)
+            seq += ismc ? "montecarlo/" : "rawfiles/";
+        seq += Form("sequences/%04d/sequence%08d.txt", numseq/10000, numseq);
+        gLog << inf << "Inflated sequence file: " << seq << endl;
+    }
+
+    if (!gSystem->AccessPathName(seq, kFileExists))
+        return kTRUE;
+
+    gLog << err << "Sorry, sequence file '" << seq << "' doesn't exist." << endl;
+    return kFALSE;
+}
+*/
 
 int main(int argc, char **argv)
@@ -70 +99 @@
     }
 
+    //const Bool_t  kIsSequence = arg.HasOnlyAndRemove("--seq");
+    const TString kConfig = arg.GetStringAndRemove("--config=", "mars.rc");
+
+    if (arg.GetNumOptions()>0)
+    {
+        gLog << warn << "WARNING - Unknown commandline options..." << endl;
+        arg.Print("options");
+        gLog << endl;
+        return 2;
+    }
+
+    //
+    // check for the right usage of the program
+    //
+    if (arg.GetNumArguments()>2)
+    {
+        Usage();
+        return 2;
+    }
+
     //
     // This is to make argv[i] more readable inside the code
     //
-    const TString kFilename = arg.GetArgumentStr(0);
+    TString kFilename = arg.GetArgumentStr(0);
+    TString kInpathD  = arg.GetArgumentStr(1);
+
+    //if (!kIsSequence && !InflateRun(kFilename))
+    //    return 3;
 
 #ifdef HAVE_XPM
@@ -100 +153 @@
 #endif
 
+    /*
+    MEnv env(kConfig);
+    if (!env.IsValid())
+    {
+        gLog << err << "Configuration file " << kConfig << " not found." << endl;
+        return 0xfe;
+    }
+    */
+
     //
     // start the main window
@@ -107 +169 @@
     else
     {
-        MEventDisplay *d = new MEventDisplay(kFilename);
+        MEventDisplay *d = new MEventDisplay(kFilename, kInpathD);
         d->SetBit(MStatusDisplay::kExitLoopOnExit);
         d->SetTitle(kFilename);

trunk/MagicSoft/Mars/mmain/MEventDisplay.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MEventDisplay.cc,v 1.60 2007-06-26 16:59:21 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MEventDisplay.cc,v 1.61 2007-06-28 19:49:30 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -95 +95 @@
 // Container
 //
+#include "MSequence.h"                 // MSequence
+#include "MDirIter.h"                  // MDirIter
 #include "MHillas.h"                   // MHillas::Print(const MGeomCam&)
 #include "MHillasExt.h"                // MHillasExt::Print(const MGeomCam&)
@@ -118 +120 @@
 //  Constructor.
 //
-MEventDisplay::MEventDisplay(const char *fname) : MStatusDisplay(), fEvtLoop(0)
+MEventDisplay::MEventDisplay(const char *fname, const char *path) : MStatusDisplay(), fEvtLoop(0)
 {
     //
     // Setup Task list for hillas calculation
     //
-    SetupTaskList("Events", fname);
+    SetupTaskList("Events", fname, path);
 
     //
@@ -163 +165 @@
 {
     TFile f(fname, "READ");
+    if (f.IsZombie())
+        return 0; // Not a root file
+
     TTree *t = (TTree*)f.Get(tree);
     if (!t)
@@ -181 +186 @@
 //  preprocess tasks and read in first event (process)
 //
-void MEventDisplay::SetupTaskList(const char *tname, const char *fname)
-{
-//    MCalibrationChargeCam *ccam=0;
-//    MPedPhotCam           *pcam=0;
-
+void MEventDisplay::SetupTaskList(const char *tname, TString fname, const char *path)
+{
     MBadPixelsCam *badpix = new MBadPixelsCam;
 
-    const Int_t type = GetFileType(tname, fname);
+    Int_t type = GetFileType(tname, fname);
     switch (type)
     {
@@ -195 +197 @@
     case -2: gLog << err << "File type unknown... abort." << endl; return;
     case -1: gLog << err << "Tree " << tname << " not found... abort." << endl; return;
-    }
+    case  0: gLog << inf << "Assuming Sequence file." << endl; break;
+    }
+
+    if (type==0 && !MSequence::InflatePath(fname))
+        return;
+
+    // Check if file is a sequence...
+    MSequence *seq = type==0 ? new MSequence(fname, path) : new MSequence;
+    if (type==0)
+        type = 1;
 
     //
@@ -209 +220 @@
     plist->AddToList(tlist);
     plist->AddToList(badpix);
-
-    MReadMarsFile *read = new MReadMarsFile(tname, fname);
+    plist->AddToList(seq);
+
+    MReadMarsFile *read = new MReadMarsFile(tname);
     read->DisableAutoScheme();
+    if (seq->IsValid())
+    {
+        MDirIter iter;
+        if (seq->SetupDatRuns(iter, MSequence::kCalibrated)<=0)
+            return;
+        read->AddFiles(iter);
+    }
+    else
+        read->AddFile(fname);
     tlist->AddToList(read);
 

trunk/MagicSoft/Mars/mmain/MEventDisplay.h

@@ -38 +38 @@
 
     void UpdateDisplay();
-    void SetupTaskList(const char *tname, const char *fname);
+    void SetupTaskList(const char *tname, TString fname, const char *path);
 
     void ReadFirstEvent();
@@ -48 +48 @@
 
 public:
-    MEventDisplay(const char *fname);
+    MEventDisplay(const char *fname, const char *path="");
     ~MEventDisplay();
 

trunk/MagicSoft/Mars/mmain/Makefile

@@ -23 +23 @@
            -I../mfileio -I../mimage -I../mhistmc -I../mgbase -I../mfbase  \
            -I../mdata -I../msignal -I../mcalib -I../mbadpixels            \
-           -I../mpointing -I../mpedestal -I../mmuon -I../mfilter
+           -I../mpointing -I../mpedestal -I../mmuon -I../mfilter -I../mjobs
 
 SRCFILES = MBrowser.cc \