Changeset 1910 for trunk/MagicSoft/Mars/manalysis

Timestamp:

04/07/03 15:34:51 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MMultiDimDistCalc.cc (modified) (5 diffs)
• MMultiDimDistCalc.h (modified) (3 diffs)
• MRanForestCalc.cc (modified) (2 diffs)
• MRanForestCalc.h (modified) (1 diff)

trunk/MagicSoft/Mars/manalysis/MMultiDimDistCalc.cc

@@ -61 +61 @@
 
 static const TString gsDefName  = "MMultiDimDistCalc";
-static const TString gsDefTitle = "Composite Probabilities Loop 1/2";
+static const TString gsDefTitle = "Calculate Hadronness with Nearest Neighbor/Kernel Method";
+
 // --------------------------------------------------------------------------
 //
@@ -68 +69 @@
 //
 MMultiDimDistCalc::MMultiDimDistCalc(const char *name, const char *title)
-    : fNum(0), fUseKernel(kTRUE), fData(NULL)
+    : fNum(0), fUseKernel(kTRUE), fHadronnessName("MHadronness"), fData(NULL)
 {
     //
@@ -151 +152 @@
     }
 
-    fHadronness = (MHadronness*)plist->FindCreateObj("MHadronness");
+    fHadronness = (MHadronness*)plist->FindCreateObj(fHadronnessName, "MHadronness");
     if (!fHadronness)
         return kFALSE;
@@ -208 +209 @@
     }
 
-    Double_t arg;
-
-    if (dg+dh != 0.0)
-      arg = dg / (dg+dh);
-    else
-      arg = 1.e10;
-    //fHadronness->SetHadronness(arg);
-
-    if (dg != 0.0)
-      arg = exp(-dh/dg);
-    else
-      arg = 0.0;
-    fHadronness->SetHadronness(arg);
-      
+    fHadronness->SetHadronness(dg==0 ? 0 : exp(-dh/dg));
 
     return kTRUE;
@@ -238 +226 @@
     out << ";" << endl;
 
+    if (fHadronnessName!="MHadronness")
+        out << "   " << GetUniqueName() << ".SetHadronnessName(\"" << fHadronnessName << "\");" << endl;
     if (fNum!=0)
         out << "   " << GetUniqueName() << ".SetUseNumRows(" << fNum << ");" << endl;

trunk/MagicSoft/Mars/manalysis/MMultiDimDistCalc.h

@@ -17 +17 @@
     Bool_t fUseKernel;        // Flag whether kernel method should be used
 
+    TString fHadronnessName;  // Name of container storing hadronness
+
     MHMatrix   *fMGammas;     //! Gammas describing matrix
     MHMatrix   *fMHadrons;    //! Hadrons (non gammas) describing matrix
@@ -30 +32 @@
     ~MMultiDimDistCalc();
 
+    void SetHadronnessName(const TString name) { fHadronnessName = name; }
+    TString GetHadronnessName() const { return fHadronnessName; }
+
     void SetUseNumRows(UShort_t n=0) { fNum = n; }
     void SetUseKernelMethod(Bool_t k=kTRUE) { fUseKernel = k; }
@@ -36 +41 @@
     Bool_t Process();
 
-    ClassDef(MMultiDimDistCalc, 0) // Task to calculate multidimensional distances
+    ClassDef(MMultiDimDistCalc, 0) // Task to calculate nearest neighbor-/kernel-hadronness
 };
 

trunk/MagicSoft/Mars/manalysis/MRanForestCalc.cc

@@ -60 +60 @@
 //
 MRanForestCalc::MRanForestCalc(const char *name, const char *title)
-    : fNum(100), fData(NULL)
+    : fNum(100), fHadronnessName("MHadronness"), fData(NULL)
 {
     //
@@ -125 +125 @@
     }
 
-    fHadroness = (MHadronness*)plist->FindCreateObj("MHadronness");
+    fHadroness = (MHadronness*)plist->FindCreateObj(fHadronnessName, "MHadronness");
     if (!fHadroness)
         return kFALSE;

trunk/MagicSoft/Mars/manalysis/MRanForestCalc.h

@@ -15 +15 @@
 {
 private:
-    Int_t  fNum;             // number of trees used to compute hadronness
+    Int_t  fNum;              // number of trees used to compute hadronness
 
-    MHadronness *fHadroness; //! Output container for calculated hadroness
-    MDataArray *fData;       //! Used to store the MDataChains to get the event values
-    MRanForest *fRanForest;
-    MRanTree   *fRanTree;
+    TString fHadronnessName;  // Name of container storing hadronness
+
+    MHadronness *fHadroness;  //! Output container for calculated hadroness
+    MDataArray  *fData;       //! Used to store the MDataChains to get the event values
+    MRanForest  *fRanForest;
+    MRanTree    *fRanTree;
 
 public:
     MRanForestCalc(const char *name=NULL, const char *title=NULL);
     ~MRanForestCalc();
+
+    void SetHadronnessName(const TString name) { fHadronnessName = name; }
+    TString GetHadronnessName() const { return fHadronnessName; }
 
     void SetUseNumTrees(UShort_t n=100) { fNum = n; }