Changeset 2516 for trunk

Timestamp:

11/15/03 18:01:32 (21 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• mhist/MFillH.cc (modified) (1 diff)
• mhist/MH.h (modified) (2 diffs)
• mhist/MHHadronness.cc (modified) (2 diffs)
• mranforest/MHRanForest.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -3 +3 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2003/11/15: Thomas Bretz, Abelardo Moralejo
+
+   * mhist/MH.h: 
+     - added fSerialNumber data member 
+
+   * mhist/MFillH.cc:
+     - distribute serial number to the MH object to be filled
+
+   * mranforest/MHRanForest.cc, mhist/MHHadronness.cc:
+     - added serial number to the MMcEvt container (does nothing unless
+       SetSerialNumber has been called for the corresponding MFillH)
+       This is intended to allow the use of Random Forest with MC
+       multi-telescope files.
+
+   * NEWS: 
+     - updated.
+
  2003/11/14: Abelardo Moralejo
 

trunk/MagicSoft/Mars/NEWS

@@ -2 +2 @@
  *** Version <cvs>
 
-
+   - adapted Random Forest classes to allow the use with MC
+     multi-telescope files which can be produced with the coming
+     camera version 0.7.
 
  *** Version 0.8.2 (2003/11/10)

trunk/MagicSoft/Mars/mhist/MFillH.cc

@@ -436 +436 @@
     // Now we have the histogram container available. Try to Setup Fill.
     //
+    fH->SetSerialNumber(GetSerialNumber());
     if (!fH->SetupFill(pList))
     {

trunk/MagicSoft/Mars/mhist/MH.h

@@ -19 +19 @@
 class MH : public MParContainer
 {
+private:
+    Byte_t fSerialNumber;
+
 public:
     MH(const char *name=NULL, const char *title=NULL);
+
+
+    virtual void SetSerialNumber(Byte_t num) { fSerialNumber = num; }
+    Byte_t  GetSerialNumber() const { return fSerialNumber; }
+    TString AddSerialNumber(const char *str) const { TString s(str); if (fSerialNumber==0) return s; s += ";"; s += fSerialNumber; return s; }
+    TString AddSerialNumber(const TString &str) const { return AddSerialNumber((const char*)str); }
+
 
     Bool_t OverwritesDraw(TClass *cls=NULL) const;
@@ -84 +94 @@
     static TObject *FindObjectInPad(const char *name, TVirtualPad *pad=NULL);
 
-    ClassDef(MH, 0) //A base class for Mars histograms
+    ClassDef(MH, 1) //A base class for Mars histograms
 };
 

trunk/MagicSoft/Mars/mhist/MHHadronness.cc

@@ -154 +154 @@
     if (!fMatrix)
     {
-        fMcEvt = (MMcEvt*)plist->FindObject("MMcEvt");
+        fMcEvt = (MMcEvt*)plist->FindObject(AddSerialNumber("MMcEvt"));
         if (!fMcEvt)
         {
-            *fLog << err << dbginf << "MMcEvt not found... aborting." << endl;
+            TString str = AddSerialNumber("MMcEvt");
+            str += " not found... aborting.";
+           *fLog << err << dbginf << str << endl;
             return kFALSE;
         }
@@ -563 +565 @@
 
     fMatrix = mat;
-    fMap = fMatrix->AddColumn("MMcEvt.fPartId");
+
+    TString str = AddSerialNumber("MMcEvt");
+    str += ".fPartId";
+
+    fMap = fMatrix->AddColumn(str);
 }
 

trunk/MagicSoft/Mars/mranforest/MHRanForest.cc

@@ -87 +87 @@
 Bool_t MHRanForest::SetupFill(const MParList *plist)
 {
-    fMcEvt = (MMcEvt*)plist->FindObject("MMcEvt");
+    fMcEvt = (MMcEvt*)plist->FindObject(AddSerialNumber("MMcEvt"));
     if (!fMcEvt)
     {
-        *fLog << err << dbginf << "MMcEvt not found... aborting." << endl;
+        TString str =  AddSerialNumber("MMcEvt");
+        str += " not found... aborting.";
+        *fLog << err << dbginf << str << endl;
         return kFALSE;
     }