Changeset 2123 for trunk/MagicSoft/Mars

Timestamp:

05/20/03 10:19:41 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbase/MLog.h (modified) (1 diff)
• mfileio/MReadMarsFile.cc (modified) (1 diff)
• mfileio/MReadTree.cc (modified) (5 diffs)
• mfileio/MReadTree.h (modified) (1 diff)
• mfileio/MWriteRootFile.cc (modified) (1 diff)
• mfilter/MF.cc (modified) (1 diff)
• mfilter/MF.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                  -*-*- END OF LINE -*-*-
+ 2003/05/20: Thomas Bretz
+
+   * mbase/MLog.h:
+     - added Separator member function
+     
+   * mfileio/MReadMarsFile.cc:
+     - moved output in Notify to MReadTree::Notify
+     - call MReadTree:Notify in Notify
+     
+   * mfileio/MReadTree.[h,cc]:
+     - do not try to delete a Baddress if it is NULL ("*")
+     - added CheckBranchSize member function
+     - added the size consistency check to Notify
+     
+   * mfileio/MWriteRootFile.cc:
+     - mini changes to Print-output
+     
+   * mfilter/MF.[h,cc]:
+     - added Print-function
+     
+   * mraw/MRawEvtPixelIter.h:
+     - removed wrong EOL characters
+
+
+     
  2003/05/19: Thomas Bretz
+
+   * mgui/MCamDisplay.cc:
+     - removed an unused variable.
+
+   * Makefile.rules:
+     - fixed Mr.Proper
 
    * mbase/MEvtLoop.cc, mbase/MParList.cc, mbase/MTaskList.cc,

trunk/MagicSoft/Mars/mbase/MLog.h

@@ -171 +171 @@
     void SetNoColors(Bool_t flag=kTRUE) { flag ? SetBit(eNoColors) : ResetBit(eNoColors); }
 
+    void Separator(TString str="", int outlvl=0)
+    {
+        if (!str.IsNull())
+        {
+            const Int_t l = (78-str.Length())/2-3;
+            str.Prepend("={ ");
+            str.Prepend('-', l);
+            str.Append(" }=");
+            str.Append('-', l);
+        }
+        if (str.Length()<78)
+            str.Append('-', 78-str.Length());
+
+        const int save = fOutputLevel;
+        SetOutputLevel(outlvl);
+        (*this) << str << endl;
+        fOutputLevel = save;
+    }
+
     ClassDef(MLog, 0) // This is what we call 'The logging system'
 };

trunk/MagicSoft/Mars/mfileio/MReadMarsFile.cc

@@ -142 +142 @@
     }
 
-    *fLog << inf << "MReadMarsFile: Switching to #" << GetFileIndex();
-    *fLog << " '" << GetFileName() << "' (before event #";
-    *fLog << GetNumEntry()-1 << ")" << endl;
+    if (!MReadTree::Notify())
+        return kFALSE;
 
     if (fDisplay)

trunk/MagicSoft/Mars/mfileio/MReadTree.cc

@@ -138 +138 @@
     TChainElement *element = NULL;
     while ((element=(TChainElement*)Next()))
-        delete (MParContainer**)element->GetBaddress();
+        if (element->GetBaddress())
+            delete (MParContainer**)element->GetBaddress();
 
     //
@@ -155 +156 @@
 // --------------------------------------------------------------------------
 //
+// This check whether all branches in the tree have the same size. If
+// this is not the case the events in the different branches cannot
+// be ordered correctly.
+//
+Bool_t MReadTree::CheckBranchSize()
+{
+    TArrayI entries(fChain->GetStatus()->GetSize());
+    Int_t num=0;
+
+    // Loop over all branches which have a corresponding container
+    TIter Next(fChain->GetStatus());
+
+    TChainElement *element = NULL;
+    while ((element=(TChainElement*)Next()))
+    {
+        // Get branch name and find pointer to corresponding branch
+        const TString name = element->GetName();
+        const TBranch *b = fChain->FindBranch(name);
+
+        // Skip element without corresponding branches (like "*")
+        if (!b)
+            continue;
+
+        entries[num++] = (Int_t)b->GetEntries();
+    }
+
+    // Check the number of entries of the branches pair-wise
+    for (int i=0; i<num; i++)
+        for (int j=i; j<num; j++)
+        {
+            if (entries[i]==entries[j])
+                continue;
+
+            *fLog << err << "ERROR - File corrupttion detected:" << endl;
+            *fLog << "  Due to several circumstances (such at a bug in MReadTree or wrong" << endl;
+            *fLog << "  usage of the file UPDATE mode) you may have produced a file in which" << endl;
+            *fLog << "  at least two branches in the same tree (" << fChain->GetName() << ") have different" << endl;
+            *fLog << "  number of entries. Sorry, but this file (" << GetFileName() << ")" << endl;
+            *fLog << "  is unusable." << endl;
+            return kFALSE;
+        }
+
+    return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
 //  If the owner flag is set all TObjects which are scheduled via
 //  AddNotify are deleted by the destructor of MReadTree
@@ -171 +219 @@
 Bool_t MReadTree::Notify()
 {
-    *fLog << inf << GetDescriptor() << ": Notify '" << fChain->GetName();
-    *fLog << "' (before processing event #" << GetNumEntry()-1 << ")" << endl;
+    //
+    // Do a consistency check for all branches
+    //
+    if (!CheckBranchSize())
+        return kFALSE;
+
+    *fLog << inf << GetDescriptor() << ": Switching to #" << GetFileIndex();
+    *fLog << " '" << GetFileName() << "' (before event #";
+    *fLog << GetNumEntry()-1 << ")" << endl;
 
     //fNotify->Notify();
@@ -542 +597 @@
 
     Int_t num=0;
+
     //
     // loop over all tasks for processing
@@ -622 +678 @@
 
     //
+    // Do a consistency check for all branches
+    //
+//    if (!CheckBranchSize())
+//        return kFALSE;
+
+    //
     // If auto enabling scheme isn't disabled, do auto enabling
     //

trunk/MagicSoft/Mars/mfileio/MReadTree.h

@@ -33 +33 @@
     void EnableBranches(MParList *plist);
     void EnableBranchChoosing();
+
+    Bool_t CheckBranchSize();
 
     virtual void SetReadyToSave(Bool_t flag=kTRUE);

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.cc

@@ -140 +140 @@
 void MWriteRootFile::Print(Option_t *) const
 {
-    *fLog << all << underline << "File: " << GetFileName() << ":" << endl;
+    *fLog << all << underline << "File: " << GetFileName() << endl;
+
+    if (fTrees.GetEntries()==0)
+    {
+        *fLog << " No contents." << endl;
+        return;
+    }
 
     TTree *t = NULL;
     TIter Next(&fTrees);
     while ((t=(TTree*)Next()))
-        *fLog << t->GetName() << ": \t" << t->GetEntries() << " entries." << endl;
+        *fLog << " " << t->GetName() << ": \t" << t->GetEntries() << " entries." << endl;
     *fLog << endl;
 }

trunk/MagicSoft/Mars/mfilter/MF.cc

@@ -473 +473 @@
 }
 
+void MF::Print(Option_t *opt) const
+{
+    *fLog << all << underline << GetDescriptor() << endl;
+    fF->Print();
+    *fLog << endl << endl;
+}

trunk/MagicSoft/Mars/mfilter/MF.h

@@ -41 +41 @@
     Bool_t PostProcess();
 
+    void Print(Option_t *opt="") const;
+
     ClassDef(MF, 0) // A Filter for cuts in any data member
 };