Changeset 9318 for trunk/MagicSoft/Mars/mbase

Timestamp:

02/11/09 17:35:54 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MLut.cc (modified) (3 diffs)
• MLut.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mbase/MLut.cc

@@ -57 +57 @@
 }
 
+void MLut::Delete(Option_t *option)
+{
+    TObjArray::Delete(option);
+
+    fMaxEntries = 0;
+    fMinEntries = 0;
+
+    fMaxIndex = -1;
+}
+
+// --------------------------------------------------------------------------
+//
+// Check if it is a default lut which would just map every entry to itself
+// An empty Lut is a default lut
+//
+Bool_t MLut::IsDefault() const
+{
+    if (IsEmpty())
+        return kTRUE;
+
+    if (!HasConstantLength() || fMaxEntries!=1)
+        return kFALSE;
+
+    // Loop over all rows
+    for (Int_t y=0; y<GetEntriesFast(); y++)
+        if (GetRow(y)[0]!=y)
+            return kFALSE;
+
+    return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
+// Setup a default lut which just maps n-entris to themself
+//
+void MLut::SetDefault(UInt_t n)
+{
+    Delete();
+
+    for (UInt_t y=0; y<n; y++)
+    {
+
+        MArrayI &idx = *new MArrayI(1);
+        idx[0] = y;
+        Add(&idx);
+    }
+
+    fMinEntries = 1;
+    fMaxEntries = 1;
+
+    fMaxIndex = n;
+}
+
 // --------------------------------------------------------------------------
 //
@@ -165 +218 @@
     MLut *lut = GetInverse(uniq);
 
-    Delete();
+    // Keep fMaxIndex
+    TObjArray::Delete();
 
     for (Int_t i=0; i<=fMaxIndex; i++)
@@ -188 +242 @@
 {
     Delete();
-
-    fMaxIndex   = -1;
-    fMaxEntries =  0;
-    fMinEntries =  0;
 
     while (1)

trunk/MagicSoft/Mars/mbase/MLut.h

@@ -13 +13 @@
 {
 private:
-    UInt_t fMinEntries;
-    UInt_t fMaxEntries;
+    UInt_t fMinEntries;   // The minimum entries per row
+    UInt_t fMaxEntries;   // The maximum entries per row
 
-    Int_t  fMaxIndex;
+    Int_t  fMaxIndex;     // The maximum index fount in the lut
 
     MLut *GetInverse(Bool_t uniq=kTRUE) const;
 
 public:
-    MLut() : fMinEntries(0), fMaxEntries(0) { SetOwner(); }
+    MLut() : fMinEntries(0), fMaxEntries(0), fMaxIndex(0) { SetOwner(); }
+
+    // TObjArry
+    void Delete(Option_t *option="");
 
     // MLut Getter
     const MArrayI &GetRow(UInt_t i) const;
+
+     Int_t GetNumRows() const { return GetEntriesFast(); }
 
     UInt_t GetMaxEntries() const { return fMaxEntries; }
@@ -31 +36 @@
     Bool_t HasConstantLength() const { return fMinEntries==fMaxEntries; }
     Bool_t IsEmpty() const { return fMaxEntries==0; }
+    Bool_t IsDefault() const;
 
-    // MLut convertions
+    // MLut conversions
     void SetInverse(const MLut &lut, Bool_t uniq=kTRUE);
     void Invert(Bool_t uniq=kTRUE);
+
+    // Setter
+    void SetDefault(UInt_t n);
 
     // MLut I/O