Changeset 4115

Timestamp:

05/21/04 15:58:32 (21 years ago)

Author:

reyes

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mjobs/MJPedestal.cc (modified) (1 diff)
• mraw/MRawFileRead.cc (modified) (2 diffs)
• mraw/MRawFileRead.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -26 +26 @@
      - changed the inheritance of MRawRead class from MTask to MRead to
        implement the AddFiles(MDirIter &) function in MRawFileRead class.
+   * mraw/MRawFileRead.[h,cc]
+     - implemented a second argument to the AddFile function and skip 
+       adding NULL files in the constructor.
+   * mjobs/MJPedestal.cc
+     - uncommented the line to allow the analysis of .raw files.
 
  2004/05/20: Markus Gaug

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -238 +238 @@
     MGeomCamMagic magiccam;
     MReadMarsFile read("Events");
-    MRawFileRead rawread("");
+    MRawFileRead rawread(NULL);
 
     if (fDataCheck)
     {
-//      rawread.AddFiles(*fRuns);
+        rawread.AddFiles(*fRuns);
         tlist.AddToList(&rawread);
     }

trunk/MagicSoft/Mars/mraw/MRawFileRead.cc

@@ -109 +109 @@
     fFileNames->SetOwner();
 
-    AddFile(fname);
+    if(fname!=NULL)
+      AddFile(fname);
 }
 
@@ -129 +130 @@
 // wildcard support)
 //
-Int_t MRawFileRead::AddFile(const char *fname)
+Int_t MRawFileRead::AddFile(const char *fname, Int_t entries)
 {
     TNamed *name = new TNamed(fname, "");

trunk/MagicSoft/Mars/mraw/MRawFileRead.h

@@ -36 +36 @@
     const TString GetFileName() const;
 
-    Int_t  AddFile(const char *fname);
+    Int_t  AddFile(const char *fname, Int_t entries=-1);
     Bool_t Rewind();