Changeset 1891 for trunk/MagicSoft/Mars/mhist

Timestamp:

04/03/03 10:28:31 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MBinning.h (modified) (1 diff)
• MHMatrix.cc (modified) (1 diff)
• MHMatrix.h (modified) (1 diff)

trunk/MagicSoft/Mars/mhist/MBinning.h

@@ -42 +42 @@
     void SetEdgesCos(const Int_t nbins, const Axis_t lo, Axis_t up);
 
+    Int_t FindLoEdge(Double_t val) const
+    {
+        for (int i=0; i<fEdges.GetSize(); i++)
+        {
+            if (val >= ((TArrayD)fEdges)[i])
+                return i;
+        }
+        return -1;
+    }
+    Int_t FindHiEdge(Double_t val) const
+    {
+        for (int i=0; i<fEdges.GetSize(); i++)
+        {
+            if (val < ((TArrayD)fEdges)[i])
+                return i;
+        }
+        return -1;
+    }
+
     // FIXME: ROOT workaround: "operator[] const" missing
     Double_t GetEdgeLo() const { return ((TArrayD)fEdges)[0]; }

trunk/MagicSoft/Mars/mhist/MHMatrix.cc

@@ -1002 +1002 @@
 
 // --------------------------------------------------------------------------
+//
+// Read the setup from a TEnv:
+//   Column0, Column1, Column2, ..., Column10, ..., Column100, ...
+//
+// Searching stops if the first key isn't found in the TEnv. Empty
+// columns are not allowed
+//
+// eg.
+//     MHMatrix.Column0: cos(MMcEvt.fTelescopeTheta)
+//     MHMatrix.Column1: MHillasSrc.fAlpha
+//
+Bool_t MHMatrix::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
+{
+    if (fM.IsValid())
+    {
+        *fLog << err << "ERROR - matrix is already in use. Can't add a new column from TEnv... skipped." << endl;
+        return kERROR;
+    }
+
+    if (TestBit(kIsLocked))
+    {
+        *fLog << err << "ERROR - matrix is locked. Can't add new column from TEnv... skipped." << endl;
+        return kERROR;
+    }
+
+    if (fData)
+    {
+        *fLog << inf << "Removing all existing columns in " << GetDescriptor() << endl;
+        fData->Delete();
+    }
+    else
+    {
+        fData = new MDataArray;
+        SetBit(kIsOwner);
+    }
+
+    //
+    // Search (beginning with 0) all keys
+    //
+    for (int i=0;; i++)
+    {
+        TString idx = "Column";
+        idx += i;
+
+        // Output if print set to kTRUE
+        IsEnvDefined(env, prefix, idx, print);
+
+        // Try to get the file name
+        TString name = GetEnvValue(env, prefix, idx, "");
+        if (name.IsNull())
+            return kTRUE;
+
+        /*
+        if (name.BeginsWith("\"") && name.EndsWith("\""))
+        {
+            name.Remove(name.Last('\"'), 1);
+            name.Remove(name.First('\"'), 1);
+        }
+        */
+
+        if (print)
+            *fLog << all << "Add Column: " << name << endl;
+        fData->AddEntry(name);
+    }
+
+    return kTRUE;
+}

trunk/MagicSoft/Mars/mhist/MHMatrix.h

@@ -110 +110 @@
     Bool_t DefRefMatrix(Int_t nmaxevts=0, TMatrix *mrest=NULL);
 
+    Bool_t ReadEnv(const TEnv &env, TString prefix, Bool_t print=kFALSE);
+
     ClassDef(MHMatrix, 1) // Multidimensional Matrix to store events
 };