Changeset 8617 for trunk/MagicSoft/Mars/mmain

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mmain

Files:

• MEventDisplay.cc (modified) (7 diffs)
• MEventDisplay.h (modified) (2 diffs)
• Makefile (modified) (1 diff)

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 \