Changeset 7130 for trunk/MagicSoft/Mars/mhbase

Timestamp:

06/03/05 18:02:36 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhbase

Files:

• MFillH.cc (modified) (4 diffs)
• MHMatrix.cc (modified) (3 diffs)
• MHMatrix.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mhbase/MFillH.cc

@@ -203 +203 @@
     fHName = hist;
     fParContainer = par;
-    fParContainerName = par->GetName();
+    if (par)
+        fParContainerName = par->GetName();
 
     AddToBranchList(Form("%s.*", (const char*)ExtractName(hist)));
-    AddToBranchList(Form("%s.*", par->GetName()));
+    if (par)
+        AddToBranchList(Form("%s.*", par->GetName()));
 
     if (!title)
-        fTitle = Form("Fill %s from %s", fName.Data(), par->GetDescriptor().Data());
+        fTitle = Form("Fill %s from %s", fName.Data(), par?par->GetDescriptor().Data():"NULL");
 }
 
@@ -226 +228 @@
 
     fH = hist;
-    fHName = hist->GetName();
+    if (hist)
+        fHName = hist->GetName();
     fParContainerName = par;
 
-    AddToBranchList(fH->GetDataMember());
+    if (fH)
+        AddToBranchList(fH->GetDataMember());
     if (par)
         AddToBranchList(Form("%s.*", (const char*)ExtractName(par)));
@@ -236 +240 @@
         return;
 
-    fTitle = Form("Fill %s", hist->GetDescriptor().Data());
+    fTitle = Form("Fill %s", hist ? hist->GetDescriptor().Data() : "NULL");
     if (!par)
         return;
@@ -257 +261 @@
 
     fH = hist;
-    fHName = hist->GetName();
+    if (hist)
+        fHName = hist->GetName();
     fParContainer = par;
-    fParContainerName = par->GetName();
-
-    AddToBranchList(fH->GetDataMember());
-    AddToBranchList(Form("%s.*", par->GetName()));
+    if (par)
+        fParContainerName = par->GetName();
+
+    if (fH)
+        AddToBranchList(fH->GetDataMember());
+    if (par)
+        AddToBranchList(Form("%s.*", par->GetName()));
 
     if (!title)
-        fTitle = Form("Fill %s from %s", hist->GetDescriptor().Data(), par->GetDescriptor().Data());
+        fTitle = Form("Fill %s from %s",
+                      hist?hist->GetDescriptor().Data():"NULL",
+                      par ? par->GetDescriptor().Data():"NULL");
 }
 

trunk/MagicSoft/Mars/mhbase/MHMatrix.cc

@@ -143 +143 @@
 Int_t MHMatrix::AddColumn(const char *rule)
 {
+    const Int_t idx = fData ? fData->FindRule(rule) : -1;
+    if (idx>=0)
+        return idx;
+
     if (IsValid(fM))
     {
@@ -160 +164 @@
         SetBit(kIsOwner);
     }
-
-    const Int_t idx = fData->FindRule(rule);
-    if (idx>=0)
-        return idx;
 
     fData->AddEntry(rule);
@@ -1262 +1262 @@
     return kTRUE;
 }
+
+// --------------------------------------------------------------------------
+//
+// Returns the row pointed to by fNumRow into TVector v
+//
+void MHMatrix::GetRow(TVector &v) const
+{
+    Int_t ncols = fM.GetNcols();
+
+    v.ResizeTo(ncols);
+
+    while (ncols--)
+        v(ncols) = fM(fRow, ncols);
+}

trunk/MagicSoft/Mars/mhbase/MHMatrix.h

@@ -73 +73 @@
     void AddColumns(MDataArray *mat);
 
+    //MDataArray *GetColumns() { return fData; }
+    const MDataArray *GetColumns() const { return fData; }
     MDataArray *GetColumns() { return fData; }
 
@@ -102 +104 @@
     Double_t operator[](Int_t col) { return fM(fRow, col); }
 
+    void GetRow(TVector &v) const;
+    void operator>>(TVector &v) const
+    {
+        GetRow(v);
+    }
+
     Bool_t Fill(MParList *plist, MTask *read, MFilter *filter=NULL);