Changeset 1488 for trunk/MagicSoft

Timestamp:

08/08/02 09:15:26 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• manalysis/MHillasSrc.cc (modified) (2 diffs)
• manalysis/MMultiDimDistCalc.cc (modified) (5 diffs)
• manalysis/MMultiDimDistCalc.h (modified) (2 diffs)
• mdata/DataLinkDef.h (modified) (1 diff)
• mdata/MDataArray.cc (added)
• mdata/MDataArray.h (added)
• mdata/Makefile (modified) (1 diff)
• mfileio/MWriteRootFile.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/manalysis/MHillasSrc.cc

@@ -116 +116 @@
     }
 
-    fDist = dist;
-                                                 // [mm]
     //
     // Calculate Alpha and Cosda = cos(d,a)
@@ -123 +121 @@
     // a head-tail information
     //
-    const Double_t arg = (sy-tand*sx) / (fDist*sqrt(tand*tand+1));
+    const Double_t arg = (sy-tand*sx) / (dist*sqrt(tand*tand+1));
 
     fAlpha         = asin(arg)*kRad2Deg;        // [deg]
-    fCosDeltaAlpha = fHeadTail/fDist;           // [1]
+    fCosDeltaAlpha = fHeadTail/dist;            // [1]
+    fDist          = dist;                      // [mm]
 
     SetReadyToSave();

trunk/MagicSoft/Mars/manalysis/MMultiDimDistCalc.cc

@@ -26 +26 @@
 /////////////////////////////////////////////////////////////////////////////
 //
-// MMultiDimDistCalc
-//
-// Calculated a multidimensional distance. It calculates the distance to
-// all vectors in a given matrix describing Gammas and another one
-// describing Hadrons (non gammas). The shortest distances are avaraged.
-// How many distances are used for avaraging can be specified in the
-// constructor.
+//  MMultiDimDistCalc
+//
+//  Calculated a multidimensional distance. It calculates the distance to
+//  all vectors in a given matrix describing Gammas and another one
+//  describing Hadrons (non gammas). The shortest distances are avaraged.
+//  How many distances are used for avaraging can be specified in the
+//  constructor.
+//
+//  * If you want to use the kernel function to calculate the distance use:
+//      MMultiDimDistCalc::SetUseKernelMethod();
+//  * To use only the n next neighbors for your calculation use:
+//      MMultiDimDistCalc::SetUseNumRows(n);
+//  * To use all reference events set the number to 0 <default>
 //
 ////////////////////////////////////////////////////////////////////////////
 #include "MMultiDimDistCalc.h"
 
+#include <fstream.h>
+
 #include "MHMatrix.h" // must be before MLogManip.h
 
@@ -49 +57 @@
 ClassImp(MMultiDimDistCalc);
 
+static const TString gsDefName  = "MMultiDimDistCalc";
+static const TString gsDefTitle = "Composite Probabilities Loop 1/2";
 // --------------------------------------------------------------------------
 //
@@ -54 +64 @@
 // avaraging in CalcDist
 //
-MMultiDimDistCalc::MMultiDimDistCalc(Int_t num, const char *name, const char *title)
-    : fNum(num)
+MMultiDimDistCalc::MMultiDimDistCalc(const char *name, const char *title)
+    : fNum(0), fUseKernel(kFALSE)
 {
     //
     //   set the name and title of this object
     //
-    fName  = name  ? name  : "MMultiDimDistCalc";
-    fTitle = title ? title : "Composite Probabilities Loop 1/2";
+    fName  = name  ? name  : gsDefName.Data();
+    fTitle = title ? title : gsDefTitle.Data();
 
     fData = new TList;
@@ -152 +162 @@
         event(n++) = data->GetValue();
 
-    Double_t dg = fMGammas->CalcDist(event, fNum);
-    Double_t dh = fMHadrons->CalcDist(event, fNum);
-
+    Double_t numg = fNum;
+    Double_t numh = fNum;
+    if (fNum==0)
+    {
+        numg = fMGammas->GetM().GetNrows();
+        numh = fMHadrons->GetM().GetNrows();
+    }
+    if (fUseKernel)
+    {
+        numg = -numg;
+        numh = -numh;
+    }
+
+    Double_t dg = fMGammas->CalcDist(event, numg);
+    Double_t dh = fMHadrons->CalcDist(event, numh);
+
+    //fHadroness->SetHadroness(dg/(dg+dh));
     fHadroness->SetHadroness(exp(-dh/dg));
 
@@ -160 +184 @@
 }
 
