Changeset 1629 for trunk/MagicSoft/Mars/mhist/MFillH.cc

Timestamp:

11/18/02 10:46:48 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mhist/MFillH.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mhist/MFillH.cc

@@ -85 +85 @@
 ClassImp(MFillH);
 
-//////////////////////////////////////////////////////////////////////////////
-//
-// MMap
-//
-// This class maps a key-value to a given value. In its simple versions it
-// maps a key to an index.
-//
-//////////////////////////////////////////////////////////////////////////////
-#include <TArrayI.h>
-
-class MMap
-{
-private:
-    TArrayI fKeys;
-    TArrayI fValues;
-
-    Int_t K(Int_t i) const { return ((TArrayI)fKeys)[i]; }
-    Int_t V(Int_t i) const { return ((TArrayI)fValues)[i]; }
-
-public:
-    // --------------------------------------------------------------------------
-    //
-    // Get the value which corresponds to the given key-value
-    //
-    Int_t GetValue(Int_t key) const
-    {
-        const Int_t n = fKeys.GetSize();
-        for (int i=0; i<n; i++)
-        {
-            if (K(i)==key)
-                return V(i);
-        }
-        return -1;
-    }
-
-    // --------------------------------------------------------------------------
-    //
-    // Adds a new pair key-value. While the key is the key to the value.
-    // if the key already exists the pair is ignored.
-    //
-    void Add(Int_t key, Int_t value)
-    {
-        if (GetValue(key)>=0)
-            return;
-
-        const Int_t n = fKeys.GetSize();
-
-        fKeys.Set(n+1);
-        fValues.Set(n+1);
-
-        fKeys[n] = key;
-        fValues[n] = value;
-    }
-
-    // --------------------------------------------------------------------------
-    //
-    // Adds a new pair key-value. While the key is the key to the value.
-    // In this case the value is an automatically sequential created index.
-    // if the key already exists the pair is ignored.
-    //
-    Int_t Add(Int_t key)
-    {
-        const Int_t k = GetValue(key);
-        if (k>=0)
-            return k;
-
-        const Int_t n = fKeys.GetSize();
-
-        fKeys.Set(n+1);
-        fValues.Set(n+1);
-
-        fKeys[n] = key;
-        fValues[n] = n;
-
-        return n;
-    }
-};
-
 // --------------------------------------------------------------------------
 //
@@ -177 +99 @@
 
     fIndex  = NULL;
-    fMapIdx = new MMap;
 }
 
@@ -326 +247 @@
         if (fIndex->TestBit(kCanDelete))
             delete fIndex;
-
-    delete fMapIdx;
 }
 
@@ -500 +419 @@
 {
     if (fIndex)
-    {
-        const Int_t key = (Int_t)fIndex->GetValue();
-        const Int_t idx = fMapIdx->Add(key);
-        ((MHArray*)fH)->SetIndex(idx);
-    }
+        ((MHArray*)fH)->SetIndexByKey(fIndex->GetValue());
+    /*
+     const Int_t key = (Int_t)fIndex->GetValue();
+     const Int_t idx = fMapIdx->Add(key);
+     ((MHArray*)fH)->SetIndex(idx);
+     */
 
     return fH->Fill(fParContainer);