Changeset 5560 for trunk/MagicSoft/Mars/mhist

Timestamp:

12/06/04 12:55:12 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MHCamEvent.cc (modified) (2 diffs)
• MHCamEvent.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mhist/MHCamEvent.cc

@@ -89 +89 @@
     fName  = name  ? name  : gsDefName.Data();
     fTitle = title ? title : gsDefTitle.Data();
+
+    fNameGeom = "MGeomCam";
 }
 
@@ -150 +152 @@
     }
 
-    MGeomCam *cam = (MGeomCam*)plist->FindObject("MGeomCam");
+    MGeomCam *cam = (MGeomCam*)plist->FindObject(fNameGeom, "MGeomCam");
     if (!cam)
     {
-        *fLog << err << GetDescriptor() << ": No MGeomCam found." << endl;
+        *fLog << err << fNameGeom << " [MGeomCam] not found... abort." << endl;
         return kFALSE;
     }
 
-    // Delete a posible old histogram from a previous loop
+    // Delete a possible old histogram from a previous loop
     if (fSum)
         delete (fSum);

trunk/MagicSoft/Mars/mhist/MHCamEvent.h

@@ -18 +18 @@
     MCamEvent *fEvt;       //! the current event
 
-    TString fNameEvt;      // Nameof MCamEvent to fill into histogram
+    TString fNameEvt;      // Name of MCamEvent to fill into histogram
+    TString fNameGeom;     // Name of geometry container
 
     Int_t fType;           // Type to used for calling GetPixelContent
@@ -37 +38 @@
     ~MHCamEvent();
 
-    void SetNameEvt(const TString name) { fNameEvt = name; }
+    void SetNameEvt(const TString name)  { fNameEvt = name; }
+    void SetNameGeom(const TString name) { fNameGeom = name; }
     void SetType(Int_t type) { fType = type; }