+void MMultiDimDistCalc::StreamPrimitive(ofstream &out) const
+{
+    out << "   MMultiDimDist " << GetUniqueName();
+
+    if (fName!=gsDefName || fTitle!=gsDefTitle)
+    {
+        out << "(\"" << fName << "\"";
+        if (fTitle!=gsDefTitle)
+            out << ", \"" << fTitle << "\")";
+    }
+    out << ";" << endl;
+
+    if (fNum!=0)
+        out << "   " << GetUniqueName() << ".SetUseNumRows(" << fNum << ");" << endl;
+    if (fUseKernel)
+        out << "   " << GetUniqueName() << ".SetUseKernelMethod();" << endl;
+}

trunk/MagicSoft/Mars/manalysis/MMultiDimDistCalc.h

@@ -13 +13 @@
 {
 private:
-    Int_t fNum;             // number of distances used for an avarage
+    Int_t  fNum;            // number of distances used for an avarage
+    Bool_t fUseKernel;      // Flag whether kernel method should be used
 
     MHMatrix   *fMGammas;   //! Gammas describing matrix
@@ -22 +23 @@
     TList *fData;           //! Used to store the MDataChains to get the event values
 
+    void StreamPrimitive(ofstream &out) const;
+
 public:
-    MMultiDimDistCalc(Int_t num, const char *name=NULL, const char *title=NULL);
+    MMultiDimDistCalc(const char *name=NULL, const char *title=NULL);
     ~MMultiDimDistCalc();
+
+    void SetUseNumRows(UShort_t n=0) { fNum = n; }
+    void SetUseKernelMethod(Bool_t k=kTRUE) { fUseKernel = k; }
 
     Bool_t PreProcess(MParList *plist);
     Bool_t Process();
 
-    ClassDef(MMultiDimDistCalc, 1) // Task to calculate multidimensional distances
+    ClassDef(MMultiDimDistCalc, 0) // Task to calculate multidimensional distances
 };
 

trunk/MagicSoft/Mars/mdata/DataLinkDef.h

@@ -6 +6 @@
 
 #pragma link C++ class MData+;
+#pragma link C++ class MDataArray+;
 #pragma link C++ class MDataList+;
 #pragma link C++ class MDataValue+;

trunk/MagicSoft/Mars/mdata/Makefile

@@ -32 +32 @@
 
 SRCFILES = MData.cc \
+           MDataArray.cc \
            MDataMember.cc \
            MDataValue.cc \

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.cc

@@ -49 +49 @@
 ClassImp(MWriteRootFile);
 
+static const TString gsDefName  = "MWriteRootFile";
+static const TString gsDefTitle = "Task which writes a root-output file";
 // --------------------------------------------------------------------------
 //
@@ -56 +58 @@
 MWriteRootFile::MWriteRootFile() : fOut(NULL)
 {
-    fName  = "MWriteRootFile";
-    fTitle = "Task which writes a root-output file";
+    fName  = gsDefName;
+    fTitle = gsDefTitle;
 
     fBranches.SetOwner();
@@ -76 +78 @@
                                const char *title)
 {
-    fName  = name  ? name  : "MWriteRootFile";
-    fTitle = title ? title : "Task which writes a root-output file";
+    fName  = name  ? name  : gsDefName.Data();
+    fTitle = title ? title : gsDefTitle.Data();
 
     //
@@ -409 +411 @@
     out << fOut->GetOption() << "\", \"";
     out << fOut->GetTitle() << "\", ";
-    out << fOut->GetCompressionLevel() << ", \"";
-    out << fName << "\", \"" << fTitle << "\");" << endl;;
+    out << fOut->GetCompressionLevel();
+
+    if (fName!=gsDefName || fTitle!=gsDefTitle)
+    {
+        out << ", \"" << fName << "\"";
+        if (fTitle!=gsDefTitle)
+            out << ", \"" << fTitle << "\"";
+    }
+    out << ");" << endl;
+
 
     MRootFileBranch *entry;
@@ -416 +426 @@
     while ((entry=(MRootFileBranch*)Next()))
     {
+        out << "   " << GetUniqueName() << ".AddContainer(";
+
         if  (entry->GetContainer())
         {
@@ -424 +436 @@
             out << "\"" << entry->GetContName() << "\"";
 
-        out << ", \"" << entry->GetName() << "\", \"";
-        out << entry->GetTitle() << "\");" << endl;
+        out << ", \"" << entry->GetName() << "\"";
+        if ((TString)entry->GetTitle()!="")
+            out << ", \"" << entry->GetTitle() << "\"";
+
+        out <<");" << endl;
     }
 }