Changeset 1527 for trunk/MagicSoft

Timestamp:

09/17/02 11:06:33 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• manalysis/MCerPhotPix.cc (modified) (1 diff)
• mbase/MTaskList.cc (modified) (4 diffs)
• mfileio/MReadTree.cc (modified) (1 diff)
• mfileio/MReadTree.h (modified) (2 diffs)
• mmain/MProgressBar.cc (added)
• mmain/MProgressBar.h (added)
• mmain/MainLinkDef.h (modified) (1 diff)
• mmain/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/manalysis/MCerPhotPix.cc

@@ -59 +59 @@
 { 
     gLog << GetDescriptor() <<" Pixel: "<< fPixId;
-    gLog << (fIsUsed?"    Used ":"  Unused ");
-    gLog << (fIsCore?"  Core  ":"        ");
-    gLog << "  Nphot= " << fPhot << "  Error(Nphot) = " << fErrPhot << endl;
+    gLog << (fIsUsed?"   Used ":" Unused ");
+    gLog << (fIsCore?" Core ":"      ");
+    gLog << "Nphot= " << fPhot << " Error(Nphot)=" << fErrPhot << endl;
 }
 

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -392 +392 @@
     // loop over all tasks for processing
     //
+    Bool_t rc = kTRUE;
     while ( (task=(MTask*)Next()) )
     {
@@ -420 +421 @@
             // an error occured: stop eventloop
             //
-            return kFALSE;
+            rc = kFALSE;
+            break;
 
         case kCONTINUE:
@@ -426 +428 @@
             // something occured: skip the rest of the tasks for this event
             //
-            return kTRUE;
+            rc = kTRUE;
+            break;
 
         default:
             *fLog << warn << "MTaskList::Process: Unknown return value from MTask::Process()... ignored." << endl;
+            continue;
         }
+        break;
     }
 
@@ -436 +441 @@
         fParList->ResetBit(MParList::kDoNotReset);
 
-    return kTRUE;
+    return rc;
 }
 

trunk/MagicSoft/Mars/mfileio/MReadTree.cc

@@ -203 +203 @@
 // --------------------------------------------------------------------------
 //
+// Adds all files from another MReadTree to this instance
+//
+// Returns the number of file which were added
+//
+Int_t MReadTree::AddFiles(const MReadTree &read)
+{
+    Int_t rc = 0;
+
+    TIter Next(read.fChain->GetListOfFiles());
+    TObject *obj = NULL;
+    while ((obj=Next()))
+        rc += AddFile(obj->GetTitle());
+
+    return rc;
+}
+
+// --------------------------------------------------------------------------
+//
 //  This function is called if Branch choosing method should get enabled.
 //  Branch choosing means, that only the enabled branches are read into

trunk/MagicSoft/Mars/mfileio/MReadTree.h

@@ -60 +60 @@
     UInt_t GetEntries() const  { return fNumEntries; }
 
-    TString GetFileName() const;
-    Int_t   GetFileIndex() const;
+    TString    GetFileName() const;
+    Int_t      GetFileIndex() const;
 
     virtual void   AddNotify(TObject *obj);
@@ -68 +68 @@
 
     virtual Int_t  AddFile(const char *fname);
+    virtual Int_t  AddFiles(const MReadTree &read);
 
     virtual Bool_t PreProcess(MParList *pList);

trunk/MagicSoft/Mars/mmain/MainLinkDef.h

@@ -12 +12 @@
 #pragma link C++ class MDataCheck+;
 #pragma link C++ class MMonteCarlo+;
+#pragma link C++ class MProgressBar+;
 #pragma link C++ class MCameraDisplay+;
 

trunk/MagicSoft/Mars/mmain/Makefile

@@ -35 +35 @@
            MAnalysis.cc \
            MMonteCarlo.cc \
+           MProgressBar.cc \
            MCameraDisplay.cc