Changeset 1910 for trunk/MagicSoft/Mars/manalysis/MMultiDimDistCalc.cc

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/manalysis/MMultiDimDistCalc.cc (modified) (5 diffs)

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;