Changeset 2557 for trunk/MagicSoft/Mars/mdata

Timestamp:

11/22/03 21:14:14 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mdata

Files:

• MDataList.cc (modified) (3 diffs)
• MDataList.h (modified) (1 diff)

trunk/MagicSoft/Mars/mdata/MDataList.cc

@@ -76 +76 @@
         fSign = kEPlus;
         return;
+    case '%':
+        fSign = kEModul;
+        return;
     default:
         fSign = kENone;
@@ -148 +151 @@
         }
         break;
+
+    case kEModul:
+        while ((member=(MData*)Next()))
+        {
+            Double_t d = member->GetValue();
+            if (d==0)
+            {
+                *fLog << warn << "Warning: Modulo division by zero (" << member->GetName() << ")" << endl;
+                return 0;
+            }
+            val = fmod(val, d);
+        }
+        break;
     }
     return val;
@@ -315 +331 @@
             str += "/";
             break;
+
+        case kEModul:
+            str += "%";
+            break;
         }
 

trunk/MagicSoft/Mars/mdata/MDataList.h

@@ -23 +23 @@
     TOrdCollection fMembers;    // Container for the filters
 
-    typedef enum { kENone, kEPlus, kEMinus, kEMult, kEDiv } SignType_t;
+    typedef enum { kENone, kEPlus, kEMinus, kEMult, kEDiv, kEModul } SignType_t;
     SignType_t fSign;