Changeset 2114

Timestamp:

05/13/03 15:16:54 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MMultiDimDistCalc.cc (modified) (1 diff)
• mdata/MDataArray.cc (modified) (3 diffs)
• mdata/MDataArray.h (modified) (2 diffs)
• mranforest/MRanForest.cc (modified) (2 diffs)
• mranforest/MRanForest.h (modified) (1 diff)
• mranforest/MRanForestCalc.cc (modified) (1 diff)
• mranforest/MRanTree.cc (modified) (5 diffs)
• mranforest/MRanTree.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                  -*-*- END OF LINE -*-*-
+ 2003/05/13: Thomas Bretz
+
+   * mdata/MDataArray.[h,cc]:
+     - addeed GetData and >>-operator to fill a TVector from the array
+     
+   * manalysis/MMultiDimDistCalc.cc:
+     - use new >>-operator from MDataArray
+     
+   * mranforest/MRanForest.[h,cc]:
+     - TVector& in CalcHadronness declared const
+     - added a const qualifier to 'Float_t sum'
+     - removed Reset() from a TIter declaration (done by the TIter 
+       constructor)
+     
+   * mranforest/MRanForestCalc.cc:
+     - fill TVector with new >>-operator of MDataArray
+     
+   * mranforest/MRanTree.[h,cc]:
+     - removed obsolete returns at the end of some functions
+     - TVector& in TreeHad declared const
+     - changed if to ?:-operator in TreeHad
+     - TreeHad() calls TreeHad(const TVector &) now (code is not
+       implemented twice)
+
+
+
  2003/05/12: Abelardo Moralejo
 
    * mhistmc/MHMcEnergyMigration.cc
      - Draw(): fixed axis label in one plot.
+
+
 
  2003/05/12: Thomas Bretz

trunk/MagicSoft/Mars/manalysis/MMultiDimDistCalc.cc

@@ -172 +172 @@
 Bool_t MMultiDimDistCalc::Process()
 {
-    const Double_t ncols = fMGammas->GetM().GetNcols();
-
-    TVector event(ncols);
-
-    for (int i=0; i<fData->GetNumEntries(); i++)
-        event(i) = (*fData)(i);
-
-    /*
-    Int_t n=0;
-    TIter Next(fData);
-    MData *data = NULL;
-    while ((data=(MData*)Next()))
-        event(n++) = data->GetValue();
-        */
+    // first copy the data from the data array to a vector event
+    TVector event;
+    *fData >> event;
 
     Double_t numg = fNum;

trunk/MagicSoft/Mars/mdata/MDataArray.cc

@@ -35 +35 @@
 #include <fstream.h>
 
+#include <TVector.h>
+
 #include "MLog.h"
 #include "MLogManip.h"
@@ -89 +91 @@
 // Return the data value of the i-th entry
 //
-Double_t MDataArray::operator()(Int_t i)
-{
-    return ((MData*)fList[i])->GetValue();
+Double_t MDataArray::operator()(Int_t i) const
+{
+    return (*this)[i].GetValue();
 }
 
@@ -189 +191 @@
     return str;
 }
+
+void MDataArray::GetData(TVector &v) const
+{
+    Double_t ncols = GetNumEntries();
+
+    v.ResizeTo(ncols);
+
+    // same as: for (int i=0; i<ncols; i++) <should be faster>
+    while (ncols--)
+        v(ncols) = (*this)(ncols);
+}

trunk/MagicSoft/Mars/mdata/MDataArray.h

@@ -14 +14 @@
 #include <TObjArray.h>
 #endif
+
+class TVector;
 
 class MData;
@@ -31 +33 @@
 
     MData &operator[](Int_t i) const;
-    Double_t operator()(Int_t i);
+    Double_t operator()(Int_t i) const;
+
+    void GetData(TVector &v) const;
+
+    void operator>>(TVector &v) const
+    {
+        GetData(v);
+    }
 
     TString GetRule(int i) const;

trunk/MagicSoft/Mars/mranforest/MRanForest.cc

@@ -85 +85 @@
 void MRanForest::SetPriors(Float_t prior_had, Float_t prior_gam)
 {
-    Float_t sum;
-
-    sum=prior_gam+prior_had;
+    const Float_t sum=prior_gam+prior_had;
 
     prior_gam/=sum;
@@ -98 +96 @@
 }
 
-Double_t MRanForest::CalcHadroness(TVector &event)
+Double_t MRanForest::CalcHadroness(const TVector &event)
 {
     Double_t hadroness=0;
     Int_t ntree=0;
+
+    TIter forest(fForest);
+
     MRanTree *tree;
-
-    TIter forest(fForest);
-    forest.Reset();
-
     while ((tree=(MRanTree*)forest.Next()))
     {

trunk/MagicSoft/Mars/mranforest/MRanForest.h

@@ -96 +96 @@
  
     // use forest to calculate hadronness of event
-    Double_t CalcHadroness(TVector &event);
+    Double_t CalcHadroness(const TVector &event);
 
     Bool_t AsciiWrite(ostream &out) const;

trunk/MagicSoft/Mars/mranforest/MRanForestCalc.cc

@@ -137 +137 @@
 Bool_t MRanForestCalc::Process()
 {
-    const Double_t ncols = fData->GetNumEntries();
-    TVector event(ncols);
-
-    for (int i=0; i<fData->GetNumEntries(); i++)
-        event(i) = (*fData)(i);
+    // first copy the data from the data array to a vector event
+    TVector event;
+    *fData >> event;
 
     Double_t hadroness=fRanForest->CalcHadroness(event);

trunk/MagicSoft/Mars/mranforest/MRanTree.cc

@@ -178 +178 @@
     // (Gini-index as criterium crit)
 
-    critmax=-1.0e20;
+    critmax=-1.0e20;  // FIXME: Replace by a constant from limits.h
 
     // random split selection, number of trials = fNumTry
@@ -301 +301 @@
     for(Int_t n=ndstart;n<=ndend;n++)
         ncase[n]=datasort[msplit*numdata+n];
-
-    return;
 }
 
@@ -459 +457 @@
             fBestSplit[kn]/=(classpop[0*nrnodes+kn]+classpop[1*nrnodes+kn]);
         }
-
-    return;
 }
 
@@ -468 +464 @@
 }
 
