Changeset 7838 for trunk

Timestamp:

08/03/06 14:45:12 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• mbase/MTask.cc (modified) (1 diff)
• mfileio/MReadReports.cc (modified) (5 diffs)
• mfileio/MReadTree.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2006/08/03 Thomas Bretz
+
+   * mbase/MTask.cc:
+     - do not print number of executions if it is (UInt_t)-1
+
+   * mfileio/MReadReports.cc:
+     - do not allocate a MTime container anymore. This can be done
+       by root automatically which has the advantage that we don't
+       have to care about its deletion
+     - added some more debug output, just in case...
+
+   * mfileio/MReadTree.cc:
+     - fixed a typo in a comment
+
+
 
  2006/08/02 Markus Meyer

trunk/MagicSoft/Mars/NEWS

@@ -23 +23 @@
 
    - merpp: didn't recognize files with the extension .raw.gz - fixed.
+
+   - callisto: Updated absolute calibration constants (muon calibration)
 
    - callisto: Fixed a bug regarding the use of the QE which doesn't

trunk/MagicSoft/Mars/mbase/MTask.cc

@@ -440 +440 @@
     if (HasStreamId())
         *fLog << GetStreamId() << ":";
-    *fLog << GetDescriptor() << "\t" << dec << GetNumExecutions();
+    *fLog << GetDescriptor();
+
+    if (GetNumExecutions()!=(UInt_t)-1)
+        *fLog << "\t" << dec << GetNumExecutions();
 
     if (fFilter)

trunk/MagicSoft/Mars/mfileio/MReadReports.cc

@@ -18 +18 @@
 !   Author(s): Thomas Bretz, 11/2003 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2003
+!   Copyright: MAGIC Software Development, 2000-2006
 !
 !
@@ -104 +104 @@
     TIter NextC(fChains);
     while ((o=NextC()))
-    {
         delete *GetTime((TChain*)o);
-        delete  GetTime((TChain*)o);
-    }
 
     delete fTrees;
@@ -297 +294 @@
         //
         MTime **tx = new MTime*;
-        *tx = new MTime;
+        *tx = 0;//new MTime;
 
         TChain *c=new TChain(tree->GetName());
+
         c->SetBranchStatus("*", 0);
         c->SetBranchAddress(tn, tx);
-        tn+="*";
-        c->SetBranchStatus(tn, 1);
+        c->SetBranchStatus(tn2, 1);
+
         c->Add((TChain*)tree->fChain);
         c->GetEntry(0);
@@ -436 +434 @@
         }
 
-        *fLog << dbg << "Removing chain " << chain->GetName() << " from list." << endl;
+        *fLog << dbg << "Removing chain " << chain->GetName() << " from list" << flush;
 
         delete *GetTime(chain);        // Delete MTime*
-        delete  GetTime(chain);        // Delete MTime-instance
+        *fLog << "." << flush;
         delete fChains->Remove(chain); // Remove chain from TList
+        *fLog << "." << flush;
 
         // FIXME: Maybe MTaskList should have a member function to
@@ -448 +447 @@
         // corresponds to the correct task in the list.
         const_cast<TList*>(fTrees->GetList())->Remove(task);
+        *fLog << "." << flush;
         const_cast<TList*>(fTrees->GetList())->AddLast(task);
+        *fLog << "done." << endl;
     }
 

trunk/MagicSoft/Mars/mfileio/MReadTree.cc

@@ -713 +713 @@
     //
     // It seems, that TFile and TTree are not completely independant if
-    // many times the same file is openes (MReadReports) and some of
+    // many times the same file is opened (MReadReports) and some of
     // the files in the chains don't have one tree. TChain::fTreeNumber
     // is already set before LoadTree from GetFile is called and