Changeset 9868 for trunk/Mars

Timestamp:

08/16/10 09:08:29 (14 years ago)

Author:

tbretz

Message:

Improved handling of nagative number of events in MTFillMatrix.

Location:

trunk/Mars

Files:

• Changelog (modified) (1 diff)
• mtools/MTFillMatrix.cc (modified) (3 diffs)

trunk/Mars/Changelog

@@ -49 +49 @@
      - added a full class description
 
+   * mtools/MTFillMatrix.cc:
+     - improved handling of negative number of events
 
 

trunk/Mars/mtools/MTFillMatrix.cc

@@ -134 +134 @@
     m->Print("SizeCols");
 
+    if (num<0)
+        return kTRUE;
+
     const Int_t generated = m->GetM().GetNrows();
     if (TMath::Abs(generated-num) <= TMath::Sqrt(9.0*num))
@@ -308 +311 @@
     *fLog << inf;
     fLog->Separator(GetDescriptor());
-    *fLog << "Fill " << fDestMatrix1->GetDescriptor() << " with " << fNumDestEvents1 << endl;
+    *fLog << "Fill " << fDestMatrix1->GetDescriptor() << " with ";
+    if (fNumDestEvents1<0)
+        *fLog << "all events";
+    else
+        *fLog << fNumDestEvents1;
+    cout << "." << endl;
     if (fDestMatrix2)
-        *fLog << "Fill " << fDestMatrix2->GetDescriptor() << " with " << fNumDestEvents2 << endl;
+    {
+        *fLog << "Fill " << fDestMatrix2->GetDescriptor() << " with ";
+    if (fNumDestEvents2<0)
+        *fLog << "all events";
+    else
+        *fLog << fNumDestEvents2;
+    cout << "." << endl;
+    }
     *fLog << "Distribution choosen ";
     if (fReference && fReference->GetHist().GetEntries()>0)
@@ -321 +336 @@
     // Create parameter list and task list, add tasklist to parlist
     //
-    parlist.Print();
+    //parlist.Print();
     MParList  plist(parlist);
     MTaskList tlist;