Changeset 984 for trunk/MagicSoft/Mars/mbase

Timestamp:

10/24/01 13:57:43 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MParList.cc (modified) (6 diffs)
• MParList.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -457 +457 @@
 //  from 1 to from.
 //
-TObjArray MParList::FindObjectList(const char *name, const UInt_t from, const UInt_t to) const
+TObjArray MParList::FindObjectList(const char *name, UInt_t first, const UInt_t last) const
 {
     TObjArray list;
 
-    if (to>0 && to<=from)
-    {
-        *fLog << dbginf << "Cannot create entries backwards (to<from)...skipped." << endl;
+    if (first>0 && last<first)
+    {
+        *fLog << dbginf << "Cannot create entries backwards (last<first)...skipped." << endl;
         return list;
     }
@@ -472 +472 @@
     strcpy(auxname, name);
 
+    if (first==0 && last!=0)
+        first = 1;
+
     //
     // If only 'from' is specified the number of entries are ment
     //
-    const Bool_t exc = from>0 && to==0;
-
-    const UInt_t first = exc ?    0 : from;
-    const UInt_t last  = exc ? from : to;
-
-    for (UInt_t num=first; num<last; num++)
-    {
-        if (from!=0 || to!=0)
-            sprintf(auxname+len, ";%d", num+1);
+    for (UInt_t i=first; i<=last; i++)
+    {
+        if (first!=0 || last!=0)
+            sprintf(auxname+len, ";%d", i);
 
         TObject *obj = FindObject(auxname);
@@ -505 +503 @@
 //  from 1 to from.
 //
-TObjArray MParList::FindCreateObjList(const char *cname, const UInt_t from, const UInt_t to, const char *oname)
+TObjArray MParList::FindCreateObjList(const char *cname, UInt_t first, const UInt_t last, const char *oname)
 {
     TObjArray list;
 
-    if (to>0 && to<=from)
-    {
-        *fLog << dbginf << "Cannot create entries backwards (to<from)...skipped." << endl;
+    if (first>0 && last<first)
+    {
+        *fLog << dbginf << "Cannot create entries backwards (last<first)...skipped." << endl;
         return list;
     }
@@ -523 +521 @@
     // If only 'from' is specified the number of entries are ment
     //
-    const Bool_t exc = from>0 && to==0;
-
-    const UInt_t first = exc ?    0 : from;
-    const UInt_t last  = exc ? from : to;
-
-    for (UInt_t num=first; num<last; num++)
-    {
-        if (from!=0 || to!=0)
-            sprintf(auxname+len, ";%d", num+1);
+    if (first==0 && last!=0)
+        first = 1;
+
+    for (UInt_t i=first; i<=last; i++)
+    {
+        if (first!=0 || last!=0)
+            sprintf(auxname+len, ";%d", i);
 
         TObject *obj = FindCreateObj(auxname, oname);
@@ -558 +554 @@
 //  compiled programs if you are not 100% sure what you are doing.
 //
-TObjArray MParList::CreateObjList(const char *cname, const UInt_t from, const UInt_t to, const char *oname)
+TObjArray MParList::CreateObjList(const char *cname, UInt_t first, const UInt_t last, const char *oname)
 {
     TObjArray list;
+
+    if (first>0 && last<first)
+    {
+        gLog << dbginf << "Cannot create entries backwards (last<first)...skipped." << endl;
+        return list;
+    }
 
     //
@@ -584 +586 @@
     // If only 'from' is specified the number of entries are ment
     //
-    const Bool_t exc = from>0 && to==0;
-
-    const UInt_t first = exc ?    0 : from;
-    const UInt_t last  = exc ? from : to;
-
-    for (UInt_t num=first; num<last; num++)
-    {
-        if (from!=0 || to!=0)
-            sprintf(auxname+len, ";%d", num+1);
+    if (first==0 && last!=0)
+        first = 1;
+
+    for (UInt_t i=first; i<=last; i++)
+    {
+        if (first!=0 || last!=0)
+            sprintf(auxname+len, ";%d", i);
 
         //

trunk/MagicSoft/Mars/mbase/MParList.h

@@ -20 +20 @@
 #include "MParContainer.h"
 #endif
+
+#include <TObjArray.h>
 
 class MLog;
@@ -49 +51 @@
     MParContainer *FindCreateObj(const char *classname, const char *objname=NULL);
 
-    TObjArray FindObjectList(const char *name, const UInt_t from, const UInt_t to=0) const;
-    TObjArray FindCreateObjList(const char *cname, const UInt_t from, const UInt_t to=0, const char *oname=NULL);
+    TObjArray FindObjectList(const char *name, UInt_t first, const UInt_t last) const;
+    TObjArray FindObjectList(const char *name, const UInt_t num) const
+    {
+        return FindObjectList(name, 0, num);
+    }
 
-    static TObjArray CreateObjList(const char *cname, const UInt_t from, const UInt_t to=0, const char *oname=NULL);
+    TObjArray FindCreateObjList(const char *cname, UInt_t first, const UInt_t last, const char *oname=NULL);
+    TObjArray FindCreateObjList(const char *cname, const UInt_t num, const char *oname=NULL)
+    {
+        return FindCreateObjList(cname, 0, num, oname);
+    }
+
+    static TObjArray CreateObjList(const char *cname, UInt_t first, const UInt_t last, const char *oname=NULL);
+    static TObjArray CreateObjList(const char *cname, const UInt_t num, const char *oname=NULL)
+    {
+        return CreateObjList(cname, 0, num, oname);
+    }
 
     void Reset();