Changeset 7130 for trunk/MagicSoft/Mars/mtools

Timestamp:

06/03/05 18:02:36 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mtools/MTFillMatrix.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mtools/MTFillMatrix.cc

@@ -109 +109 @@
 Bool_t MTFillMatrix::CheckResult(MHMatrix *m, Int_t num) const
 {
-    if (!m)
+    if (!m || num==0)
         return kTRUE;
 
@@ -190 +190 @@
     fLog->Separator(GetDescriptor());
     *fLog << "Fill " << fDestMatrix1->GetDescriptor() << " with " << fNumDestEvents1 << endl;
-    *fLog << "Fill " << fDestMatrix2->GetDescriptor() << " with " << fNumDestEvents2 << endl;
+    if (fDestMatrix2)
+        *fLog << "Fill " << fDestMatrix2->GetDescriptor() << " with " << fNumDestEvents2 << endl;
     *fLog << "Distribution choosen ";
     if (fReference && fReference->GetHist().GetEntries()>0)
@@ -210 +211 @@
     // FIXME: Merge MFEventSelector and MFEventSelector2
     MFilter *selector=0;
-    if (fReference)
-    {
-        // Case of a reference/nominal distribution
-        // The events must be read before selection
-        MFEventSelector2 *sel = new MFEventSelector2(*fReference);
-        sel->SetNumMax(fNumDestEvents1+fNumDestEvents2);
-        sel->SetInverted();
-
-        selector = sel;
-    }
-    else
-    {
-        // Case of a random distribution
-        // The events can be selected before reading
-        MFEventSelector *sel = new MFEventSelector;
-        sel->SetNumSelectEvts(fNumDestEvents1+fNumDestEvents2);
-        fReader->SetSelector(sel);
-
-        selector = sel;
+    if (fNumDestEvents1>0 || fNumDestEvents2>0)
+    {
+        if (fReference)
+        {
+            // Case of a reference/nominal distribution
+            // The events must be read before selection
+            MFEventSelector2 *sel = new MFEventSelector2(*fReference);
+            sel->SetNumMax(fNumDestEvents1+fNumDestEvents2);
+            sel->SetInverted();
+
+            selector = sel;
+        }
+        else
+        {
+            // Case of a random distribution
+            // The events can be selected before reading
+            MFEventSelector *sel = new MFEventSelector;
+            sel->SetNumSelectEvts(fNumDestEvents1+fNumDestEvents2);
+            fReader->SetSelector(sel);
+
+            selector = sel;
+        }
     }
 
@@ -256 +260 @@
     MFillH fill1(fDestMatrix1);
     MFillH fill2(fDestMatrix2);
-    fill1.SetFilter(&split);
-    fill2.SetFilter(&invsplit);
+    if (selector)
+    {
+        fill1.SetFilter(&split);
+        fill2.SetFilter(&invsplit);
+    }
 
     // entries in MTaskList
     tlist.AddToList(fReader);        // Read events
-    if (fReference)
+    if (fReference && selector)
         tlist.AddToList(&cont);      // select a sample of events
     tlist.AddToList(&invsplit);      // process invsplit (which implicitly processes split)
-    if (fDestMatrix1 && fNumDestEvents1>0)
+    if (fDestMatrix1)
         tlist.AddToList(&fill1);     // fill matrix 1
-    if (fDestMatrix2 && fNumDestEvents2>0)
+    if (fDestMatrix2)
         tlist.AddToList(&fill2);     // fill matrix 2
     if (fWriteFile1)
@@ -289 +296 @@
     const Bool_t rc = evtloop.Eventloop();
 
-    // Print execution statistics of the tasklist
-    if (rc)
-        tlist.PrintStatistics();
-
-    delete selector;
+    if (selector)
+        delete selector;
 
     if (!rc)