-Double_t MRanTree::TreeHad(TVector &event)
-{
-    Int_t kt=0;
-    // to optimize on storage space node status and node class
-    // are coded into fBestVar:
-    // status of node kt = TMath::Sign(1,fBestVar[kt])
-    // hadronness assigned to node kt = fBestSplit[kt]
-
-    for (Int_t k=0;k<fNumNodes;k++)
-    {
-        if (fBestVar[kt]<0)
-            break;
-
-        Int_t m=fBestVar[kt];
-
-        if (event(m)<=fBestSplit[kt])
-            kt=fTreeMap1[kt];
-        else
-            kt=fTreeMap2[kt];
-    }
-
-    return fBestSplit[kt];
-}
-
-Double_t MRanTree::TreeHad()
-{
-    const Double_t ncols = fData->GetNumEntries();
-    TVector event(ncols);
-
-    for (int i=0; i<fData->GetNumEntries(); i++)
-        event(i) = (*fData)(i);
-
+Double_t MRanTree::TreeHad(const TVector &event)
+{
     Int_t kt=0;
     // to optimize on storage space node status and node class
@@ -513 +479 @@
             break;
 
-        Int_t m=fBestVar[kt];
-
-        if (event(m)<=fBestSplit[kt])
-            kt=fTreeMap1[kt];
-        else
-            kt=fTreeMap2[kt];
-
+        const Int_t m=fBestVar[kt];
+
+        kt = event(m)<=fBestSplit[kt] ? fTreeMap1[kt] : fTreeMap2[kt];
     }
 
     return fBestSplit[kt];
+}
+
+Double_t MRanTree::TreeHad()
+{
+    TVector event;
+    *fData >> event;
+
+    return TreeHad(event);
 }
 

trunk/MagicSoft/Mars/mranforest/MRanTree.h

@@ -81 +81 @@
                    TArrayF &wl,Int_t ninbag);
 
-    Double_t TreeHad(TVector &event);
+    Double_t TreeHad(const TVector &event);
     Double_t TreeHad();