Changeset 4898

Timestamp:

09/09/04 17:02:18 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mfileio/MReadRflFile.cc (modified) (3 diffs)
• mfileio/MReadRflFile.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -34 +34 @@
 
 
+
  2004/09/09: Thomas Bretz
 
@@ -52 +53 @@
    * mjobs/Makefile:
      - added path to mhvstime
+
+   * manalysis/MParameters.[h,cc]:
+     - added Print() functions
+
+   * mfileio/MReadReports.[h,cc], mfileio/MReadTree.[h,cc]:
+     - moved setting of StreamId from MReadReports To MReadTree
+
+   * mhbase/MH.cc:
+     - workaround all the this which are reset in TAxis::Set
+  
+   * mfileio/MReadRflFile.[h,cc]:
+     - added missing abstract functions
 
 

trunk/MagicSoft/Mars/mfileio/MReadRflFile.cc

@@ -300 +300 @@
     // open the file which is the first one in the chain
     //
-    const TString name = file->GetName();
-
-    const char *expname = gSystem->ExpandPathName(name);
-    const TString fname(expname);
-    delete [] expname;
+    fFileName = file->GetName();
+    const TString expname = fFileName;
+    gSystem->ExpandPathName(expname);
 
     //
@@ -311 +309 @@
     //fFileNames->Remove(file);
 
-    *fLog << inf << "Open file: '" << name << "'" << endl;
-
-    fIn = new ifstream(name);
+    *fLog << inf << "Open file: '" << fFileName << "'" << endl;
+
+    fIn = new ifstream(expname);
     if (!*fIn)
     {
-        *fLog << err << "Cannot open file " << name << ": ";
+        *fLog << err << "Cannot open file " << expname << ": ";
         *fLog << strerror(errno) << endl;
         return kFALSE;
@@ -322 +320 @@
 
     *fLog << inf;
-    fLog->Separator(name);
+    fLog->Separator(fFileName);
 
     fCurrentVersion = ReadVersion();

trunk/MagicSoft/Mars/mfileio/MReadRflFile.h

@@ -27 +27 @@
     UInt_t fNumFile;
     UInt_t fEntries; // TO BE IMPLEMENTED
+    TString fFileName;
 
     Float_t fCurrentVersion; //! Version of currently open rfl file
@@ -52 +53 @@
     Bool_t Rewind() { fNumFile=0; return kTRUE; }
     UInt_t GetEntries() { return fEntries; }
+    TString GetFileName() const { return fFileName; }
 
     Bool_t SearchFor(Int_t runno, Int_t eventno);