Changeset 6513 for trunk/MagicSoft

Timestamp:

02/16/05 10:44:53 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbase/MEvtLoop.cc (modified) (1 diff)
• mbase/MParList.cc (modified) (1 diff)
• mfileio/MReadMarsFile.cc (modified) (1 diff)
• mfileio/MReadTree.cc (modified) (2 diffs)
• mfileio/MWriteRootFile.cc (modified) (6 diffs)
• mfileio/MWriteRootFile.h (modified) (1 diff)
• mhist/MHCamEvent.cc (modified) (1 diff)
• mjobs/MJStar.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2005/02/16 Thomas Bretz
+
+   * mbase/MEvtLoop.cc:
+     - fixed a typo
+
+   * mbase/MParList.cc, mfileio/MReadMarsFile.cc,
+     mfileio/MReadTree.cc, mfileio/MWriteRootFile.cc,
+     mjobs/MJStar.cc:
+     - optimized size of some output
+
+   * mfileio/MWriteRootFile.[h,cc]:
+     - fixed CopySource option for single-file case
+
+   * mhist/MHCamEvent.cc:
+     - replaced the warn in SetupFill by an inf
+
+
 
  2005/02/15 Abelardo Moralejo

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -668 +668 @@
             "!   Author(s): Thomas Bretz et al. <mailto:tbretz@astro.uni-wuerzburg.de>" << endl <<
             "!" << endl <<
-            "!   Copyright: MAGIC Software Development, 2000-2002" << endl <<
+            "!   Copyright: MAGIC Software Development, 2000-2005" << endl <<
             "!" << endl <<
             "!" << endl <<

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -532 +532 @@
     // if object is not existing in the list try to create one
     //
-    *fLog << inf << "Object '" << oname << "' [" << cname << "] not yet in " << GetName() << "... creating." << endl;
+    *fLog << inf << "Object '" << oname << "' ";
+    if (oname!=cname)
+        *fLog << "[" << cname << "] ";
+    *fLog << "not yet in " << GetName() << "... creating." << endl;
 
     //

trunk/MagicSoft/Mars/mfileio/MReadMarsFile.cc

@@ -79 +79 @@
     // open the input stream
     //
-    fRun = new MReadTree("RunHeaders", fname, "ReadRunHeaders");
+    fRun = new MReadTree("RunHeaders", fname, "RunHeaders");
 
     //

trunk/MagicSoft/Mars/mfileio/MReadTree.cc

@@ -395 +395 @@
     {
         SetBit(kChainWasChanged);
-        *fLog << inf << GetDescriptor() << " - AddFile: " << numfiles << " files added from " << fname << "." << endl;
+        *fLog << inf << GetDescriptor() << ": Added " << fname << " <" << numfiles << ">" << endl;
     }
     else
@@ -839 +839 @@
         fTree->SetBranchAddress(bname, pcont); // *CHANGED-fChain-to-fTree*
 
-        *fLog << inf << "Master branch address '" << bname << "' [";
-        *fLog << classname << "] setup for reading." << endl;
+        *fLog << inf << "Master branch address '" << bname << "' ";
+        if ((TString)bname!=(TString)classname)
+            *fLog << "[" << classname << "] ";
+        *fLog << "setup for reading." << endl;
 
         //*fLog << "Branch " << bname << " autodel: " << (int)branch->IsAutoDelete() << endl;

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.cc

@@ -582 +582 @@
             // The containers should be written in Splitlevel=1
             //
-            *fLog << inf << "Creating Branch " << cname << " of " << cont->ClassName();
-            *fLog << " in tree " << tree->GetName() << "... " << flush;
+            *fLog << inf << "Creating Branch '" << cname << "' ";
+            if ((TString)cname!=(TString)cont->ClassName())
+                *fLog << "[" << cont->ClassName() << "] ";
+            *fLog << "in tree " << tree->GetName() << "... " << flush;
 
             branch = tree->Branch(branchname, cont->ClassName(), entry->GetAddress());
@@ -805 +807 @@
 // If you need more difficult rules please send me an eMail...
 //
-TString MWriteRootFile::GetNewFileName(TString &inname) const
+TString MWriteRootFile::GetNewFileName(const char *inname) const
 {
     // Remove the path from the filename
@@ -868 +870 @@
         path.Append("/");
 
-    inname.Prepend(path);
+    //inname.Prepend(path);
 
     // Create full qualified pathname
@@ -924 +926 @@
         TTree *gettree = dynamic_cast<TTree*>(file->Get(o->GetName()));
         if (!gettree)
-            continue;
+        {
+            *fLog << err << "ERROR - MakeCopies: Tree " << o->GetName() << " not found in file " << fname << "... abort." << endl;
+            return kFALSE;
+        }
 
         gettree->SetBranchStatus(o->GetTitle(), 1);
@@ -960 +965 @@
 Bool_t MWriteRootFile::ReInit(MParList *pList)
 {
+    MRead *read = (MRead*)pList->FindTask("MRead");
+    if (fSplitRule.IsNull() && fCopies.GetEntries()>0 && fOut)
+    {
+        if (!read)
+        {
+            *fLog << err;
+            *fLog << "ERROR: No Task 'MRead' found in the tasklist.  This task is" << endl;
+            *fLog << "  necessary to  get the filename.  Without  a filename file" << endl;
+            *fLog << "  AddCopySource cannot be used... abort." << endl;
+            *fLog << endl;
+            return kFALSE;
+        }
+        if (!MakeCopies(read->GetFullFileName()))
+            return kFALSE;
+
+    }
+
     if (fSplitRule.IsNull() || !(fOut || TestBit(kIsNotOwner)))
         return MWriteFile::ReInit(pList);
 
-    MRead *read = (MRead*)pList->FindTask("MRead");
     if (!read)
     {
@@ -975 +996 @@
     }
 
-    TString oldname = read->GetFileName();
-
+
+    const TString oldname = read->GetFullFileName();
     const TString newname = GetNewFileName(oldname);
     if (!ChangeFile(newname))

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.h

@@ -93 +93 @@
     // File handling
     void    Close();
-    TString GetNewFileName(TString &inname) const;
+    TString GetNewFileName(const char *inname) const;
     Bool_t  ChangeFile(const char *fname);
     TFile  *OpenFile(const char *name, Option_t *option, const char *title, Int_t comp);

trunk/MagicSoft/Mars/mhist/MHCamEvent.cc

@@ -149 +149 @@
             return kFALSE;
         }
-        *fLog << warn << GetDescriptor() << ": No MCamEvent available..." << endl;
+        *fLog << inf << GetDescriptor() << ": Assuming to get MCamEvent from Fill()..." << endl;
     }
 

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -125 +125 @@
     *fLog << inf;
     fLog->Separator(GetDescriptor());
-    *fLog << "Calculate image parameters from sequence ";
+    *fLog << "Calculate image parameters of sequence ";
     *fLog << fSequence.GetName() << endl;
     *fLog << endl;