Changeset 4895 for trunk/MagicSoft/Mars/mfileio

Timestamp:

09/09/04 15:43:47 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfileio

Files:

• MReadReports.cc (modified) (2 diffs)
• MReadReports.h (modified) (1 diff)
• MReadTree.cc (modified) (2 diffs)
• MReadTree.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mfileio/MReadReports.cc

@@ -226 +226 @@
 Int_t MReadReports::PreProcess(MParList *plist)
 {
-    fList = (MTask*)plist->FindObject("MTaskList");
-
     fChains->Delete();
 
@@ -385 +383 @@
             const Int_t rc = task->CallProcess();
             if (rc)
-            {
-                fList->SetStreamId(task->GetName());
                 return rc;
-            }
         }
 

trunk/MagicSoft/Mars/mfileio/MReadReports.h

@@ -22 +22 @@
     TArrayL    fPosEntry; // Store the position in each tree/chain
     TArrayL    fPosTree;  // Number of Tree in file.
-
-    MTask     *fList;     // pointer to the task list to set the stream id
 
     Bool_t     fEnableAutoScheme;

trunk/MagicSoft/Mars/mfileio/MReadTree.cc

@@ -601 +601 @@
 Int_t MReadTree::PreProcess(MParList *pList)
 {
+    fTaskList = (MTaskList*)pList->FindObject("MTaskList");
+    if (!fTaskList)
+        *fLog << warn << "WARNING - Standard tasklist MTaskList not found... ignoring Stream-ID." << endl;
+
     //
     // Make sure, that all the following calls doesn't result in
@@ -854 +858 @@
     const Bool_t rc = fChain->GetEntry(fNumEntry++) != 0;
 
+    if (fTaskList)
+        fTaskList->SetStreamId(fChain->GetName());
+
     if (rc)
         SetReadyToSave();

trunk/MagicSoft/Mars/mfileio/MReadTree.h

@@ -8 +8 @@
 class MChain;
 class TBranch;
+class MTaskList;
 
 class MReadTree : public MRead
@@ -24 +25 @@
     TList  *fVetoList;         // List of Branches which are not allowed to get enabled
     TList  *fNotify;           // List of TObjects to notify when switching files
+
+    MTaskList *fTaskList;      // Tasklist to set StreamId
 
     enum { kChainWasChanged = BIT(14) };