Changeset 1489 for trunk/MagicSoft/Mars/manalysis

Timestamp:

08/08/02 11:58:59 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MHillasSrc.cc (modified) (1 diff)
• MMultiDimDistCalc.cc (modified) (8 diffs)
• MMultiDimDistCalc.h (modified) (2 diffs)

trunk/MagicSoft/Mars/manalysis/MHillasSrc.cc

@@ -69 +69 @@
 {
     fName  = name  ? name  : "MHillasSrc";
-    fTitle = title ? title : "parameters depending in source position";
+    fTitle = title ? title : "Parameters depending in source position";
 }
 

trunk/MagicSoft/Mars/manalysis/MMultiDimDistCalc.cc

@@ -52 +52 @@
 #include "MParList.h"
 #include "MDataChain.h"
+#include "MDataArray.h"
 
 #include "MHadroness.h"
@@ -65 +66 @@
 //
 MMultiDimDistCalc::MMultiDimDistCalc(const char *name, const char *title)
-    : fNum(0), fUseKernel(kFALSE)
+    : fNum(0), fUseKernel(kFALSE), fData(NULL)
 {
     //
@@ -73 +74 @@
     fTitle = title ? title : gsDefTitle.Data();
 
-    fData = new TList;
-    fData->SetOwner();
+    /*
+     fData = new TList;
+     fData->SetOwner();
+     */
 }
 
@@ -83 +86 @@
 MMultiDimDistCalc::~MMultiDimDistCalc()
 {
-    delete fData;
+    //    delete fData;
 }
 
@@ -119 +122 @@
     }
 
+    /*
     TIter Next(fMGammas->GetRules());
     TObject *data=NULL;
@@ -130 +134 @@
         }
         fData->Add(chain);
+    }
+    */
+    fData = fMGammas->GetColumns();
+    if (!fData)
+    {
+        *fLog << err << dbginf << "Error matrix doesn't contain columns... aborting." << endl;
+        return kFALSE;
+    }
+
+    if (!fData->PreProcess(plist))
+    {
+        *fLog << err << dbginf << "PreProcessing of the MDataArray failed for the columns failed... aborting." << endl;
+        return kFALSE;
     }
 
@@ -156 +173 @@
     TVector event(ncols);
 
+    for (int i=0; i<fData->GetNumEntries(); i++)
+        event(i) = (*fData)(i);
+
+    /*
     Int_t n=0;
     TIter Next(fData);
@@ -161 +182 @@
     while ((data=(MData*)Next()))
         event(n++) = data->GetValue();
+        */
 
     Double_t numg = fNum;

trunk/MagicSoft/Mars/manalysis/MMultiDimDistCalc.h

@@ -9 +9 @@
 class MParList;
 class MHadroness;
+class MDataArray;
 
 class MMultiDimDistCalc : public MTask
@@ -21 +22 @@
     MHadroness *fHadroness; //! Output container for calculated hadroness
 
-    TList *fData;           //! Used to store the MDataChains to get the event values
+    MDataArray *fData;      //! Used to store the MDataChains to get the event values
 
     void StreamPrimitive(ofstream &out) const;